Merge branch 'develop' into travis/pl_enhancements

2017-10-11 08:42:45 -06:00
parent 20798dd2fa ffb9dd844a
commit f874fc1203
53 changed files with 815 additions and 270 deletions
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -126,7 +126,7 @@
    "disabled": "uitgeschakeld",
    "Moderator": "Moderator",
    "Must be viewing a room": "Moet een ruimte weergeven",
-    "my Matrix ID": "mijn Matrix-ID",
+    "%(serverName)s Matrix ID": "%(serverName)s Matrix-ID",
    "Name": "Naam",
    "New password": "Nieuw wachtwoord",
    "none": "geen",