Merge master into federation #48

Manually merged
nutomic merged 120 commits from merge-master into federation 2020-06-09 18:07:02 +00:00
1 changed files with 2 additions and 2 deletions
Showing only changes of commit 445f38eb3c - Show all commits

View File

@ -64,14 +64,14 @@
"remove_as_admin": "remove as admin",
"appoint_as_admin": "appoint as admin",
"remove": "remove",
"removed": "removed",
"removed": "removed by mod",
"locked": "locked",
"stickied": "stickied",
"reason": "Reason",
"mark_as_read": "mark as read",
"mark_as_unread": "mark as unread",
"delete": "delete",
"deleted": "deleted",
"deleted": "deleted by creator",
"delete_account": "Delete Account",
"delete_account_confirm":
"Warning: this will permanently delete all your data. Enter your password to confirm.",