Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
e410b7a5ab
4 changed files with 54 additions and 5 deletions
|
@ -190,7 +190,6 @@
|
|||
"Message Replies": "Message Replies",
|
||||
"Message Pinning": "Message Pinning",
|
||||
"Tag Panel": "Tag Panel",
|
||||
"Sticker Messages": "Sticker Messages",
|
||||
"Disable Emoji suggestions while typing": "Disable Emoji suggestions while typing",
|
||||
"Use compact timeline layout": "Use compact timeline layout",
|
||||
"Hide removed messages": "Hide removed messages",
|
||||
|
@ -566,8 +565,6 @@
|
|||
"Download %(text)s": "Download %(text)s",
|
||||
"Invalid file%(extra)s": "Invalid file%(extra)s",
|
||||
"Error decrypting image": "Error decrypting image",
|
||||
"This image cannot be displayed.": "This image cannot be displayed.",
|
||||
"Image '%(Body)s' cannot be displayed.": "Image '%(Body)s' cannot be displayed.",
|
||||
"Error decrypting video": "Error decrypting video",
|
||||
"%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s changed the avatar for %(roomName)s",
|
||||
"%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s removed the room avatar.",
|
||||
|
@ -815,8 +812,8 @@
|
|||
"Encryption key request": "Encryption key request",
|
||||
"Sign out": "Sign out",
|
||||
"Log out and remove encryption keys?": "Log out and remove encryption keys?",
|
||||
"Send Logs": "Send Logs",
|
||||
"Clear Storage and Sign Out": "Clear Storage and Sign Out",
|
||||
"Send Logs": "Send Logs",
|
||||
"Refresh": "Refresh",
|
||||
"Unable to restore session": "Unable to restore session",
|
||||
"We encountered an error trying to restore your previous session.": "We encountered an error trying to restore your previous session.",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue