Merge branch 'develop' into bwindels/resynconlltoggle

Author: bwindels

package.json

@@ -38,10 +38,12 @@
     "reskindex:watch": "node scripts/reskindex.js -h header -w",
     "i18n": "matrix-gen-i18n",
     "prunei18n": "matrix-prune-i18n",
-    "build": "npm run reskindex && babel src -d lib --source-maps --copy-files",
-    "build:watch": "babel src -w -d lib --source-maps --copy-files",
+    "build": "npm run reskindex && npm run start:init",
+    "build:watch": "babel src -w --skip-initial-build -d lib --source-maps --copy-files",
     "emoji-data-strip": "node scripts/emoji-data-strip.js",
-    "start": "parallelshell \"npm run build:watch\" \"npm run reskindex:watch\"",
+    "start": "npm run start:init && npm run start:all",
+    "start:all": "concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n build,reskindex \"npm run build:watch\" \"npm run reskindex:watch\"",
+    "start:init": "babel src -d lib --source-maps --copy-files",
     "lint": "eslint src/",
     "lintall": "eslint src/ test/",
     "lintwithexclusions": "eslint --max-warnings 20 --ignore-path .eslintignore.errorfiles src test",
@@ -111,6 +113,7 @@
     "babel-preset-es2017": "^6.14.0",
     "babel-preset-react": "^6.11.1",
     "chokidar": "^1.6.1",
+    "concurrently": "^4.0.1",
     "eslint": "^3.13.1",
     "eslint-config-google": "^0.7.1",
     "eslint-plugin-babel": "^4.0.1",
@@ -133,7 +136,6 @@
     "matrix-mock-request": "^1.2.1",
     "matrix-react-test-utils": "^0.1.1",
     "mocha": "^5.0.5",
-    "parallelshell": "3.0.1",
     "react-addons-test-utils": "^15.4.0",
     "require-json": "0.0.1",
     "rimraf": "^2.4.3",

src/i18n/strings/ar.json

@@ -65,5 +65,6 @@
     "Cancel Sending": "إلغاء الإرسال",
     "Collapse panel": "طي الجدول",
     "Set Password": "تعيين كلمة سرية",
-    "Checking for an update...": "البحث عن تحديث …"
+    "Checking for an update...": "البحث عن تحديث …",
+    "powered by Matrix": "مشغل بواسطة Matrix"
 }

src/i18n/strings/bg.json

@@ -1256,5 +1256,25 @@
     "Lazy loading is not supported by your current homeserver.": "Отложеното зареждане не се поддържа от текущия сървър.",
     "Sorry, your homeserver is too old to participate in this room.": "Съжаляваме, вашият сървър е прекалено стар за да участва в тази стая.",
     "Please contact your homeserver administrator.": "Моля, свържете се се със сървърния администратор.",
-    "Legal": "Юридически"
+    "Legal": "Юридически",
+    "Registration Required": "Нужна е регистрация",
+    "You need to register to do this. Would you like to register now?": "За да направите това е нужно да се регистрирате. Искате ли да се регистрирате сега?",
+    "Unable to connect to Homeserver. Retrying...": "Неуспешно свързване със сървъра. Опитване отново...",
+    "This room has been replaced and is no longer active.": "Тази стая е била заменена и вече не е активна.",
+    "The conversation continues here.": "Разговора продължава тук.",
+    "Upgrade room to version %(ver)s": "Обновете стаята до версия %(ver)s",
+    "This room is a continuation of another conversation.": "Тази стая е продължение на предишен разговор.",
+    "Click here to see older messages.": "Кликнете тук за да видите предишните съобщения.",
+    "Failed to upgrade room": "Неуспешно обновяване на стаята",
+    "The room upgrade could not be completed": "Обновяването на тази стая не можа да бъде завършено",
+    "Upgrade this room to version %(version)s": "Обновете тази стая до версия %(version)s",
+    "Unable to query for supported registration methods": "Неуспешно запитване за поддържани методи за регистрация",
+    "Forces the current outbound group session in an encrypted room to be discarded": "Принудително прекратява текущата изходяща групова сесия в шифрована стая",
+    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s добави %(addedAddresses)s като адрес за тази стая.",
+    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s добави %(addedAddresses)s като адреси за тази стая.",
+    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s премахна %(removedAddresses)s като адрес за тази стая.",
+    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s премахна %(removedAddresses)s като адреси за тази стая.",
+    "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s добави %(addedAddresses)s и премахна %(removedAddresses)s като адреси за тази стая.",
+    "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s настрой основния адрес на тази стая на %(address)s.",
+    "%(senderName)s removed the main address for this room.": "%(senderName)s премахна основния адрес на тази стая."
 }

src/i18n/strings/ca.json

@@ -130,7 +130,7 @@
     "Unable to create widget.": "No s'ha pogut crear el giny.",
     "Failed to send request.": "No s'ha pogut enviar la sol·licitud.",
     "This room is not recognised.": "No es reconeix aquesta sala.",
-    "Power level must be positive integer.": "El nivell de potència ha de ser un enter positiu.",
+    "Power level must be positive integer.": "El nivell de poders ha de ser un enter positiu.",
     "You are not in this room.": "No heu entrat a aquesta sala.",
     "You do not have permission to do that in this room.": "No teniu el permís per realitzar aquesta acció en aquesta sala.",
     "Missing room_id in request": "Falta l'ID de la sala en la vostra sol·licitud",
