Merge branch 'develop' into matthew/webpack4

2018-09-26 00:15:56 +01:00 · 2018-09-26 00:15:56 +01:00 · c57c653535
commit c57c653535
parent 9063a96629 e58ac74aa2
40 changed files with 1380 additions and 411 deletions
--- a/src/i18n/strings/ar.json
+++ b/src/i18n/strings/ar.json
@ -3,5 +3,6 @@
    "Dismiss": "تجاهل",
    "Riot is not supported on mobile web. Install the app?": "رايوت غير مدعوم في وضعية الويب على الهاتف. هل تريد تثبيت التطبيق ؟",
    "Riot Desktop on %(platformName)s": "الواجهة المكتبية لرايوت على %(platformName)s",
-    "Unknown device": "جهاز مجهول"
+    "Unknown device": "جهاز مجهول",
+    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s عبر %(browserName)s على %(osName)s"
 }
--- a/src/i18n/strings/bn_IN.json
+++ b/src/i18n/strings/bn_IN.json
@ -1 +1,3 @@
-{}
+{
+    "Riot is not supported on mobile web. Install the app?": "মোবাইল ওয়েব রায়ট সমর্থন করে না. অ্য়াপ টি ইনস্টল করতে চান?"
+}
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@ -34,5 +34,6 @@
    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/iOS a matrix-ios-sdk chat",
    "Riot/Android &amp; matrix-android-sdk chat": "Riot/Android a matrix-android-sdk chat",
    "Discussion of the Identity Service API": "Diskuze o API služby identity",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Přes vlastní serverové volby se můžete přihlásit k dalším Matrix serverům tak, že zadáte jinou adresu domovského serveru.<br/>Díky tomu můžete v Riotu používat Matrix účet z jiného domovského serveru.<br/><br/>Můžete nastavit i vlastní server identity, ale pak už nebudete moci zvát ani být zván/a skrze e-mailovou adresu."
+    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Přes vlastní serverové volby se můžete přihlásit k dalším Matrix serverům tak, že zadáte jinou adresu domovského serveru.<br/>Díky tomu můžete v Riotu používat Matrix účet z jiného domovského serveru.<br/><br/>Můžete nastavit i vlastní server identity, ale pak už nebudete moci zvát ani být zván/a skrze e-mailovou adresu.",
+    "Co-ordination for Riot translators": "Spolupráce pro překladatele Riot"
 }
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@ -6,7 +6,7 @@
    "Unknown device": "Άγνωστη συσκευή",
    "You need to be using HTTPS to place a screen-sharing call.": "Απαιτείται η χρήση HTTPS για το διαμοιρασμό της επιφάνειας εργασίας μέσω κλήσης.",
    "Riot is not supported on mobile web. Install the app?": "Το Riot δεν υποστηρίζεται από περιηγητές κινητών. Θέλετε να εγκαταστήσετε την εφαρμογή;",
-    "powered by Matrix": "βασισμένο στο πρωτόκολλο Matrix",
+    "powered by Matrix": "βασισμένο στο Matrix",
    "Welcome to Riot.im": "Καλώς ήλθατε στο Riot.im",
    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Αποκεντρωμένη, κρυπτογραφημένη συνομιλία &amp; συνεργασία με τη βοήθεια του [matrix]",
    "Search the room directory": "Αναζήτηση του ευρετηρίου δωματίων",
@ -22,16 +22,18 @@
    "Community-run support for Synapse": "Κοινοτική υποστήριξη για το Synapse",
    "Admin support for Dendrite": "Υποστήριξη διαχειριστή για το Dendrite",
    "Announcements about Synapse releases": "Ανακοινώσεις σχετικά με τις εκδόσεις του Synapse",
-    "Support for those using and running matrix-appservice-irc": "Υποστήριξη για τους χρήστες που χρησιμοποιούν το matrix-appservice-irc",
+    "Support for those using and running matrix-appservice-irc": "Υποστήριξη για τους χρήστες του matrix-appservice-irc",
    "Building services on Matrix": "Ανάπτυξη υπηρεσιών στο Matrix",
    "Support for those using the Matrix spec": "Υποστήριξη για τους χρήστες που χρησιμοποιούν το Matrix spec",
    "Design and implementation of E2E in Matrix": "Σχεδιασμός και υλοποίηση του E2E στο Matrix",
    "Implementing VR services with Matrix": "Υλοποίηση υπηρεσίων VR με το Matrix",
    "Implementing VoIP services with Matrix": "Υλοποίηση υπηρεσίων VoIP με το Matrix",
    "Discussion of the Identity Service API": "Συζήτηση σχετικά με το Identity Service API",
-    "Contributing code to Matrix and Riot": "Συνεισφορά κώδικα στο Matrix και Riot",
+    "Contributing code to Matrix and Riot": "Συνεισφορά κώδικα στο Matrix και στο Riot",
    "Dev chat for the Riot/Web dev team": "Συζήτηση με την ομάδα ανάπτυξης του Riot/Web",
    "Dev chat for the Dendrite dev team": "Συζήτηση με την ομάδα ανάπτυξης του Dendrite",
    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Αρκετά δωμάτια υπάρχουν ήδη στο Matrix, συνδεδεμένα σε υπάρχοντα δίκτυα (Slack, IRC, Gitter κ.λπ) ή αυτόνομα. Ρίξτε μια ματιά στο ευρετήριο!",
-    "Support for those using, running and writing other bridges": "Υποστήριξη για τους χρήστες που χρησιμοποιούν ή αναπτύσσουν εφαρμογές ενσωμάτωσης για το Matrix"
+    "Support for those using, running and writing other bridges": "Υποστήριξη για τους χρήστες που χρησιμοποιούν ή αναπτύσσουν εφαρμογές ενσωμάτωσης για το Matrix",
+    "Co-ordination for Riot translators": "Συντονισμός για μεταφραστές του Riot",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Μπορείτε να χρησιμοποιήσετε τις προσαρμοσμένες ρυθμίσεις διακομιστή για να συνδεθείτε σε άλλους διακομιστές Matrix δίνοντας ένα διαφορετικό URL διακομιστή.<br/>Αυτό σας επιτρέπει να χρησιμοποιήσετε το Riot με έναν υπάρχοντα λογαριασμό Matrix σε έναν διαφορετικό διακομιστή.<br/><br/>Μπορείτε επίσης να ορίσετε έναν προσαρμοσμένο διακομιστή ταυτοποίησης αλλά δεν θα μπορείτε να προσκαλέσετε χρήστες ή να προσκληθείτε εσείς μέσω διεύθυνσης ηλεκτρονικού ταχυδρομίου."
 }
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@ -33,5 +33,7 @@
    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!",
    "Riot/Android &amp; matrix-android-sdk chat": "Riot/Android &amp; matrix-android-sdk chat",
    "Riot/Web &amp; Desktop chat": "Riot/Web &amp; Desktop chat",
-    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/iOS &amp; matrix-ios-sdk chat"
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/iOS &amp; matrix-ios-sdk chat",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.",
+    "Co-ordination for Riot translators": "Co-ordination for Riot translators"
 }
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@ -34,5 +34,6 @@
    "Dev chat for the Riot/Web dev team": "Conversaciones del equipo de desarrollo de Riot/Web",
    "Dev chat for the Dendrite dev team": "Conversaciones del equipo de desarrollo de Dendrite",
    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Muchas salas ya están disponibles en Matrix, enlazadas a redes existentes (Slack, IRC, Gitter, etc) o independientes. ¡Revisa el directorio!",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Puedes usar las opciones del servidor personalizado para acceder a otros servidores Matrix especificando su URL. <br/> Esto te permite usar Riot con una cuenta Matrix existente en un servidor doméstico distinto. <br/><br/>También puedes establecer un servidor de identidad personalizado pero no podrás invitar a otros usuarios usando su dirección de correo electrónico, y tampoco ser invitado por el tuyo."
+    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Puedes usar las opciones del servidor personalizado para acceder a otros servidores Matrix especificando su URL. <br/> Esto te permite usar Riot con una cuenta Matrix existente en un servidor doméstico distinto. <br/><br/>También puedes establecer un servidor de identidad personalizado pero no podrás invitar a otros usuarios usando su dirección de correo electrónico, y tampoco ser invitado por el tuyo.",
+    "Co-ordination for Riot translators": "Co-odinación de traductores de Riot"
 }
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@ -4,9 +4,9 @@
    "powered by Matrix": "propulsé par Matrix",
    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s dans %(browserName)s sous %(osName)s",
    "Riot Desktop on %(platformName)s": "Version bureau de Riot sur %(platformName)s",
-    "Riot is not supported on mobile web. Install the app?": "Riot n’est pas supporté sur les appareils mobiles. Installer l’application ?",
+    "Riot is not supported on mobile web. Install the app?": "Riot n’est pas disponible en version web mobile. Installer l’application ?",
    "Unknown device": "Appareil inconnu",
