From 29398a0ab55254d53744f621a6eda02b3da7c79e Mon Sep 17 00:00:00 2001 From: Fendo Date: Fri, 17 May 2019 13:35:42 +0000 Subject: [PATCH 1/8] Translated using Weblate (Esperanto) Currently translated at 100.0% (19 of 19 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eo/ --- src/i18n/strings/eo.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json index af49346594..dd9f0152fd 100644 --- a/src/i18n/strings/eo.json +++ b/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." } From bdb0f5e81c02626d43030fd6c36d721bc113e2f3 Mon Sep 17 00:00:00 2001 From: Tuomas Hietala Date: Thu, 16 May 2019 10:12:57 +0000 Subject: [PATCH 2/8] Translated using Weblate (Finnish) Currently translated at 100.0% (19 of 19 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fi/ --- src/i18n/strings/fi.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json index 32bb2cc75f..afc0bbdfa2 100644 --- a/src/i18n/strings/fi.json +++ b/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.
This allows you to use Riot with an existing Matrix account on a different home 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.": "Voit käyttää edistyksellisiä asetuksia kirjautuaksesi muille Matrix palvelimille, määrittelemällä kotipalvelimen URL-osoitteen.
Tämän avulla voit käyttää Riot:ia olemassa olevalla toisen Matrix palvelimen käyttäjätilillä.

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", From b54a53d1acef42671a12c1899a045aeadac471c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20=C5=A0?= Date: Thu, 16 May 2019 15:35:16 +0000 Subject: [PATCH 3/8] Translated using Weblate (Slovenian) Currently translated at 100.0% (19 of 19 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sl/ --- src/i18n/strings/sl.json | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/sl.json b/src/i18n/strings/sl.json index 0967ef424b..174cf0109f 100644 --- a/src/i18n/strings/sl.json +++ b/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!" +} From 43d2c3bbc888c043f01b4dfe1d845c7103e180c8 Mon Sep 17 00:00:00 2001 From: Edgars Voroboks Date: Sun, 19 May 2019 05:02:19 +0000 Subject: [PATCH 4/8] Translated using Weblate (Latvian) Currently translated at 100.0% (19 of 19 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/lv/ --- src/i18n/strings/lv.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/lv.json b/src/i18n/strings/lv.json index 4fa734ee49..37c314628b 100644 --- a/src/i18n/strings/lv.json +++ b/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.
This allows you to use Riot with an existing Matrix account on a different home 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.": "Tu vari lietot \"custom\" servera opcijas, lai ielogotos citos Matrix serveros, norādot citu Bāzes servera URL.
Tas atļaus tev lietot Riot ar esošo Matrix kontu uz cita Bāzes servera.

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.
This allows you to use Riot with an existing Matrix account on a different home 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.": "Tu vari lietot \"custom\" servera opcijas, lai ielogotos citos Matrix serveros, norādot citu Bāzes servera URL.
Tas atļaus tev lietot Riot ar esošo Matrix kontu uz cita Bāzes servera.

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" } From d617d8ebb3ca4ab1dfce3d3d7677eabcc1e89a8c Mon Sep 17 00:00:00 2001 From: Karol Kosek Date: Sat, 18 May 2019 22:16:25 +0000 Subject: [PATCH 5/8] Translated using Weblate (Polish) Currently translated at 89.5% (17 of 19 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pl/ --- src/i18n/strings/pl.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json index 85d9a5dd8a..dd087c6ee5 100644 --- a/src/i18n/strings/pl.json +++ b/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" } From 4cbe6c10006d6aca54ab8584362b287252ab46e6 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Sun, 19 May 2019 21:26:11 +0100 Subject: [PATCH 6/8] remove emojione --- package.json | 1 - scripts/copy-res.js | 2 -- 2 files changed, 3 deletions(-) diff --git a/package.json b/package.json index 6b47f8faad..5255e85666 100644 --- a/package.json +++ b/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", diff --git a/scripts/copy-res.js b/scripts/copy-res.js index 4a2c6707d0..9f422064ca 100755 --- a/scripts/copy-res.js +++ b/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 }], ]; From 913bc6da93f685e5f01c88a200874aec339a4f5f Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Tue, 21 May 2019 13:27:02 +0100 Subject: [PATCH 7/8] Update yarn.lock --- yarn.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/yarn.lock b/yarn.lock index 72c023a187..4165d55ae8 100644 --- a/yarn.lock +++ b/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" From 001b7fb799fbb3f851a3f91dbcc95ce32386e51d Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 22 May 2019 12:51:41 +0100 Subject: [PATCH 8/8] electron 4.2.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5255e85666..1d20819dbb 100644 --- a/package.json +++ b/package.json @@ -153,7 +153,7 @@ }, "build": { "appId": "im.riot.app", - "electronVersion": "4.1.5", + "electronVersion": "4.2.2", "files": [ "node_modules/**", "src/**",