@@ -167,7 +167,7 @@
     "%(targetName)s joined the room.": "%(targetName)s ha entrat a la sala.",
     "VoIP conference finished.": "S'ha finalitzat la conferència VoIP.",
     "%(targetName)s rejected the invitation.": "%(targetName)s ha rebutjat la invitació.",
-    "%(targetName)s left the room.": "%(targetName)s ha sortir de la sala.",
+    "%(targetName)s left the room.": "%(targetName)s ha sortit de la sala.",
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s ha readmès a %(targetName)s.",
     "%(senderName)s kicked %(targetName)s.": "%(senderName)s ha fet fora a %(targetName)s.",
     "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s ha retirat la invitació per a %(targetName)s.",
@@ -191,7 +191,7 @@
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s ha fet visible l'històric de la sala per a desconeguts (%(visibility)s).",
     "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s ha activat l'encriptació d'extrem a extrem (algoritme %(algorithm)s).",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s de %(fromPowerLevel)s fins %(toPowerLevel)s",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s ha canviat el nivell de potència de %(powerLevelDiffText)s.",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s ha canviat el nivell de poders de %(powerLevelDiffText)s.",
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s ha canviat els missatges fixats de la sala.",
     "%(widgetName)s widget modified by %(senderName)s": "%(senderName)s ha modificat el giny %(widgetName)s",
     "%(widgetName)s widget added by %(senderName)s": "%(senderName)s ha afegit el giny %(widgetName)s",
@@ -301,7 +301,7 @@
     "Failed to ban user": "No s'ha pogut expulsar l'usuari",
     "Failed to mute user": "No s'ha pogut silenciar l'usuari",
     "Failed to toggle moderator status": "No s'ha pogut canviar l'estat del moderador",
-    "Failed to change power level": "No s'ha pogut canviar el nivell de potència",
+    "Failed to change power level": "No s'ha pogut canviar el nivell de poders",
     "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "No podreu desfer aquest canvi ja que estareu baixant de grau de privilegis. Només un altre usuari amb més privilegis podrà fer que els recupereu.",
     "Are you sure?": "Esteu segur?",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "No podreu desfer aquesta acció ja que esteu donant al usuari el mateix nivell de privilegi que el vostre.",
@@ -401,7 +401,7 @@
     "Press <StartChatButton> to start a chat with someone": "Prem <StartChatButton> per a començar un xat amb algú",
     "You may wish to login with a different account, or add this email to this account.": "És possible que vulgueu iniciar la sessió amb un altre compte o bé afegir aquest correu electrònic a aquest compte.",
     "You have been invited to join this room by %(inviterName)s": "Heu sigut convidat a aquesta sala per %(inviterName)s",
-    "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "Voleu <acceptText>accept</acceptText> o bé declineText>decline</declineText> aquesta invitació?",
+    "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "Voleu <acceptText>accept</acceptText> o bé <declineText>decline</declineText> aquesta invitació?",
     "Reason: %(reasonText)s": "Raó: %(reasonText)s",
     "Rejoin": "Trona a entrar",
     "You have been kicked from %(roomName)s by %(userName)s.": "%(userName)s us ha fet fora de la sala %(roomName)s.",

src/i18n/strings/de_DE.json

@@ -1266,5 +1266,16 @@
     "The room upgrade could not be completed": "Die Raum-Aufrüstung konnte nicht fertiggestellt werden",
     "Upgrade this room to version %(version)s": "Diesen Raum zur Version %(version)s aufrüsten",
     "Forces the current outbound group session in an encrypted room to be discarded": "Erzwingt, dass die aktuell ausgehende Gruppen-Sitzung in einem verschlüsseltem Raum verworfen wird",
-    "Error Discarding Session": "Sitzung konnte nicht verworfen werden"
+    "Error Discarding Session": "Sitzung konnte nicht verworfen werden",
+    "Registration Required": "Registrierung erforderlich",
+    "You need to register to do this. Would you like to register now?": "Du musst dich registrieren um dies zu tun. Möchtest du dich jetzt registrieren?",
+    "Unable to connect to Homeserver. Retrying...": "Verbindung mit Heimserver nicht möglich. Versuche erneut...",
+    "Unable to query for supported registration methods": "Unterstützte Registrierungsmethoden können nicht abgefragt werden",
+    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s fügte %(addedAddresses)s als Adresse zu diesem Raum hinzu.",
+    "%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s fügte %(addedAddresses)s als Adressen zu diesem Raum hinzu.",
+    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s entfernte %(removedAddresses)s als Adresse von diesem Raum.",
+    "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s entfernte %(removedAddresses)s als Adressen von diesem Raum.",
+    "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s setzte die Hauptadresse zu diesem Raum auf %(address)s.",
+    "%(senderName)s removed the main address for this room.": "%(senderName)s entfernte die Hauptadresse von diesem Raum.",
+    "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s fügte %(addedAddresses)s hinzu und entfernte %(removedAddresses)s als Adressen von diesem Raum."
 }