-    "You need to be using HTTPS to place a screen-sharing call.": "Vous devez utiliser HTTPS pour effectuer un appel en partage d’écran.",
+    "You need to be using HTTPS to place a screen-sharing call.": "Vous devez utiliser HTTPS pour effectuer un appel avec partage d’écran.",
    "Welcome to Riot.im": "Bienvenue sur Riot.im",
    "Chat with Riot Bot": "Discussion avec Riot Bot",
    "Search the room directory": "Rechercher dans le répertoire de salons",
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@ -4,35 +4,36 @@
    "Dismiss": "Rexeitar",
    "powered by Matrix": "funciona grazas a Matrix",
    "Riot Desktop on %(platformName)s": "Riot Desktop en %(platformName)s",
-    "Riot is not supported on mobile web. Install the app?": "Riot no se pode executar na web móbil. Instalar a app?",
+    "Riot is not supported on mobile web. Install the app?": "Riot non se pode executar na web do móbil. Instalar a aplicación?",
    "Unknown device": "Dispositivo descoñecido",
    "You need to be using HTTPS to place a screen-sharing call.": "Precisa utilizar HTTPS para establecer unha chamada de pantalla compartida.",
-    "Welcome to Riot.im": "Benvida a Riot.im",
-    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Chat &amp; colaboración descentralizados e cifrados grazas a [matrix]",
+    "Welcome to Riot.im": "Benvida/o a Riot.im",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Conversas e colaboración descentralizada e cifrada grazas a [matrix]",
    "Search the room directory": "Buscar no directorio de salas",
-    "Chat with Riot Bot": "Chat co Bot de Riot",
-    "Get started with some tips from Riot Bot!": "Iníciese con algúns consellos do Bot de Riot!",
+    "Chat with Riot Bot": "Conversa co bot de Riot",
+    "Get started with some tips from Riot Bot!": "Iníciese con algúns consellos do bot de Riot!",
    "General discussion about Matrix and Riot": "Discusión xeral sobre Matrix e Riot",
-    "Discussion of all things Matrix!": "Conversa sobre to o relativo a Matrix!",
-    "Riot/Web &amp; Desktop chat": "Riot/Web &amp; chat de Escritorio",
-    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/iOS &amp; chat matrix-ios-sdk",
+    "Discussion of all things Matrix!": "Conversa sobre todo o relativo a Matrix!",
+    "Riot/Web &amp; Desktop chat": "Riot/Web &amp; sala de conversas para escritorio",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/iOS &amp; sala de conversas matrix-ios-sdk",
    "Matrix technical discussions": "Discusións técnicas sobre Matrix",
-    "Running Matrix services": "Servizos correndo sobre Matrix",
+    "Running Matrix services": "Servizos que empregan Matrix",
    "Community-run support for Synapse": "Axuda da comunidade para Synapse",
-    "Admin support for Dendrite": "Axuda administrador para Dendrite",
+    "Admin support for Dendrite": "Axuda de administrador para Dendrite",
    "Announcements about Synapse releases": "Anuncios sobre lanzamentos de Synapse",
    "Support for those using and running matrix-appservice-irc": "Axuda para quen usa matrix-appservice-irc",
    "Building services on Matrix": "Deseñando servizos sobre Matrix",
-    "Support for those using the Matrix spec": "Axuda para quen usa a especificación Matrix",
+    "Support for those using the Matrix spec": "Axuda para quen usa a especificación de Matrix",
    "Design and implementation of E2E in Matrix": "Deseño e implementación de E2E en Matrix",
    "Implementing VR services with Matrix": "Implementando servizos de RV con Matrix",
    "Implementing VoIP services with Matrix": "Implementación de servizos VoIP con Matrix",
-    "Discussion of the Identity Service API": "Conversa sobre a Identity Service API",
-    "Support for those using, running and writing other bridges": "Axuda para que utiliza, executa e desenvolve outras pontes",
-    "Contributing code to Matrix and Riot": "Contribuíndo ao código en Matrix e Riot",
-    "Dev chat for the Riot/Web dev team": "Chat para o equipo de desenvolvemento do Riot/Web",
-    "Dev chat for the Dendrite dev team": "Chat para o equipo de desenvolvemento de Dendrite",
-    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Xa existen multitude de salas en Matrix, ligadas a redes existentes (Slack, IRC, Gitter etc) ou independentes. Busque no directorio!",
-    "Riot/Android &amp; matrix-android-sdk chat": "Chat para Riot/Android &amp; matrix-android-sdk",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Vostede pode utilizar as opcións de servidor personalizado para conectarse a outros servidores Matrix indicando o enderezo URL do Servidor.</br>Esto permítelle utilizar Riot con unha conta Matrix existente en outro servidor.<br/><br/>Tamén pode indicar un servidor de identidade pero non poderá convidar a usarias polo seu enderezo de correo electrónico, o ser convidada vostede por correo electrónico."
+    "Discussion of the Identity Service API": "Conversa sobre a API do servizo de identificación",
+    "Support for those using, running and writing other bridges": "Axuda para quen está a utilizar, executar ou desenvolver outras pontes",
+    "Contributing code to Matrix and Riot": "Contribuíndo ao código de Matrix e Riot",
+    "Dev chat for the Riot/Web dev team": "Sala de conversa para o equipo de desenvolvemento de Riot/Web",
+    "Dev chat for the Dendrite dev team": "Sala de conversas para o equipo de desenvolvemento de Dendrite",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Xa existen multitude de salas en Matrix ben ligadas a redes existentes (Slack, IRC, Gitter etc) ou ben independentes. Busque no directorio!",
+    "Riot/Android &amp; matrix-android-sdk chat": "Riot/Android &amp; sala de conversas matrix-android-sdk",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Pode utilizar as opcións persoais de servidor para conectarse a outros servidores Matrix indicando o enderezo URL dese servidor.</br>Isto permítelle utilizar Riot cunha conta Matrix existente en outro servidor.<br/><br/>Tamén pode empregar un servidor personalizado de identidade mais nese caso nin se poderán convidar a outros usuarios empregando os correo electrónicos nin tampouco eles o poderán convidar a vostede por correo.",
+    "Co-ordination for Riot translators": "Coordinación para tradutora/es de Riot"
 }
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@ -34,6 +34,6 @@
    "Dev chat for the Riot/Web dev team": "Csevegés a Riot/Web fejlesztői csapatával fejlesztőknek",
    "Dev chat for the Dendrite dev team": "Csevegés a Dendrite fejlesztői csapatával fejlesztőknek",
    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Már sok szoba van a Matrixon: más hálózatokkal (Slack, IRC, Gitter stb.) összekapcsolt és függetlenek szobák is. Nézd meg a szobajegyzéket!",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Bejelentkezhetsz más Matrix szerverre is az egyedi szerverbeállításoknál megadott másik szerver URL-jével.<br/>Így használhatod a Riotot egy már máshol meglévő Matrix fiókkal is.<br/><br/>Beállíthatsz egyéni identitásszervert is, de akkor nem tudsz más felhasználókat e-mail címmel meghívni, illetve ők sem tudnak téged.",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Bejelentkezhetsz más Matrix szerverre is az egyedi szerverbeállításoknál megadott Matrix szerver URL-jével.<br/>Így használhatod a Riotot egy már máshol meglévő Matrix fiókkal is.<br/><br/>Beállíthatsz egyéni identitásszervert is, de akkor nem tudsz más felhasználókat e-mail címmel meghívni, illetve ők sem tudnak téged.",
    "Co-ordination for Riot translators": "Koordináció Riot fordítók számára"
 }
--- a/src/i18n/strings/id.json
+++ b/src/i18n/strings/id.json
@ -34,5 +34,6 @@
    "Dev chat for the Riot/Web dev team": "Obrolan Developer untuk tim developer Riot/Web",
    "Dev chat for the Dendrite dev team": "Obrolan Developer untuk tim developer Dendrite",
    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Banyak ruang sudah tersedia di Matrix, terhubung ke jaringan yang sudah ada (Slack, IRC, Gitter dls) atau independen. Cek direktori!",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Anda dapat menggunakan opsi lain untuk mendaftar pada server Matrix yang berbeda dengan memasukkan URL server yang sesuai. <br/>Hal ini memungkinkan anda untuk menggunakan Riot dengan akun matrix yang telah tersedia pada Home server yang berbeda.<br/><br/>Anda juga dapat melakukan pengubahan identitas server akan tetapi akan berakibat tidak dapat mengundang pengguna melalui email, atau diundang melalui email."
+    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Anda dapat menggunakan opsi lain untuk mendaftar pada server Matrix yang berbeda dengan memasukkan URL server yang sesuai. <br/>Hal ini memungkinkan anda untuk menggunakan Riot dengan akun matrix yang telah tersedia pada Home server yang berbeda.<br/><br/>Anda juga dapat melakukan pengubahan identitas server akan tetapi akan berakibat tidak dapat mengundang pengguna melalui email, atau diundang melalui email.",
+    "Co-ordination for Riot translators": "Koordinasi dengan penerjemah Riot"
 }
--- a/src/i18n/strings/is.json
+++ b/src/i18n/strings/is.json
@ -23,5 +23,17 @@
    "Co-ordination for Riot translators": "Yfirlit fyrir þýðendur Riot",
    "Search the room directory": "Leita í herbergisskránni",
    "Building services on Matrix": "Að byggja þjónustur á Matrix",
