Merge branch 'develop' into gsouquet/message-bubbles-4635
This commit is contained in:
commit
ba3e7e24ba
151 changed files with 1395 additions and 984 deletions
|
@ -695,6 +695,7 @@
|
|||
"Error leaving room": "Error leaving room",
|
||||
"Unrecognised address": "Unrecognised address",
|
||||
"You do not have permission to invite people to this room.": "You do not have permission to invite people to this room.",
|
||||
"User %(userId)s is already invited to the room": "User %(userId)s is already invited to the room",
|
||||
"User %(userId)s is already in the room": "User %(userId)s is already in the room",
|
||||
"User %(user_id)s does not exist": "User %(user_id)s does not exist",
|
||||
"User %(user_id)s may or may not exist": "User %(user_id)s may or may not exist",
|
||||
|
@ -1368,17 +1369,17 @@
|
|||
"Where you’re logged in": "Where you’re logged in",
|
||||
"Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.": "Manage the names of and sign out of your sessions below or <a>verify them in your User Profile</a>.",
|
||||
"A session's public name is visible to people you communicate with": "A session's public name is visible to people you communicate with",
|
||||
"Default Device": "Default Device",
|
||||
"No media permissions": "No media permissions",
|
||||
"You may need to manually permit %(brand)s to access your microphone/webcam": "You may need to manually permit %(brand)s to access your microphone/webcam",
|
||||
"Missing media permissions, click the button below to request.": "Missing media permissions, click the button below to request.",
|
||||
"Request media permissions": "Request media permissions",
|
||||
"No Audio Outputs detected": "No Audio Outputs detected",
|
||||
"No Microphones detected": "No Microphones detected",
|
||||
"No Webcams detected": "No Webcams detected",
|
||||
"Default Device": "Default Device",
|
||||
"Audio Output": "Audio Output",
|
||||
"No Audio Outputs detected": "No Audio Outputs detected",
|
||||
"Microphone": "Microphone",
|
||||
"No Microphones detected": "No Microphones detected",
|
||||
"Camera": "Camera",
|
||||
"No Webcams detected": "No Webcams detected",
|
||||
"Voice & Video": "Voice & Video",
|
||||
"This room is not accessible by remote Matrix servers": "This room is not accessible by remote Matrix servers",
|
||||
"<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.",
|
||||
|
@ -1512,6 +1513,8 @@
|
|||
"Your message was sent": "Your message was sent",
|
||||
"Failed to send": "Failed to send",
|
||||
"Scroll to most recent messages": "Scroll to most recent messages",
|
||||
"Show %(count)s other previews|other": "Show %(count)s other previews",
|
||||
"Show %(count)s other previews|one": "Show %(count)s other preview",
|
||||
"Close preview": "Close preview",
|
||||
"and %(count)s others...|other": "and %(count)s others...",
|
||||
"and %(count)s others...|one": "and one other...",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue