Merge branches 'develop' and 't3chguy/app_load_tweaks' of github.com:vector-im/riot-web into t3chguy/app_load_tweaks

.gitignore

@@ -21,3 +21,4 @@ electron/pub
 /config.local*.json
 /src/component-index.js
 /.tmp
+/webpack-stats.json

package.json

@@ -37,11 +37,13 @@
     "reskindex:watch-react": "node scripts/yarn-sub.js matrix-react-sdk reskindex:watch",
     "clean": "rimraf lib webapp electron_app/dist",
     "build": "yarn clean && yarn build:genfiles && yarn build:compile && yarn build:types && yarn build:bundle",
+    "build-stats": "yarn clean && yarn build:genfiles && yarn build:compile && yarn build:types && yarn build:bundle-stats",
     "build:res": "node scripts/copy-res.js",
     "build:genfiles": "yarn reskindex && yarn build:res",
     "build:modernizr": "modernizr -c .modernizr.json -d src/vector/modernizr.js",
     "build:compile": "babel -d lib --verbose --extensions \".ts,.js,.tsx\" src",
     "build:bundle": "cross-env NODE_ENV=production webpack -p --progress --bail --mode production",
+    "build:bundle-stats": "cross-env NODE_ENV=production webpack -p --progress --bail --mode production --json > webpack-stats.json",
     "build:electron": "yarn build && yarn install:electron && electron-builder -wml --ia32 --x64",
     "build:electron:linux": "yarn build && electron-builder -l --x64",
     "build:electron:macos": "yarn build && electron-builder -m --x64",

src/i18n/strings/bg.json

@@ -21,5 +21,7 @@
     "Your Riot is misconfigured": "Riot не е конфигуриран правилно",
     "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Riot конфигурацията ви съдържа невалиден JSON. Коригирайте проблема и презаредете страницата.",
     "The message from the parser is: %(message)s": "Грешката от парсъра е: %(message)s",
-    "Invalid JSON": "Невалиден JSON"
+    "Invalid JSON": "Невалиден JSON",
+    "Open user settings": "Отвори потребителските настройки",
+    "Go to your browser to complete Sign In": "Отидете в браузъра за да завършите влизането"
 }

src/i18n/strings/cy.json

@@ -21,5 +21,6 @@
     "Need help?": "Angen cymorth?",
     "Chat with Riot Bot": "Sgwrsio gyda Riot Bot",
     "Explore rooms": "Archwilio Ystafelloedd",
-    "Room Directory": "Cyfeiriadur Ystafelloedd"
+    "Room Directory": "Cyfeiriadur Ystafelloedd",
+    "Go to your browser to complete Sign In": "Ewch i'ch porwr i gwblhau Mewngofnodi"
 }

src/i18n/strings/de_DE.json

@@ -22,5 +22,6 @@
     "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Deine Riot Konfiguration enthält ungültiges JSON. Bitte korrigiere das Problem und lade die Seite neu.",
     "The message from the parser is: %(message)s": "Die Nachricht des Parsers ist: %(message)s",
     "Invalid JSON": "Ungültiges JSON",
-    "Go to your browser to complete Sign In": "Gehe zu deinem Browser, um die Anmeldung abzuschließen"
+    "Go to your browser to complete Sign In": "Gehe zu deinem Browser, um die Anmeldung abzuschließen",
+    "Open user settings": "Öffne Nutzer-Einstellungen"
 }

src/i18n/strings/eu.json

@@ -22,5 +22,6 @@
     "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Zure Riot konfigurazioak baliogabeko JSON kodea du. Zuzendu arazoa eta kargatu orria berriro.",
     "The message from the parser is: %(message)s": "Prozesatzailearen mezua hau da: %(message)s",
     "Invalid JSON": "JSON baliogabea",
-    "Go to your browser to complete Sign In": "Joan zure nabigatzailera izena ematen bukatzeko"
+    "Go to your browser to complete Sign In": "Joan zure nabigatzailera izena ematen bukatzeko",
+    "Open user settings": "Ireki erabiltzailearen ezarpenak"
 }