-    "Design and implementation of E2E in Matrix": "Hönnun og framkvæmd E2E í Matrix"
+    "Design and implementation of E2E in Matrix": "Hönnun og framkvæmd E2E í Matrix",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Þú getur notað sérsniðna valkosti til að skrá inn á aðra Matrix-vefþjóna með því að tilgreina aðra slóð á Heimavefþjón.<br/>Þetta gerir þér kleift að nota Riot með fyrirliggjandi Matrix notandaaðgangi á öðrum heimaþjóni.<br/><br/>Þú getur líka stillt sérsniðinn auðkenningarþjón, en þá getur þú ekki boðið notendum eftir tölvupóstfangi eða sjálfur fengið boð með tölvupósti.",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Dulritað dreifvinnsluspjall &amp; samstarfstól keyrt með [matrix]",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Margar spjallrásir eru til í Matrix, tengdar við fyrirliggjandi netkerfi (Slack, IRC, Gitter, o.s.frv.) eða óháð. Skoðaðu skráninguna!",
+    "Community-run support for Synapse": "Aðstoð frá samfélaginu fyrir Synapse",
+    "Admin support for Dendrite": "Kerfisstjórnarstuðningur fyrir Dendrite",
+    "Announcements about Synapse releases": "Tilkynningar um Synapse útgáfur",
+    "Support for those using and running matrix-appservice-irc": "Stuðningur við þá sem nota og keyra matrix-appservice-irc",
+    "Support for those using the Matrix spec": "Stuðningur við þá sem nota tæknilega Matrix eiginleika",
+    "Discussion of the Identity Service API": "Umræða um Identity Service API-kerfisviðmót",
+    "Support for those using, running and writing other bridges": "Stuðningur við þá sem nota, keyra og skrifa aðrar brýr",
+    "Dev chat for the Riot/Web dev team": "Forritaraspjall fyrir Riot/vefþróunarhópinn",
+    "Dev chat for the Dendrite dev team": "Forritaraspjall fyrir Dendrite þróunarhópinn"
 }
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@ -1,6 +1,6 @@
 {
    "Custom Server Options": "Opzioni Server Personalizzate",
-    "Dismiss": "Scarta",
+    "Dismiss": "Chiudi",
    "powered by Matrix": "offerto da Matrix",
    "Riot Desktop on %(platformName)s": "Riot Desktop su %(platformName)s",
    "Riot is not supported on mobile web. Install the app?": "Riot non è supportato sul web mobile. Vuoi installare l'applicazione?",
@ -34,5 +34,6 @@
    "Dev chat for the Riot/Web dev team": "Chat per gli sviluppatori di Riot/Web",
    "Dev chat for the Dendrite dev team": "Chat per gli sviluppatori di Dendrite",
    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Esistono già molte stanze in Matrix, collegate a reti già esistenti (Slack, IRC, Gitter ecc) o indipendenti. Dai un'occhiata all'elenco!",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Puoi usare le opzioni server personalizzate per accedere ad altri server Matrix specificando l'indirizzo dell'home server.<br/> Questo permette di usare Matrix con un account esistente su un home server diverso.<br/><br/>È anche possibile impostare un diverso identity server, ma in quel caso non sarà possibile invitare utenti attraverso l'indirizzo e-mail o essere invitati attraverso l'indirizzo e-mail."
+    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Puoi usare le opzioni server personalizzate per accedere ad altri server Matrix specificando l'indirizzo dell'home server.<br/> Questo permette di usare Matrix con un account esistente su un home server diverso.<br/><br/>È anche possibile impostare un diverso identity server, ma in quel caso non sarà possibile invitare utenti attraverso l'indirizzo e-mail o essere invitati attraverso l'indirizzo e-mail.",
+    "Co-ordination for Riot translators": "Coordinazione per i traduttori di Riot"
 }
