[WEBLATE] fix fr and de merge issue

package.json

@@ -64,7 +64,7 @@
     "isomorphic-fetch": "^2.2.1",
     "linkifyjs": "^2.1.3",
     "lodash": "^4.13.1",
-    "matrix-js-sdk": "matrix-org/matrix-js-sdk#develop",
+    "matrix-js-sdk": "0.7.9",
     "optimist": "^0.6.1",
     "q": "^1.4.1",
     "react": "^15.4.0",

scripts/check-i18n.pl

@@ -178,12 +178,12 @@ sub read_src_strings {
         $src =~ s/"\s*\+\s*"//g;
 
         $file =~ s/^.*\/src/src/;
-        while ($src =~ /_t\(\s*'(.*?[^\\])'/sg) {
+        while ($src =~ /_t(?:Jsx)?\(\s*'(.*?[^\\])'/sg) {
             my $s = $1;
             $s =~ s/\\'/'/g;
             push @$strings, [$s, $file];
         }
-        while ($src =~ /_t\(\s*"(.*?[^\\])"/sg) {
+        while ($src =~ /_t(?:Jsx)?\(\s*"(.*?[^\\])"/sg) {
             push @$strings, [$1, $file];
         }
     }

scripts/fix-i18n.pl

@@ -48,6 +48,10 @@ Guests can't use labs features. Please register.
 A new password must be entered.
 Resetting password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.
 Guests cannot join this room even if explicitly invited.
+Guest users can't invite users. Please register to invite.
+This room is inaccessible to guests. You may be able to join if you register.
+delete the alias.
+remove %(name)s from the directory.
 EOT
 )];
 }

src/BasePlatform.js

@@ -71,6 +71,9 @@ export default class BasePlatform {
     displayNotification(title: string, msg: string, avatarUrl: string, room: Object) {
     }
 
+    loudNotification(ev: Event, room: Object) {
+    }
+
     /**
      * Returns a promise that resolves to a string representing
      * the current version of the application.

src/Notifier.js

@@ -250,6 +250,7 @@ const Notifier = {
                 this._displayPopupNotification(ev, room);
             }
             if (actions.tweaks.sound && this.isAudioEnabled()) {
+                PlatformPeg.get().loudNotification(ev, room);
                 this._playAudioNotification(ev, room);
             }
         }

src/Skinner.js

@@ -23,24 +23,30 @@ class Skinner {
         if (this.components === null) {
             throw new Error(
                 "Attempted to get a component before a skin has been loaded."+
-                "This is probably because either:"+
+                " This is probably because either:"+
                 " a) Your app has not called sdk.loadSkin(), or"+
-                " b) A component has called getComponent at the root level"
+                " b) A component has called getComponent at the root level",
             );
         }
-        var comp = this.components[name];
+        let comp = this.components[name];
-        if (comp) {
-            return comp;
-        }
         // XXX: Temporarily also try 'views.' as we're currently
         // leaving the 'views.' off views.
-        var comp = this.components['views.'+name];
+        if (!comp) {
-        if (comp) {
+            comp = this.components['views.'+name];
-            return comp;
         }
+
+        if (!comp) {
             throw new Error("No such component: "+name);
         }
 
+        // components have to be functions.
+        const validType = typeof comp === 'function';
+        if (!validType) {
+            throw new Error(`Not a valid component: ${name}.`);
+        }
+        return comp;
+    }
+
     load(skinObject) {
         if (this.components !== null) {
             throw new Error(

src/components/structures/login/Login.js

@@ -222,17 +222,20 @@ module.exports = React.createClass({
                 (this.state.enteredHomeserverUrl.startsWith("http:") ||
                  !this.state.enteredHomeserverUrl.startsWith("http")))
             {
-                const urlStart = <a href='https://www.google.com/search?&q=enable%20unsafe%20scripts'>;
-                const urlEnd = </a>;
                 errorText = <span>
-                    { _t('Can\'t connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or %(urlStart)s enable unsafe scripts %(urlEnd)s', {urlStart: urlStart, urlEnd: urlEnd})}
+                    { _tJsx("Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. " +
+                            "Either use HTTPS or <a>enable unsafe scripts</a>.",
+                      /<a>(.*?)<\/a>/,
+                      (sub) => { return <a href="https://www.google.com/search?&q=enable%20unsafe%20scripts">{ sub }</a>; }
+                    )}
                 </span>;
             }
             else {
-                const urlStart = <a href={this.state.enteredHomeserverUrl}>;
-                const urlEnd = </a>;
                 errorText = <span>
-                    { _t('Can\'t connect to homeserver - please check your connectivity and ensure your %(urlStart)s homeserver\'s SSL certificate %(urlEnd)s is trusted', {urlStart: urlStart, urlEnd: urlEnd})}
+                    { _tJsx("Can't connect to homeserver - please check your connectivity and ensure your <a>homeserver's SSL certificate</a> is trusted.",
+                      /<a>(.*?)<\/a>/,
+                      (sub) => { return <a href={this.state.enteredHomeserverUrl}>{ sub }</a>; }
+                    )}
                 </span>;
             }
         }

src/components/views/rooms/MemberList.js

@@ -28,12 +28,6 @@ var CallHandler = require("../../../CallHandler");
 var Invite = require("../../../Invite");
 
 var INITIAL_LOAD_NUM_MEMBERS = 30;
-var SHARE_HISTORY_WARNING =
-    <span>
-        Newly invited users will see the history of this room. <br/>
-        If you'd prefer invited users not to see messages that were sent before they joined, <br/>
-        turn off, 'Share message history with new users' in the settings for this room.
-    </span>;
 
 module.exports = React.createClass({
     displayName: 'MemberList',
@@ -355,7 +349,7 @@ module.exports = React.createClass({
         if (invitedMemberTiles.length > 0) {
             invitedSection = (
                 <div className="mx_MemberList_invited">
-                    <h2>Invited</h2>
+                    <h2>{ _t("Invited") }</h2>
                     <div className="mx_MemberList_wrapper">
                         {invitedMemberTiles}
                     </div>

src/components/views/rooms/PresenceLabel.js

@@ -55,17 +55,17 @@ module.exports = React.createClass({
         var d = parseInt(t / (60 * 60 * 24));
         if (t < 60) {
             if (t < 0) {
-                return "0s";
+                return _t("for %(amount)ss", {amount: 0});
             }
-            return s + "s";
+            return _t("for %(amount)ss", {amount: s});
         }
         if (t < 60 * 60) {
-            return m + "m";
+            return  _t("for %(amount)sm", {amount: m});
         }
         if (t < 24 * 60 * 60) {
-            return h + "h";
+            return  _t("for %(amount)sh", {amount: h});
         }
-        return d + "d ";
+        return  _t("for %(amount)sd", {amount: d});
     },
 
     getPrettyPresence: function(presence) {
@@ -77,9 +77,8 @@ module.exports = React.createClass({
 
     render: function() {
         if (this.props.activeAgo >= 0) {
-            var ago = this.props.currentlyActive ? "" : "for " + (this.getDuration(this.props.activeAgo));
+            let duration = this.getDuration(this.props.activeAgo);
-            // var ago = this.getDuration(this.props.activeAgo) + " ago";
+            let ago = this.props.currentlyActive || !duration ? "" : duration;
-            // if (this.props.currentlyActive) ago += " (now?)";
             return (
                 <div className="mx_PresenceLabel">
                     { this.getPrettyPresence(this.props.presenceState) } { ago }

src/i18n/strings/da.json

@@ -40,7 +40,6 @@
     "Searches DuckDuckGo for results": "Søger DuckDuckGo for resultater",
     "Commands": "kommandoer",
     "Emoji": "Emoji",
-    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar.": "Kan ikke oprette forbindelse til hjemmeserver via HTTP, når en HTTPS-URL er i din browserbjælke.",
     "Sorry, this homeserver is using a login which is not recognised ": "Beklager, denne homeerver bruger et login, der ikke kan genkendes ",
     "Login as guest": "Log ind som gæst",
     "Return to app": "Tilbage til app",

src/i18n/strings/de_DE.json

@@ -228,7 +228,6 @@
     "To kick users": "Um Nutzer zu entfernen",
     "Admin": "Administrator",
     "Server may be unavailable, overloaded, or you hit a bug": "Server könnte nicht verfügbar oder überlastet sein oder du bist auf einen Fehler gestoßen",
-    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar": "Verbindung zum Homeserver ist über HTTP nicht möglich, wenn HTTPS in deiner Browserleiste steht",
     "Could not connect to the integration server": "Konnte keine Verbindung zum Integrations-Server herstellen",
     "Disable inline URL previews by default": "URL-Vorschau im Chat standardmäßig deaktivieren",
     "Guests can't use labs features. Please register.": "Gäste können keine Labor-Funktionen nutzen. Bitte registrieren.",
@@ -271,7 +270,6 @@
     "Who would you like to add to this room?": "Wen möchtest du zu diesem Raum hinzufügen?",
     "Who would you like to communicate with?": "Mit wem möchtest du kommunizieren?",
     "Would you like to": "Möchtest du",
-    "You are trying to access": "Du möchtest Zugang zu %(sth)s bekommen",
     "You do not have permission to post to this room": "Du hast keine Berechtigung an diesen Raum etwas zu senden",
     "You have been invited to join this room by %(inviterName)s": "Du wurdest in diesen Raum eingeladen von %(inviterName)s",
     "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device": "Du wurdest von allen Geräten ausgeloggt und wirst keine Push-Benachrichtigungen mehr bekommen. Um Benachrichtigungen zu reaktivieren melde dich auf jedem Gerät neu an",
@@ -560,8 +558,8 @@
     "Are you sure?": "Bist du sicher?",
     "Attachment": "Anhang",
     "Ban": "Verbannen",
-    "Can't connect to homeserver - please check your connectivity and ensure your %(urlStart)s homeserver's SSL certificate %(urlEnd)s is trusted": "Kann nicht zum Heimserver verbinden - bitte checke eine Verbindung und stelle sicher, dass dem %(urlStart)s SSL-Zertifikat deines Heimservers  %(urlEnd)s vertraut wird",
+    "Can't connect to homeserver - please check your connectivity and ensure your <a>homeserver's SSL certificate</a> is trusted.": "Kann nicht zum Heimserver verbinden - bitte checke eine Verbindung und stelle sicher, dass dem <a>SSL-Zertifikat deines Heimservers</a> vertraut wird.",
-    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or %(urlStart)s enable unsafe scripts %(urlEnd)s": "Kann nicht zum Heimserver via HTTP verbinden, wenn eine HTTPS-Url in deiner Adresszeile steht. Nutzer HTTPS oder %(urlStart)s aktiviere unsichere Skripte %(urlEnd)s",
+    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Kann nicht zum Heimserver via HTTP verbinden, wenn eine HTTPS-Url in deiner Adresszeile steht. Nutzer HTTPS oder <a>aktiviere unsichere Skripte</a>.",
     "changing room on a RoomView is not supported": "Das Ändern eines Raumes in einer RaumAnsicht wird nicht unterstützt",
     "Click to mute audio": "Klicke um den Ton stumm zu stellen",
     "Click to mute video": "Klicken, um das Video stummzuschalten",

src/i18n/strings/en_EN.json

@@ -166,8 +166,8 @@
   "Bug Report": "Bug Report",
   "Bulk Options": "Bulk Options",
   "Call Timeout": "Call Timeout",
-  "Can't connect to homeserver - please check your connectivity and ensure your %(urlStart)s homeserver's SSL certificate %(urlEnd)s is trusted": "Can't connect to homeserver - please check your connectivity and ensure your %(urlStart)s homeserver's SSL certificate %(urlEnd)s is trusted",
+  "Can't connect to homeserver - please check your connectivity and ensure your <a>homeserver's SSL certificate</a> is trusted.": "Can't connect to homeserver - please check your connectivity and ensure your <a>homeserver's SSL certificate</a> is trusted.",
-  "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or %(urlStart)s enable unsafe scripts %(urlEnd)s": "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or %(urlStart)s enable unsafe scripts %(urlEnd)s",
+  "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.",
   "Can't load user settings": "Can't load user settings",
   "Change Password": "Change Password",
   "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.",
@@ -220,6 +220,7 @@
   "Devices will not yet be able to decrypt history from before they joined the room": "Devices will not yet be able to decrypt history from before they joined the room",
   "Direct Chat": "Direct Chat",
   "Direct chats": "Direct chats",
+  "disabled": "disabled",
   "Disable inline URL previews by default": "Disable inline URL previews by default",
   "Disinvite": "Disinvite",
   "Display name": "Display name",
@@ -234,6 +235,7 @@
   "Email, name or matrix ID": "Email, name or matrix ID",
   "Emoji": "Emoji",
   "Enable encryption": "Enable encryption",
+  "enabled": "enabled",
   "Encrypted messages will not be visible on clients that do not yet implement encryption": "Encrypted messages will not be visible on clients that do not yet implement encryption",
   "Encrypted room": "Encrypted room",
   "%(senderName)s ended the call.": "%(senderName)s ended the call.",
@@ -303,6 +305,7 @@
   "Invalid file%(extra)s": "Invalid file%(extra)s",
   "%(senderName)s invited %(targetName)s.": "%(senderName)s invited %(targetName)s.",
   "Invite new room members": "Invite new room members",
+  "Invited": "Invited",
   "Invites": "Invites",
   "Invites user with given id to current room": "Invites user with given id to current room",
   "is a": "is a",
@@ -584,6 +587,7 @@
   "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s",
   "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
   "Set a display name:": "Set a display name:",
+  "Set a Display Name": "Set a Display Name",
   "Upload an avatar:": "Upload an avatar:",
   "This server does not support authentication with a phone number.": "This server does not support authentication with a phone number.",
   "Missing password.": "Missing password.",
@@ -682,7 +686,6 @@
   "Opt out of analytics": "Opt out of analytics",
   "Options": "Options",
   "Riot collects anonymous analytics to allow us to improve the application.": "Riot collects anonymous analytics to allow us to improve the application.",
-  "Please select the destination room for this message": "Please select the destination room for this message",
   "Passphrases must match": "Passphrases must match",
   "Passphrase must not be empty": "Passphrase must not be empty",
   "Export room keys": "Export room keys",
@@ -690,11 +693,12 @@
   "Confirm passphrase": "Confirm passphrase",
   "Import room keys": "Import room keys",
   "File to import": "File to import",
-  "Enter passphrase": "Enter passphrase",
   "This process allows you to export the keys for messages you have received in encrypted rooms to a local file. You will then be able to import the file into another Matrix client in the future, so that client will also be able to decrypt these messages.": "This process allows you to export the keys for messages you have received in encrypted rooms to a local file. You will then be able to import the file into another Matrix client in the future, so that client will also be able to decrypt these messages.",
   "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.",
   "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.",
-  "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.", "You must join the room to see its files": "You must join the room to see its files", "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
+  "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.",
+  "You must join the room to see its files": "You must join the room to see its files",
+  "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
   "Reject all %(invitedRooms)s invites": "Reject all %(invitedRooms)s invites",
   "Start new Chat": "Start new Chat",
   "Guest users can't invite users. Please register.": "Guest users can't invite users. Please register.",
@@ -765,6 +769,10 @@
   "Drop file here to upload": "Drop file here to upload",
   " (unsupported)": " (unsupported)",
   "Ongoing conference call%(supportedText)s. %(joinText)s": "Ongoing conference call%(supportedText)s. %(joinText)s",
+  "for %(amount)ss": "for %(amount)ss",
+  "for %(amount)sm": "for %(amount)sm",
+  "for %(amount)sh": "for %(amount)sh",
+  "for %(amount)sd": "for %(amount)sd",
   "Online": "Online",
   "Idle": "Idle",
   "Offline": "Offline",

src/i18n/strings/es.json

@@ -166,8 +166,8 @@
     "Bug Report": "Reporte de error",
     "Bulk Options": "Opciones masivas",
     "Call Timeout": "Tiempo de espera de la llamada",
-    "Can't connect to homeserver - please check your connectivity and ensure your %(urlStart)s homeserver's SSL certificate %(urlEnd)s is trusted": "No se puede conectar con el servidor - Por favor verifique su conexión y asegúrese de que su %(urlStart)s certificado SSL del servidor %(urlEnd)s sea confiable",
+    "Can't connect to homeserver - please check your connectivity and ensure your <a>homeserver's SSL certificate</a> is trusted.": "No se puede conectar con el servidor - Por favor verifique su conexión y asegúrese de que su <a>certificado SSL del servidor</a> sea confiable.",
-    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or %(urlStart)s enable unsafe scripts %(urlEnd)s": "No se puede conectar al servidor via HTTP, cuando es necesario un enlace HTTPS en la barra de direcciones de tu navegador. Ya sea usando HTTPS o %(urlStart)s habilitando los scripts inseguros %(urlEnd)s",
+    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "No se puede conectar al servidor via HTTP, cuando es necesario un enlace HTTPS en la barra de direcciones de tu navegador. Ya sea usando HTTPS o <a>habilitando los scripts inseguros</a>.",
     "Can't load user settings": "No se puede cargar las configuraciones del usuario",
     "Change Password": "Cambiar clave",
     "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "%(senderName)s ha cambiado su nombre de %(oldDisplayName)s a %(displayName)s.",

src/i18n/strings/fr.json

@@ -209,8 +209,8 @@
     "Blacklisted": "Sur liste noire",
     "Bug Report": "Rapport d'erreur",
     "Call Timeout": "Délai d’appel expiré",
-    "Can't connect to homeserver - please check your connectivity and ensure your %(urlStart)s homeserver's SSL certificate %(urlEnd)s is trusted": "Connexion au Home Server impossible - merci de vérifier votre connectivité et que le %(urlStart)s certificat SSL de votre Home Server %(urlEnd)s est de confiance",
+    "Can't connect to homeserver - please check your connectivity and ensure your <a>homeserver's SSL certificate</a> is trusted.": "Connexion au Home Server impossible - merci de vérifier votre connectivité et que le <a>certificat SSL de votre Home Server</a> est de confiance.",
-    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or %(urlStart)s enable unsafe scripts %(urlEnd)s": "Impossible de se connecter au homeserver en HTTP si l'URL dans la barre de votre explorateur est en HTTPS. Utilisez HTTPS ou %(urlStart)s activez le support des scripts non-vérifiés %(urlEnd)s",
+    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Impossible de se connecter au homeserver en HTTP si l'URL dans la barre de votre explorateur est en HTTPS. Utilisez HTTPS ou <a>activez le support des scripts non-vérifiés</a>.",
     "Can't load user settings": "Impossible de charger les paramètres utilisateur",
     "Change Password": "Changer le mot de passe",
     "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "%(senderName)s a changé son nom d’affichage de  %(oldDisplayName)s en %(displayName)s.",
@@ -311,6 +311,7 @@
     "Invalid Email Address": "Adresse e-mail invalide",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s a invité %(targetName)s.",
     "Invite new room members": "Inviter de nouveaux membres",
+    "Invited": "Invités",
     "Invites": "Invitations",
     "Invites user with given id to current room": "Inviter l’utilisateur avec un ID donné dans le salon actuel",
     "is a": "est un",

src/i18n/strings/nl.json

@@ -167,8 +167,8 @@
     "Bug Report": "Bug report",
     "Bulk Options": "Bulk opties",
     "Call Timeout": "Gesprek time-out",
-    "Can't connect to homeserver - please check your connectivity and ensure your %(urlStart)s homeserver's SSL certificate %(urlEnd)s is trusted": "Kan niet met de homeserver verbinden - controleer alsjeblieft je verbinding en wees zeker dat je %(urlStart)s homeserver's SSL certificaat %(urlEnd)s vertrouwd wordt",
+    "Can't connect to homeserver - please check your connectivity and ensure your <a>homeserver's SSL certificate</a> is trusted.": "Kan niet met de homeserver verbinden - controleer alsjeblieft je verbinding en wees zeker dat je <a>homeserver's SSL certificaat</a> vertrouwd wordt.",
-    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or %(urlStart)s enable unsafe scripts %(urlEnd)s": "Kan niet met de homeserver verbinden via HTTP wanneer er een HTTPS URL in je browser balk staat. Gebruik HTTPS of %(urlStart)s activeer onveilige scripts %(urlEnd)s",
+    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Kan niet met de homeserver verbinden via HTTP wanneer er een HTTPS URL in je browser balk staat. Gebruik HTTPS of <a>activeer onveilige scripts</a>.",
     "Can't load user settings": "Kan de gebruiker instellingen niet laden",
     "Change Password": "Wachtwoord veranderen",
     "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "%(senderName)s heeft zijn of haar weergave naam veranderd van %(oldDisplayName)s naar %(displayName)s.",

src/i18n/strings/pt_BR.json

@@ -567,8 +567,8 @@
     "sx": "Sutu",
     "sz": "Sami (Lappish)",
     "ve": "Venda",
-    "Can't connect to homeserver - please check your connectivity and ensure your %(urlStart)s homeserver's SSL certificate %(urlEnd)s is trusted": "Não consigo conectar ao servidor padrão - favor checar sua conexão à internet e verificar se o certificado SSL do seu %(urlStart)s servidor padrão %(urlEnd)s é confiável",
+    "Can't connect to homeserver - please check your connectivity and ensure your <a>homeserver's SSL certificate</a> is trusted.": "Não consigo conectar ao servidor padrão - favor checar sua conexão à internet e verificar se o certificado SSL do seu <a>servidor padrão</a> é confiável.",
-    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or %(urlStart)s enable unsafe scripts %(urlEnd)s": "Não consigo conectar ao servidor padrão através de HTTP quando uma URL HTTPS está na barra de endereços do seu navegador. Use HTTPS ou então %(urlStart)s habilite scripts não seguros no seu navegador %(urlEnd)s",
+    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Não consigo conectar ao servidor padrão através de HTTP quando uma URL HTTPS está na barra de endereços do seu navegador. Use HTTPS ou então <a>habilite scripts não seguros no seu navegador</a>.",
     "Change Password": "Alterar senha",
     "changing room on a RoomView is not supported": "mudar a sala em uma 'RoomView' não é permitido",
     "Click to mute audio": "Clique para colocar o áudio no mudo",
@@ -742,7 +742,7 @@
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "O arquivo exportado será protegido com uma senha. Você deverá inserir a senha aqui para poder descriptografar o arquivo futuramente.",
     "You must join the room to see its files": "Você precisa ingressar na sala para ver seus arquivos",
     "Server may be unavailable, overloaded, or you hit a bug.": "O servidor pode estar indisponível ou sobrecarregado, ou então você encontrou uma falha no sistema.",
-    "Reject all %(invitedRooms)s invites": "Rejeitar todos os %(invitedRoom)s convites",
+    "Reject all %(invitedRooms)s invites": "Rejeitar todos os %(invitedRooms)s convites",
     "Start new Chat": "Iniciar nova conversa",
     "Guest users can't invite users. Please register.": "Visitantes não podem convidar usuárias(os) registradas(os). Favor registrar.",
     "Failed to invite": "Falha ao enviar o convite",

src/i18n/strings/ru.json

@@ -452,7 +452,7 @@
     "and %(overflowCount)s others...": "и %(overflowCount)s других...",
     "Are you sure?": "Вы уверены?",
     "Autoplay GIFs and videos": "Проигрывать GIF и видео автоматически",
-    "Can't connect to homeserver - please check your connectivity and ensure your %(urlStart)s homeserver's SSL certificate %(urlEnd)s is trusted": "Невозможно соединиться с домашним сервером - проверьте своё соединение и убедитесь, что %(urlStart)s SSL-сертификат вашего домашнего сервера %(urlEnd)s включён в доверяемые",
+    "Can't connect to homeserver - please check your connectivity and ensure your <a>homeserver's SSL certificate</a> is trusted.": "Невозможно соединиться с домашним сервером - проверьте своё соединение и убедитесь, что <a>SSL-сертификат вашего домашнего сервера</a> включён в доверяемые.",
     "changing room on a RoomView is not supported": "изменение комнаты в RoomView не поддерживается",
     "Click to mute audio": "Выключить звук",
     "Click to mute video": "Выключить звук у видео",
@@ -651,5 +651,5 @@
     "%(oneUser)schanged their avatar %(repeats)s times": "%(oneUser)sизменил своё изображение %(repeats)s раз",
     "%(severalUsers)schanged their avatar": "%(severalUsers)sизменили своё изображение",
     "%(oneUser)schanged their avatar": "%(oneUser)sизменил своё изображение",
-    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or %(urlStart)s enable unsafe scripts %(urlEnd)s": "Не возможно подключиться к серверу через HTTP, когда в строке браузера HTTPS. Используйте HTTPS или %(urlStart) включив небезопасные скрипты %(urlEnd)"
+    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Не возможно подключиться к серверу через HTTP, когда в строке браузера HTTPS. Используйте HTTPS или <a>включив небезопасные скрипты</a>."
 }

src/i18n/strings/zh_Hant.json

@@ -16,8 +16,8 @@
     "Blacklisted": "已列入黑名單",
     "Bug Report": "錯誤報告",
     "Call Timeout": "通話超時",
-    "Can't connect to homeserver - please check your connectivity and ensure your %(urlStart)s homeserver's SSL certificate %(urlEnd)s is trusted": "無法連結主伺服器 - 請檢查網路狀況並確保您的 %(urlStart)s 主伺服器 SSL 證書 %(urlEnd)s 得到信任",
+    "Can't connect to homeserver - please check your connectivity and ensure your <a>homeserver's SSL certificate</a> is trusted.": "無法連結主伺服器 - 請檢查網路狀況並確保您的 <a>主伺服器 SSL 證書</a> 得到信任",
-    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or %(urlStart)s enable unsafe scripts %(urlEnd)s": "當瀏覽器網址列里有 HTTPS URL 時，不能使用 HTTP 連結主伺服器。請採用 HTTPS 或者%(urlStart)s 允許不安全的腳本 %(urlEnd)s",
+    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "當瀏覽器網址列里有 HTTPS URL 時，不能使用 HTTP 連結主伺服器。請採用 HTTPS 或者 <a>允許不安全的腳本</a>",
     "Can't load user settings": "無法載入使用者設定",
     "Change Password": "變更密碼",
     "%(targetName)s left the room.": "%(targetName)s 離開了聊天室。"

src/languageHandler.js

@@ -107,7 +107,7 @@ export function _tJsx(jsxText, patterns, subs) {
 }
 
 // Allow overriding the text displayed when no translation exists
-// Currently only use din unit tests to avoid having to load
+// Currently only used in unit tests to avoid having to load
 // the translations in riot-web
 export function setMissingEntryGenerator(f) {
     counterpart.setMissingEntryGenerator(f);