From 918d9834ee7e5b1d4992abb5913b16e4a850a176 Mon Sep 17 00:00:00 2001 From: jelv Date: Wed, 12 May 2021 11:55:54 +0000 Subject: [PATCH 01/11] Translated using Weblate (Dutch) Currently translated at 100.0% (34 of 34 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/nl/ --- src/i18n/strings/nl.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json index c7250c046..72ededa35 100644 --- a/src/i18n/strings/nl.json +++ b/src/i18n/strings/nl.json @@ -1,11 +1,11 @@ { - "Dismiss": "Afwijzen", + "Dismiss": "Sluiten", "powered by Matrix": "draait op Matrix", "Unknown device": "Onbekend apparaat", "You need to be using HTTPS to place a screen-sharing call.": "Oproepen met schermdelen vergen HTTPS.", "Welcome to Element": "Welkom bij Element", "Decentralised, encrypted chat & collaboration powered by [matrix]": "Gedecentraliseerd en versleuteld chatten & samenwerken dankzij [matrix]", - "Sign In": "Aanmelden", + "Sign In": "Inloggen", "Create Account": "Account aanmaken", "Explore rooms": "Gesprekken ontdekken", "Unexpected error preparing the app. See console for details.": "Er is een onverwachte fout opgetreden bij het voorbereiden van de app. Zie de console voor details.", @@ -22,16 +22,16 @@ "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)", "Unsupported browser": "Niet-ondersteunde browser", "Please install Chrome, Firefox, or Safari for the best experience.": "Installeer Chrome, Firefox, of Safari voor de beste gebruikservaring.", - "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Je kunt je huidige browser blijven gebruiken, maar sommige of alle functies zouden niet kunnen werken en de uitstraling van het programma kan verkeerd zijn.", + "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "U kunt uw huidige browser blijven gebruiken, maar sommige of alle functies zouden niet kunnen werken en de weergave van het programma kan verkeerd zijn.", "I understand the risks and wish to continue": "Ik begrijp de risico's en wil verder gaan", "Go to element.io": "Ga naar element.io", "Failed to start": "Opstarten mislukt", "Open": "Openen", - "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Je Element configuratie bevat ongeldige JSON. Gelieve het probleem te corrigeren daarna de pagina te herladen.", + "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Uw Element configuratie bevat ongeldige JSON. Gelieve het probleem te corrigeren daarna de pagina te herladen.", "Download Completed": "Download voltooid", - "Your Element is misconfigured": "Je Element is verkeerd geconfigureerd", - "Your browser can't run %(brand)s": "Je browser kan %(brand)s niet draaien", - "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s gebruikt geavanceerde functies die niet ondersteund worden in je huidige browser.", - "Powered by Matrix": "Gebruikt Matrix technologie", + "Your Element is misconfigured": "Uw Element is verkeerd geconfigureerd", + "Your browser can't run %(brand)s": "Uw browser kan %(brand)s niet starten", + "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s gebruikt geavanceerde functies die niet ondersteund worden in uw huidige browser.", + "Powered by Matrix": "Mogelijk gemaakt door Matrix", "Use %(brand)s on mobile": "Gebruik %(brand)s op uw mobiel" } From 099f5844b4a9b09876bf830c3101fa28b8b04ec1 Mon Sep 17 00:00:00 2001 From: Oliver Gramberg Date: Thu, 13 May 2021 18:03:46 +0000 Subject: [PATCH 02/11] Translated using Weblate (German) Currently translated at 100.0% (34 of 34 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/de/ --- src/i18n/strings/de_DE.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index 3fdd5390a..f631c7a94 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -4,7 +4,7 @@ "Unknown device": "Unbekanntes Gerät", "You need to be using HTTPS to place a screen-sharing call.": "Du musst HTTPS nutzen, um einen Anruf mit Bildschirmfreigabe durchzuführen.", "Welcome to Element": "Willkommen bei Element", - "Decentralised, encrypted chat & collaboration powered by [matrix]": "Dezentrale, verschlüsselte Chat- & Kollaborationslösung mittels [matrix]", + "Decentralised, encrypted chat & collaboration powered by [matrix]": "Dezentrale, verschlüsselte Chat- & Kollaborationslösung auf der Basis von [matrix]", "Sign In": "Anmelden", "Create Account": "Konto erstellen", "Explore rooms": "Räume erkunden", From 0ac07c4522d3f3f8dcd5c004a07b243533185c4e Mon Sep 17 00:00:00 2001 From: libexus Date: Thu, 13 May 2021 18:04:18 +0000 Subject: [PATCH 03/11] Translated using Weblate (German) Currently translated at 100.0% (34 of 34 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/de/ --- src/i18n/strings/de_DE.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index f631c7a94..72cd8e7be 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -4,7 +4,7 @@ "Unknown device": "Unbekanntes Gerät", "You need to be using HTTPS to place a screen-sharing call.": "Du musst HTTPS nutzen, um einen Anruf mit Bildschirmfreigabe durchzuführen.", "Welcome to Element": "Willkommen bei Element", - "Decentralised, encrypted chat & collaboration powered by [matrix]": "Dezentrale, verschlüsselte Chat- & Kollaborationslösung auf der Basis von [matrix]", + "Decentralised, encrypted chat & collaboration powered by [matrix]": "Dezentrale, verschlüsselte Chat- & Kollaborationslösung basierend auf [matrix]", "Sign In": "Anmelden", "Create Account": "Konto erstellen", "Explore rooms": "Räume erkunden", From f04790e1cd0acb4ef2ddb49146901b3a330d5060 Mon Sep 17 00:00:00 2001 From: Trendyne Date: Thu, 13 May 2021 22:01:50 +0000 Subject: [PATCH 04/11] Translated using Weblate (Icelandic) Currently translated at 100.0% (34 of 34 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/is/ --- src/i18n/strings/is.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/is.json b/src/i18n/strings/is.json index 23dd043c8..7dcd7cb42 100644 --- a/src/i18n/strings/is.json +++ b/src/i18n/strings/is.json @@ -32,5 +32,6 @@ "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Element stillingar þínar innihalda ógilda JSON. Vinsamlegast leiðréttu vandamálið og endurhladdu síðuna.", "Your Element is misconfigured": "Element þitt er rangt stillt", "Invalid configuration: no default server specified.": "Ógild stilling: enginn sjálfgefinn þjónn tilgreindur.", - "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Ógild stilling: getur aðeins tilgreint einn af default_server_config, default_server_name eða default_hs_url." + "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Ógild stilling: getur aðeins tilgreint einn af default_server_config, default_server_name eða default_hs_url.", + "Use %(brand)s on mobile": "Nota %(brand)s í síma" } From 51b380da651e98e9a3e596546636d92301d5c199 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Mon, 17 May 2021 16:39:04 -0600 Subject: [PATCH 05/11] Update matrix-widget-api/react-sdk dependency reference To fix inevitable build errors. --- package.json | 2 +- yarn.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 7707e665b..552574fbc 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "katex": "^0.12.0", "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", - "matrix-widget-api": "^0.1.0-beta.13", + "matrix-widget-api": "^0.1.0-beta.14", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", "prop-types": "^15.7.2", "react": "^16.14.0", diff --git a/yarn.lock b/yarn.lock index b80afde10..115ffe14d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7672,7 +7672,7 @@ matrix-mock-request@^1.2.3: "matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": version "3.21.0" - resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/12a9ce1a94440e6b96f739fb5e4f148a8f100535" + resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/4929e3f3edf8ee15d6ddd27d1f13b4da340bb5b4" dependencies: "@babel/runtime" "^7.12.5" await-lock "^2.1.0" @@ -7701,7 +7701,7 @@ matrix-mock-request@^1.2.3: linkifyjs "^2.1.9" lodash "^4.17.20" matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" - matrix-widget-api "^0.1.0-beta.13" + matrix-widget-api "^0.1.0-beta.14" minimist "^1.2.5" opus-recorder "^8.0.3" pako "^2.0.3" @@ -7738,10 +7738,10 @@ matrix-react-test-utils@^0.2.2: "@babel/traverse" "^7.13.17" walk "^2.3.14" -matrix-widget-api@^0.1.0-beta.13: - version "0.1.0-beta.13" - resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-0.1.0-beta.13.tgz#ebddc83eaef39bbb87b621a02a35902e1a29b9ef" - integrity sha512-DJAvuX2E7gxc/a9rtJPDh17ba9xGIOAoBHcWirNTN3KGodzsrZ+Ns+M/BREFWMwGS5yEBZko5eq7uhXStEbnyQ== +matrix-widget-api@^0.1.0-beta.14: + version "0.1.0-beta.14" + resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-0.1.0-beta.14.tgz#e38beed71c5ebd62c1ac1d79ef262d7150b42c70" + integrity sha512-5tC6LO1vCblKg/Hfzf5U1eHPz1nHUZIobAm3gkEKV5vpYPgRpr8KdkLiGB78VZid0tB17CVtAb4VKI8CQ3lhAQ== dependencies: "@types/events" "^3.0.0" events "^3.2.0" From 148149f7653fa6fbc522cc17f06b0ee731bfb86c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erkin=20Alp=20G=C3=BCney?= Date: Tue, 18 May 2021 09:19:18 +0000 Subject: [PATCH 06/11] Translated using Weblate (Turkish) Currently translated at 100.0% (34 of 34 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/tr/ --- src/i18n/strings/tr.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json index 6d4df3849..e3360cb54 100644 --- a/src/i18n/strings/tr.json +++ b/src/i18n/strings/tr.json @@ -8,7 +8,7 @@ "Sign In": "Giriş Yap", "Create Account": "Hesap Oluştur", "Explore rooms": "Odaları keşfet", - "Invalid JSON": "Geçersiz JSON", + "Invalid JSON": "JSON geçersiz", "Unexpected error preparing the app. See console for details.": "Uygulama hazırlanırken beklenmeyen bir hata oldu. Detaylar için konsola bakın.", "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ş.", @@ -28,9 +28,10 @@ "Go to element.io": "element.io adresine git", "Failed to start": "Başlatılamadı", "Previous/next recently visited room or community": "Yakında ziyaret edilen önceki/sonraki oda veya topluluk", - "Powered by Matrix": "Matrix tarafından güçlendirildi", + "Powered by Matrix": "Gücünü Matrix'ten alır", "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)", "%(brand)s Desktop (%(platformName)s)": "%(brand)s Masaüstü (%(platformName)s)", "Open": "Aç", - "Missing indexeddb worker script!": "Indexeddb worker kodu eksik!" + "Missing indexeddb worker script!": "Indexeddb worker kodu eksik!", + "Use %(brand)s on mobile": "Mobilde %(brand)s kullan" } From a380fe5883abca43920202e008641fbebd5bf4d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ege=20Sert=C3=A7etin?= Date: Tue, 18 May 2021 09:19:05 +0000 Subject: [PATCH 07/11] Translated using Weblate (Turkish) Currently translated at 100.0% (34 of 34 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/tr/ --- src/i18n/strings/tr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json index e3360cb54..0e4816f01 100644 --- a/src/i18n/strings/tr.json +++ b/src/i18n/strings/tr.json @@ -29,7 +29,7 @@ "Failed to start": "Başlatılamadı", "Previous/next recently visited room or community": "Yakında ziyaret edilen önceki/sonraki oda veya topluluk", "Powered by Matrix": "Gücünü Matrix'ten alır", - "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)", + "%(appName)s (%(browserName)s, %(osName)s)": "%(appName) (%(browserName), %(osName))", "%(brand)s Desktop (%(platformName)s)": "%(brand)s Masaüstü (%(platformName)s)", "Open": "Aç", "Missing indexeddb worker script!": "Indexeddb worker kodu eksik!", From 90a20ce6a7c3b595e9aceae830603f72624ec55b Mon Sep 17 00:00:00 2001 From: Ege Date: Tue, 18 May 2021 09:18:25 +0000 Subject: [PATCH 08/11] Translated using Weblate (Turkish) Currently translated at 100.0% (34 of 34 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/tr/ --- src/i18n/strings/tr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json index 0e4816f01..4ab11605f 100644 --- a/src/i18n/strings/tr.json +++ b/src/i18n/strings/tr.json @@ -10,7 +10,7 @@ "Explore rooms": "Odaları keşfet", "Invalid JSON": "JSON geçersiz", "Unexpected error preparing the app. See console for details.": "Uygulama hazırlanırken beklenmeyen bir hata oldu. Detaylar için konsola bakın.", - "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: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Hatalı ayarlar: default_server_config, default_server_name ve default_hs_url ayarlarından en fazla biri girilebilir.", "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", "Go to your browser to complete Sign In": "Oturum açmayı tamamlamak için tarayıcınıza gidin", From 10194fe4456773be38ee9c06598979d6ba630b12 Mon Sep 17 00:00:00 2001 From: fooness <11408027+fooness@users.noreply.github.com> Date: Tue, 18 May 2021 12:35:51 +0200 Subject: [PATCH 09/11] Prevent minification of `.html` files generated by new verison html-webpack-plugin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This described in https://github.com/vector-im/element-web/issues/17330#issuecomment-842530812, this should prevent the newly introduced version of `html-webpack-plugin` from minifying `.html` files, like e.g. `index.html`, `jitsi.html`, et cetera … Quoting @jryans via: https://github.com/vector-im/element-web/issues/17330#issuecomment-842415694 > The content of the `index.html` file is not a supported API surface, so it might change at any time. > > This document minification was not done on purpose, but instead it happened as a side effect of upgrading. We would happily accept a PR to fix this, but it is also not a priority for the core team. Could please someone test and, hopefully, accept this change back to not minifying the `.html` files? --- webpack.config.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/webpack.config.js b/webpack.config.js index 9d7fa703d..07fcb4f67 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -386,7 +386,7 @@ module.exports = (env, argv) => { // of the themes and which chunks we actually care about. inject: false, excludeChunks: ['mobileguide', 'usercontent', 'jitsi'], - minify: argv.mode === 'production', + minify: false, templateParameters: { og_image_url: ogImageUrl, }, @@ -396,7 +396,7 @@ module.exports = (env, argv) => { new HtmlWebpackPlugin({ template: './src/vector/jitsi/index.html', filename: 'jitsi.html', - minify: argv.mode === 'production', + minify: false, chunks: ['jitsi'], }), @@ -404,7 +404,7 @@ module.exports = (env, argv) => { new HtmlWebpackPlugin({ template: './src/vector/mobile_guide/index.html', filename: 'mobile_guide/index.html', - minify: argv.mode === 'production', + minify: false, chunks: ['mobileguide'], }), @@ -412,13 +412,13 @@ module.exports = (env, argv) => { new HtmlWebpackPlugin({ template: './src/vector/static/unable-to-load.html', filename: 'static/unable-to-load.html', - minify: argv.mode === 'production', + minify: false, chunks: [], }), new HtmlWebpackPlugin({ template: './src/vector/static/incompatible-browser.html', filename: 'static/incompatible-browser.html', - minify: argv.mode === 'production', + minify: false, chunks: [], }), @@ -426,7 +426,7 @@ module.exports = (env, argv) => { new HtmlWebpackPlugin({ template: './node_modules/matrix-react-sdk/src/usercontent/index.html', filename: 'usercontent/index.html', - minify: argv.mode === 'production', + minify: false, chunks: ['usercontent'], }), From b739b0faf996fe5e031dad402fbc79e87a313aaa Mon Sep 17 00:00:00 2001 From: Fake Mail Date: Tue, 18 May 2021 21:14:02 +0000 Subject: [PATCH 10/11] Translated using Weblate (Bulgarian) Currently translated at 100.0% (34 of 34 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/bg/ --- src/i18n/strings/bg.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json index b8d9db3e3..b2d0bd2d4 100644 --- a/src/i18n/strings/bg.json +++ b/src/i18n/strings/bg.json @@ -32,5 +32,6 @@ "Open": "Отвори", "Your browser can't run %(brand)s": "Браузърът ви не може да изпълни %(brand)s", "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s използва модерни функции на браузъра, които не се поддържат от Вашия.", - "Powered by Matrix": "Базирано на Matrix" + "Powered by Matrix": "Базирано на Matrix", + "Use %(brand)s on mobile": "Използвайте %(brand)s на мобилен телефон" } From 4e1204f34e98127bfe41da1f19960753d76574d6 Mon Sep 17 00:00:00 2001 From: Robin Townsend Date: Thu, 20 May 2021 17:28:25 -0400 Subject: [PATCH 11/11] Remove logo spinner Removed since design wants to avoid associating slowness with the brand. Signed-off-by: Robin Townsend --- config.sample.json | 4 +--- docs/kubernetes.md | 4 +--- docs/labs.md | 4 ---- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/config.sample.json b/config.sample.json index 32bdc7e58..adf33174b 100644 --- a/config.sample.json +++ b/config.sample.json @@ -25,9 +25,7 @@ "bug_report_endpoint_url": "https://element.io/bugreports/submit", "defaultCountryCode": "GB", "showLabsSettings": false, - "features": { - "feature_new_spinner": false - }, + "features": { }, "default_federate": true, "default_theme": "light", "roomDirectory": { diff --git a/docs/kubernetes.md b/docs/kubernetes.md index 37f65da46..803a72e09 100644 --- a/docs/kubernetes.md +++ b/docs/kubernetes.md @@ -62,9 +62,7 @@ Then you can deploy it to your cluster with something like `kubectl apply -f my- "bug_report_endpoint_url": "https://element.io/bugreports/submit", "defaultCountryCode": "GB", "showLabsSettings": false, - "features": { - "feature_new_spinner": false - }, + "features": { }, "default_federate": true, "default_theme": "light", "roomDirectory": { diff --git a/docs/labs.md b/docs/labs.md index eb2956f22..64d57bed6 100644 --- a/docs/labs.md +++ b/docs/labs.md @@ -19,10 +19,6 @@ Still in heavy development. Enables rendering of LaTeX maths in messages using [KaTeX](https://katex.org/). LaTeX between single dollar-signs is interpreted as inline maths and double dollar-signs as display maths (i.e. centred on its own line). -## New spinner design (`feature_new_spinner`) - -Replaces the old spinner image with a new, svg-based one featuring a sleeker design. - ## Message pinning (`feature_pinning`) Allows you to pin messages in the room. To pin a message, use the 3 dots to the right of the message