sorb/ThreadNet-Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/piwik

Browse Source
This commit is contained in:
Michael Telatynski
2017-05-29 15:23:05 +01:00
parent 9b8dcaf274 229eef4624
commit 42e20c38f9
14 changed files with 66 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/i18n/strings/en_EN.json
+4 -9
View File
@@ -80,7 +80,6 @@
"ja":"Japanese",
"ji":"Yiddish",
"ko":"Korean",
"ko":"Korean (Johab)",
"lt":"Lithuanian",
"lv":"Latvian",
"mk":"Macedonian (FYROM)",
@@ -101,8 +100,7 @@
"sk":"Slovak",
"sl":"Slovenian",
"sq":"Albanian",
"sr":"Serbian (Cyrillic)",
"sr":"Serbian (Latin)",
"sr":"Serbian",
"sv-fi":"Swedish (Finland)",
"sv":"Swedish",
"sx":"Sutu",
@@ -285,7 +283,6 @@
"Guests can't set avatars. Please register.": "Guests can't set avatars. Please register.",
"Guest users can't create new rooms. Please register to create room and start a chat": "Guest users can't create new rooms. Please register to create room and start a chat",
"Guest users can't upload files. Please register to upload": "Guest users can't upload files. Please register to upload",
"Guests can't set avatars. Please register.": "Guests can't set avatars. Please register.",
"Guests can't use labs features. Please register.": "Guests can't use labs features. Please register.",
"Guests cannot join this room even if explicitly invited.": "Guests cannot join this room even if explicitly invited.",
"had": "had",
@@ -371,7 +368,6 @@
"Once you've followed the link it contains, click below": "Once you've followed the link it contains, click below",
"Only people who have been invited": "Only people who have been invited",
"Operation failed": "Operation failed",
"or": "or",
"Password": "Password",
"Passwords can't be empty": "Passwords can't be empty",
"People": "People",
@@ -483,7 +479,7 @@
"To kick users": "To kick users",
"To link to a room it must have": "To link to a room it must have",
"to make a room or": "to make a room or",
"To redact other users' messages": "To redact other users' messages",
"To remove other users' messages": "To remove other users' messages",
"To reset your password, enter the email address linked to your account": "To reset your password, enter the email address linked to your account",
"to restore": "to restore",
"To send events of type": "To send events of type",
@@ -604,8 +600,6 @@
"Encrypt room": "Encrypt room",
"There are no visible files in this room": "There are no visible files in this room",
"Room": "Room",
"Room name (optional)": "Room name (optional)",
"Who would you like to add to this room?": "Who would you like to add to this room?",
"Connectivity to the server has been lost.": "Connectivity to the server has been lost.",
"Sent messages will be stored until your connection has returned.": "Sent messages will be stored until your connection has returned.",
"Auto-complete": "Auto-complete",
@@ -681,5 +675,6 @@
"%(oneUser)schanged their avatar": "%(oneUser)schanged their avatar",
"Analytics": "Analytics",
"Opt out of analytics": "Opt out of analytics",
"Riot collects anonymous analytics to allow us to improve the application.": "Riot collects anonymous analytics to allow us to improve the application."
"Riot collects anonymous analytics to allow us to improve the application.": "Riot collects anonymous analytics to allow us to improve the application.",
"Please select the destination room for this message": "Please select the destination room for this message"
}