Merge pull request #1798 from vector-im/feature/bma/config

Configs object in appconfig and move strings to dedicated modules.
2023-11-14 16:53:46 +01:00 · 2023-11-14 16:53:46 +01:00 · 55cbef9848
commit 55cbef9848
parent 96e4106410 470613e451
83 changed files with 589 additions and 481 deletions
--- 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,
                    )
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/EmojibaseExtensions.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/EmojibaseExtensions.kt
@ -28,31 +28,29 @@ import androidx.compose.material.icons.outlined.EmojiSymbols
 import androidx.compose.material.icons.outlined.EmojiTransportation
 import androidx.compose.ui.graphics.vector.ImageVector
 import io.element.android.emojibasebindings.EmojibaseCategory
-import io.element.android.libraries.ui.strings.CommonStrings
+import io.element.android.features.messages.impl.R

@get:StringRes
-val EmojibaseCategory.title: Int get() =
-    when(this){
-        EmojibaseCategory.People -> CommonStrings.emoji_picker_category_people
-        EmojibaseCategory.Nature -> CommonStrings.emoji_picker_category_nature
-        EmojibaseCategory.Foods -> CommonStrings.emoji_picker_category_foods
-        EmojibaseCategory.Activity -> CommonStrings.emoji_picker_category_activity
-        EmojibaseCategory.Places -> CommonStrings.emoji_picker_category_places
-        EmojibaseCategory.Objects -> CommonStrings.emoji_picker_category_objects
-        EmojibaseCategory.Symbols -> CommonStrings.emoji_picker_category_symbols
-        EmojibaseCategory.Flags -> CommonStrings.emoji_picker_category_flags
+val EmojibaseCategory.title: Int
+    get() = when (this) {
+        EmojibaseCategory.People -> R.string.emoji_picker_category_people
+        EmojibaseCategory.Nature -> R.string.emoji_picker_category_nature
+        EmojibaseCategory.Foods -> R.string.emoji_picker_category_foods
+        EmojibaseCategory.Activity -> R.string.emoji_picker_category_activity
+        EmojibaseCategory.Places -> R.string.emoji_picker_category_places
+        EmojibaseCategory.Objects -> R.string.emoji_picker_category_objects
+        EmojibaseCategory.Symbols -> R.string.emoji_picker_category_symbols
+        EmojibaseCategory.Flags -> R.string.emoji_picker_category_flags
    }

 val EmojibaseCategory.icon: ImageVector
-    get() =
-        when(this){
-            EmojibaseCategory.People -> Icons.Outlined.EmojiPeople
-            EmojibaseCategory.Nature -> Icons.Outlined.EmojiNature
-            EmojibaseCategory.Foods -> Icons.Outlined.EmojiFoodBeverage
-            EmojibaseCategory.Activity -> Icons.Outlined.EmojiEvents
-            EmojibaseCategory.Places -> Icons.Outlined.EmojiTransportation
-            EmojibaseCategory.Objects -> Icons.Outlined.EmojiObjects
-            EmojibaseCategory.Symbols -> Icons.Outlined.EmojiSymbols
-            EmojibaseCategory.Flags -> Icons.Outlined.EmojiFlags
-        }
-
+    get() = when (this) {
+        EmojibaseCategory.People -> Icons.Outlined.EmojiPeople
+        EmojibaseCategory.Nature -> Icons.Outlined.EmojiNature
+        EmojibaseCategory.Foods -> Icons.Outlined.EmojiFoodBeverage
+        EmojibaseCategory.Activity -> Icons.Outlined.EmojiEvents
+        EmojibaseCategory.Places -> Icons.Outlined.EmojiTransportation
+        EmojibaseCategory.Objects -> Icons.Outlined.EmojiObjects
+        EmojibaseCategory.Symbols -> Icons.Outlined.EmojiSymbols
+        EmojibaseCategory.Flags -> Icons.Outlined.EmojiFlags
+    }
--- a/features/messages/impl/src/main/res/values-cs/translations.xml
+++ b/features/messages/impl/src/main/res/values-cs/translations.xml
@ -1,11 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="emoji_picker_category_activity">"Aktivity"</string>
+  <string name="emoji_picker_category_flags">"Vlajky"</string>
+  <string name="emoji_picker_category_foods">"Jídlo a nápoje"</string>
+  <string name="emoji_picker_category_nature">"Zvířata a příroda"</string>
+  <string name="emoji_picker_category_objects">"Předměty"</string>
+  <string name="emoji_picker_category_people">"Smajlíci a lidé"</string>
+  <string name="emoji_picker_category_places">"Cestování a místa"</string>
+  <string name="emoji_picker_category_symbols">"Symboly"</string>
  <plurals name="room_timeline_state_changes">
    <item quantity="one">"%1$d změna místnosti"</item>
    <item quantity="few">"%1$d změny místnosti"</item>
    <item quantity="other">"%1$d změn místnosti"</item>
  </plurals>
+  <string name="report_content_explanation">"Tato zpráva bude nahlášena správci vašeho domovského serveru. Nebude si moci přečíst žádné šifrované zprávy."</string>
+  <string name="report_content_hint">"Důvod nahlášení tohoto obsahu"</string>
  <string name="screen_room_mentions_at_room_subtitle">"Informujte celou místnost"</string>
+  <string name="screen_report_content_block_user_hint">"Zaškrtněte, pokud chcete skrýt všechny aktuální a budoucí zprávy od tohoto uživatele"</string>
  <string name="screen_room_attachment_source_camera">"Fotoaparát"</string>
  <string name="screen_room_attachment_source_camera_photo">"Vyfotit"</string>
  <string name="screen_room_attachment_source_camera_video">"Natočit video"</string>
@ -41,6 +52,7 @@
  <string name="screen_room_timeline_less_reactions">"Zobrazit méně"</string>
  <string name="screen_room_voice_message_tooltip">"Držte pro nahrávání"</string>
  <string name="screen_room_mentions_at_room_title">"Všichni"</string>
+  <string name="screen_report_content_block_user">"Zablokovat uživatele"</string>
  <string name="screen_room_error_failed_processing_media">"Nahrání média se nezdařilo, zkuste to prosím znovu."</string>
  <string name="screen_room_notification_settings_mode_mentions_and_keywords">"Pouze zmínky a klíčová slova"</string>
 </resources>
--- a/features/messages/impl/src/main/res/values-de/translations.xml
+++ b/features/messages/impl/src/main/res/values-de/translations.xml
@ -1,9 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="emoji_picker_category_activity">"Aktivitäten"</string>
+  <string name="emoji_picker_category_flags">"Flaggen"</string>
+  <string name="emoji_picker_category_foods">"Essen &amp; Trinken"</string>
+  <string name="emoji_picker_category_nature">"Tiere &amp; Natur"</string>
+  <string name="emoji_picker_category_objects">"Objekte"</string>
+  <string name="emoji_picker_category_people">"Smileys &amp; Menschen"</string>
+  <string name="emoji_picker_category_places">"Reisen &amp; Orte"</string>
+  <string name="emoji_picker_category_symbols">"Symbole"</string>
  <plurals name="room_timeline_state_changes">
    <item quantity="one">"%1$d Raumänderung"</item>
    <item quantity="other">"%1$d Raumänderungen"</item>
  </plurals>
+  <string name="report_content_explanation">"Diese Meldung wird an den Administrator deines Homeservers weitergeleitet. Dieser kann keine verschlüsselten Nachrichten lesen."</string>
+  <string name="report_content_hint">"Grund für die Meldung dieses Inhalts"</string>
+  <string name="screen_report_content_block_user_hint">"Prüfe, ob du alle aktuellen und zukünftigen Nachrichten dieses Benutzers ausblenden möchtest"</string>
  <string name="screen_room_attachment_source_camera">"Kamera"</string>
  <string name="screen_room_attachment_source_camera_photo">"Foto machen"</string>
  <string name="screen_room_attachment_source_camera_video">"Video aufnehmen"</string>
@ -36,6 +47,7 @@
  <string name="screen_room_retry_send_menu_title">"Deine Nachricht konnte nicht gesendet werden"</string>
  <string name="screen_room_timeline_add_reaction">"Emoji hinzufügen"</string>
  <string name="screen_room_timeline_less_reactions">"Weniger anzeigen"</string>
+  <string name="screen_report_content_block_user">"Benutzer sperren"</string>
  <string name="screen_room_error_failed_processing_media">"Fehler beim Verarbeiten des hochgeladenen Mediums. Bitte versuche es erneut."</string>
  <string name="screen_room_notification_settings_mode_mentions_and_keywords">"Nur Erwähnungen und Schlüsselwörter"</string>
 </resources>
--- a/features/messages/impl/src/main/res/values-es/translations.xml
+++ b/features/messages/impl/src/main/res/values-es/translations.xml
@ -1,7 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="emoji_picker_category_activity">"Actividades"</string>
+  <string name="emoji_picker_category_flags">"Banderas"</string>
+  <string name="emoji_picker_category_foods">"Comida y bebida"</string>
+  <string name="emoji_picker_category_nature">"Animales y naturaleza"</string>
+  <string name="emoji_picker_category_objects">"Objetos"</string>
+  <string name="emoji_picker_category_people">"Emojis y personas"</string>
+  <string name="emoji_picker_category_places">"Viajes y lugares"</string>
+  <string name="emoji_picker_category_symbols">"Símbolos"</string>
  <plurals name="room_timeline_state_changes">
    <item quantity="one">"%1$d cambio en la sala"</item>
    <item quantity="other">"%1$d cambios en la sala"</item>
  </plurals>
+  <string name="report_content_explanation">"Este mensaje se notificará al administrador de su homeserver. No podrán leer ningún mensaje cifrado."</string>
+  <string name="report_content_hint">"Motivo para denunciar este contenido"</string>
+  <string name="screen_report_content_block_user_hint">"Marque si quieres ocultar todos los mensajes actuales y futuros de este usuario"</string>
+  <string name="screen_report_content_block_user">"Bloquear usuario"</string>
 </resources>
--- a/features/messages/impl/src/main/res/values-fr/translations.xml
+++ b/features/messages/impl/src/main/res/values-fr/translations.xml
@ -1,10 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="emoji_picker_category_activity">"Activités"</string>
+  <string name="emoji_picker_category_flags">"Drapeaux"</string>
+  <string name="emoji_picker_category_foods">"Nourriture et boissons"</string>
+  <string name="emoji_picker_category_nature">"Animaux et nature"</string>
+  <string name="emoji_picker_category_objects">"Objets"</string>
+  <string name="emoji_picker_category_people">"Émoticônes et personnes"</string>
+  <string name="emoji_picker_category_places">"Voyages &amp; lieux"</string>
+  <string name="emoji_picker_category_symbols">"Symboles"</string>
  <plurals name="room_timeline_state_changes">
    <item quantity="one">"%1$d changement dans le salon"</item>
    <item quantity="other">"%1$d changements dans le salon"</item>
  </plurals>
+  <string name="report_content_explanation">"Ce message sera signalé à l’administrateur de votre serveur d’accueil. Il ne pourra lire aucun message chiffré."</string>
+  <string name="report_content_hint">"Raison du signalement de ce contenu"</string>
  <string name="screen_room_mentions_at_room_subtitle">"Notifier tout le salon"</string>
+  <string name="screen_report_content_block_user_hint">"Cochez si vous souhaitez masquer tous les messages actuels et futurs de cet utilisateur."</string>
  <string name="screen_room_attachment_source_camera">"Appareil photo"</string>
  <string name="screen_room_attachment_source_camera_photo">"Prendre une photo"</string>
  <string name="screen_room_attachment_source_camera_video">"Enregistrer une vidéo"</string>
@ -40,6 +51,7 @@
  <string name="screen_room_timeline_less_reactions">"Afficher moins"</string>
  <string name="screen_room_voice_message_tooltip">"Maintenir pour enregistrer"</string>
  <string name="screen_room_mentions_at_room_title">"Tout le monde"</string>
+  <string name="screen_report_content_block_user">"Bloquer l’utilisateur"</string>
  <string name="screen_room_error_failed_processing_media">"Échec du traitement des médias à télécharger, veuillez réessayer."</string>
  <string name="screen_room_notification_settings_mode_mentions_and_keywords">"Mentions et mots clés uniquement"</string>
 </resources>
--- a/features/messages/impl/src/main/res/values-it/translations.xml
+++ b/features/messages/impl/src/main/res/values-it/translations.xml
@ -1,7 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="emoji_picker_category_activity">"Attività"</string>
+  <string name="emoji_picker_category_flags">"Bandiere"</string>
+  <string name="emoji_picker_category_foods">"Cibi &amp; Bevande"</string>
+  <string name="emoji_picker_category_nature">"Animali &amp; Natura"</string>
+  <string name="emoji_picker_category_objects">"Oggetti"</string>
+  <string name="emoji_picker_category_people">"Faccine &amp; Persone"</string>
+  <string name="emoji_picker_category_places">"Viaggi &amp; Luoghi"</string>
+  <string name="emoji_picker_category_symbols">"Simboli"</string>
  <plurals name="room_timeline_state_changes">
    <item quantity="one">"%1$d modifica alla stanza"</item>
    <item quantity="other">"%1$d modifiche alla stanza"</item>
  </plurals>
+  <string name="report_content_explanation">"Questo messaggio verrà segnalato all\'amministratore dell\'homeserver. Questi non sarà in grado di leggere i messaggi criptati."</string>
+  <string name="report_content_hint">"Motivo della segnalazione di questo contenuto"</string>
+  <string name="screen_report_content_block_user_hint">"Seleziona se vuoi nascondere tutti i messaggi attuali e futuri di questo utente"</string>
+  <string name="screen_report_content_block_user">"Blocca utente"</string>
 </resources>
--- a/features/messages/impl/src/main/res/values-ro/translations.xml
+++ b/features/messages/impl/src/main/res/values-ro/translations.xml
@ -1,10 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="emoji_picker_category_activity">"Activități"</string>
+  <string name="emoji_picker_category_flags">"Steaguri"</string>
+  <string name="emoji_picker_category_foods">"Mâncare &amp; Băutură"</string>
+  <string name="emoji_picker_category_nature">"Animale și Natură"</string>
+  <string name="emoji_picker_category_objects">"Obiecte"</string>
+  <string name="emoji_picker_category_people">"Fețe zâmbitoare &amp; Oameni"</string>
+  <string name="emoji_picker_category_places">"Călătorii &amp; Locuri"</string>
+  <string name="emoji_picker_category_symbols">"Simboluri"</string>
  <plurals name="room_timeline_state_changes">
    <item quantity="one">"%1$d schimbare a camerii"</item>
    <item quantity="few">"%1$d schimbări ale camerei"</item>
    <item quantity="other">"%1$d schimbări ale camerei"</item>
  </plurals>
+  <string name="report_content_explanation">"Acest mesaj va fi raportat administratorilor homeserver-ului tau. Ei nu vor putea citi niciun mesaj criptat."</string>
+  <string name="report_content_hint">"Motivul raportării acestui conținut"</string>
+  <string name="screen_report_content_block_user_hint">"Confirmați că doriți să ascundeți toate mesajele curente și viitoare de la acest utilizator"</string>
  <string name="screen_room_attachment_source_camera">"Cameră foto"</string>
  <string name="screen_room_attachment_source_camera_photo">"Faceți o fotografie"</string>
  <string name="screen_room_attachment_source_camera_video">"Înregistrați un videoclip"</string>
@ -37,6 +48,7 @@
  <string name="screen_room_retry_send_menu_title">"Mesajul dvs. nu a putut fi trimis"</string>
  <string name="screen_room_timeline_add_reaction">"Adăugați emoji"</string>
  <string name="screen_room_timeline_less_reactions">"Afișați mai puțin"</string>
+  <string name="screen_report_content_block_user">"Blocați utilizatorul"</string>
  <string name="screen_room_error_failed_processing_media">"Procesarea datelor media a eșuat, vă rugăm să încercați din nou."</string>
  <string name="screen_room_notification_settings_mode_mentions_and_keywords">"Numai mențiuni și cuvinte cheie"</string>
 </resources>
--- a/features/messages/impl/src/main/res/values-ru/translations.xml
+++ b/features/messages/impl/src/main/res/values-ru/translations.xml
@ -1,11 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="emoji_picker_category_activity">"Деятельность"</string>
+  <string name="emoji_picker_category_flags">"Флаги"</string>
+  <string name="emoji_picker_category_foods">"Еда и напитки"</string>
+  <string name="emoji_picker_category_nature">"Животные и природа"</string>
+  <string name="emoji_picker_category_objects">"Объекты"</string>
+  <string name="emoji_picker_category_people">"Смайлы и люди"</string>
+  <string name="emoji_picker_category_places">"Путешествия и места"</string>
+  <string name="emoji_picker_category_symbols">"Символы"</string>
  <plurals name="room_timeline_state_changes">
    <item quantity="one">"%1$d изменение в комнате"</item>
    <item quantity="few">"%1$d изменения в комнате"</item>
    <item quantity="many">"%1$d изменений в комнате"</item>
  </plurals>
+  <string name="report_content_explanation">"Это сообщение будет передано администратору вашего домашнего сервера. Они не смогут прочитать зашифрованные сообщения."</string>
+  <string name="report_content_hint">"Причина, по которой вы пожаловались на этот контент"</string>
  <string name="screen_room_mentions_at_room_subtitle">"Уведомить всю комнату"</string>
+  <string name="screen_report_content_block_user_hint">"Отметьте, хотите ли вы скрыть все текущие и будущие сообщения от этого пользователя"</string>
  <string name="screen_room_attachment_source_camera">"Камера"</string>
  <string name="screen_room_attachment_source_camera_photo">"Сделать фото"</string>
  <string name="screen_room_attachment_source_camera_video">"Записать видео"</string>
@ -41,6 +52,7 @@
  <string name="screen_room_timeline_less_reactions">"Показать меньше"</string>
  <string name="screen_room_voice_message_tooltip">"Удерживайте для записи"</string>
  <string name="screen_room_mentions_at_room_title">"Для всех"</string>
+  <string name="screen_report_content_block_user">"Заблокировать пользователя"</string>
  <string name="screen_room_error_failed_processing_media">"Не удалось обработать медиафайл для загрузки, попробуйте еще раз."</string>
  <string name="screen_room_notification_settings_mode_mentions_and_keywords">"Только упоминания и ключевые слова"</string>
 </resources>
--- a/features/messages/impl/src/main/res/values-sk/translations.xml
+++ b/features/messages/impl/src/main/res/values-sk/translations.xml
@ -1,11 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="emoji_picker_category_activity">"Aktivity"</string>
+  <string name="emoji_picker_category_flags">"Vlajky"</string>
+  <string name="emoji_picker_category_foods">"Jedlo a nápoje"</string>
+  <string name="emoji_picker_category_nature">"Zvieratá a príroda"</string>
+  <string name="emoji_picker_category_objects">"Predmety"</string>
+  <string name="emoji_picker_category_people">"Smajlíky a ľudia"</string>
+  <string name="emoji_picker_category_places">"Cestovanie a miesta"</string>
+  <string name="emoji_picker_category_symbols">"Symboly"</string>
  <plurals name="room_timeline_state_changes">
    <item quantity="one">"%1$d zmena miestnosti"</item>
    <item quantity="few">"%1$d zmeny miestnosti"</item>
    <item quantity="other">"%1$d zmien miestnosti"</item>
  </plurals>
+  <string name="report_content_explanation">"Táto správa bude nahlásená správcovi vášho domovského servera. Nebude môcť prečítať žiadne šifrované správy."</string>
+  <string name="report_content_hint">"Dôvod nahlásenia tohto obsahu"</string>
  <string name="screen_room_mentions_at_room_subtitle">"Informovať celú miestnosť"</string>
+  <string name="screen_report_content_block_user_hint">"Označte, či chcete skryť všetky aktuálne a budúce správy od tohto používateľa"</string>
  <string name="screen_room_attachment_source_camera">"Kamera"</string>
  <string name="screen_room_attachment_source_camera_photo">"Odfotiť"</string>
  <string name="screen_room_attachment_source_camera_video">"Nahrať video"</string>
@ -41,6 +52,7 @@
  <string name="screen_room_timeline_less_reactions">"Zobraziť menej"</string>
  <string name="screen_room_voice_message_tooltip">"Podržaním nahrajte"</string>
  <string name="screen_room_mentions_at_room_title">"Všetci"</string>
+  <string name="screen_report_content_block_user">"Zablokovať používateľa"</string>
  <string name="screen_room_error_failed_processing_media">"Nepodarilo sa spracovať médiá na odoslanie, skúste to prosím znova."</string>
  <string name="screen_room_notification_settings_mode_mentions_and_keywords">"Iba zmienky a kľúčové slová"</string>
 </resources>
--- a/features/messages/impl/src/main/res/values-zh-rTW/translations.xml
+++ b/features/messages/impl/src/main/res/values-zh-rTW/translations.xml
@ -1,8 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="emoji_picker_category_activity">"活動"</string>
+  <string name="emoji_picker_category_flags">"旗幟"</string>
+  <string name="emoji_picker_category_foods">"食物與飲料"</string>
+  <string name="emoji_picker_category_nature">"動物與大自然"</string>
+  <string name="emoji_picker_category_objects">"物品"</string>
+  <string name="emoji_picker_category_people">"表情與人物"</string>
+  <string name="emoji_picker_category_places">"旅行與景點"</string>
+  <string name="emoji_picker_category_symbols">"標誌"</string>
  <plurals name="room_timeline_state_changes">
    <item quantity="other">"%1$d 個聊天室變更"</item>
  </plurals>
+  <string name="report_content_hint">"檢舉這個內容的原因"</string>
  <string name="screen_room_attachment_source_camera">"照相機"</string>
  <string name="screen_room_attachment_source_camera_photo">"拍照"</string>
  <string name="screen_room_attachment_source_camera_video">"錄影"</string>
@ -25,5 +34,6 @@
  <string name="screen_room_retry_send_menu_title">"無法傳送您的訊息"</string>
  <string name="screen_room_timeline_add_reaction">"新增表情符號"</string>
  <string name="screen_room_timeline_less_reactions">"較少"</string>
+  <string name="screen_report_content_block_user">"封鎖使用者"</string>
  <string name="screen_room_notification_settings_mode_mentions_and_keywords">"僅限提及與關鍵字"</string>
 </resources>
--- a/features/messages/impl/src/main/res/values/localazy.xml
+++ b/features/messages/impl/src/main/res/values/localazy.xml
@ -1,10 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="emoji_picker_category_activity">"Activities"</string>
+  <string name="emoji_picker_category_flags">"Flags"</string>
+  <string name="emoji_picker_category_foods">"Food &amp; Drink"</string>
+  <string name="emoji_picker_category_nature">"Animals &amp; Nature"</string>
+  <string name="emoji_picker_category_objects">"Objects"</string>
+  <string name="emoji_picker_category_people">"Smileys &amp; People"</string>
+  <string name="emoji_picker_category_places">"Travel &amp; Places"</string>
+  <string name="emoji_picker_category_symbols">"Symbols"</string>
  <plurals name="room_timeline_state_changes">
    <item quantity="one">"%1$d room change"</item>
    <item quantity="other">"%1$d room changes"</item>
  </plurals>
+  <string name="report_content_explanation">"This message will be reported to your homeserver’s administrator. They will not be able to read any encrypted messages."</string>
+  <string name="report_content_hint">"Reason for reporting this content"</string>
  <string name="screen_room_mentions_at_room_subtitle">"Notify the whole room"</string>
+  <string name="screen_report_content_block_user_hint">"Check if you want to hide all current and future messages from this user"</string>
  <string name="screen_room_attachment_source_camera">"Camera"</string>
  <string name="screen_room_attachment_source_camera_photo">"Take photo"</string>
  <string name="screen_room_attachment_source_camera_video">"Record video"</string>
@ -40,6 +51,7 @@
  <string name="screen_room_timeline_less_reactions">"Show less"</string>
  <string name="screen_room_voice_message_tooltip">"Hold to record"</string>
  <string name="screen_room_mentions_at_room_title">"Everyone"</string>
+  <string name="screen_report_content_block_user">"Block user"</string>
  <string name="screen_room_error_failed_processing_media">"Failed processing media to upload, please try again."</string>
  <string name="screen_room_notification_settings_mode_mentions_and_keywords">"Mentions and Keywords only"</string>
 </resources>