--- a/src/i18n/strings/ka.json
+++ b/src/i18n/strings/ka.json
@ -0,0 +1,39 @@
+{
+    "Riot is not supported on mobile web. Install the app?": "Riot ვებსაიტს არ აქვს მხარდაჭერა მობილური მოწყობილობებისთვის. გსურთ აპლიკაციის დაყენება?",
+    "Riot Desktop on %(platformName)s": "Riot Desktop-ი %(platformName)s-ზე",
+    "Unknown device": "უცნობი მოწყობილობა",
+    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s-ი %(browserName)s-ით %(osName)s-იდან",
+    "You need to be using HTTPS to place a screen-sharing call.": "ეკრანის გაზიარების ფუნქციის მქონე ზარისთვის საჭიროა, იყენებდეთ HTTPS-ს.",
+    "Custom Server Options": "პერსონალიზებული სერვერის პარამეტრები",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "სხვა Matrix სერვერებზე შესასვლელად შეგიძლიათ გამოიყენოთ პერსონალიზებული სერვერის პარამეტრები განსხვავებული მთავარი სერვერის URL-ის მითითებით <br/>ეს გაძლევთ საშუალებას, გამოიყენოთ Riot-ი არსებულ Matrix ანგარიშით სხვა მთავარ სერვერზე.<br/><br/>თქვენ ასევე შეგიძლიათ დააყენოთ პერსონალიზებული იდენტუროის სერვერი, მაგრამ თქვენ ვერ მოიწვევთ მომხმარებლებს ელფოსტის მისამართით და თავად თქვენ ვერ მოგიწვევენ ელფოსტის მისამართით.",
+    "Dismiss": "უარის თქმა",
+    "powered by Matrix": "Matrix-ზე დაფუძნებული",
+    "Welcome to Riot.im": "კეთილი იყოს თქვენი მობრძანება Riot.im-ზე",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "დეცენტრალიზებული, დაშიფრული ჩატი &amp; კოლაბორაცია, დაფუძნებული [matrix]-ზე",
+    "Search the room directory": "მოძებნა ოთახის სიაში",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "მრავალი ოთახი უკვე არსებობს Matrix-ში, რომლებიც არიან დაკავშირებული არსებულ ქსელებთან (Slack, IRC, Glitter და ა.შ) ან დამოუკიდებელი. შეამოწმეთ სია!",
+    "Chat with Riot Bot": "ისაუბრეთ Riot-ის Bot-თან",
+    "Get started with some tips from Riot Bot!": "დაიწყეთ რჩევებით Riot-ის Bot-ისგან!",
+    "General discussion about Matrix and Riot": "ზოგადი დისკუსია Matrix-სა და Riot-ზე",
+    "Discussion of all things Matrix!": "დისკუსია ყველაფერზე, რაც ეხება Matrix-ს!",
+    "Riot/Web &amp; Desktop chat": "Riot/ვებ-ისა &amp; Desktop-ის ჩატი",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/iOS-ისა &amp; matrix-ios-sdk-ის ჩატი",
+    "Riot/Android &amp; matrix-android-sdk chat": "Riot/ანდროიდისა &amp; matrix-android-sdk-ის ჩატი",
+    "Matrix technical discussions": "Matrix-ის ტექნიკური დისკუსიები",
+    "Running Matrix services": "Matrix-ის სერვისების გამოყენება",
+    "Community-run support for Synapse": "საზოგადოებისმიერი მხარდაჭერა Synapse-ისთვის",
+    "Admin support for Dendrite": "ადმინისტრატორის მხარდაჭერა Dendrite-ისთვის",
+    "Announcements about Synapse releases": "განცხადებები Synapse-ის გამოშვებებთან დაკავშირებით",
+    "Support for those using and running matrix-appservice-irc": "მხარდაჭერა მათთვის, ვინც იყენებს matrix-appservice-irc-ს",
+    "Building services on Matrix": "სერვისების Matrix-ზე დაფუძნებით გამომუშავება",
+    "Support for those using the Matrix spec": "მხარდაჭერა Matrix სპეციფიკაციების გამოყენებასთან დაკავშირებულ კითხვებზე",
+    "Design and implementation of E2E in Matrix": "პირით-პირამდე დაშიფვრის დაგეგმვა და შესრულება",
+    "Implementing VR services with Matrix": "VR სერვისების Matrix-ით შესრულება",
+    "Implementing VoIP services with Matrix": "VoIP სერვისების Matrix-ით შესრულება",
+    "Discussion of the Identity Service API": "იდენტიფიკაციის სერვისის API-ს დისკუსია",
+    "Support for those using, running and writing other bridges": "მხარდაჭერა მათთვის, ვინც იყენებს და წერს სხვა ხიდებს",
+    "Contributing code to Matrix and Riot": "Matrix-ის და Riot-ის გამომუშავებაში მონაწილეობის მიღება",
+    "Dev chat for the Riot/Web dev team": "დეველოპერების ჩატი Riot/ვებ დეველოპერების გუნდთან",
+    "Dev chat for the Dendrite dev team": "დეველოპერების ჩატი Dendrite-ის დეველოპერების გუნდთან",
+    "Co-ordination for Riot translators": "კოორდინაცია Riot-ის მთარგმნელებისთვის"
+}
--- a/src/i18n/strings/ko.json
+++ b/src/i18n/strings/ko.json
@ -1,37 +1,37 @@
 {
    "Custom Server Options": "사용자 지정 서버 설정",
    "Dismiss": "없애기",
-    "powered by Matrix": "매트릭스의 지원을 받고 있어요",
-    "Riot Desktop on %(platformName)s": "%(platformName)s에서 라이엇 컴퓨터판",
-    "Riot is not supported on mobile web. Install the app?": "라이엇은 모바일 사이트를 지원하지 않아요. 앱을 설치하시겠어요?",
+    "powered by Matrix": "Matrix의 지원을 받고 있습니다",
+    "Riot Desktop on %(platformName)s": "%(platformName)s PC용 Riot",
+    "Riot is not supported on mobile web. Install the app?": "”Riot은 모바일 사이트를 지원하지 않습니다. 앱을 설치하시겠어요?",
    "Unknown device": "알 수 없는 장치",
-    "Welcome to Riot.im": "라이엇에 오신 걸 환영해요",
-    "Chat with Riot Bot": "Riot 봇과 이야기하기",
+    "Welcome to Riot.im": "Riot에 오신 걸 환영해요",
+    "Chat with Riot Bot": "Riot 봇과 대화하기",
    "%(appName)s via %(browserName)s on %(osName)s": "%(osName)s의 %(browserName)s을 통한 %(appName)s",
-    "You need to be using HTTPS to place a screen-sharing call.": "화면 공유를 하려면 HTTPS를 써야만 해요.",
+    "You need to be using HTTPS to place a screen-sharing call.": "화면 공유 전화를 걸려면 HTTPS를 사용해야 합니다.",
    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "분산되고, 암호화된 대화 &amp; [matrix]의 지원으로 협력",
-    "Search the room directory": "방 목록을 찾기",
+    "Search the room directory": "방 목록 찾기",
    "Get started with some tips from Riot Bot!": "라이엇 봇에게 조언을 받고 시작하세요!",
-    "General discussion about Matrix and Riot": "매트릭스와 라이엇에 대한 일반 논의",
-    "Discussion of all things Matrix!": "매트릭스의 모든 것에 대한 토론!",
-    "Riot/Web &amp; Desktop chat": "라이엇/웹 &amp; 컴퓨터 이야기",
-    "Riot/iOS &amp; matrix-ios-sdk chat": "라이엇/IOS &amp; matrix-ios-sdk 대화",
-    "Riot/Android &amp; matrix-android-sdk chat": "매트릭스/안드로이드 &amp; matrix-ios-sdk 대화",
-    "Matrix technical discussions": "매트릭스 기술 논의",
-    "Running Matrix services": "매트릭스 서비스 실행",
+    "General discussion about Matrix and Riot": "Matrix와 Riot에 대한 일반적인 토론",
+    "Discussion of all things Matrix!": "모든 Matrix에 대한 토론!",
+    "Riot/Web &amp; Desktop chat": "Riot/웹 &amp; PC 대화",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/IOS &amp; matrix-ios-sdk 대화",
+    "Riot/Android &amp; matrix-android-sdk chat": "Riot/Android &amp; matrix-ios-sdk 대화",
+    "Matrix technical discussions": "Matrix에 대한 기술적인 토론",
+    "Running Matrix services": "Matrix 서비스 실행 중",
    "Community-run support for Synapse": "시냅스 커뮤니티 운영 지원",
-    "Admin support for Dendrite": "덴드라이트 관리 지원",
-    "Announcements about Synapse releases": "시냅스 공개 발표",
-    "Support for those using and running matrix-appservice-irc": "matrix-appservice-irc를 사용하고 운영하는 사람들을 지원",
-    "Building services on Matrix": "매트릭스에서 서비스 구축",
+    "Admin support for Dendrite": "Dendrite 관리 지원",
+    "Announcements about Synapse releases": "Synapse 출시에 대한 발표",
+    "Support for those using and running matrix-appservice-irc": "matrix-appservice-irc를 사용하고 운영하는 사람들을 위한 지원",
+    "Building services on Matrix": "Matrix에서 서비스 구축",
    "Support for those using the Matrix spec": "Matrix spec을 사용하는 사람들을 지원",
    "Design and implementation of E2E in Matrix": "매트릭스에서 E2E 설계와 구현",
    "Implementing VR services with Matrix": "매트릭스로 VR 서비스 구현",
-    "Implementing VoIP services with Matrix": "매트릭스로 인터넷전화 서비스 구현",
+    "Implementing VoIP services with Matrix": "Matrix로 인터넷전화 서비스 구현",
    "Discussion of the Identity Service API": "ID 서비스 API에 대한 논의",
-    "Support for those using, running and writing other bridges": "다른 브릿지를 사용하고, 운영하고, 기록하는 사람들을 지원",
-    "Contributing code to Matrix and Riot": "매트릭스와 라이엇에 코드 기여하기",
-    "Dev chat for the Riot/Web dev team": "라이엇/웹 개발 팀을 위한 개발자 대화",
+    "Support for those using, running and writing other bridges": "다른 브릿지를 사용하고, 운영하고, 기록하는 사람들을 위한 지원",
+    "Contributing code to Matrix and Riot": "Matrix와 Riot에 코드 기여하기",
+    "Dev chat for the Riot/Web dev team": "Riot/웹 개발 팀을 위한 개발자 대화",
    "Dev chat for the Dendrite dev team": "덴드라이트 개발 팀을 위한 개발자 대화",
-    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "기존 네트워크(Slack, IRC, Gitter 등)에 연결되있거나 독립된 많은 방들이 이미 매트릭스에 있어요. 목록을 확인해보세요!"
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "기존 네트워크(Slack, IRC, Gitter 등)에 연결되있거나 독립된 많은 방이 이미 Matrix에 있습니다. 목록을 확인해보세요!"
 }
