From 022c5221a803dd1b6e14ead0fa6db8e981f990e3 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 14 Nov 2023 11:37:21 +0100 Subject: [PATCH] Localazy: move `report_content` strings to the `:features:messages:impl` module. --- .../features/messages/impl/report/ReportMessageView.kt | 9 +++++---- .../impl/src/main/res/values-cs/translations.xml | 4 ++++ .../impl/src/main/res/values-de/translations.xml | 4 ++++ .../impl/src/main/res/values-es/translations.xml | 4 ++++ .../impl/src/main/res/values-fr/translations.xml | 4 ++++ .../impl/src/main/res/values-it/translations.xml | 4 ++++ .../impl/src/main/res/values-ro/translations.xml | 4 ++++ .../impl/src/main/res/values-ru/translations.xml | 4 ++++ .../impl/src/main/res/values-sk/translations.xml | 4 ++++ .../impl/src/main/res/values-zh-rTW/translations.xml | 2 ++ features/messages/impl/src/main/res/values/localazy.xml | 4 ++++ .../ui-strings/src/main/res/values-cs/translations.xml | 4 ---- .../ui-strings/src/main/res/values-de/translations.xml | 4 ---- .../ui-strings/src/main/res/values-es/translations.xml | 4 ---- .../ui-strings/src/main/res/values-fr/translations.xml | 4 ---- .../ui-strings/src/main/res/values-it/translations.xml | 4 ---- .../ui-strings/src/main/res/values-ro/translations.xml | 4 ---- .../ui-strings/src/main/res/values-ru/translations.xml | 4 ---- .../ui-strings/src/main/res/values-sk/translations.xml | 4 ---- .../src/main/res/values-zh-rTW/translations.xml | 2 -- libraries/ui-strings/src/main/res/values/localazy.xml | 4 ---- tools/localazy/config.json | 3 ++- 22 files changed, 45 insertions(+), 43 deletions(-) diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/report/ReportMessageView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/report/ReportMessageView.kt index d75c8f45c6..f4b152ecab 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/report/ReportMessageView.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/report/ReportMessageView.kt @@ -40,6 +40,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.unit.dp +import io.element.android.features.messages.impl.R import io.element.android.libraries.architecture.Async import io.element.android.libraries.designsystem.components.async.AsyncView import io.element.android.libraries.designsystem.components.button.BackButton @@ -101,14 +102,14 @@ fun ReportMessageView( OutlinedTextField( value = state.reason, onValueChange = { state.eventSink(ReportMessageEvents.UpdateReason(it)) }, - placeholder = { Text(stringResource(CommonStrings.report_content_hint)) }, + placeholder = { Text(stringResource(R.string.report_content_hint)) }, enabled = !isSending, modifier = Modifier .fillMaxWidth() .heightIn(min = 90.dp) ) Text( - text = stringResource(CommonStrings.report_content_explanation), + text = stringResource(R.string.report_content_explanation), style = ElementTheme.typography.fontBodySmRegular, color = MaterialTheme.colorScheme.secondary, textAlign = TextAlign.Start, @@ -122,11 +123,11 @@ fun ReportMessageView( ) { Column(modifier = Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(4.dp)) { Text( - text = stringResource(CommonStrings.screen_report_content_block_user), + text = stringResource(R.string.screen_report_content_block_user), style = ElementTheme.typography.fontBodyLgRegular, ) Text( - text = stringResource(CommonStrings.screen_report_content_block_user_hint), + text = stringResource(R.string.screen_report_content_block_user_hint), style = ElementTheme.typography.fontBodyMdRegular, color = MaterialTheme.colorScheme.secondary, ) diff --git a/features/messages/impl/src/main/res/values-cs/translations.xml b/features/messages/impl/src/main/res/values-cs/translations.xml index 09c0aa4929..a59dcdca59 100644 --- a/features/messages/impl/src/main/res/values-cs/translations.xml +++ b/features/messages/impl/src/main/res/values-cs/translations.xml @@ -13,7 +13,10 @@ "%1$d změny místnosti" "%1$d změn místnosti" + "Tato zpráva bude nahlášena správci vašeho domovského serveru. Nebude si moci přečíst žádné šifrované zprávy." + "Důvod nahlášení tohoto obsahu" "Informujte celou místnost" + "Zaškrtněte, pokud chcete skrýt všechny aktuální a budoucí zprávy od tohoto uživatele" "Fotoaparát" "Vyfotit" "Natočit video" @@ -49,6 +52,7 @@ "Zobrazit méně" "Držte pro nahrávání" "Všichni" + "Zablokovat uživatele" "Nahrání média se nezdařilo, zkuste to prosím znovu." "Pouze zmínky a klíčová slova" diff --git a/features/messages/impl/src/main/res/values-de/translations.xml b/features/messages/impl/src/main/res/values-de/translations.xml index c561551060..cb446ff6b4 100644 --- a/features/messages/impl/src/main/res/values-de/translations.xml +++ b/features/messages/impl/src/main/res/values-de/translations.xml @@ -12,6 +12,9 @@ "%1$d Raumänderung" "%1$d Raumänderungen" + "Diese Meldung wird an den Administrator deines Homeservers weitergeleitet. Dieser kann keine verschlüsselten Nachrichten lesen." + "Grund für die Meldung dieses Inhalts" + "Prüfe, ob du alle aktuellen und zukünftigen Nachrichten dieses Benutzers ausblenden möchtest" "Kamera" "Foto machen" "Video aufnehmen" @@ -44,6 +47,7 @@ "Deine Nachricht konnte nicht gesendet werden" "Emoji hinzufügen" "Weniger anzeigen" + "Benutzer sperren" "Fehler beim Verarbeiten des hochgeladenen Mediums. Bitte versuche es erneut." "Nur Erwähnungen und Schlüsselwörter" diff --git a/features/messages/impl/src/main/res/values-es/translations.xml b/features/messages/impl/src/main/res/values-es/translations.xml index f411e6152f..6a0b285638 100644 --- a/features/messages/impl/src/main/res/values-es/translations.xml +++ b/features/messages/impl/src/main/res/values-es/translations.xml @@ -12,4 +12,8 @@ "%1$d cambio en la sala" "%1$d cambios en la sala" + "Este mensaje se notificará al administrador de su homeserver. No podrán leer ningún mensaje cifrado." + "Motivo para denunciar este contenido" + "Marque si quieres ocultar todos los mensajes actuales y futuros de este usuario" + "Bloquear usuario" diff --git a/features/messages/impl/src/main/res/values-fr/translations.xml b/features/messages/impl/src/main/res/values-fr/translations.xml index 13376219da..8c3babbcf8 100644 --- a/features/messages/impl/src/main/res/values-fr/translations.xml +++ b/features/messages/impl/src/main/res/values-fr/translations.xml @@ -12,7 +12,10 @@ "%1$d changement dans le salon" "%1$d changements dans le salon" + "Ce message sera signalé à l’administrateur de votre serveur d’accueil. Il ne pourra lire aucun message chiffré." + "Raison du signalement de ce contenu" "Notifier tout le salon" + "Cochez si vous souhaitez masquer tous les messages actuels et futurs de cet utilisateur." "Appareil photo" "Prendre une photo" "Enregistrer une vidéo" @@ -48,6 +51,7 @@ "Afficher moins" "Maintenir pour enregistrer" "Tout le monde" + "Bloquer l’utilisateur" "Échec du traitement des médias à télécharger, veuillez réessayer." "Mentions et mots clés uniquement" diff --git a/features/messages/impl/src/main/res/values-it/translations.xml b/features/messages/impl/src/main/res/values-it/translations.xml index 295be40922..735ecbe913 100644 --- a/features/messages/impl/src/main/res/values-it/translations.xml +++ b/features/messages/impl/src/main/res/values-it/translations.xml @@ -12,4 +12,8 @@ "%1$d modifica alla stanza" "%1$d modifiche alla stanza" + "Questo messaggio verrà segnalato all\'amministratore dell\'homeserver. Questi non sarà in grado di leggere i messaggi criptati." + "Motivo della segnalazione di questo contenuto" + "Seleziona se vuoi nascondere tutti i messaggi attuali e futuri di questo utente" + "Blocca utente" diff --git a/features/messages/impl/src/main/res/values-ro/translations.xml b/features/messages/impl/src/main/res/values-ro/translations.xml index d096387b16..b23e524d77 100644 --- a/features/messages/impl/src/main/res/values-ro/translations.xml +++ b/features/messages/impl/src/main/res/values-ro/translations.xml @@ -13,6 +13,9 @@ "%1$d schimbări ale camerei" "%1$d schimbări ale camerei" + "Acest mesaj va fi raportat administratorilor homeserver-ului tau. Ei nu vor putea citi niciun mesaj criptat." + "Motivul raportării acestui conținut" + "Confirmați că doriți să ascundeți toate mesajele curente și viitoare de la acest utilizator" "Cameră foto" "Faceți o fotografie" "Înregistrați un videoclip" @@ -45,6 +48,7 @@ "Mesajul dvs. nu a putut fi trimis" "Adăugați emoji" "Afișați mai puțin" + "Blocați utilizatorul" "Procesarea datelor media a eșuat, vă rugăm să încercați din nou." "Numai mențiuni și cuvinte cheie" diff --git a/features/messages/impl/src/main/res/values-ru/translations.xml b/features/messages/impl/src/main/res/values-ru/translations.xml index 881c8c929f..7fc6a14494 100644 --- a/features/messages/impl/src/main/res/values-ru/translations.xml +++ b/features/messages/impl/src/main/res/values-ru/translations.xml @@ -13,7 +13,10 @@ "%1$d изменения в комнате" "%1$d изменений в комнате" + "Это сообщение будет передано администратору вашего домашнего сервера. Они не смогут прочитать зашифрованные сообщения." + "Причина, по которой вы пожаловались на этот контент" "Уведомить всю комнату" + "Отметьте, хотите ли вы скрыть все текущие и будущие сообщения от этого пользователя" "Камера" "Сделать фото" "Записать видео" @@ -49,6 +52,7 @@ "Показать меньше" "Удерживайте для записи" "Для всех" + "Заблокировать пользователя" "Не удалось обработать медиафайл для загрузки, попробуйте еще раз." "Только упоминания и ключевые слова" diff --git a/features/messages/impl/src/main/res/values-sk/translations.xml b/features/messages/impl/src/main/res/values-sk/translations.xml index b0f20c938d..8c20bcf252 100644 --- a/features/messages/impl/src/main/res/values-sk/translations.xml +++ b/features/messages/impl/src/main/res/values-sk/translations.xml @@ -13,7 +13,10 @@ "%1$d zmeny miestnosti" "%1$d zmien miestnosti" + "Táto správa bude nahlásená správcovi vášho domovského servera. Nebude môcť prečítať žiadne šifrované správy." + "Dôvod nahlásenia tohto obsahu" "Informovať celú miestnosť" + "Označte, či chcete skryť všetky aktuálne a budúce správy od tohto používateľa" "Kamera" "Odfotiť" "Nahrať video" @@ -49,6 +52,7 @@ "Zobraziť menej" "Podržaním nahrajte" "Všetci" + "Zablokovať používateľa" "Nepodarilo sa spracovať médiá na odoslanie, skúste to prosím znova." "Iba zmienky a kľúčové slová" diff --git a/features/messages/impl/src/main/res/values-zh-rTW/translations.xml b/features/messages/impl/src/main/res/values-zh-rTW/translations.xml index 945d815ce6..9eb7664c47 100644 --- a/features/messages/impl/src/main/res/values-zh-rTW/translations.xml +++ b/features/messages/impl/src/main/res/values-zh-rTW/translations.xml @@ -11,6 +11,7 @@ "%1$d 個聊天室變更" + "檢舉這個內容的原因" "照相機" "拍照" "錄影" @@ -33,5 +34,6 @@ "無法傳送您的訊息" "新增表情符號" "較少" + "封鎖使用者" "僅限提及與關鍵字" diff --git a/features/messages/impl/src/main/res/values/localazy.xml b/features/messages/impl/src/main/res/values/localazy.xml index cbf6c3ec16..cbc5f127e9 100644 --- a/features/messages/impl/src/main/res/values/localazy.xml +++ b/features/messages/impl/src/main/res/values/localazy.xml @@ -12,7 +12,10 @@ "%1$d room change" "%1$d room changes" + "This message will be reported to your homeserver’s administrator. They will not be able to read any encrypted messages." + "Reason for reporting this content" "Notify the whole room" + "Check if you want to hide all current and future messages from this user" "Camera" "Take photo" "Record video" @@ -48,6 +51,7 @@ "Show less" "Hold to record" "Everyone" + "Block user" "Failed processing media to upload, please try again." "Mentions and Keywords only" diff --git a/libraries/ui-strings/src/main/res/values-cs/translations.xml b/libraries/ui-strings/src/main/res/values-cs/translations.xml index 89141c9d4d..ddb7b09671 100644 --- a/libraries/ui-strings/src/main/res/values-cs/translations.xml +++ b/libraries/ui-strings/src/main/res/values-cs/translations.xml @@ -207,15 +207,12 @@ "%d hlasů" "Zatřeste zařízením pro nahlášení chyby" - "Tato zpráva bude nahlášena správci vašeho domovského serveru. Nebude si moci přečíst žádné šifrované zprávy." - "Důvod nahlášení tohoto obsahu" "Toto je začátek %1$s." "Toto je začátek této konverzace." "Nové" "Výběr média se nezdařil, zkuste to prosím znovu." "Nahrání média se nezdařilo, zkuste to prosím znovu." "Nahrání média se nezdařilo, zkuste to prosím znovu." - "Zaškrtněte, pokud chcete skrýt všechny aktuální a budoucí zprávy od tohoto uživatele" "Sdílet polohu" "Sdílet moji polohu" "Otevřít v Mapách Apple" @@ -227,5 +224,4 @@ "en" "Chyba" "Úspěch" - "Zablokovat uživatele" diff --git a/libraries/ui-strings/src/main/res/values-de/translations.xml b/libraries/ui-strings/src/main/res/values-de/translations.xml index 3a4f32c3cd..2fa0c20ff5 100644 --- a/libraries/ui-strings/src/main/res/values-de/translations.xml +++ b/libraries/ui-strings/src/main/res/values-de/translations.xml @@ -175,15 +175,12 @@ "%d Stimmen" "Schüttel heftig zum Melden von Fehlern" - "Diese Meldung wird an den Administrator deines Homeservers weitergeleitet. Dieser kann keine verschlüsselten Nachrichten lesen." - "Grund für die Meldung dieses Inhalts" "Dies ist der Anfang von %1$s." "Dies ist der Anfang dieses Gesprächs." "Neu" "Medienauswahl fehlgeschlagen, bitte versuche es erneut." "Fehler beim Verarbeiten des hochgeladenen Mediums. Bitte versuche es erneut." "Das Hochladen der Medien ist fehlgeschlagen. Bitte versuche es erneut." - "Prüfe, ob du alle aktuellen und zukünftigen Nachrichten dieses Benutzers ausblenden möchtest" "Standort teilen" "Meinen Standort teilen" "In Apple Maps öffnen" @@ -195,5 +192,4 @@ "en" "Fehler" "Erfolg" - "Benutzer sperren" diff --git a/libraries/ui-strings/src/main/res/values-es/translations.xml b/libraries/ui-strings/src/main/res/values-es/translations.xml index 595d59f295..f901b48cb3 100644 --- a/libraries/ui-strings/src/main/res/values-es/translations.xml +++ b/libraries/ui-strings/src/main/res/values-es/translations.xml @@ -105,15 +105,11 @@ "%1$d miembros" "Agitar con fuerza para informar de un error" - "Este mensaje se notificará al administrador de su homeserver. No podrán leer ningún mensaje cifrado." - "Motivo para denunciar este contenido" "Este es el principio de %1$s." "Este es el principio de esta conversación." "Nuevos" - "Marque si quieres ocultar todos los mensajes actuales y futuros de este usuario" "Versión: %1$s (%2$s)" "es" "Error" "Terminado" - "Bloquear usuario" 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 9cad4513d8..cc0adae38d 100644 --- a/libraries/ui-strings/src/main/res/values-fr/translations.xml +++ b/libraries/ui-strings/src/main/res/values-fr/translations.xml @@ -202,15 +202,12 @@ "%d votes" "Rageshake pour signaler un problème" - "Ce message sera signalé à l’administrateur de votre serveur d’accueil. Il ne pourra lire aucun message chiffré." - "Raison du signalement de ce contenu" "Ceci est le début de %1$s." "Ceci est le début de cette conversation." "Nouveau" "Échec de la sélection du média, veuillez réessayer." "Échec du traitement des médias à télécharger, veuillez réessayer." "Échec du téléchargement du média, veuillez réessayer." - "Cochez si vous souhaitez masquer tous les messages actuels et futurs de cet utilisateur." "Partage de position" "Partager ma position" "Ouvrir dans Apple Maps" @@ -222,5 +219,4 @@ "Ang." "Erreur" "Succès" - "Bloquer l’utilisateur" diff --git a/libraries/ui-strings/src/main/res/values-it/translations.xml b/libraries/ui-strings/src/main/res/values-it/translations.xml index 9fe0d0b900..e8e35c284e 100644 --- a/libraries/ui-strings/src/main/res/values-it/translations.xml +++ b/libraries/ui-strings/src/main/res/values-it/translations.xml @@ -105,15 +105,11 @@ "%1$d membri" "Scuoti per segnalare un problema" - "Questo messaggio verrà segnalato all\'amministratore dell\'homeserver. Questi non sarà in grado di leggere i messaggi criptati." - "Motivo della segnalazione di questo contenuto" "Questo è l\'inizio di %1$s." "Questo è l\'inizio della conversazione." "Nuovo" - "Seleziona se vuoi nascondere tutti i messaggi attuali e futuri di questo utente" "Versione: %1$s (%2$s)" "it" "Errore" "Operazione riuscita" - "Blocca utente" diff --git a/libraries/ui-strings/src/main/res/values-ro/translations.xml b/libraries/ui-strings/src/main/res/values-ro/translations.xml index 09a6392bc6..863d4cd097 100644 --- a/libraries/ui-strings/src/main/res/values-ro/translations.xml +++ b/libraries/ui-strings/src/main/res/values-ro/translations.xml @@ -159,15 +159,12 @@ "%d voturi" "Rageshake pentru a raporta erori" - "Acest mesaj va fi raportat administratorilor homeserver-ului tau. Ei nu vor putea citi niciun mesaj criptat." - "Motivul raportării acestui conținut" "Acesta este începutul conversației %1$s." "Acesta este începutul acestei conversații." "Nou" "Selectarea fișierelor media a eșuat, încercați din nou." "Procesarea datelor media a eșuat, vă rugăm să încercați din nou." "Încărcarea fișierelor media a eșuat, încercați din nou." - "Confirmați că doriți să ascundeți toate mesajele curente și viitoare de la acest utilizator" "Partajați locația" "Distribuiți locația mea" "Deschideți în Apple Maps" @@ -179,5 +176,4 @@ "ro" "Eroare" "Succes" - "Blocați utilizatorul" diff --git a/libraries/ui-strings/src/main/res/values-ru/translations.xml b/libraries/ui-strings/src/main/res/values-ru/translations.xml index e8c2780e26..87f4d74201 100644 --- a/libraries/ui-strings/src/main/res/values-ru/translations.xml +++ b/libraries/ui-strings/src/main/res/values-ru/translations.xml @@ -209,15 +209,12 @@ "%d голосов" "Rageshake сообщит об ошибке" - "Это сообщение будет передано администратору вашего домашнего сервера. Они не смогут прочитать зашифрованные сообщения." - "Причина, по которой вы пожаловались на этот контент" "Это начало %1$s." "Это начало разговора." "Новый" "Не удалось выбрать носитель, попробуйте еще раз." "Не удалось обработать медиафайл для загрузки, попробуйте еще раз." "Не удалось загрузить медиафайлы, попробуйте еще раз." - "Отметьте, хотите ли вы скрыть все текущие и будущие сообщения от этого пользователя" "Поделиться местоположением" "Поделиться моим местоположением" "Открыть в Apple Maps" @@ -229,5 +226,4 @@ "en" "Ошибка" "Успешно" - "Заблокировать пользователя" diff --git a/libraries/ui-strings/src/main/res/values-sk/translations.xml b/libraries/ui-strings/src/main/res/values-sk/translations.xml index abfc25093b..4f38c2fb8b 100644 --- a/libraries/ui-strings/src/main/res/values-sk/translations.xml +++ b/libraries/ui-strings/src/main/res/values-sk/translations.xml @@ -209,15 +209,12 @@ "%d hlasov" "Zúrivo potriasť pre nahlásenie chyby" - "Táto správa bude nahlásená správcovi vášho domovského servera. Nebude môcť prečítať žiadne šifrované správy." - "Dôvod nahlásenia tohto obsahu" "Toto je začiatok %1$s." "Toto je začiatok tejto konverzácie." "Nové" "Nepodarilo sa vybrať médium, skúste to prosím znova." "Nepodarilo sa spracovať médiá na odoslanie, skúste to prosím znova." "Nepodarilo sa nahrať médiá, skúste to prosím znova." - "Označte, či chcete skryť všetky aktuálne a budúce správy od tohto používateľa" "Zdieľať polohu" "Zdieľať moju polohu" "Otvoriť v Apple Maps" @@ -229,5 +226,4 @@ "sk" "Chyba" "Úspech" - "Zablokovať používateľa" diff --git a/libraries/ui-strings/src/main/res/values-zh-rTW/translations.xml b/libraries/ui-strings/src/main/res/values-zh-rTW/translations.xml index 6854367532..d86a2b0265 100644 --- a/libraries/ui-strings/src/main/res/values-zh-rTW/translations.xml +++ b/libraries/ui-strings/src/main/res/values-zh-rTW/translations.xml @@ -167,7 +167,6 @@ "%d 票" - "檢舉這個內容的原因" "新訊息" "無法上傳媒體檔案,請稍後再試。" "分享位置" @@ -181,5 +180,4 @@ "zh-tw" "錯誤" "成功" - "封鎖使用者" diff --git a/libraries/ui-strings/src/main/res/values/localazy.xml b/libraries/ui-strings/src/main/res/values/localazy.xml index 17bbe93bca..156b5e5b17 100644 --- a/libraries/ui-strings/src/main/res/values/localazy.xml +++ b/libraries/ui-strings/src/main/res/values/localazy.xml @@ -206,15 +206,12 @@ "%d votes" "Rageshake to report bug" - "This message will be reported to your homeserver’s administrator. They will not be able to read any encrypted messages." - "Reason for reporting this content" "This is the beginning of %1$s." "This is the beginning of this conversation." "New" "Failed selecting media, please try again." "Failed processing media to upload, please try again." "Failed uploading media, please try again." - "Check if you want to hide all current and future messages from this user" "Share location" "Share my location" "Open in Apple Maps" @@ -227,5 +224,4 @@ "en" "Error" "Success" - "Block user" diff --git a/tools/localazy/config.json b/tools/localazy/config.json index 23fc18a5ef..e95892ac52 100644 --- a/tools/localazy/config.json +++ b/tools/localazy/config.json @@ -125,7 +125,8 @@ "screen\\.room\\..*", "screen_dm_details_.*", "room_timeline_state_changes", - "emoji_picker_category_.*" + "emoji_picker_category_.*", + ".*report_content_.*" ], "excludeRegex": [ "screen_room_details_.*",