src/i18n/strings/fr.json

@@ -22,5 +22,6 @@
     "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Votre configuration de Riot contient du JSON non valide. Corrigez ce problème et rechargez la page.",
     "The message from the parser is: %(message)s": "Le message de l’analyseur est : %(message)s",
     "Invalid JSON": "JSON non valide",
-    "Go to your browser to complete Sign In": "Utilisez votre navigateur pour terminer la connexion"
+    "Go to your browser to complete Sign In": "Utilisez votre navigateur pour terminer la connexion",
+    "Open user settings": "Ouvrir les paramètres utilisateur"
 }

src/i18n/strings/oc.json

@@ -0,0 +1,22 @@
+{
+    "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Vòstra configuracion Riot conten de JSON invalid. Mercés de corregir lo problèma e d’actualizar la pagina.",
+    "The message from the parser is: %(message)s": "Lo messatge de l’analisaire es : %(message)s",
+    "Invalid JSON": "Invalid JSON",
+    "Your Riot is misconfigured": "Vòstre Riot es mal configurat",
+    "Unexpected error preparing the app. See console for details.": "Error inesperada en preparant l’aplicacion. Vejatz la consòla pels detalhs.",
+    "Riot Desktop on %(platformName)s": "Riot Desktop sus %(platformName)s",
+    "Go to your browser to complete Sign In": "Anatz al navegador per acabar la connexion",
+    "Unknown device": "Periferic desconegut",
+    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s via %(browserName)s sus %(osName)s",
+    "powered by Matrix": "propulsat per Matrix",
+    "Custom Server Options": "Opcions de servidor personalizat",
+    "Dismiss": "Refusar",
+    "Welcome to Riot.im": "La benvenguda a Riot.im",
+    "Decentralised, encrypted chat & collaboration powered by [matrix]": "Messatjariá chifrada, descentralizada e collaborativa propulsada per [matrix]",
+    "Sign In": "Se connectar",
+    "Create Account": "Crear un compte",
+    "Need help?": "Besonh d’ajuda ?",
+    "Chat with Riot Bot": "Charrar amb lo robòt Riot",
+    "Explore rooms": "Percórrer las salas",
+    "Room Directory": "Annuari de las sala"
+}

src/i18n/strings/pt.json

@@ -1,25 +1,26 @@
 {
-    "Custom Server Options": "Opções para Servidor Personalizado",
+    "Custom Server Options": "Opções do Servidor Personalizado",
     "Dismiss": "Descartar",
-    "powered by Matrix": "rodando a partir do Matrix",
+    "powered by Matrix": "powered by Matrix",
     "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s via %(browserName)s em %(osName)s",
-    "Riot Desktop on %(platformName)s": "Riot para computadores desktop em %(platformName)s",
+    "Riot Desktop on %(platformName)s": "Riot Desktop em %(platformName)s",
     "Unknown device": "Dispositivo desconhecido",
     "You need to be using HTTPS to place a screen-sharing call.": "Necessita de estar a usar HTTPS para poder iniciar uma chamada com partilha de ecrã.",
     "Welcome to Riot.im": "Bem-vindo ao Riot.im",
-    "Decentralised, encrypted chat & collaboration powered by [matrix]": "Chat descentralizado, encriptado & colaborativo alimentado por [matrix]",
+    "Decentralised, encrypted chat & collaboration powered by [matrix]": "Chat descentralizado, encriptado & colaborativo powered by [matrix]",
     "Chat with Riot Bot": "Falar com o Bot do Riot",
-    "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "A sua configuração do RIOT contém JSON inválido. Por favor corriga o erro e recarregue a página.",
-    "The message from the parser is: %(message)s": "A mensagem do analisador é: %(message)s",
+    "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "A sua configuração do Riot contém JSON inválido. Por favor corrija o erro e recarregue a página.",
+    "The message from the parser is: %(message)s": "A mensagem do parser é: %(message)s",
     "Invalid JSON": "JSON inválido",
-    "Your Riot is misconfigured": "A sua configuração do RIOT está incorrecta.",
+    "Your Riot is misconfigured": "Existe um erro na configuração do Riot",
     "Unexpected error preparing the app. See console for details.": "Erro inesperado na preparação da aplicação. Veja a consola para mais detalhes.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuração inválida: só pode especificar uma das default_server_config, default_server_name,\nor default_hs_url.",
-    "Invalid configuration: no default server specified.": "Configuração inválida: não existe especificação de servidor padrão.",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Pode usar as opções de custom server, para iniciar sessão noutros servidores Matrix.org, especificando o URL do homeserver diferente. Isto autoriza-lo-á  a usar RIOT com a sua conta Matrix num servidor diferente",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuração inválida: só pode especificar uma das default_server_config, default_server_name, ou default_hs_url.",
+    "Invalid configuration: no default server specified.": "Configuração inválida: servidor padrão não especificado.",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Pode usar as opções de servidor personalizado, para iniciar sessão noutros servidores Matrix, especificando o URL do homeserver diferente. Isto autoriza-lo-á a usar Riot com a sua conta Matrix num servidor diferente.",
     "Sign In": "Iniciar sessão",
     "Create Account": "Criar conta",
     "Need help?": "Ajuda?",
     "Explore rooms": "Explorar rooms",
-    "Room Directory": "Diretório de rooms"
+    "Room Directory": "Diretório de rooms",
+    "Go to your browser to complete Sign In": "Abra o seu navegador para completar o inicio de sessão"
 }

