Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
cd94ba6fb9
1 changed files with 2 additions and 2 deletions
|
@ -163,6 +163,7 @@
|
|||
"Failed to join room": "Failed to join room",
|
||||
"Message Pinning": "Message Pinning",
|
||||
"Presence Management": "Presence Management",
|
||||
"Tag Panel": "Tag Panel",
|
||||
"Disable Emoji suggestions while typing": "Disable Emoji suggestions while typing",
|
||||
"Use compact timeline layout": "Use compact timeline layout",
|
||||
"Hide removed messages": "Hide removed messages",
|
||||
|
@ -219,9 +220,8 @@
|
|||
"Your home server does not support device management.": "Your home server does not support device management.",
|
||||
"Unable to load device list": "Unable to load device list",
|
||||
"Authentication": "Authentication",
|
||||
"Failed to delete device": "Failed to delete device",
|
||||
"Delete %(count)s devices|one": "Delete device",
|
||||
"Delete %(count)s devices|other": "Delete %(count)s devices",
|
||||
"Delete %(count)s devices|one": "Delete device",
|
||||
"Device ID": "Device ID",
|
||||
"Device Name": "Device Name",
|
||||
"Last seen": "Last seen",
|
||||
|
|
Loading…
Reference in a new issue