From 3167148265bc1a665d1eda9c08cabc6c11318c99 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 28 Apr 2025 22:25:41 +0200 Subject: [PATCH] Take change of screen_change_server_error_no_sliding_sync_message into account (#4650) * Sync strings. * screen_change_server_error_no_sliding_sync_message is now taking a parameter. * Update screenshots --------- Co-authored-by: ElementBot --- .../login/impl/dialogs/SlidingSyncNotSupportedDialog.kt | 6 +++++- features/login/impl/src/main/res/values-be/translations.xml | 1 - features/login/impl/src/main/res/values-cs/translations.xml | 1 - features/login/impl/src/main/res/values-cy/translations.xml | 1 - features/login/impl/src/main/res/values-de/translations.xml | 1 - features/login/impl/src/main/res/values-el/translations.xml | 1 - features/login/impl/src/main/res/values-es/translations.xml | 1 - features/login/impl/src/main/res/values-et/translations.xml | 1 - features/login/impl/src/main/res/values-eu/translations.xml | 1 - features/login/impl/src/main/res/values-fa/translations.xml | 1 - features/login/impl/src/main/res/values-fi/translations.xml | 1 - features/login/impl/src/main/res/values-fr/translations.xml | 1 - features/login/impl/src/main/res/values-hu/translations.xml | 1 - features/login/impl/src/main/res/values-in/translations.xml | 1 - features/login/impl/src/main/res/values-it/translations.xml | 1 - features/login/impl/src/main/res/values-ka/translations.xml | 1 - features/login/impl/src/main/res/values-lt/translations.xml | 1 - features/login/impl/src/main/res/values-nb/translations.xml | 1 - features/login/impl/src/main/res/values-nl/translations.xml | 1 - features/login/impl/src/main/res/values-pl/translations.xml | 1 - .../login/impl/src/main/res/values-pt-rBR/translations.xml | 1 - features/login/impl/src/main/res/values-pt/translations.xml | 1 - features/login/impl/src/main/res/values-ro/translations.xml | 1 - features/login/impl/src/main/res/values-ru/translations.xml | 1 - features/login/impl/src/main/res/values-sk/translations.xml | 1 - features/login/impl/src/main/res/values-sv/translations.xml | 1 - features/login/impl/src/main/res/values-tr/translations.xml | 1 - features/login/impl/src/main/res/values-uk/translations.xml | 1 - features/login/impl/src/main/res/values-uz/translations.xml | 1 - .../login/impl/src/main/res/values-zh-rTW/translations.xml | 1 - features/login/impl/src/main/res/values-zh/translations.xml | 1 - features/login/impl/src/main/res/values/localazy.xml | 2 +- .../impl/src/main/res/values-et/translations.xml | 4 ++++ .../impl/src/main/res/values-fr/translations.xml | 4 ++++ .../ui-strings/src/main/res/values-fr/translations.xml | 1 + ...es.login.impl.changeserver_ChangeServerView_Day_2_en.png | 4 ++-- ....login.impl.changeserver_ChangeServerView_Night_2_en.png | 4 ++-- ....impl.dialogs_SlidingSyncNotSupportedDialog_Day_0_en.png | 4 ++-- ...mpl.dialogs_SlidingSyncNotSupportedDialog_Night_0_en.png | 4 ++-- 39 files changed, 23 insertions(+), 40 deletions(-) diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/dialogs/SlidingSyncNotSupportedDialog.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/dialogs/SlidingSyncNotSupportedDialog.kt index a3397dc41b..be526ccb0d 100644 --- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/dialogs/SlidingSyncNotSupportedDialog.kt +++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/dialogs/SlidingSyncNotSupportedDialog.kt @@ -14,6 +14,7 @@ import io.element.android.features.login.impl.R import io.element.android.libraries.designsystem.components.dialogs.ConfirmationDialog import io.element.android.libraries.designsystem.preview.ElementPreview import io.element.android.libraries.designsystem.preview.PreviewsDayNight +import io.element.android.libraries.designsystem.theme.LocalBuildMeta import io.element.android.libraries.ui.strings.CommonStrings @Composable @@ -29,7 +30,10 @@ internal fun SlidingSyncNotSupportedDialog( onSubmitClick = onLearnMoreClick, onCancelClick = onDismiss, title = stringResource(CommonStrings.dialog_title_error), - content = stringResource(R.string.screen_change_server_error_no_sliding_sync_message), + content = stringResource( + id = R.string.screen_change_server_error_no_sliding_sync_message, + LocalBuildMeta.current.applicationName, + ), ) } diff --git a/features/login/impl/src/main/res/values-be/translations.xml b/features/login/impl/src/main/res/values-be/translations.xml index e4276c99b8..a4fc7f4e6f 100644 --- a/features/login/impl/src/main/res/values-be/translations.xml +++ b/features/login/impl/src/main/res/values-be/translations.xml @@ -16,7 +16,6 @@ "Нам не ўдалося звязацца з гэтым хатнім серверам. Упэўніцеся, што вы правільна ўвялі URL-адрас хатняга сервера. Калі URL-адрас пазначаны правільна, звярніцеся да адміністратара хатняга сервера за дадатковай дапамогай." "Sliding sync недаступны з-за праблемы ў вядомым файле: %1$s" - "Выбачце, гэты сервер не падтрымлівае sliding sync." "URL хатняга сервера" "Вы можаце падключыцца толькі да існуючага сервера, які падтрымлівае sliding sync. Адміністратару хатняга сервера запатрабуецца наладзіць яго. %1$s" "Які адрас вашага сервера?" diff --git a/features/login/impl/src/main/res/values-cs/translations.xml b/features/login/impl/src/main/res/values-cs/translations.xml index 27aea5c811..a2831eb130 100644 --- a/features/login/impl/src/main/res/values-cs/translations.xml +++ b/features/login/impl/src/main/res/values-cs/translations.xml @@ -16,7 +16,6 @@ "Nepodařilo se nám připojit k tomuto domovskému serveru. Zkontrolujte prosím, zda jste správně zadali adresu URL domovského serveru. Pokud je adresa URL správná, obraťte se na správce domovského serveru, který vám poskytne další pomoc." "Klouzavá synchronizace není k dispozici kvůli problému se souborem well-known: %1$s" - "Tento server v současné době nepodporuje klouzavou synchronizaci." "Adresa URL domovského serveru" "Můžete se připojit pouze k serveru, který podporuje klouzavou synchronizaci. Správce vašeho domovského serveru jej bude muset nakonfigurovat. %1$s" "Jaká je adresa vašeho serveru?" diff --git a/features/login/impl/src/main/res/values-cy/translations.xml b/features/login/impl/src/main/res/values-cy/translations.xml index 63ccb43404..4aaa339899 100644 --- a/features/login/impl/src/main/res/values-cy/translations.xml +++ b/features/login/impl/src/main/res/values-cy/translations.xml @@ -16,7 +16,6 @@ "Doedd dim modd i ni gyrraedd y gweinydd cartref hwn. Gwiriwch eich bod wedi rhoi URL y gweinydd cartref yn gywir. Os yw\'r URL yn gywir, cysylltwch â gweinyddwr eich gweinydd cartref am ragor o help." "Nid yw cydweddu llithrig ar gael oherwydd problem yn y ffeil adnabyddus: %1$s" - "Nid yw\'r gweinydd hwn yn cefnogi cydweddu llithrig ar hyn o bryd." "URL y Gweinydd Cartref" "Dim ond i weinydd presennol sy\'n cefnogi cydweddu llithrig y gallwch chi gysylltu. Bydd angen i weinyddwr eich gweinydd cartref ei ffurfweddu. %1$s" "Beth yw cyfeiriad eich gweinydd?" diff --git a/features/login/impl/src/main/res/values-de/translations.xml b/features/login/impl/src/main/res/values-de/translations.xml index 0b6dd41c96..89c2a76e04 100644 --- a/features/login/impl/src/main/res/values-de/translations.xml +++ b/features/login/impl/src/main/res/values-de/translations.xml @@ -16,7 +16,6 @@ "Wir konnten diesen Homeserver nicht erreichen. Bitte überprüfe, ob du die Homeserver-URL korrekt eingegeben hast. Wenn die URL korrekt ist, wende dich an deinen Homeserver-Administrator, um weitere Hilfe zu erhalten." "Sliding Sync ist aufgrund eines Problems im \"well-known file\" nicht verfügbar: %1$s" - "Dieser Server unterstützt derzeit kein Sliding Sync." "Homeserver-URL" "Du kannst nur eine Verbindung zu einem vorhandenen Server herstellen, der Sliding Sync unterstützt. Dein Homeserver-Administrator muss das konfigurieren. %1$s" "Wie lautet die Adresse deines Servers?" diff --git a/features/login/impl/src/main/res/values-el/translations.xml b/features/login/impl/src/main/res/values-el/translations.xml index 532ee17023..4316087496 100644 --- a/features/login/impl/src/main/res/values-el/translations.xml +++ b/features/login/impl/src/main/res/values-el/translations.xml @@ -16,7 +16,6 @@ "Δεν μπορούσαμε να επικοινωνήσουμε με αυτόν τον οικιακό διακομιστή. Βεβαιώσου ότι έχεις εισαγάγει σωστά τη διεύθυνση URL του αρχικού διακομιστή. Εάν η διεύθυνση URL είναι σωστή, επικοινώνησε με τον διαχειριστή του κεντρικού διακομιστή για περαιτέρω βοήθεια." "Το Sliding sync δεν είναι διαθέσιμο εξαιτίας ενός ζητήματος σε ένα πολύ γνωστό αρχείο: %1$s" - "Αυτός ο διακομιστής προς το παρόν δεν υποστηρίζει Sliding sync." "URL οικιακού διακομιστή" "Μπορείτε να συνδεθείς μόνο σε υπάρχοντα διακομιστή που υποστηρίζει Sliding sync. Ο διαχειριστής του οικιακού διακομιστή σου θα πρέπει να το ρυθμίσει. %1$s" "Ποια είναι η διεύθυνση του διακομιστή σου;" diff --git a/features/login/impl/src/main/res/values-es/translations.xml b/features/login/impl/src/main/res/values-es/translations.xml index a6df64575a..efede3bc1c 100644 --- a/features/login/impl/src/main/res/values-es/translations.xml +++ b/features/login/impl/src/main/res/values-es/translations.xml @@ -16,7 +16,6 @@ "No hemos podido acceder a este servidor. Comprueba que has introducido correctamente la dirección del servidor. Si la dirección es correcta, ponte en contacto con el administrador del servidor para obtener más ayuda." "Sliding sync no está disponible debido a un problema en el archivo well-known: %1$s" - "Este servidor no soporta sliding sync." "Dirección del homeserver" "Solo puedes conectarte a un servidor que soporte sliding sync. El administrador de tu servidor tendrá que configurarlo. %1$s" "¿Cuál es la dirección de tu servidor?" diff --git a/features/login/impl/src/main/res/values-et/translations.xml b/features/login/impl/src/main/res/values-et/translations.xml index 832b0a5b38..38c9133e1e 100644 --- a/features/login/impl/src/main/res/values-et/translations.xml +++ b/features/login/impl/src/main/res/values-et/translations.xml @@ -16,7 +16,6 @@ "Me ei suutnud luuaühendust selle koduserveriga. Palun kontrolli, kas koduserveri aadress on õige. Kui aadress on õige, siis täiendavat teavet oskab sulle anda koduserveri haldaja." "Sliding sync režiim pole saadaval vea tõttu well-known failis: %1$s" - "See koduserver hetkel ei toeta „Sliding sync“ režiimi" "Koduserveri url" "Sa saad luua ühendust vaid olemasoleva serveriga, mis toetab Sliding sync režiimi. Sinu koduserveri haldur peaks selle seadistama. %1$s" "Mis on sinu koduserveri aadress?" diff --git a/features/login/impl/src/main/res/values-eu/translations.xml b/features/login/impl/src/main/res/values-eu/translations.xml index 2abc6c823e..aad7020ab8 100644 --- a/features/login/impl/src/main/res/values-eu/translations.xml +++ b/features/login/impl/src/main/res/values-eu/translations.xml @@ -10,7 +10,6 @@ "Beste bat" "Erabili beste kontu-hornitzaile bat, hala nola zure zerbitzari pribatua edo laneko kontu bat." "Aldatu kontu-hornitzailea" - "Zerbitzari hau ez da gaur-gaurkoz sliding sync-ekin bateragarria." "Zerbitzariaren URLa" "Zein da zure zerbitzariaren helbidea?" "Hautatu zure zerbitzaria" diff --git a/features/login/impl/src/main/res/values-fa/translations.xml b/features/login/impl/src/main/res/values-fa/translations.xml index 29ec79b9fd..d32ddc3cab 100644 --- a/features/login/impl/src/main/res/values-fa/translations.xml +++ b/features/login/impl/src/main/res/values-fa/translations.xml @@ -13,7 +13,6 @@ "دیگر" "استفاده از فراهم کنندهٔ حسابی دیگر چون کارساز خصوصی خوتان یا حسابی کاری." "تغییر فراهم کنندهٔ حساب" - "این کارساز در حال حاضر از هم‌گام سازی اسلایدی پشتیبانی نمی‌کند." "نشانی کارساز خانگی" "تنها می‌توانید به کارسازهای موجودی که از هم‌گام سازی اسلاید پشتیبانی می‌کنند وصل شود. مدیر کارساز خانگیتان باید پیکربندیش کند. %1$s" "نشانی کارسازتان چیست؟" diff --git a/features/login/impl/src/main/res/values-fi/translations.xml b/features/login/impl/src/main/res/values-fi/translations.xml index 37457a9958..cf5f89317b 100644 --- a/features/login/impl/src/main/res/values-fi/translations.xml +++ b/features/login/impl/src/main/res/values-fi/translations.xml @@ -16,7 +16,6 @@ "Kotipalvelimeen ei saatu yhteyttä. Varmista, että olet syöttänyt osoitteen oikein. Jos osoite on oikein, ota yhteyttä palvelimesi ylläpitäjään." "Sliding sync ei ole saatavilla well-known tiedostossa olevan ongelman vuoksi: %1$s" - "Tämä palvelin ei tällä hetkellä tue sliding syncia." "Kotipalvelimen osoite" "Voit yhdistää vain olemassa olevaan palvelimeen, joka tukee sliding syncia. Kotipalvelimesi ylläpitäjän on otettava se käyttöön. %1$s" "Mikä on palvelimesi osoite?" diff --git a/features/login/impl/src/main/res/values-fr/translations.xml b/features/login/impl/src/main/res/values-fr/translations.xml index 9bc76ef9d7..a1b2869d6f 100644 --- a/features/login/impl/src/main/res/values-fr/translations.xml +++ b/features/login/impl/src/main/res/values-fr/translations.xml @@ -16,7 +16,6 @@ "Nous n’avons pas pu atteindre ce serveur d’accueil. Vérifiez que vous avez correctement saisi l’URL du serveur d’accueil. Si l’URL est correcte, contactez l’administrateur de votre serveur d’accueil pour obtenir de l’aide." "Sliding sync n’est pas disponible en raison d’un problème dans le well-known file : %1$s" - "Ce serveur ne prend actuellement pas en charge la synchronisation glissante." "URL du serveur d’accueil" "Vous ne pouvez vous connecter qu’à un serveur existant qui prend en charge le sliding sync. L’administrateur de votre serveur d’accueil devra le configurer. %1$s" "Quelle est l’adresse de votre serveur ?" diff --git a/features/login/impl/src/main/res/values-hu/translations.xml b/features/login/impl/src/main/res/values-hu/translations.xml index d278d3a15a..6e6b8e4af1 100644 --- a/features/login/impl/src/main/res/values-hu/translations.xml +++ b/features/login/impl/src/main/res/values-hu/translations.xml @@ -16,7 +16,6 @@ "Nem sikerült elérni ezt a Matrix-kiszolgálót. Ellenőrizze, hogy helyesen adta-e meg a Matrix-kiszolgáló webcímét. Ha a webcím helyes, akkor további segítségért lépjen kapcsolatba a Matrix-kiszolgáló adminisztrátorával." "A Sliding sync protokoll a well-known fájl problémája miatt nem érhető el: %1$s" - "A kiszolgáló jelenleg nem támogatja a Sliding sync protokollt." "Matrix-kiszolgáló webcíme" "Csak olyan meglévő kiszolgálóhoz csatlakozhat, amely támogatja a Sliding sync protokollt. Ezt a Matrix-kiszolgáló adminisztrátorának kell beállítania. %1$s" "Mi a kiszolgálója címe?" diff --git a/features/login/impl/src/main/res/values-in/translations.xml b/features/login/impl/src/main/res/values-in/translations.xml index 0ddc32c212..837ac27204 100644 --- a/features/login/impl/src/main/res/values-in/translations.xml +++ b/features/login/impl/src/main/res/values-in/translations.xml @@ -16,7 +16,6 @@ "Kami tidak dapat menjangkau server ini. Periksa apakah Anda telah memasukkan URL homeserver dengan benar. Jika URL sudah benar, hubungi administrator homeserver Anda untuk bantuan lebih lanjut." "Sliding sync tidak tersedia karena adanya masalah dalam berkas .well-known: %1$s" - "Server ini saat ini tidak mendukung sinkronisasi geser." "URL Homeserver" "Anda hanya dapat terhubung ke server yang ada yang mendukung sinkronisasi geser. Admin homeserver Anda perlu mengaturnya. %1$s" "Apa alamat server Anda?" diff --git a/features/login/impl/src/main/res/values-it/translations.xml b/features/login/impl/src/main/res/values-it/translations.xml index 5cbc4ead18..bf8a2c84be 100644 --- a/features/login/impl/src/main/res/values-it/translations.xml +++ b/features/login/impl/src/main/res/values-it/translations.xml @@ -16,7 +16,6 @@ "Non siamo riusciti a raggiungere questo homeserver. Verifica di aver inserito correttamente l\'URL. Se l\'URL è corretto, contatta l\'amministratore del homeserver per ulteriore assistenza." "La sliding sync non è disponibile per un problema nel file well-known: %1$s" - "Questo server attualmente non supporta la sliding sync." "URL dell\'homeserver" "Puoi connetterti solo a un server esistente che supporta la sliding sync. L\'amministratore del tuo homeserver dovrà configurarla. %1$s" "Qual è l\'indirizzo del tuo server?" diff --git a/features/login/impl/src/main/res/values-ka/translations.xml b/features/login/impl/src/main/res/values-ka/translations.xml index b7cddcf7e7..446184bf15 100644 --- a/features/login/impl/src/main/res/values-ka/translations.xml +++ b/features/login/impl/src/main/res/values-ka/translations.xml @@ -15,7 +15,6 @@ "შეცვალეთ ანგარიშის მომწოდებელი" "ჩვენ ვერ მივაღწიეთ ამ სახლის სერვერს. გთხოვთ, შეამოწმოთ, რომ სწორად შეიყვანეთ სახლის სერვერის URL. თუ URL სწორია, დაუკავშირდით თქვენი სახლის სერვერის ადმინისტრატორს დამატებითი დახმარებისთვის." "Sliding sync არ არის ხელმისაწვდომი well-known ფაილში პრობლემის გამო: %1$s" - "ამჟამად ეს სერვერი მხარს არ უჭერს \"sliding sync\"-ს." "სახლის სერვერის URL" "თქვენ შეგიძლიათ დაუკავშირდეთ მხოლოდ იმ სერვერს, რომელიც მხარს უჭერს \"sliding sync\"-ს. თქვენი სახლის სერვერის ადმინისტრატორს დასჭირდება მისი კონფიგურაცია.%1$s" "რა არის თქვენი სერვერის მისამართი?" diff --git a/features/login/impl/src/main/res/values-lt/translations.xml b/features/login/impl/src/main/res/values-lt/translations.xml index dcc959242b..f3f0196e37 100644 --- a/features/login/impl/src/main/res/values-lt/translations.xml +++ b/features/login/impl/src/main/res/values-lt/translations.xml @@ -5,7 +5,6 @@ "Čia bus saugomi Jūsų pokalbiai - panašiai kaip el. pašto paslaugų teikėjas saugo Jūsų el. laiškus." "Keisti paskyros teikėją" "Nepavyko pasiekti šio serverio. Patikrinkite, ar teisingai įvedėte serverio URL. Jei URL yra teisingas, susisiekite su serverio administracija dėl tolimesnės pagalbos." - "Šiuo metu šis serveris nepalaiko slenkančios sinchronizacijos (sliding sync)." "Serverio URL" "Galite prisijungti tik prie serverio, palaikančio slenkančią sinchronizaciją (sliding sync). Jūsų serverio administracija turėtų ją sukonfigūruoti. %1$s" "Koks yra Jūsų serverio adresas?" diff --git a/features/login/impl/src/main/res/values-nb/translations.xml b/features/login/impl/src/main/res/values-nb/translations.xml index 1ab5de35c9..5d6178f455 100644 --- a/features/login/impl/src/main/res/values-nb/translations.xml +++ b/features/login/impl/src/main/res/values-nb/translations.xml @@ -16,7 +16,6 @@ "Vi kunne ikke nå denne hjemmeserveren. Kontroller at du har skrevet inn hjemmeserverens URL riktig. Hvis URL-en er riktig, kontakt administratoren for hjemmeserveren din for å få mer hjelp." "Glidende synkronisering er ikke tilgjengelig på grunn av et problem i den velkjente filen: %1$s" - "Denne serveren støtter for øyeblikket ikke sliding sync." "URL til hjemmeserver" "Du kan bare koble til en eksisterende server som støtter sliding sync. Administrator for din hjemmeserver må konfigurere det. %1$s" "Hva er adressen til serveren din?" diff --git a/features/login/impl/src/main/res/values-nl/translations.xml b/features/login/impl/src/main/res/values-nl/translations.xml index 4097408d55..ead05b4e3e 100644 --- a/features/login/impl/src/main/res/values-nl/translations.xml +++ b/features/login/impl/src/main/res/values-nl/translations.xml @@ -16,7 +16,6 @@ "We konden deze homeserver niet bereiken. Controleer of je de homeserver-URL juist hebt ingevoerd. Als de URL juist is, neem dan contact op met de beheerder van je homeserver voor verdere hulp." "Sliding sync is niet beschikbaar vanwege een probleem in het well-known bestand: %1$s" - "Deze server ondersteunt op dit moment geen sliding sync." "Homeserver-URL" "Je kunt alleen verbinding maken met een bestaande server die sliding sync ondersteunt. De beheerder van de homeserver moet dit configureren. %1$s" "Wat is het adres van je server?" diff --git a/features/login/impl/src/main/res/values-pl/translations.xml b/features/login/impl/src/main/res/values-pl/translations.xml index fc0ad2789c..415dcf6f93 100644 --- a/features/login/impl/src/main/res/values-pl/translations.xml +++ b/features/login/impl/src/main/res/values-pl/translations.xml @@ -16,7 +16,6 @@ "Nie mogliśmy połączyć się z tym serwerem domowym. Sprawdź, czy adres URL serwera został wprowadzony poprawnie. Jeśli adres URL jest poprawny, skontaktuj się z administratorem serwera w celu uzyskania dalszej pomocy." "Sliding sync nie jest dostępny z powodu problemu w znanym pliku: %1$s" - "Ten serwer obecnie nie obsługuje technologii Sliding Sync." "URL serwera domowego" "Możesz połączyć się tylko z serwerem, który obsługuje technologię Sliding Sync. Administrator serwera domowego będzie musiał ją skonfigurować. %1$s" "Jaki jest adres Twojego serwera?" diff --git a/features/login/impl/src/main/res/values-pt-rBR/translations.xml b/features/login/impl/src/main/res/values-pt-rBR/translations.xml index d4702ed3d8..96137f15e5 100644 --- a/features/login/impl/src/main/res/values-pt-rBR/translations.xml +++ b/features/login/impl/src/main/res/values-pt-rBR/translations.xml @@ -14,7 +14,6 @@ "Use um provedor de conta diferente, como seu próprio servidor privado ou uma conta corporativa." "Alterar provedor da conta" "Não conseguimos acessar esse servidor. Verifique se você inseriu a URL do servidor corretamente. Se a URL estiver correta, entre em contato com o administrador do servidor para obter mais ajuda." - "Este servidor atualmente não oferece suporte à tecnologia sliding sync." "URL do servidor" "Você só pode se conectar a um servidor existente que ofereça suporte à tecnologia sliding sync. O administrador do seu servidor precisará configurá-lo. %1$s" "Qual é o endereço do seu servidor?" diff --git a/features/login/impl/src/main/res/values-pt/translations.xml b/features/login/impl/src/main/res/values-pt/translations.xml index de06747232..a98e9ea12d 100644 --- a/features/login/impl/src/main/res/values-pt/translations.xml +++ b/features/login/impl/src/main/res/values-pt/translations.xml @@ -16,7 +16,6 @@ "Não foi possível comunicar com este servidor. Por favor, verifica se introduziste o seu URL corretamente. Se sim, contacta o administrador para obteres mais ajuda." "A sincronização deslizante (sliding sync) não está disponível devido a um problema no ficheiro \"well-known\": %1$s" - "Este servidor não suporta sincronização deslizante (sliding sync)." "URL do servidor" "Só te podes ligar a um servidor existente que suporte a sincronização deslizante (sliding sync). O administrador do teu servidor terá de a configurar. %1$s" "Qual é o endereço do teu servidor?" diff --git a/features/login/impl/src/main/res/values-ro/translations.xml b/features/login/impl/src/main/res/values-ro/translations.xml index 01e0c1a821..bcea0b3233 100644 --- a/features/login/impl/src/main/res/values-ro/translations.xml +++ b/features/login/impl/src/main/res/values-ro/translations.xml @@ -16,7 +16,6 @@ "Nu am putut accesa acest homeserver. Te rugăm să verifici că ai introdus corect adresa URL a homeserver-ului. Dacă adresa URL este corectă, contactează administratorul homeserver-ului pentru ajutor suplimentar." "Sliding sync nu este disponibil din cauza unei probleme în fișierul well-known: %1$s" - "Momentan acest server nu oferă suport pentru sliding sync." "Adresa URL a homeserver-ului" "Vă putețo conecta numai la un server existent care oferă suport pentru sliding sync. Administratorul homeserver-ului dumneavoastră va trebui să îl configureze. %1$s" "Care este adresa serverului dumneavoastră?" diff --git a/features/login/impl/src/main/res/values-ru/translations.xml b/features/login/impl/src/main/res/values-ru/translations.xml index 40a958e7ef..d622daa636 100644 --- a/features/login/impl/src/main/res/values-ru/translations.xml +++ b/features/login/impl/src/main/res/values-ru/translations.xml @@ -16,7 +16,6 @@ "Нам не удалось связаться с этим домашним сервером. Убедитесь, что вы правильно ввели URL-адрес домашнего сервера. Если URL-адрес указан правильно, обратитесь к администратору домашнего сервера за дополнительной помощью." "Sliding sync недоступен из-за проблемы в известном файле: %1$s" - "К сожалению данный сервер не поддерживает sliding sync." "URL-адрес домашнего сервера" "Вы можете подключиться только к существующему серверу, поддерживающему sliding sync. Администратору домашнего сервера потребуется настроить его. %1$s" "Какой адрес у вашего сервера?" diff --git a/features/login/impl/src/main/res/values-sk/translations.xml b/features/login/impl/src/main/res/values-sk/translations.xml index d4a5717360..c122e4f14f 100644 --- a/features/login/impl/src/main/res/values-sk/translations.xml +++ b/features/login/impl/src/main/res/values-sk/translations.xml @@ -16,7 +16,6 @@ "Nemohli sme sa spojiť s týmto domovským serverom. Skontrolujte prosím, či ste zadali URL adresu domovského servera správne. Ak je adresa URL správna, kontaktujte svoj domovský server pre ďalšiu pomoc." "Posuvná synchronizácia nie je k dispozícii z dôvodu problému v známom súbore: %1$s" - "Tento server momentálne nepodporuje kĺzavú synchronizáciu." "Adresa URL domovského servera" "Môžete sa pripojiť iba k existujúcemu serveru, ktorý podporuje kĺzavú synchronizáciu. Správca domovského servera ju bude musieť nakonfigurovať. %1$s" "Aká je adresa vášho servera?" diff --git a/features/login/impl/src/main/res/values-sv/translations.xml b/features/login/impl/src/main/res/values-sv/translations.xml index b63ab01183..b84e879732 100644 --- a/features/login/impl/src/main/res/values-sv/translations.xml +++ b/features/login/impl/src/main/res/values-sv/translations.xml @@ -16,7 +16,6 @@ "Vi kunde inte nå den här hemservern. Kontrollera att du har angett hemserverns URL korrekt. Om URL:en är korrekt kontaktar du administratören för hemservern för ytterligare hjälp." "Sliding Sync är inte tillgängligt på grund av ett problem i well-known-filen: %1$s" - "Den här servern stöder för närvarande inte sliding sync." "Hemserverns URL" "Du kan bara ansluta till en befintlig server som stöder sliding sync. Din hemserveradministratör måste konfigurera det. %1$s" "Vad är adressen till din server?" diff --git a/features/login/impl/src/main/res/values-tr/translations.xml b/features/login/impl/src/main/res/values-tr/translations.xml index 746163a0e7..ab1f4a50b6 100644 --- a/features/login/impl/src/main/res/values-tr/translations.xml +++ b/features/login/impl/src/main/res/values-tr/translations.xml @@ -16,7 +16,6 @@ "Bu ana sunucuya ulaşamadık. Lütfen ana sunucu URL\'sini doğru girip girmediğinizi kontrol edin. URL doğruysa, daha fazla yardım için ana sunucu yöneticinize başvurun." "Sliding sync, iyi bilinen dosyadaki bir sorun nedeniyle kullanılamıyor: %1$s" - "Bu sunucu şu anda sliding sync desteklemiyor." "Ana sunucu URL\'si" "Yalnızca sliding sync destekleyen mevcut bir sunucuya bağlanabilirsiniz. Ana sunucu yöneticinizin bunu yapılandırması gerekecektir. %1$s" "Sunucunuzun adresi nedir?" diff --git a/features/login/impl/src/main/res/values-uk/translations.xml b/features/login/impl/src/main/res/values-uk/translations.xml index 0fa0be9868..5093f7a972 100644 --- a/features/login/impl/src/main/res/values-uk/translations.xml +++ b/features/login/impl/src/main/res/values-uk/translations.xml @@ -16,7 +16,6 @@ "Не вдалося під\'єднатися до цього домашнього сервера. Перевірте правильність введеної URL-адреси домашнього сервера. Якщо URL-адреса правильна, зверніться по додаткову допомогу до адміністратора домашнього сервера." "Sliding sync недоступний через проблему у файлі well-known: %1$s" - "Наразі цей сервер не підтримує sliding sync." "URL-адреса домашнього сервера" "Ви можете під\'єднатися лише до наявного сервера, який підтримує sliding sync. Адміністратор вашого домашнього сервера повинен буде налаштувати його. %1$s" "Яка адреса вашого сервера?" diff --git a/features/login/impl/src/main/res/values-uz/translations.xml b/features/login/impl/src/main/res/values-uz/translations.xml index d3f1af3ea7..7a531e384e 100644 --- a/features/login/impl/src/main/res/values-uz/translations.xml +++ b/features/login/impl/src/main/res/values-uz/translations.xml @@ -14,7 +14,6 @@ "Shaxsiy serveringiz yoki ishchi hisob qaydnomangiz kabi boshqa hisob provayderidan foydalaning." "Hisob provayderini o\'zgartiring" "Bu uy serveriga kira olmadik. Iltimos, uy serverining URL manzilini to\'ri kiritganingizni tekshiring. Agar URL toʻgʻri boʻlsa, qoʻshimcha yordam olish uchun uy serveri administratoriga murojaat qiling." - "Hozirda bu server siljish sinxronlashni qo‘llab-quvvatlamaydi." "Uy serverining URL manzili" "Siz faqat siljish sinxronlashni qo\'llab-quvvatlaydigan mavjud serverga ulanishingiz mumkin. Uy serveringiz administratori uni sozlashi kerak.%1$s" "Serveringizning manzili nima?" diff --git a/features/login/impl/src/main/res/values-zh-rTW/translations.xml b/features/login/impl/src/main/res/values-zh-rTW/translations.xml index a87d1c2094..1a8a7b5ebc 100644 --- a/features/login/impl/src/main/res/values-zh-rTW/translations.xml +++ b/features/login/impl/src/main/res/values-zh-rTW/translations.xml @@ -16,7 +16,6 @@ "我們無法連線至此家伺服器。請檢查您是否已正確輸入家伺服器 URL。若 URL 正確，請聯絡您家伺服器的管理員以取得進一步協助。" "因為 well-known 檔案的問題，無法使用 sliding sync： %1$s" - "此伺服器目前不支援滑動同步（sliding sync）。" "家伺服器 URL" "您僅能連線至支援 sliding sync 的既有伺服器。您的家伺服器管理員必須設定它。%1$s" "您的伺服器地址？" diff --git a/features/login/impl/src/main/res/values-zh/translations.xml b/features/login/impl/src/main/res/values-zh/translations.xml index c23bb10f9f..d7082a71ac 100644 --- a/features/login/impl/src/main/res/values-zh/translations.xml +++ b/features/login/impl/src/main/res/values-zh/translations.xml @@ -16,7 +16,6 @@ "我们无法访问此服务器。请检查您输入的服务器网址是否正确。如果 URL 正确，请联系您的服务器管理员寻求进一步帮助。" "由于 Well Known 文件中的问题，Sliding Sync 不可用： %1$s" - "该服务器目前不支持 Sliding Sync。" "服务器网址" "您只能连接到支持 Sliding Sync 的现有服务器。您的服务器管理员需要对其进行配置。%1$s" "您的服务器地址是什么？" diff --git a/features/login/impl/src/main/res/values/localazy.xml b/features/login/impl/src/main/res/values/localazy.xml index be01bd56d5..8fa6334377 100644 --- a/features/login/impl/src/main/res/values/localazy.xml +++ b/features/login/impl/src/main/res/values/localazy.xml @@ -16,7 +16,7 @@ "We couldn\'t reach this homeserver. Please check that you have entered the homeserver URL correctly. If the URL is correct, contact your homeserver administrator for further help." "Sliding sync isn\'t available due to an issue in the well-known file: %1$s" - "This server currently doesn’t support sliding sync." + "The selected account provider does not support sliding sync. An upgrade to the server is needed to use %1$s." "Homeserver URL" "You can only connect to an existing server that supports sliding sync. Your homeserver admin will need to configure it. %1$s" "What is the address of your server?" diff --git a/libraries/eventformatter/impl/src/main/res/values-et/translations.xml b/libraries/eventformatter/impl/src/main/res/values-et/translations.xml index 3f5baafb0b..497d41307e 100644 --- a/libraries/eventformatter/impl/src/main/res/values-et/translations.xml +++ b/libraries/eventformatter/impl/src/main/res/values-et/translations.xml @@ -19,6 +19,8 @@ "Sina eemaldasid jututoa tunnuspildi" "%1$s keelas %2$s ligipääsu" "Sina keelasid %1$s ligipääsu" + "Sina seadsid ligipääsukeelu kasutajale %1$s: %2$s" + "%1$s seadis ligipääsukeelu kasutajale %2$s: %3$s" "%1$s lõi jututoa" "Sina lõid jututoa" "%1$s saatis kutse kasutajale %2$s" @@ -55,6 +57,8 @@ "Sina lükkasid kutse tagasi" "%1$s eemaldas jututoast kasutaja %2$s" "Sina eemaldasid jututoast kasutaja %1$s" + "Sina eemaldasid kasutaja %1$s: %2$s" + "%1$s eemaldas kasutaja %2$s: %3$s" "%1$s saatis jututoaga liitumiseks kutse kasutajale %2$s" "Sina saatsid kasutajale %1$s kutse jututoaga liitumiseks" "%1$s võttis tagasi jututoaga liitumise kutse kasutajalt %2$s" diff --git a/libraries/eventformatter/impl/src/main/res/values-fr/translations.xml b/libraries/eventformatter/impl/src/main/res/values-fr/translations.xml index dda1e4787d..f8189ea040 100644 --- a/libraries/eventformatter/impl/src/main/res/values-fr/translations.xml +++ b/libraries/eventformatter/impl/src/main/res/values-fr/translations.xml @@ -19,6 +19,8 @@ "Vous avez supprimé l’avatar du salon" "%1$s a banni %2$s" "Vous avez banni %1$s" + "Vous avez banni %1$s: %2$s" + "%1$s a banni %2$s: %3$s" "%1$s a créé le salon" "Vous avez créé le salon" "%1$s a invité %2$s" @@ -55,6 +57,8 @@ "Vous avez refusé l’invitation" "%1$s a supprimé %2$s" "Vous avez supprimé %1$s" + "Vous avez supprimé %1$s: %2$s" + "%1$s a supprimé %2$s: %3$s" "%1$s a envoyé une invitation à %2$s à rejoindre le salon" "Vous avez envoyé une invitation à %1$s pour rejoindre le salon" "%1$s a révoqué l’invitation de %2$s à rejoindre le salon" diff --git a/libraries/ui-strings/src/main/res/values-fr/translations.xml b/libraries/ui-strings/src/main/res/values-fr/translations.xml index 90b74e3a62..9ef6ad1e0a 100644 --- a/libraries/ui-strings/src/main/res/values-fr/translations.xml +++ b/libraries/ui-strings/src/main/res/values-fr/translations.xml @@ -261,6 +261,7 @@ Raison : %1$s." "Position partagée" "Déconnexion" "Une erreur s’est produite" + "Nous avons rencontré un problème. Veuillez réessayer." "Création de la discussion…" "Autocollant" "Succès" diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.changeserver_ChangeServerView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.changeserver_ChangeServerView_Day_2_en.png index 6e612f359f..2d6df8b039 100644 --- a/tests/uitests/src/test/snapshots/images/features.login.impl.changeserver_ChangeServerView_Day_2_en.png +++ b/tests/uitests/src/test/snapshots/images/features.login.impl.changeserver_ChangeServerView_Day_2_en.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f642737475ed867d2c1ae5cf34af6261298c33c761e6f9182c0a9b75e3f583bc -size 19091 +oid sha256:fcaa6f6abb01095e62ece79207536c035e70335403a4c6d73c7e18bdc7d0aa5d +size 27024 diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.changeserver_ChangeServerView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.changeserver_ChangeServerView_Night_2_en.png index 7727e0abae..ab7ccfe7fd 100644 --- a/tests/uitests/src/test/snapshots/images/features.login.impl.changeserver_ChangeServerView_Night_2_en.png +++ b/tests/uitests/src/test/snapshots/images/features.login.impl.changeserver_ChangeServerView_Night_2_en.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3929cf3c7bae2c26b5ad499383ffc5d5aecfee7f5c9d24dff0c1116bec018836 -size 17074 +oid sha256:066175e7a3408f163dc0b1126b3644ab83d08f2627bd0429e3fa4a14e1444c03 +size 25335 diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.dialogs_SlidingSyncNotSupportedDialog_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.dialogs_SlidingSyncNotSupportedDialog_Day_0_en.png index 6e612f359f..2d6df8b039 100644 --- a/tests/uitests/src/test/snapshots/images/features.login.impl.dialogs_SlidingSyncNotSupportedDialog_Day_0_en.png +++ b/tests/uitests/src/test/snapshots/images/features.login.impl.dialogs_SlidingSyncNotSupportedDialog_Day_0_en.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f642737475ed867d2c1ae5cf34af6261298c33c761e6f9182c0a9b75e3f583bc -size 19091 +oid sha256:fcaa6f6abb01095e62ece79207536c035e70335403a4c6d73c7e18bdc7d0aa5d +size 27024 diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.dialogs_SlidingSyncNotSupportedDialog_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.dialogs_SlidingSyncNotSupportedDialog_Night_0_en.png index 7727e0abae..ab7ccfe7fd 100644 --- a/tests/uitests/src/test/snapshots/images/features.login.impl.dialogs_SlidingSyncNotSupportedDialog_Night_0_en.png +++ b/tests/uitests/src/test/snapshots/images/features.login.impl.dialogs_SlidingSyncNotSupportedDialog_Night_0_en.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3929cf3c7bae2c26b5ad499383ffc5d5aecfee7f5c9d24dff0c1116bec018836 -size 17074 +oid sha256:066175e7a3408f163dc0b1126b3644ab83d08f2627bd0429e3fa4a14e1444c03 +size 25335