src/i18n/strings/sq.json

@@ -22,5 +22,6 @@
     "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Formësimi juaj i Riot-it përmban JSON. Ju lutemi, ndreqeni problemin dhe ringarkoni faqen.",
     "The message from the parser is: %(message)s": "Mesazhi prej procesit është: %(message)s",
     "Invalid JSON": "JSON i pavlefshëm",
-    "Go to your browser to complete Sign In": "Që të plotësoni Hyrjen, kaloni te shfletuesi juaj"
+    "Go to your browser to complete Sign In": "Që të plotësoni Hyrjen, kaloni te shfletuesi juaj",
+    "Open user settings": "Hapni rregullime përdoruesi"
 }

src/i18n/strings/tr.json

@@ -21,5 +21,6 @@
     "Unexpected error preparing the app. See console for details.": "Uygulamayı hazırlarken beklenmeyen hata oluştu. Lütfen detaylar için konsola bakınız.",
     "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Geçersiz yapılandırma: default_server_config, default_server_name, yada default_hs_url den sadece birisi seçilebilir.",
     "Invalid configuration: no default server specified.": "Geçersiz yapılandırma: varsayılan sunucu seçilmemiş.",
-    "The message from the parser is: %(message)s": "Ayrıştırıcıdan gelen mesaj: %(message)s"
+    "The message from the parser is: %(message)s": "Ayrıştırıcıdan gelen mesaj: %(message)s",
+    "Go to your browser to complete Sign In": "Oturum açmayı tamamlamak için tarayıcınıza gidin"
 }

src/i18n/strings/zh_Hant.json

@@ -22,5 +22,6 @@
     "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "您的 Riot 包含無效的 JSON。請修正問題並重新整理頁面。",
     "The message from the parser is: %(message)s": "從解析器而來的訊息為：%(message)s",
     "Invalid JSON": "無效的 JSON",
-    "Go to your browser to complete Sign In": "到您的瀏覽器完成登入"
+    "Go to your browser to complete Sign In": "到您的瀏覽器完成登入",
+    "Open user settings": "開啟使用者設定"
 }

webpack.config.js

@@ -96,6 +96,9 @@ module.exports = (env, argv) => {
 
                 // same goes for js-sdk - we don't need two copies.
                 "matrix-js-sdk": path.resolve(__dirname, 'node_modules/matrix-js-sdk'),
+                // and prop-types and sanitize-html
+                "prop-types": path.resolve(__dirname, 'node_modules/prop-types'),
+                "sanitize-html": path.resolve(__dirname, 'node_modules/sanitize-html'),
 
                 // Define a variable so the i18n stuff can load
                 "$webapp": path.resolve(__dirname, 'webapp'),