Merge branch 'develop' into travis/poc/theme-command
This commit is contained in:
commit
65d7bb2ef9
14 changed files with 90 additions and 58 deletions
|
@ -1145,6 +1145,7 @@
|
|||
"Revoke invite": "Revoke invite",
|
||||
"Invited by %(sender)s": "Invited by %(sender)s",
|
||||
"Jump to first unread message.": "Jump to first unread message.",
|
||||
"Mark all as read": "Mark all as read",
|
||||
"Error updating main address": "Error updating main address",
|
||||
"There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.",
|
||||
"Error creating alias": "Error creating alias",
|
||||
|
@ -2134,13 +2135,13 @@
|
|||
"If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.",
|
||||
"If disabled, messages from encrypted rooms won't appear in search results.": "If disabled, messages from encrypted rooms won't appear in search results.",
|
||||
"Disable": "Disable",
|
||||
"Not currently downloading messages for any room.": "Not currently downloading messages for any room.",
|
||||
"Downloading mesages for %(currentRoom)s.": "Downloading mesages for %(currentRoom)s.",
|
||||
"Not currently indexing messages for any room.": "Not currently indexing messages for any room.",
|
||||
"Currently indexing: %(currentRoom)s.": "Currently indexing: %(currentRoom)s.",
|
||||
"Riot is securely caching encrypted messages locally for them to appear in search results:": "Riot is securely caching encrypted messages locally for them to appear in search results:",
|
||||
"Space used:": "Space used:",
|
||||
"Indexed messages:": "Indexed messages:",
|
||||
"Indexed rooms:": "Indexed rooms:",
|
||||
"%(crawlingRooms)s out of %(totalRooms)s": "%(crawlingRooms)s out of %(totalRooms)s",
|
||||
"%(doneRooms)s out of %(totalRooms)s": "%(doneRooms)s out of %(totalRooms)s",
|
||||
"Message downloading sleep time(ms)": "Message downloading sleep time(ms)",
|
||||
"Failed to set direct chat tag": "Failed to set direct chat tag",
|
||||
"Failed to remove tag %(tagName)s from room": "Failed to remove tag %(tagName)s from room",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue