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 develop

Browse Source
This commit is contained in:
daniel tygel
2017-05-31 09:09:27 -03:00
parent f4e5039e70 532198dd10
commit d4a89cc2df
8 changed files with 190 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/i18n/strings/en_EN.json
+3
View File
@@ -675,6 +675,9 @@
"%(oneUser)schanged their avatar %(repeats)s times": "%(oneUser)schanged their avatar %(repeats)s times",
"%(severalUsers)schanged their avatar": "%(severalUsers)schanged their avatar",
"%(oneUser)schanged their avatar": "%(oneUser)schanged their avatar",
"Please select the destination room for this message": "Please select the destination room for this message",
"Start automatically after system login": "Start automatically after system login",
"Desktop specific": "Desktop specific",
"Analytics": "Analytics",
"Opt out of analytics": "Opt out of analytics",
"Options": "Options",