Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
6504201190
19 changed files with 584 additions and 383 deletions
|
@ -359,6 +359,7 @@
|
|||
"Filter room members": "Filter room members",
|
||||
"%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (power %(powerLevelNumber)s)",
|
||||
"Attachment": "Attachment",
|
||||
"At this time it is not possible to reply with a file so this will be sent without being a reply.": "At this time it is not possible to reply with a file so this will be sent without being a reply.",
|
||||
"Upload Files": "Upload Files",
|
||||
"Are you sure you want to upload the following files?": "Are you sure you want to upload the following files?",
|
||||
"Encrypted room": "Encrypted room",
|
||||
|
@ -379,6 +380,8 @@
|
|||
"Server error": "Server error",
|
||||
"Server unavailable, overloaded, or something else went wrong.": "Server unavailable, overloaded, or something else went wrong.",
|
||||
"Command error": "Command error",
|
||||
"Unable to reply": "Unable to reply",
|
||||
"At this time it is not possible to reply with an emote.": "At this time it is not possible to reply with an emote.",
|
||||
"bold": "bold",
|
||||
"italic": "italic",
|
||||
"strike": "strike",
|
||||
|
@ -406,9 +409,9 @@
|
|||
"Idle": "Idle",
|
||||
"Offline": "Offline",
|
||||
"Unknown": "Unknown",
|
||||
"Replying": "Replying",
|
||||
"Seen by %(userName)s at %(dateTime)s": "Seen by %(userName)s at %(dateTime)s",
|
||||
"Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Seen by %(displayName)s (%(userName)s) at %(dateTime)s",
|
||||
"Replying": "Replying",
|
||||
"No rooms to show": "No rooms to show",
|
||||
"Unnamed room": "Unnamed room",
|
||||
"World readable": "World readable",
|
||||
|
@ -729,6 +732,7 @@
|
|||
"expand": "expand",
|
||||
"Custom of %(powerLevel)s": "Custom of %(powerLevel)s",
|
||||
"Custom level": "Custom level",
|
||||
"Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.",
|
||||
"<a>In reply to</a> <pill>": "<a>In reply to</a> <pill>",
|
||||
"Room directory": "Room directory",
|
||||
"Start chat": "Start chat",
|
||||
|
@ -862,6 +866,7 @@
|
|||
"Permalink": "Permalink",
|
||||
"Quote": "Quote",
|
||||
"Source URL": "Source URL",
|
||||
"Collapse Reply Thread": "Collapse Reply Thread",
|
||||
"Failed to set Direct Message status of room": "Failed to set Direct Message status of room",
|
||||
"All messages (noisy)": "All messages (noisy)",
|
||||
"All messages": "All messages",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue