Merge branch 'develop' into travis/feature/wellknown2

package.json

@@ -110,7 +110,6 @@
     "electron-builder": "^20.38.5",
     "electron-builder-squirrel-windows": "^20.38.5",
     "electron-devtools-installer": "^2.2.4",
-    "emojione": "^2.2.7",
     "eslint": "^5.8.0",
     "eslint-config-google": "^0.7.1",
     "eslint-plugin-babel": "^4.1.2",
@@ -154,7 +153,7 @@
   },
   "build": {
     "appId": "im.riot.app",
-    "electronVersion": "4.1.5",
+    "electronVersion": "4.2.2",
     "files": [
       "node_modules/**",
       "src/**",

scripts/copy-res.js

@@ -57,8 +57,6 @@ const COPY_LIST = [
     ["res/themes/**", "webapp/themes"],
     ["res/vector-icons/**", "webapp/vector-icons"],
     ["node_modules/matrix-react-sdk/res/media/**", "webapp/media"],
-    ["node_modules/emojione/assets/svg/*", "webapp/emojione/svg/"],
-    ["node_modules/emojione/assets/png/*", "webapp/emojione/png/"],
     ["node_modules/olm/olm_legacy.js", "webapp", { directwatch: 1 }],
     ["./config.json", "webapp", { directwatch: 1 }],
 ];

src/i18n/strings/eo.json

@@ -41,5 +41,6 @@
     "Create Account": "Krei konton",
     "Need help?": "Ĉu vi bezonas helpon?",
     "Explore rooms": "Esplori ĉambrojn",
-    "Room Directory": "Ĉambra dosierujo"
+    "Room Directory": "Ĉambra dosierujo",
+    "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.": "Vi povas uzi proprajn servilajn elekteblojn por saluti aliajn servilojn de Matrix, donante alian hejmeservilan URL-on. Tio povigos vin uzi programon Riot kun jama konto de Matrix en alia hejmservilo."
 }

src/i18n/strings/fi.json

@@ -37,7 +37,7 @@
     "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.": "Voit käyttää edistyksellisiä asetuksia kirjautuaksesi muille Matrix palvelimille, määrittelemällä kotipalvelimen URL-osoitteen.<br/>Tämän avulla voit käyttää Riot:ia olemassa olevalla toisen Matrix palvelimen käyttäjätilillä.<br/><br/>Voit myös asettaa valinnaisen identiteettipalvelimen, mutta et voi kutsua käyttäjiä sähköpostiosoitteella tai tulla kutsutuksi.",
     "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.": "Voit käyttää mukautettuja palvelinasetuksia kirjautuaksesi muihin Matrix-palvelimiin. Tämä mahdollistaa Riotin käyttämisen toisella kotipalvelimella olevalla Matrix-tilillä.",
     "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.": "Voit myös määrittää toisen identiteettipalvelimen, mutta et voi kutsua muita käyttäjiä sähköpostin perusteella tai saada itse kutsua sähköpostin perusteella.",
-    "Sign In": "Kirjaudu sisään",
+    "Sign In": "Kirjaudu",
     "Create Account": "Luo tili",
     "Need help?": "Tarvitsetko apua?",
     "Explore rooms": "Etsi huoneita",

src/i18n/strings/lv.json

@@ -34,5 +34,12 @@
     "Dev chat for the Riot/Web dev team": "Riot/Web izstrādātāju komandas čats",
     "Dev chat for the Dendrite dev team": "Dendrite izstrādatāju komandas čats",
     "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Matrix-ā pastāv daudzas neatkarīgas un/vai eksistējošiem tīmekļa resursiem (Slack, IRC, Gitter u.tml.) piesaistītas istabas. Ieskaties katalogā!",
-    "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.": "Tu vari lietot \"custom\" servera opcijas, lai ielogotos citos Matrix serveros, norādot citu Bāzes servera URL.<br> Tas atļaus tev lietot Riot ar esošo Matrix kontu uz cita Bāzes servera.<br/><br/>Tu arī vari uzstādīt atsevišķu Identitāšu serveri, taču tad Tev nebūs iespēju uzaicināt lietotājus, izmantojot epasta adresi, vai pašam tikt uzaicinātam, izmantojot epasta adresi."
+    "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.": "Tu vari lietot \"custom\" servera opcijas, lai ielogotos citos Matrix serveros, norādot citu Bāzes servera URL.<br> Tas atļaus tev lietot Riot ar esošo Matrix kontu uz cita Bāzes servera.<br/><br/>Tu arī vari uzstādīt atsevišķu Identitāšu serveri, taču tad Tev nebūs iespēju uzaicināt lietotājus, izmantojot epasta adresi, vai pašam tikt uzaicinātam, izmantojot epasta adresi.",
+    "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.": "Varat izmantot pielāgotās servera opcijas, lai pierakstītos citos Matrix serveros, norādot citu mājas servera URL. Tas ļauj jums izmantot Riot ar esošu Matrix kontu citā mājas serverī.",
+    "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.": "Varat arī iestatīt pielāgotu identitātes serveri, bet jūs nevarēsiet uzaicināt lietotājus izmantojot e-pasta adresi, kā arī tikt uzaicināts pēc e-pasta adreses.",
+    "Sign In": "Ienākt",
+    "Create Account": "Izveidot kontu",
+    "Need help?": "Nepieciešama palīdzība?",
+    "Explore rooms": "Atklāt istabas",
+    "Room Directory": "Istabu Katalogs"
 }