--- a/src/i18n/strings/lt.json
+++ b/src/i18n/strings/lt.json
@ -1,38 +1,39 @@
 {
    "Unknown device": "Nežinomas įrenginys",
-    "powered by Matrix": "palaikomas Matrix",
+    "powered by Matrix": "veikia su Matrix",
    "Welcome to Riot.im": "Sveiki atvykę į Riot.im",
    "Chat with Riot Bot": "Kalbėtis su Riot robotu",
    "General discussion about Matrix and Riot": "Bendros diskusijos apie Matrix ir Riot",
    "Matrix technical discussions": "Matrix techninės diskusijos",
    "Riot is not supported on mobile web. Install the app?": "Riot nėra palaikoma naršant svetainėje mobiliaisiais įrenginiais. Įdiegti programėlę?",
-    "Riot Desktop on %(platformName)s": "Riot Desktop, %(platformName)s",
+    "Riot Desktop on %(platformName)s": "Riot Desktop, naudojant %(platformName)s",
    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s per %(browserName)s, naudojant %(osName)s",
    "You need to be using HTTPS to place a screen-sharing call.": "Norint skambinti su ekrano bendrinimo funkcija būtina naudoti HTTPS.",
-    "Custom Server Options": "Pasirinktiniai serverio nustatymai",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Norėdami jungtis prie kito nei Matrix serverio galite pasirinktinio serverio nustatymuose nurodyti kito serverio URL adresą.<br/>Ši funkcija leis naudoti Riot su esama Matrix serverio paskyrą kituose serveriuose.<br/><br/>Taip pat galite nurodyti pasirinktinį identifikavimo serverį, bet tuomet negalėsite kviesti kitų vartotojų el. paštu ar jie jūsų.",
-    "Dismiss": "Nutraukti",
-    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Decentralizuotas, šifruotas čatas; bendradarbiavimas palaikomas [matrix]",
+    "Custom Server Options": "Tinkinto serverio parametrai",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Norėdami prisijungti prie kito nei Matrix serverio, galite naudoti tinkinto serverio parametrus ir nurodyti kito serverio URL adresą.<br/>Tai leis jums naudoti Riot su esama Matrix paskyra kituose serveriuose.<br/><br/>Taip pat galite nustatyti tinkintą tapatybės serverį, tačiau tuomet negalėsite pakviesti kitus naudotojus pagal el. paštą, o taip pat ir jie negalės pakviesti jūsų.",
+    "Dismiss": "Atmesti",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Decentralizuoti, šifruoti pokalbiai ir bendradarbiavimas, veikiantis su [matrix]",
    "Search the room directory": "Ieškoti kambarių kataloge",
-    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Daugybė kambarių yra prisijungę prie Matrix, kurie yra susieti su egzistuojančiais tinklais (Slack, IRC, Gitter etc) arba nepriklausomi. Patikrinkite kambarių katalogą!",
-    "Get started with some tips from Riot Bot!": "Pradėkite su patarimais nuo Riot roboto!",
-    "Discussion of all things Matrix!": "Diskusijos apie viską Matrix!",
-    "Riot/Web &amp; Desktop chat": "Riot/Web &amp; Darbalaukio čatas",
-    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/iOS &amp; matrix-ios-sdk chat",
-    "Riot/Android &amp; matrix-android-sdk chat": "Riot/Android &amp; matrix-android-sdk chat",
-    "Running Matrix services": "Vykdant Matrix servisus",
-    "Community-run support for Synapse": "Bendruomenės Synapse palaikymas",
-    "Admin support for Dendrite": "Administratoriaus Dendrite palaikymas",
-    "Announcements about Synapse releases": "Pranešimai apie Synapse naujinimus",
-    "Support for those using and running matrix-appservice-irc": "Palaikymas skirtas matrix-appservice-irc naudotojams",
-    "Building services on Matrix": "Servisų kūrimas ant Matrix",
-    "Support for those using the Matrix spec": "Palaikymas skirtas Matrix spec",
-    "Design and implementation of E2E in Matrix": "E2E dizainas ir įgyvendinimas Matrix'e",
-    "Implementing VR services with Matrix": "VR serviso įgyvendinimas su Matrix",
-    "Implementing VoIP services with Matrix": "VoIP serviso įgyvendinimas su Matrix",
-    "Discussion of the Identity Service API": "Diskusijos apie identifikavimo serviso API",
-    "Support for those using, running and writing other bridges": "Palaikymas skirtas tiems kas naudoja kitus tiltus",
-    "Contributing code to Matrix and Riot": "Contributing code to Matrix and Riot",
-    "Dev chat for the Riot/Web dev team": "Kūrėjų čatas Riot/Web dev team",
-    "Dev chat for the Dendrite dev team": "Kūrėjų čatas Dendrite dev team"
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Daugybė kambarių jau yra Matrix, susieti prie esamų tinklų (Slack, IRC, Gitter ir t.t.) arba nepriklausomi. Pasižvalgykite kataloge!",
+    "Get started with some tips from Riot Bot!": "Pradėkite darbo pradžią nuo Riot roboto patarimų!",
+    "Discussion of all things Matrix!": "Diskusijos apie viską, kas susiję su Matrix!",
+    "Riot/Web &amp; Desktop chat": "Pokalbiai apie Riot/Web ir Desktop",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Pokalbiai apie Riot/iOS ir matrix-ios-sdk",
+    "Riot/Android &amp; matrix-android-sdk chat": "Pokalbiai apie Riot/Android ir matrix-android-sdk",
+    "Running Matrix services": "Matrix paslaugų paleidimas",
+    "Community-run support for Synapse": "Su Synapse susijęs bendruomenės palaikymas",
+    "Admin support for Dendrite": "Dendrite administratorių palaikymas",
+    "Announcements about Synapse releases": "Skelbimai apie Synapse laidas",
+    "Support for those using and running matrix-appservice-irc": "Palaikymas skirtas besinaudojantiems ir prižiūrintiems matrix-appservice-irc",
+    "Building services on Matrix": "Paslaugų kūrimas, naudojant Matrix",
+    "Support for those using the Matrix spec": "Palaikymas skirtas besinaudojantiems Matrix specifikacija",
+    "Design and implementation of E2E in Matrix": "E2E dizainas ir įgyvendinimas ties Matrix",
+    "Implementing VR services with Matrix": "VR paslaugų įgyvendinimas ties Matrix",
+    "Implementing VoIP services with Matrix": "VoIP paslaugų įgyvendinimas ties Matrix",
+    "Discussion of the Identity Service API": "Diskusijos apie tapatybės paslaugos API",
+    "Support for those using, running and writing other bridges": "Palaikymas skirtas besinaudojantiems, prižiūrintiems ar kuriantiems kitus tinklų tiltus",
+    "Contributing code to Matrix and Riot": "Matrix ir Riot kodo plėtojimas",
+    "Dev chat for the Riot/Web dev team": "Kūrėjų pokalbiai, skirti Riot/Web kūrėjų komandai",
+    "Dev chat for the Dendrite dev team": "Kūrėjų pokalbiai, skirti Dendrite kūrėjų komandai",
+    "Co-ordination for Riot translators": "Koordinavimas Riot vertėjams"
 }
--- a/src/i18n/strings/nb_NO.json
+++ b/src/i18n/strings/nb_NO.json
@ -1,4 +1,16 @@
 {
    "Custom Server Options": "Tilpassede serveralternativer",
-    "powered by Matrix": "benytter seg av Matrix"
+    "powered by Matrix": "benytter seg av Matrix",
+    "Riot is not supported on mobile web. Install the app?": "Riot er ikke støttet av mobil-nettlesere. Ønsker De å innstalere appen?",
+    "Riot Desktop on %(platformName)s": "Riot på skrivebordet er på %(platformName)s",
+    "Unknown device": "Ukjent enhet",
+    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s via %(browserName)s på %(osName)s",
+    "You need to be using HTTPS to place a screen-sharing call.": "De er nødt til å benytte HTTPS for å kunne ha en samtale med skjermdeling.",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "De kan benytte brukerdefinerte server-innstillinger for å kunne logge Dem inn på andre Matrix-servere ved å spesifisere en annen hjemmeserver-adresse. <br/> Dette tillater Dem til å bruke Riot med en eksisterende Matrix-konto på en annen hjemmeserver. <br/><br/> De kan i tillegg definere en egen hjemmeserver-identitet, men De kan da ikke invitere andre brukere via email, og De kan heller ikke bli invitert via email selv.",
+    "Dismiss": "Avvis",
+    "Welcome to Riot.im": "Velkommen skal De være til Riot.im",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Desentralisert, kryptert nettprat &amp; sammabeid drevet av [matrix]",
+    "Search the room directory": "Søk i romutvalget",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Allerede finnes det alskens rom i Matrix, sammenkoblet til eksisterende nettverk (Slack, IRC, Gitter osv.) eller selvstendig. Dersom De formoder, kan De kikke på utvalget!",
+    "Chat with Riot Bot": "Nettprat med Riot Bot"
 }
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@ -34,5 +34,6 @@
    "Support for those using, running and writing other bridges": "Ondersteuning voor het gebruiken, draaien en ontwikkelen aan andere bruggen",
    "Dev chat for the Riot/Web dev team": "Dev-chat voor het Riot/Web ontwikkelteam",
    "Dev chat for the Dendrite dev team": "Dev-chat voor het Dendrite-ontwikkelteam",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Je kan de custom server opties gebruiken om op andere Matrix server in te loggen door een andere Home server URL op te geven.<br/> Dit laat je toe om Riot te gebruiken met een bestaande Matrix account op een andere home server.<br/><br/>Je kan ook een custom identiteits-server opzetten maar dan kan je geen gebruikers uitnodigen via hun email adres, of zelf uitgenodigd worden via je email adres."
+    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Je kan de custom server opties gebruiken om op andere Matrix server in te loggen door een andere Home server URL op te geven.<br/> Dit laat je toe om Riot te gebruiken met een bestaande Matrix account op een andere home server.<br/><br/>Je kan ook een custom identiteits-server opzetten maar dan kan je geen gebruikers uitnodigen via hun email adres, of zelf uitgenodigd worden via je email adres.",
+    "Co-ordination for Riot translators": "Coördinatie voor Riot vertalers"
 }
