fix missing translations and typos in i18n

src/components/structures/CreateRoom.js

@@ -231,7 +231,7 @@ module.exports = React.createClass({
             if (curr_phase == this.phases.ERROR) {
                 error_box = (
                     <div className="mx_Error">
-                        {_t('An error occured: %(error_string)s', {error_string: this.state.error_string})}
+                        {_t('An error occurred: %(error_string)s', {error_string: this.state.error_string})}
                     </div>
                 );
             }

src/components/views/dialogs/SetMxIdDialog.js

@@ -125,8 +125,8 @@ export default React.createClass({
                         break;
                     case "M_INVALID_USERNAME":
                         newState.usernameError = _t(
-                            'Username invalid: %(errMessage)',
+                            'Username invalid: %(error_message)s',
-                            { errMessage: err.message},
+                            { error_message: err.message},
                         );
                         break;
                     case "M_UNRECOGNIZED":
@@ -139,7 +139,7 @@ export default React.createClass({
                         break;
                     default:
                         newState.usernameError = _t(
-                            'An error occurred: %(errMessage)',
+                            'An error occurred: %(errMessage)s',
                             { errMessage: err.message },
                         );
                         break;

src/i18n/strings/de_DE.json

@@ -339,7 +339,7 @@
     "User names may only contain letters, numbers, dots, hyphens and underscores.": "Benutzernamen sollen nur Buchstaben, Nummern, Binde- und Unterstriche enthalten.",
     "An unknown error occurred.": "Ein unbekannter Fehler trat auf.",
     "I already have an account": "Ich habe bereits einen Account",
-    "An error occured: %(error_string)s": "Ein Fehler trat auf: %(error_string)s",
+    "An error occurred: %(error_string)s": "Ein Fehler trat auf: %(error_string)s",
     "Topic": "Thema",
     "Make this room private": "Mache diesen Raum privat",
     "Share message history with new users": "Bisherigen Chatverlauf mit neuen Nutzern teilen",

src/i18n/strings/en_EN.json

@@ -268,6 +268,7 @@
   "End-to-end encryption information": "End-to-end encryption information",
   "End-to-end encryption is in beta and may not be reliable": "End-to-end encryption is in beta and may not be reliable",
   "Enter Code": "Enter Code",
+  "Enter passphrase": "Enter passphrase",
   "Error": "Error",
   "Error decrypting attachment": "Error decrypting attachment",
   "Error: Problem communicating with the given homeserver.": "Error: Problem communicating with the given homeserver.",
@@ -580,6 +581,7 @@
   "User ID": "User ID",
   "User Interface": "User Interface",
   "User name": "User name",
+  "Username invalid: %(errMessage)s": "Username invalid: %(errMessage)s",
   "Users": "Users",
   "User": "User",
   "Verification Pending": "Verification Pending",
@@ -661,7 +663,7 @@
   "User names may only contain letters, numbers, dots, hyphens and underscores.": "User names may only contain letters, numbers, dots, hyphens and underscores.",
   "An unknown error occurred.": "An unknown error occurred.",
   "I already have an account": "I already have an account",
-  "An error occured: %(error_string)s": "An error occured: %(error_string)s",
+  "An error occurred: %(error_string)s": "An error occurred: %(error_string)s",
   "Topic": "Topic",
   "Make Moderator": "Make Moderator",
   "Make this room private": "Make this room private",

src/i18n/strings/en_US.json

@@ -645,7 +645,7 @@
     "User names may only contain letters, numbers, dots, hyphens and underscores.": "User names may only contain letters, numbers, dots, hyphens and underscores.",
     "An unknown error occurred.": "An unknown error occurred.",
     "I already have an account": "I already have an account",
-    "An error occured: %(error_string)s": "An error occured: %(error_string)s",
+    "An error occurred: %(error_string)s": "An error occurred: %(error_string)s",
     "Topic": "Topic",
     "Make Moderator": "Make Moderator",
     "Make this room private": "Make this room private",

src/i18n/strings/fr.json

@@ -611,7 +611,7 @@
     "User names may only contain letters, numbers, dots, hyphens and underscores.": "Les noms d’utilisateurs ne peuvent contenir que des lettres, chiffres, points et tirets hauts ou bas.",
     "An unknown error occurred.": "Une erreur inconnue est survenue.",
     "I already have an account": "J’ai déjà un compte",
-    "An error occured: %(error_string)s": "Une erreur est survenue : %(error_string)s",
+    "An error occurred: %(error_string)s": "Une erreur est survenue : %(error_string)s",
     "Topic": "Sujet",
     "Make Moderator": "Nommer modérateur",
     "Make this room private": "Rendre ce salon privé",

src/i18n/strings/pt.json

@@ -417,7 +417,7 @@
     "User names may only contain letters, numbers, dots, hyphens and underscores.": "Nomes de usuária/o podem conter apenas letras, números, pontos, hífens e linha inferior (_).",
     "An unknown error occurred.": "Um erro desconhecido ocorreu.",
     "I already have an account": "Eu já tenho uma conta",
-    "An error occured: %(error_string)s": "Um erro ocorreu: %(error_string)s",
+    "An error occurred: %(error_string)s": "Um erro ocorreu: %(error_string)s",
     "Topic": "Tópico",
     "Make this room private": "Tornar esta sala privada",
     "Share message history with new users": "Compartilhar histórico de mensagens com novas/os usuárias/os",

src/i18n/strings/pt_BR.json

@@ -417,7 +417,7 @@
     "User names may only contain letters, numbers, dots, hyphens and underscores.": "Nomes de usuária/o podem conter apenas letras, números, pontos, hífens e linha inferior (_).",
     "An unknown error occurred.": "Um erro desconhecido ocorreu.",
     "I already have an account": "Eu já tenho uma conta",
-    "An error occured: %(error_string)s": "Um erro ocorreu: %(error_string)s",
+    "An error occurred: %(error_string)s": "Um erro ocorreu: %(error_string)s",
     "Topic": "Tópico",
     "Make this room private": "Tornar esta sala privada",
     "Share message history with new users": "Compartilhar histórico de mensagens com novas/os usuárias/os",

src/i18n/strings/ru.json

@@ -336,7 +336,7 @@
     "User names may only contain letters, numbers, dots, hyphens and underscores.": "Имена пользователей могут только содержать буквы, числа, точки, дефисы и подчеркивания.",
     "An unknown error occurred.": "Произошла неизвестная ошибка.",
     "I already have an account": "У меня уже есть учетная запись",
-    "An error occured: %(error_string)s": "Произошла ошибка: %(error_string)s",
+    "An error occurred: %(error_string)s": "Произошла ошибка: %(error_string)s",
     "Topic": "Тема",
     "Make this room private": "Сделать эту комнату частной",
     "Share message history with new users": "Поделись историей сообщений с новыми учасниками",