Update strings

features/messages/impl/src/main/res/values-ru/translations.xml

@@ -5,6 +5,11 @@
     <item quantity="few">"%1$d изменения в комнате"</item>
     <item quantity="many">"%1$d изменений в комнате"</item>
   </plurals>
+  <plurals name="screen_room_timeline_more_reactions">
+    <item quantity="one">"одно"</item>
+    <item quantity="few">"%1$d"</item>
+    <item quantity="many">"более %1$d"</item>
+  </plurals>
   <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>

features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsView.kt

@@ -44,6 +44,7 @@ import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.TopAppBar
 import io.element.android.libraries.matrix.api.room.RoomNotificationMode
 import io.element.android.libraries.theme.ElementTheme
+import io.element.android.libraries.ui.strings.CommonStrings
 
 @OptIn(ExperimentalLayoutApi::class)
 @Composable
@@ -67,14 +68,14 @@ fun RoomNotificationSettingsView(
             verticalArrangement = Arrangement.spacedBy(16.dp),
         ) {
             val subtitle = when(state.defaultRoomNotificationMode) {
-                RoomNotificationMode.ALL_MESSAGES -> "All messages"
+                RoomNotificationMode.ALL_MESSAGES -> stringResource(id = R.string.screen_room_notification_settings_mode_all_messages)
-                RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY -> "Mentions and keywords"
+                RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY -> stringResource(id = R.string.screen_room_notification_settings_mode_mentions_and_keywords)
-                RoomNotificationMode.MUTE -> "Mute"
+                RoomNotificationMode.MUTE -> stringResource(id = CommonStrings.common_mute)
                 null -> ""
             }
 
 
-            PreferenceCategory(title = "Notify me in this chat for") {
+            PreferenceCategory(title = stringResource(id = R.string.screen_room_notification_settings_custom_settings_title)) {
                 PreferenceSwitch(
                     isChecked = state.roomNotificationSettings?.isDefault.orTrue(),
                     onCheckedChange = {
@@ -86,8 +87,8 @@ fun RoomNotificationSettingsView(
                 )
 
                 PreferenceText(
-                    title = "Allow custom setting",
+                    title = stringResource(id = R.string.screen_room_notification_settings_allow_custom),
-                    subtitle = "Turning this on will override yout default setting",
+                    subtitle = stringResource(id = R.string.screen_room_notification_settings_allow_custom_footnote),
                     enabled = state.roomNotificationSettings != null && !state.roomNotificationSettings.isDefault,
                 )
 

features/roomdetails/impl/src/main/res/values-fr/translations.xml

@@ -23,6 +23,16 @@
   <string name="screen_room_details_share_room_title">"Partager le salon"</string>
   <string name="screen_room_details_updating_room">"Mise à jour du salon…"</string>
   <string name="screen_room_member_list_pending_header_title">"En attente"</string>
+  <string name="screen_room_notification_settings_allow_custom">"Autoriser les paramètres personnalisés"</string>
+  <string name="screen_room_notification_settings_allow_custom_footnote">"Activer cette option remplacera votre paramètre par défaut"</string>
+  <string name="screen_room_notification_settings_custom_settings_title">"Me notifier dans ce chat pour"</string>
+  <string name="screen_room_notification_settings_default_setting_footnote_content_link">"paramètres généraux"</string>
+  <string name="screen_room_notification_settings_default_setting_title">"Paramètre par défaut"</string>
+  <string name="screen_room_notification_settings_error_loading_settings">"Une erreur s’est produite lors du chargement des paramètres de notification."</string>
+  <string name="screen_room_notification_settings_error_restoring_default">"Impossible de restaurer le mode par défaut, veuillez réessayer."</string>
+  <string name="screen_room_notification_settings_error_setting_mode">"Impossible de régler le mode, veuillez réessayer."</string>
+  <string name="screen_room_notification_settings_mode_all_messages">"Tous les messages"</string>
+  <string name="screen_room_notification_settings_mode_mentions_and_keywords">"Mentions et mots-clés uniquement"</string>
   <string name="screen_dm_details_block_alert_action">"Bloquer"</string>
   <string name="screen_dm_details_block_alert_description">"Les utilisateurs bloqués ne pourront pas vous envoyer de messages et tous leurs messages seront masqués. Vous pouvez les débloquer à tout moment."</string>
   <string name="screen_dm_details_block_user">"Bloquer l\'utilisateur"</string>

features/roomdetails/impl/src/main/res/values-ru/translations.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <plurals name="screen_room_member_list_header_title">
-    <item quantity="one">"%1$d пользователь"</item>
+    <item quantity="one">"1 пользователь"</item>
     <item quantity="few">"%1$d пользователя"</item>
     <item quantity="many">"%1$d пользователей"</item>
   </plurals>
@@ -25,6 +25,17 @@
   <string name="screen_room_details_updating_room">"Обновление комнаты…"</string>
   <string name="screen_room_member_list_pending_header_title">"В ожидании"</string>
   <string name="screen_room_member_list_room_members_header_title">"Участники комнаты"</string>
+  <string name="screen_room_notification_settings_allow_custom">"Разрешить пользовательские настройки"</string>
+  <string name="screen_room_notification_settings_allow_custom_footnote">"Включение этого параметра отменяет настройки по умолчанию"</string>
+  <string name="screen_room_notification_settings_custom_settings_title">"Уведомить меня в этом чате"</string>
+  <string name="screen_room_notification_settings_default_setting_footnote">"Вы можете изменить его в своем %1$s."</string>
+  <string name="screen_room_notification_settings_default_setting_footnote_content_link">"Основные Настройки"</string>
+  <string name="screen_room_notification_settings_default_setting_title">"Настройка по умолчанию"</string>
+  <string name="screen_room_notification_settings_error_loading_settings">"Произошла ошибка при загрузке настроек уведомлений."</string>
+  <string name="screen_room_notification_settings_error_restoring_default">"Не удалось восстановить режим по умолчанию, попробуйте еще раз."</string>
+  <string name="screen_room_notification_settings_error_setting_mode">"Не удалось настроить режим, попробуйте еще раз."</string>
+  <string name="screen_room_notification_settings_mode_all_messages">"Все сообщения"</string>
+  <string name="screen_room_notification_settings_mode_mentions_and_keywords">"Только упоминания и ключевые слова"</string>
   <string name="screen_dm_details_block_alert_action">"Заблокировать"</string>
   <string name="screen_dm_details_block_alert_description">"Заблокированные пользователи не смогут отправлять вам сообщения, а все их сообщения будут скрыты. Вы можете разблокировать их в любое время."</string>
   <string name="screen_dm_details_block_user">"Заблокировать пользователя"</string>

features/roomdetails/impl/src/main/res/values-sk/translations.xml

@@ -25,6 +25,17 @@
   <string name="screen_room_details_updating_room">"Aktualizácia miestnosti…"</string>
   <string name="screen_room_member_list_pending_header_title">"Čaká sa"</string>
   <string name="screen_room_member_list_room_members_header_title">"Členovia miestnosti"</string>
+  <string name="screen_room_notification_settings_allow_custom">"Povoliť vlastné nastavenie"</string>
+  <string name="screen_room_notification_settings_allow_custom_footnote">"Zapnutím tohto nastavenia sa prepíše vaše predvolené nastavenie"</string>
+  <string name="screen_room_notification_settings_custom_settings_title">"Upozorniť ma v tejto konverzácii na"</string>
+  <string name="screen_room_notification_settings_default_setting_footnote">"Môžete to zmeniť vo svojich %1$s."</string>
+  <string name="screen_room_notification_settings_default_setting_footnote_content_link">"všeobecných nastaveniach"</string>
+  <string name="screen_room_notification_settings_default_setting_title">"Predvolené nastavenie"</string>
+  <string name="screen_room_notification_settings_error_loading_settings">"Pri načítavaní nastavení oznámení došlo k chybe."</string>
+  <string name="screen_room_notification_settings_error_restoring_default">"Nepodarilo sa obnoviť predvolený režim, skúste to prosím znova."</string>
+  <string name="screen_room_notification_settings_error_setting_mode">"Nepodarilo sa nastaviť režim, skúste to prosím znova."</string>
+  <string name="screen_room_notification_settings_mode_all_messages">"Všetky správy"</string>
+  <string name="screen_room_notification_settings_mode_mentions_and_keywords">"Iba zmienky a kľúčové slová"</string>
   <string name="screen_dm_details_block_alert_action">"Zablokovať"</string>
   <string name="screen_dm_details_block_alert_description">"Blokovaní používatelia vám nebudú môcť posielať správy a všetky ich správy budú skryté. Môžete ich kedykoľvek odblokovať."</string>
   <string name="screen_dm_details_block_user">"Zablokovať používateľa"</string>

features/roomdetails/impl/src/main/res/values/localazy.xml

@@ -24,6 +24,17 @@
   <string name="screen_room_details_updating_room">"Updating room…"</string>
   <string name="screen_room_member_list_pending_header_title">"Pending"</string>
   <string name="screen_room_member_list_room_members_header_title">"Room members"</string>
+  <string name="screen_room_notification_settings_allow_custom">"Allow custom setting"</string>
+  <string name="screen_room_notification_settings_allow_custom_footnote">"Turning this on will override your default setting"</string>
+  <string name="screen_room_notification_settings_custom_settings_title">"Notify me in this chat for"</string>
+  <string name="screen_room_notification_settings_default_setting_footnote">"You can change it in your %1$s."</string>
+  <string name="screen_room_notification_settings_default_setting_footnote_content_link">"global settings"</string>
+  <string name="screen_room_notification_settings_default_setting_title">"Default setting"</string>
+  <string name="screen_room_notification_settings_error_loading_settings">"An error occurred while loading notification settings."</string>
+  <string name="screen_room_notification_settings_error_restoring_default">"Failed restoring the default mode, please try again."</string>
+  <string name="screen_room_notification_settings_error_setting_mode">"Failed setting the mode, please try again."</string>
+  <string name="screen_room_notification_settings_mode_all_messages">"All messages"</string>
+  <string name="screen_room_notification_settings_mode_mentions_and_keywords">"Mentions and Keywords only"</string>
   <string name="screen_dm_details_block_alert_action">"Block"</string>
   <string name="screen_dm_details_block_alert_description">"Blocked users won\'t be able to send you messages and all their messages will be hidden. You can unblock them anytime."</string>
   <string name="screen_dm_details_block_user">"Block user"</string>

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceText.kt

@@ -28,18 +28,12 @@ import androidx.compose.foundation.progressSemantics
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.BugReport
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.text.ExperimentalTextApi
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.rememberTextMeasurer
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.Constraints
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
 import io.element.android.libraries.designsystem.components.preferences.components.PreferenceIcon
 import io.element.android.libraries.designsystem.preview.ElementThemedPreview
 import io.element.android.libraries.designsystem.preview.PreviewGroup

libraries/ui-strings/src/main/res/values-ru/translations.xml

@@ -163,7 +163,7 @@
     <item quantity="many">"%1$d участников"</item>
   </plurals>
   <plurals name="common_poll_votes_count">
-    <item quantity="one">"%d голос"</item>
+    <item quantity="one">"1 голос"</item>
     <item quantity="few">"%d голоса"</item>
     <item quantity="many">"%d голосов"</item>
   </plurals>

libraries/ui-strings/src/main/res/values-sk/translations.xml

@@ -183,8 +183,6 @@
   <string name="screen_notification_settings_additional_settings_section_title">"Ďalšie nastavenia"</string>
   <string name="screen_notification_settings_calls_label">"Audio a video hovory"</string>
   <string name="screen_notification_settings_direct_chats">"Priame konverzácie"</string>
-  <string name="screen_notification_settings_edit_screen_direct_section_header">"Pri priamych rozhovoroch ma upozorniť na"</string>
-  <string name="screen_notification_settings_edit_screen_group_section_header">"Pri skupinových rozhovoroch ma upozorniť na"</string>
   <string name="screen_notification_settings_enable_notifications">"Povoliť oznámenia na tomto zariadení"</string>
   <string name="screen_notification_settings_group_chats">"Skupinové rozhovory"</string>
   <string name="screen_notification_settings_mentions_section_title">"Zmienky"</string>

tools/localazy/config.json

@@ -92,7 +92,8 @@
       "includeRegex": [
         "screen_room_details_.*",
         "screen_room_member_list_.*",
-        "screen_dm_details_.*"
+        "screen_dm_details_.*",
+        "screen_room_notification_settings_.*"
       ]
     },
     {