--- a/src/i18n/strings/nn.json
+++ b/src/i18n/strings/nn.json
@ -0,0 +1,39 @@
+{
+    "Riot is not supported on mobile web. Install the app?": "Riot er ikkja støtta på mobilnettlesare. Last æppen inn?",
+    "Riot Desktop on %(platformName)s": "Riot på Skrivebord for %(platformName)s",
+    "Unknown device": "Ukjend eining",
+    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s gjennom %(browserName)s på %(osName)s",
+    "You need to be using HTTPS to place a screen-sharing call.": "Du må bruka HTTPS for å ha ei samtale med skjermdeling.",
+    "Dismiss": "Avvis",
+    "powered by Matrix": "Matrixdriven",
+    "Welcome to Riot.im": "Velkomen til Riot.im",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Desentralisert, kryptert nettprat &amp; samarbeid driven av [matrix]",
+    "Search the room directory": "Søk i romutvalet",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Det finst allereie massevis av rom på Matrix, anten lenkja til nettverk som allereie finst (Slack, IRC, Gitter osv.) eller uavhengige. Tak ein titt på utvalet!",
+    "Chat with Riot Bot": "Nettprat med Riot Bot",
+    "Get started with some tips from Riot Bot!": "Kom i gang med nokre råd frå Riot Bot!",
+    "General discussion about Matrix and Riot": "Allmenn meiningsutveksling om Matrix og Riot",
+    "Discussion of all things Matrix!": "Meiningsutveksling om alt som gjeld Matrix!",
+    "Riot/Web &amp; Desktop chat": "Riot/Web &amp; Skrivebordsprat",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/iOS &amp; matrix-ios-sdk-prat",
+    "Riot/Android &amp; matrix-android-sdk chat": "Riot/Android &amp; matrix-android-sdk-prat",
+    "Matrix technical discussions": "Teknisk meiningsutveksling om Matrix",
+    "Running Matrix services": "Å køyra Matrix-tenestar",
+    "Community-run support for Synapse": "Samfunnsdriven støtte for Synapse",
+    "Admin support for Dendrite": "Administratorstøtte for Dendrite",
+    "Announcements about Synapse releases": "Kunngjeringar om Synapse-utgåver",
+    "Support for those using and running matrix-appservice-irc": "Støtte for dei som brukar og køyrar matrix-appleservice-irc",
+    "Building services on Matrix": "Byggingstenester på Matrix",
+    "Support for those using the Matrix spec": "Støtte for dei som brukar Matrix-specen",
+    "Design and implementation of E2E in Matrix": "E2E-oppbygging og -implementering på Matrix",
+    "Implementing VR services with Matrix": "Implementering av VR-tenester med Matrix",
+    "Implementing VoIP services with Matrix": "Implementering av VoIP-tenester med Matrix",
+    "Discussion of the Identity Service API": "Meiningsutveksling om Identitetstenar-APIen",
+    "Support for those using, running and writing other bridges": "Støtte for dei som brukar, køyrer og skriv andre bruer",
+    "Contributing code to Matrix and Riot": "For å bidraga med kode til Matrix og Riot",
+    "Dev chat for the Riot/Web dev team": "Utviklar-prat for Riot/Web-utviklargruppa",
+    "Dev chat for the Dendrite dev team": "Utviklar-prat for Dendrite-utviklargruppa",
+    "Co-ordination for Riot translators": "Samordning for Riot-omsetjare",
+    "Custom Server Options": "Eigentenar-innstillingar",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Du kan bruka eigentenarinnstillingar til å logga inn på andre Matrixtenarar ved å oppgje ein annan Heimtenar-URL. <br/>Dette gjer at du kan bruka Riot med ein Matrixbrukar som allereie finst på ein annan heimtenar.<br/><br/>Du kan òg setja ein eigen identitetstenar men du kjem i so fall ikkje til å kunna byda brukare inn med epost, eller å sjølv verta boden inn med epost."
+}
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@ -8,12 +8,12 @@
    "Unknown device": "Nieznane urządzenie",
    "You need to be using HTTPS to place a screen-sharing call.": "Musisz używać bezpiecznego protokołu HTTPS aby użyć połączenia współdzielenia ekranu.",
    "Welcome to Riot.im": "Witamy w Riot.im",
-    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Zdecentralizowany, szyfrowany czat &amp; współpraca wspierana przez [matrix]",
-    "Search the room directory": "Wyszukaj katalog pokojów",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Zdecentralizowany, szyfrowany czat &amp; współpraca oparta na [matrix]",
+    "Search the room directory": "Przeszukaj katalog pokojów",
    "Chat with Riot Bot": "Rozmowa z Botem Riota",
    "Get started with some tips from Riot Bot!": "Rozpocznij z wskazówkami Riot Bota!",
-    "General discussion about Matrix and Riot": "Generalna rozmowa o Matrix i Riot",
-    "Discussion of all things Matrix!": "Rozmowa o wszystkim Matrixowym!",
+    "General discussion about Matrix and Riot": "Ogólna rozmowa o Matrix i Riot",
+    "Discussion of all things Matrix!": "Rozmowa o wszystkich sprawach Matrixowych!",
    "Matrix technical discussions": "Dyskusje techniczne Matrixa",
    "Riot/Web &amp; Desktop chat": "Czat o Riot/Web i Desktop",
    "Riot/iOS &amp; matrix-ios-sdk chat": "Czat o Riot/iOS i matrix-ios-sdk",
@ -29,10 +29,11 @@
    "Implementing VR services with Matrix": "Implementowanie usług wirtualnej rzeczywistości w oparciu o Matrix",
    "Implementing VoIP services with Matrix": "Implementowanie usług telefonii internetowej VoIP w oparciu o Matrix",
    "Discussion of the Identity Service API": "Dyskusja na temat API Identity Service",
-    "Support for those using, running and writing other bridges": "Wsparcie dla używających, zapewniających i piszących inne mosty",
-    "Contributing code to Matrix and Riot": "Wspieranie rozwoju Matrix i Riot",
+    "Support for those using, running and writing other bridges": "Wsparcie dla używających, utrzymujących i piszących inne mosty",
+    "Contributing code to Matrix and Riot": "Współtworzenie kodu do Matrix lub Riot",
    "Dev chat for the Riot/Web dev team": "Czat deweloperów zespołu Riot/Web",
    "Dev chat for the Dendrite dev team": "Czat deweloperów zespołu Dendrite",
    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Matrix ma wiele, już działających pokoi, połączonych z istniejącymi sieciami, takimi jak Slack, IRC lub Gitter, a także wiele zupełnie niezależnych. Możesz przejrzeć je wszystkie w spisie pokoi!",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Możesz skorzystać z opcji dedykowanego serwera, aby zalogować się na inne serwery Matrix, podając inny adres URL serwera Domowego.<br/>Pozwala to na używanie Riot z istniejącym kontem Matrix na innym serwerze domowym.<br/><br/>Możesz również ustawić dedykowany serwer tożsamości, ale nie będziesz w stanie zapraszać użytkowników przez adres email, lub otrzymywać zaproszeń na adres email."
+    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Możesz skorzystać z opcji niestandardowego serwera, aby zalogować się na inne serwery Matrix, podając inny adres URL serwera domowego.<br/>Pozwala to na używanie Riot z istniejącym kontem Matrix na innym serwerze domowym.<br/><br/>Możesz również ustawić niestandardowy serwer tożsamości, ale nie będziesz w stanie zapraszać użytkowników przez adres e-mail ani otrzymywać zaproszeń na adres e-mail.",
+    "Co-ordination for Riot translators": "Koordynacja tłumaczy Riot"
 }