src/i18n/strings/pl.json

@@ -39,5 +39,6 @@
     "Create Account": "Stwórz konto",
     "Sign In": "Zaloguj",
     "Need help?": "Potrzebujesz pomocy?",
-    "Room Directory": "Katalog pokojów"
+    "Room Directory": "Katalog pokojów",
+    "Explore rooms": "Przeglądaj pokoje"
 }

src/i18n/strings/sl.json

@@ -1 +1,21 @@
-{}
+{
+    "Riot Desktop on %(platformName)s": "Namizni Riot za %(platformName)s",
+    "Unknown device": "Neznana naprava",
+    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s s %(browserName)s na %(osName)s",
+    "You need to be using HTTPS to place a screen-sharing call.": "Za klic s skupno rabo zaslona potrebujete HTTPS.",
+    "powered by Matrix": "poganja Matrix",
+    "Custom Server Options": "Možnosti strežnika po meri",
+    "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.": "Možnosti strežnika po meri lahko uporabite za prijavo v druge Matrix strežnike, s tem da podate drug URL domačega strežnika. To vam omogoča, da uporabljate Riot z obstoječim Matrix računom na drugem strežniku.",
+    "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.": "Nastavite lahko tudi strežnik za identiteto po meri, vendar ne boste mogli povabiti uporabnikov prek e-pošte, prav tako pa vas ne bodo mogli povabiti drugi.",
+    "Dismiss": "Opusti",
+    "Welcome to Riot.im": "Dobrodošli v Riot.im",
+    "Decentralised, encrypted chat & collaboration powered by [matrix]": "Decentralizirano šifrirano sporočanje & sodelovanje s pomočjo [matrix]",
+    "Sign In": "Prijava",
+    "Create Account": "Registracija",
+    "Need help?": "Potrebujete pomoč?",
+    "Chat with Riot Bot": "Klepetajte z Riot Botom",
+    "Explore rooms": "Raziščite sobe",
+    "Room Directory": "Imenik sob",
+    "Search the room directory": "Preiščite imenik sob",
+    "Get started with some tips from Riot Bot!": "Začnite z nekaterimi nasveti Riot Bota!"
+}

yarn.lock

@@ -3144,7 +3144,7 @@ emoji-regex@^7.0.1:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
   integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
 
-emojione@2.2.7, emojione@^2.2.7:
+emojione@2.2.7:
   version "2.2.7"
   resolved "https://registry.yarnpkg.com/emojione/-/emojione-2.2.7.tgz#46457cf6b9b2f8da13ae8a2e4e547de06ee15e96"
   integrity sha1-RkV89rmy+NoTroouTlR94G7hXpY=
@@ -6800,6 +6800,13 @@ pluralizers@^0.1.7:
   resolved "https://registry.yarnpkg.com/pluralizers/-/pluralizers-0.1.7.tgz#8d38dd0a1b660e739b10ab2eab10b684c9d50142"
   integrity sha512-mw6AejUiCaMQ6uPN9ObjJDTnR5AnBSmnHHy3uVTbxrSFSxO5scfwpTs8Dxyb6T2v7GSulhvOq+pm9y+hXUvtOA==
 
+png-chunks-extract@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/png-chunks-extract/-/png-chunks-extract-1.0.0.tgz#fad4a905e66652197351c65e35b92c64311e472d"
+  integrity sha1-+tSpBeZmUhlzUcZeNbksZDEeRy0=
+  dependencies:
+    crc-32 "^0.3.0"
+
 portfinder@^1.0.20:
   version "1.0.20"
   resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.20.tgz#bea68632e54b2e13ab7b0c4775e9b41bf270e44a"
@@ -6809,13 +6816,6 @@ portfinder@^1.0.20:
     debug "^2.2.0"
     mkdirp "0.5.x"
 
-png-chunks-extract@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/png-chunks-extract/-/png-chunks-extract-1.0.0.tgz#fad4a905e66652197351c65e35b92c64311e472d"
-  integrity sha1-+tSpBeZmUhlzUcZeNbksZDEeRy0=
-  dependencies:
-    crc-32 "^0.3.0"
-
 posix-character-classes@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"