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

Conflicts: src/i18n/strings/en_EN.json src/i18n/strings/fr.json src/i18n/strings/ru.json
2017-08-15 14:00:35 +00:00
parent 97ee9d72db 472b5b5350
commit d443368aa3
154 changed files with 5550 additions and 2763 deletions
@@ -140,8 +140,10 @@
    "%(items)s and %(remaining)s others": "%(items)s y %(remaining)s otros",
    "%(items)s and one other": "%(items)s y otro",
    "%(items)s and %(lastItem)s": "%(items)s y %(lastItem)s",
-    "and %(overflowCount)s others...": "y %(overflowCount)s otros...",
-    "and one other...": "y otro...",
+    "and %(count)s others...": {
+        "other": "y %(count)s otros...",
+        "one": "y otro..."
+    },
    "%(names)s and %(lastPerson)s are typing": "%(names)s y %(lastPerson)s están escribiendo",
    "%(names)s and one other are typing": "%(names)s y otro están escribiendo",
    "%(names)s and %(count)s others are typing": "%(names)s y %(count)s otros están escribiendo",