--- a/src/i18n/strings/ro.json
+++ b/src/i18n/strings/ro.json
@ -0,0 +1,5 @@
+{
+    "Riot is not supported on mobile web. Install the app?": "Riot nu functionează pe mobil. Instalezi aplicaţia?",
+    "Riot Desktop on %(platformName)s": "Riot Desktop pe %(platformName)s",
+    "Unknown device": "Device necunoscut"
+}
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@ -1,12 +1,12 @@
 {
-    "Custom Server Options": "Egna serverinställningar",
+    "Custom Server Options": "Anpassade serverinställningar",
    "Dismiss": "Avvisa",
    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s via %(browserName)s på %(osName)s",
    "powered by Matrix": "drivs av Matrix",
    "Riot Desktop on %(platformName)s": "Riot Desktop på %(platformName)s",
    "Riot is not supported on mobile web. Install the app?": "Riot stöds inte på mobil-webb. Installera appen?",
    "Unknown device": "Okänd enhet",
-    "You need to be using HTTPS to place a screen-sharing call.": "Du måste använda HTTPS för att dela din skärm.",
+    "You need to be using HTTPS to place a screen-sharing call.": "Du måste använda HTTPS för att ringa med skärmdelning.",
    "Welcome to Riot.im": "Välkommen till Riot.im",
    "Chat with Riot Bot": "Chatta med Riot Bot",
    "Get started with some tips from Riot Bot!": "Kom igång med några tips från Riot Bot!",
@ -27,7 +27,7 @@
    "Dev chat for the Riot/Web dev team": "Chatt för utvecklare av Riot/Web",
    "Dev chat for the Dendrite dev team": "Chatt för utvecklare av Dendrite",
    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Många rum finns redan i Matrix, länkade till andra nätverk (Slack, IRC, Gitter etc.) eller fristående. Kolla in katalogen!",
-    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Decentraliserad, krypterad chatt &amp; samarbete möjliggjort med [matrix]",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Decentraliserad, krypterad chatt &amp; samarbetsplattform möjliggjort med [matrix]",
    "Search the room directory": "Sök i rumskatalogen",
    "Riot/Web &amp; Desktop chat": "Riot/Web &amp; Desktop-chatt",
    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/iOS &amp; matrix-ios-sdk-chatt",
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@ -1,17 +1,17 @@
 {
    "%(appName)s via %(browserName)s on %(osName)s": "%(osName)s işletim sisteminde %(browserName)s ile %(appName)s",
-    "Custom Server Options": "Özel Sunucu Seçenekleri",
-    "Dismiss": "Uzaklaştır",
+    "Custom Server Options": "Özelleştirilebilir Sunucu Seçenekleri",
+    "Dismiss": "Kapat",
    "powered by Matrix": "Matrix tarafından desteklenmektedir",
    "Riot Desktop on %(platformName)s": "%(platformName)s platformunda Riot Masaüstü",
    "Riot is not supported on mobile web. Install the app?": "Riot mobil web'de desteklenmiyor . Uygulamayı yükle ?",
    "Unknown device": "Bilinmeyen aygıt",
    "You need to be using HTTPS to place a screen-sharing call.": "Ekran paylaşımlı arama yapmak için HTTPS kullanıyor olmalısınız.",
-    "Welcome to Riot.im": "Riot.im'e Hoş Geldiniz",
-    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Dağıtık , şifreli sohbet &amp; işbirliği ile Matrix tarafından desteklenmektedir",
+    "Welcome to Riot.im": "Riot.im'e hoş geldiniz",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Merkezsiz, şifreli sohbet &amp; işbirliği ile Matrix tarafından desteklenmektedir",
    "Search the room directory": "Oda dizinini ara",
-    "Chat with Riot Bot": "Riot Bot ile Sohbet Et",
-    "Get started with some tips from Riot Bot!": "Bazı Riot Bot ipuçları ile başlayın !",
+    "Chat with Riot Bot": "Riot Bot ile sohbet et",
+    "Get started with some tips from Riot Bot!": "Riot Bot'tan bazı ipuçları ile başlayın!",
    "General discussion about Matrix and Riot": "Matrix ve Riot hakkında genel tartışma",
    "Discussion of all things Matrix!": "Matrix'in tüm tartışması!",
    "Riot/Web &amp; Desktop chat": "Riot/Web &amp; Masaüstü sohbet",
@ -19,19 +19,21 @@
    "Riot/Android &amp; matrix-android-sdk chat": "Riot/Android &amp; matrix-android-sdk sohbet",
    "Matrix technical discussions": "Matrix teknik tartışmalar",
    "Running Matrix services": "Çalışan Matrix hizmetleri",
-    "Community-run support for Synapse": "Synapse için topluluk tarafından işlenen destek",
-    "Admin support for Dendrite": "Dendrite için Admin desteği",
+    "Community-run support for Synapse": "Synapse için topluluk tarafından işletilen destek",
+    "Admin support for Dendrite": "Dendrite için yönetici desteği",
    "Announcements about Synapse releases": "Synapse sürümleri hakkında duyurular",
    "Support for those using and running matrix-appservice-irc": "matrix-appservice-irc kullanan ve çalıştıran kullanıcılar için destek",
-    "Building services on Matrix": "Matrix üzerinde Yapı hizmetleri",
+    "Building services on Matrix": "Matrix üzerinde yapı hizmetleri",
    "Support for those using the Matrix spec": "Matrix teknik özelliklerini kullananlar için destek",
-    "Design and implementation of E2E in Matrix": "Matrix'te E2E ' nin Tasarım ve İmplementasyonu",
-    "Implementing VR services with Matrix": "Matrix'te VR hizmetlerini implement etmek",
-    "Implementing VoIP services with Matrix": "Matrix'te VoIP hizmetlerini implement etmek",
-    "Discussion of the Identity Service API": "Kimlik Hizmet API ( Identity Service API ) Tartışması",
+    "Design and implementation of E2E in Matrix": "Matrix'te E2E ' nin Tasarımı ve uyglamanması",
+    "Implementing VR services with Matrix": "Matrix'te VR hizmetlerini uygulamak",
+    "Implementing VoIP services with Matrix": "Matrix'te VoIP hizmetlerini uygulamak",
+    "Discussion of the Identity Service API": "Kimlik Hizmet API ( Identity Service API ) tartışması",
    "Support for those using, running and writing other bridges": "Diğer köprüleri kullanan , çalıştıran ve yazanlar için destek",
-    "Contributing code to Matrix and Riot": "Matrix ve Riot'a kod katkısı (contribution) sağla",
-    "Dev chat for the Riot/Web dev team": "Riot/Web Geliştirici takımı için Geliştirici sohbeti",
-    "Dev chat for the Dendrite dev team": "Dendrite Geliştirici Takımı için Geliştirici sohbeti",
-    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Matrix'te varolan ağlara (Slack , IRC , Gitter vb.) bağlı ya da bağımsız bir çok oda var . Dizini kontrol edin!"
+    "Contributing code to Matrix and Riot": "Matrix ve Riot'a kod katkısı sağlama",
+    "Dev chat for the Riot/Web dev team": "Riot/Web Geliştirici takımı için geliştirici sohbeti",
+    "Dev chat for the Dendrite dev team": "Dendrite geliştirici takımı için geliştirici sohbeti",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Matrix'te var olan ağalara bağlı (Slack , IRC , Gitter vb.) birçok oda var. Dizini kontrol edin!",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Farklı bir ev sunucusu URL'sini belirterek diğer Matrix sunucularına oturum açmak için özel sunucu seçeneklerini kullanabilirsiniz.<br />Bu, Riot'u başka bir ev sunucusu üzerinde var olan Matrix hesabını kullanmanıza olanak sağlar. <br/><br/> Ayrıca özelleştirilebilir bir kimlik de ayarlayabilirsiniz, ama kullanıcılırı ve kendinizi e-posta adreslerinden davet edemeyeceksiniz.",
+    "Co-ordination for Riot translators": "Riot çeviricileri için iş güdüm (koordinasyon)"
 }
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@ -1,14 +1,14 @@
 {
-    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s 透過 %(browserName)s 在 %(osName)s",
+    "%(appName)s via %(browserName)s on %(osName)s": "在 %(osName)s 的 %(browserName)s 上的 %(appName)s",
    "Custom Server Options": "自訂伺服器選項",
-    "Dismiss": "無視",
-    "powered by Matrix": "由 Matrix 架設",
+    "Dismiss": "關閉",
+    "powered by Matrix": "由 Matrix 提供",
    "Unknown device": "未知裝置",
-    "You need to be using HTTPS to place a screen-sharing call.": "你需要使用 HTTPS 來放置螢幕分享的通話。",
-    "Riot Desktop on %(platformName)s": "Riot 桌面版在 %(platformName)s",
+    "You need to be using HTTPS to place a screen-sharing call.": "你需要使用 HTTPS 來撥打螢幕分享的通話。",
+    "Riot Desktop on %(platformName)s": "%(platformName)s 的 Riot 桌面版",
    "Riot is not supported on mobile web. Install the app?": "Riot 不支援行動版網頁，要安裝應用程式嗎？",
    "Welcome to Riot.im": "歡迎來到 Riot.im",
-    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "去中心化、保密的聊天與協作，由 [matrix] 出品",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "去中心化、保密的聊天與協作，由 [matrix] 提供",
    "Search the room directory": "搜尋聊天室目錄",
    "Chat with Riot Bot": "與 Riot 機器人聊天",
    "Get started with some tips from Riot Bot!": "從 Riot 機器人了解使用 Riot 的訣竅吧！",
--- a/src/vector/getconfig.js
+++ b/src/vector/getconfig.js
@ -0,0 +1,67 @@
+/*
+Copyright 2018 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import Promise from 'bluebird';
+import request from 'browser-request';
+
+export async function getVectorConfig(relativeLocation) {
+    if (relativeLocation === undefined) relativeLocation = '';
+    if (relativeLocation !== '' && !relativeLocation.endsWith('/')) relativeLocation += '/';
+    try {
+        const configJson = await getConfig(`${relativeLocation}config.${document.domain}.json`);
+        // 404s succeed with an empty json config, so check that there are keys
+        if (Object.keys(configJson).length === 0) {
+            throw new Error(); // throw to enter the catch
+        }
+        return configJson;
+    } catch (e) {
+        return await getConfig(relativeLocation + "config.json");
+    }
+}
+
+function getConfig(configJsonFilename) {
+    let deferred = Promise.defer();
+
+    request(
+        { method: "GET", url: configJsonFilename },
+        (err, response, body) => {
+            if (err || response.status < 200 || response.status >= 300) {
+                // Lack of a config isn't an error, we should
+                // just use the defaults.
+                // Also treat a blank config as no config, assuming
+                // the status code is 0, because we don't get 404s
+                // from file: URIs so this is the only way we can
+                // not fail if the file doesn't exist when loading
+                // from a file:// URI.
+                if (response) {
+                    if (response.status == 404 || (response.status == 0 && body == '')) {
+                        deferred.resolve({});
+                    }
+                }
+                deferred.reject({err: err, response: response});
+                return;
+            }
+
+            // We parse the JSON ourselves rather than use the JSON
+            // parameter, since this throws a parse error on empty
+            // which breaks if there's no config.json and we're
+            // loading from the filesystem (see above).
+            deferred.resolve(JSON.parse(body));
+        }
+    );
+
+    return deferred.promise;
+}
--- a/src/vector/index.js
+++ b/src/vector/index.js
@ -1,6 +1,7 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2017 Vector Creations Ltd
+Copyright 2018 New Vector Ltd

 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@ -15,8 +16,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-'use strict';
-
 // Require common CSS here; this will make webpack process it into bundle.css.
 // Our own CSS (which is themed) is imported via separate webpack entry points
 // in webpack.config.js
@ -25,36 +24,22 @@ require('gfm.css/gfm.css');
 require('highlight.js/styles/github.css');
 require('draft-js/dist/Draft.css');

-const rageshake = require("matrix-react-sdk/lib/rageshake/rageshake");
-rageshake.init().then(() => {
-    console.log("Initialised rageshake: See https://bugs.chromium.org/p/chromium/issues/detail?id=583193 to fix line numbers on Chrome.");
-    rageshake.cleanup();
-}, (err) => {
-    console.error("Failed to initialise rageshake: " + err);
-});
-
-window.addEventListener('beforeunload', (e) => {
-    console.log('riot-web closing');
-    // try to flush the logs to indexeddb
-    rageshake.flush();
-});
-
-
- // add React and ReactPerf to the global namespace, to make them easier to
- // access via the console
-global.React = require("react");
+import React from 'react';
+// add React and ReactPerf to the global namespace, to make them easier to
+// access via the console
+global.React = React;
 if (process.env.NODE_ENV !== 'production') {
-    global.Perf = require("react-addons-perf");
+    global.Perf = require('react-addons-perf');
 }

-var RunModernizrTests = require("./modernizr"); // this side-effects a global
-var ReactDOM = require("react-dom");
-var sdk = require("matrix-react-sdk");
-const PlatformPeg = require("matrix-react-sdk/lib/PlatformPeg");
+import RunModernizrTests from './modernizr'; // this side-effects a global
+import ReactDOM from 'react-dom';
+import sdk from 'matrix-react-sdk';
+import PlatformPeg from 'matrix-react-sdk/lib/PlatformPeg';
 sdk.loadSkin(require('../component-index'));
-var VectorConferenceHandler = require('matrix-react-sdk/lib/VectorConferenceHandler');
+import VectorConferenceHandler from 'matrix-react-sdk/lib/VectorConferenceHandler';
 import Promise from 'bluebird';
-var request = require('browser-request');
+import request from 'browser-request';
 import * as languageHandler from 'matrix-react-sdk/lib/languageHandler';
 // Also import _t directly so we can call it just `_t` as this is what gen-i18n.js expects
 import { _t } from 'matrix-react-sdk/lib/languageHandler';
@ -69,12 +54,29 @@ import SettingsStore, {SettingLevel} from "matrix-react-sdk/lib/settings/Setting
 import Tinter from 'matrix-react-sdk/lib/Tinter';
 import SdkConfig from "matrix-react-sdk/lib/SdkConfig";

-var lastLocationHashSet = null;
+import rageshake from "matrix-react-sdk/lib/rageshake/rageshake";

-var CallHandler = require("matrix-react-sdk/lib/CallHandler");
-CallHandler.setConferenceHandler(VectorConferenceHandler);
+import CallHandler from 'matrix-react-sdk/lib/CallHandler';

-MatrixClientPeg.setIndexedDbWorkerScript(window.vector_indexeddb_worker_script);
+import {getVectorConfig} from './getconfig';
+
+let lastLocationHashSet = null;
+
+function initRageshake() {
+    rageshake.init().then(() => {
+        console.log("Initialised rageshake: See https://bugs.chromium.org/p/chromium/issues/detail?id=583193 to fix line numbers on Chrome.");
+
+        window.addEventListener('beforeunload', (e) => {
+            console.log('riot-web closing');
+            // try to flush the logs to indexeddb
+            rageshake.flush();
+        });
+
+        rageshake.cleanup();
+    }, (err) => {
+        console.error("Failed to initialise rageshake: " + err);
+    });
+}

 function checkBrowserFeatures(featureList) {
    if (!window.Modernizr) {
@ -100,11 +102,6 @@ function checkBrowserFeatures(featureList) {
    return featureComplete;
 }

-var validBrowser = checkBrowserFeatures([
-    "displaytable", "flexbox", "es5object", "es5function", "localstorage",
-    "objectfit", "indexeddb", "webworkers",
-]);
-
 // Parse the given window.location and return parameters that can be used when calling
 // MatrixChat.showScreen(screen, params)
 function getScreenFromLocation(location) {
@ -135,7 +132,7 @@ function onHashChange(ev) {

 // This will be called whenever the SDK changes screens,
 // so a web page can update the URL bar appropriately.
-var onNewScreen = function(screen) {
+function onNewScreen(screen) {
    console.log("newscreen "+screen);
    var hash = '#/' + screen;
    lastLocationHashSet = hash;
@ -151,7 +148,7 @@ var onNewScreen = function(screen) {
 // If we're in electron, we should never pass through a file:// URL otherwise
 // the identity server will try to 302 the browser to it, which breaks horribly.
 // so in that instance, hardcode to use riot.im/app for now instead.
-var makeRegistrationUrl = function(params) {
+function makeRegistrationUrl(params) {
    let url;
    if (window.location.protocol === "file:") {
        url = 'https://riot.im/app/#/register';
@ -177,8 +174,6 @@ var makeRegistrationUrl = function(params) {
    return url;
 }

-window.addEventListener('hashchange', onHashChange);
-
 function getConfig(configJsonFilename) {
    let deferred = Promise.defer();

@ -226,6 +221,12 @@ function onTokenLoginCompleted() {
 }

 async function loadApp() {
+    initRageshake();
+    MatrixClientPeg.setIndexedDbWorkerScript(window.vector_indexeddb_worker_script);
+    CallHandler.setConferenceHandler(VectorConferenceHandler);
+
+    window.addEventListener('hashchange', onHashChange);
+
    await loadLanguage();

    const fragparts = parseQsFromFragment(window.location);
@ -239,15 +240,7 @@ async function loadApp() {
    let configJson;
    let configError;
    try {
-        try {
-            configJson = await getConfig(`config.${document.domain}.json`);
-            // 404s succeed with an empty json config, so check that there are keys
-            if (Object.keys(configJson).length === 0) {
-                throw new Error(); // throw to enter the catch
-            }
-        } catch (e) {
-            configJson = await getConfig("config.json");
-        }
+        configJson = await getVectorConfig();
    } catch (e) {
        configError = e;
    }
@ -261,31 +254,13 @@ async function loadApp() {
    const preventRedirect = Boolean(fragparts.params.client_secret);

    if (!preventRedirect) {
-        if (/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream) {
-            // FIXME: ugly status hardcoding
-            if (SettingsStore.getValue("theme") === 'status') {
-                window.location = "https://status.im/join-riot.html";
+        const isIos = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream;
+        const isAndroid = /Android/.test(navigator.userAgent);
+        if (isIos || isAndroid) {
+            if (!document.cookie.split(';').some((c) => c.startsWith('mobile_redirect_to_guide'))) {
+                window.location = "mobile_guide/";
                return;
            }
-            else {
-                if (confirm(_t("Riot is not supported on mobile web. Install the app?"))) {
-                    window.location = "https://itunes.apple.com/us/app/vector.im/id1083446067";
-                    return;
-                }
-            }
-        }
-        else if (/Android/.test(navigator.userAgent)) {
-            // FIXME: ugly status hardcoding
-            if (SettingsStore.getValue("theme") === 'status') {
-                window.location = "https://status.im/join-riot.html";
-                return;
-            }
-            else {
-                if (confirm(_t("Riot is not supported on mobile web. Install the app?"))) {
-                    window.location = "https://play.google.com/store/apps/details?id=im.vector.alpha";
-                    return;
-                }
-            }
        }
    }

@ -325,17 +300,19 @@ async function loadApp() {
        }
    }

-    if (window.localStorage && window.localStorage.getItem('mx_accepts_unsupported_browser')) {
-        console.log('User has previously accepted risks in using an unsupported browser');
-        validBrowser = true;
-    }
+    const validBrowser = checkBrowserFeatures([
+        "displaytable", "flexbox", "es5object", "es5function", "localstorage",
+        "objectfit", "indexeddb", "webworkers",
+    ]);
+
+    const acceptInvalidBrowser = window.localStorage && window.localStorage.getItem('mx_accepts_unsupported_browser');

    console.log("Vector starting at "+window.location);
    if (configError) {
        window.matrixChat = ReactDOM.render(<div className="error">
            Unable to load config file: please refresh the page to try again.
        </div>, document.getElementById('matrixchat'));
-    } else if (validBrowser) {
+    } else if (validBrowser || acceptInvalidBrowser) {
        const platform = PlatformPeg.get();
        platform.startUpdater();

@ -362,7 +339,6 @@ async function loadApp() {
        window.matrixChat = ReactDOM.render(
            <CompatibilityPage onAccept={function() {
                if (window.localStorage) window.localStorage.setItem('mx_accepts_unsupported_browser', true);
-                validBrowser = true;
                console.log("User accepts the compatibility risks.");
                loadApp();
            }} />,
--- a/src/vector/mobile_guide/index.html
+++ b/src/vector/mobile_guide/index.html
--- a/src/vector/mobile_guide/index.js
+++ b/src/vector/mobile_guide/index.js
@ -0,0 +1,23 @@
+import {getVectorConfig} from '../getconfig';
+
+function onBackToRiotClick() {
+    document.cookie = 'mobile_redirect_to_guide=false;path=/';
+    window.location.href = '../';
+}
+
+async function initPage() {
+    document.getElementById('back_to_riot_button').onclick = onBackToRiotClick;
+
+    const config = await getVectorConfig('..');
+    let hsUrl;
+    if (config && config['default_hs_url']) {
+        hsUrl = config['default_hs_url'];
+    }
+    if (hsUrl && hsUrl !== 'https://matrix.org/') {
+        document.getElementById('step2_container').style.display = 'block';
+        document.getElementById('hs_url').innerHTML = hsUrl;
+        document.getElementById('step_login_header').innerHTML= 'Step 3: Register or Log in';
+    }
+}
+
+initPage();