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 c3ed526564..996c4d0aa0 100644
--- a/features/messages/impl/src/main/res/values-ru/translations.xml
+++ b/features/messages/impl/src/main/res/values-ru/translations.xml
@@ -5,6 +5,11 @@
- "%1$d изменения в комнате"
- "%1$d изменений в комнате"
+
+ - "одно"
+ - "%1$d"
+ - "более %1$d"
+
"Камера"
"Сделать фото"
"Записать видео"
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsView.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsView.kt
index 6452b412a0..b078f29ded 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsView.kt
+++ b/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.MENTIONS_AND_KEYWORDS_ONLY -> "Mentions and keywords"
- RoomNotificationMode.MUTE -> "Mute"
+ RoomNotificationMode.ALL_MESSAGES -> stringResource(id = R.string.screen_room_notification_settings_mode_all_messages)
+ RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY -> stringResource(id = R.string.screen_room_notification_settings_mode_mentions_and_keywords)
+ 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",
- subtitle = "Turning this on will override yout default setting",
+ title = stringResource(id = R.string.screen_room_notification_settings_allow_custom),
+ subtitle = stringResource(id = R.string.screen_room_notification_settings_allow_custom_footnote),
enabled = state.roomNotificationSettings != null && !state.roomNotificationSettings.isDefault,
)
diff --git a/features/roomdetails/impl/src/main/res/values-fr/translations.xml b/features/roomdetails/impl/src/main/res/values-fr/translations.xml
index 2696cc99ea..34fae4fea9 100644
--- a/features/roomdetails/impl/src/main/res/values-fr/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-fr/translations.xml
@@ -23,6 +23,16 @@
"Partager le salon"
"Mise à jour du salon…"
"En attente"
+ "Autoriser les paramètres personnalisés"
+ "Activer cette option remplacera votre paramètre par défaut"
+ "Me notifier dans ce chat pour"
+ "paramètres généraux"
+ "Paramètre par défaut"
+ "Une erreur s’est produite lors du chargement des paramètres de notification."
+ "Impossible de restaurer le mode par défaut, veuillez réessayer."
+ "Impossible de régler le mode, veuillez réessayer."
+ "Tous les messages"
+ "Mentions et mots-clés uniquement"
"Bloquer"
"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."
"Bloquer l\'utilisateur"
diff --git a/features/roomdetails/impl/src/main/res/values-ru/translations.xml b/features/roomdetails/impl/src/main/res/values-ru/translations.xml
index 4d2664ab30..e1fe6dcd90 100644
--- a/features/roomdetails/impl/src/main/res/values-ru/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-ru/translations.xml
@@ -1,7 +1,7 @@
- - "%1$d пользователь"
+ - "1 пользователь"
- "%1$d пользователя"
- "%1$d пользователей"
@@ -25,6 +25,17 @@
"Обновление комнаты…"
"В ожидании"
"Участники комнаты"
+ "Разрешить пользовательские настройки"
+ "Включение этого параметра отменяет настройки по умолчанию"
+ "Уведомить меня в этом чате"
+ "Вы можете изменить его в своем %1$s."
+ "Основные Настройки"
+ "Настройка по умолчанию"
+ "Произошла ошибка при загрузке настроек уведомлений."
+ "Не удалось восстановить режим по умолчанию, попробуйте еще раз."
+ "Не удалось настроить режим, попробуйте еще раз."
+ "Все сообщения"
+ "Только упоминания и ключевые слова"
"Заблокировать"
"Заблокированные пользователи не смогут отправлять вам сообщения, а все их сообщения будут скрыты. Вы можете разблокировать их в любое время."
"Заблокировать пользователя"
diff --git a/features/roomdetails/impl/src/main/res/values-sk/translations.xml b/features/roomdetails/impl/src/main/res/values-sk/translations.xml
index 1d744fba30..687c495ce7 100644
--- a/features/roomdetails/impl/src/main/res/values-sk/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-sk/translations.xml
@@ -25,6 +25,17 @@
"Aktualizácia miestnosti…"
"Čaká sa"
"Členovia miestnosti"
+ "Povoliť vlastné nastavenie"
+ "Zapnutím tohto nastavenia sa prepíše vaše predvolené nastavenie"
+ "Upozorniť ma v tejto konverzácii na"
+ "Môžete to zmeniť vo svojich %1$s."
+ "všeobecných nastaveniach"
+ "Predvolené nastavenie"
+ "Pri načítavaní nastavení oznámení došlo k chybe."
+ "Nepodarilo sa obnoviť predvolený režim, skúste to prosím znova."
+ "Nepodarilo sa nastaviť režim, skúste to prosím znova."
+ "Všetky správy"
+ "Iba zmienky a kľúčové slová"
"Zablokovať"
"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ť."
"Zablokovať používateľa"
diff --git a/features/roomdetails/impl/src/main/res/values/localazy.xml b/features/roomdetails/impl/src/main/res/values/localazy.xml
index b1f67dab1e..717f503e22 100644
--- a/features/roomdetails/impl/src/main/res/values/localazy.xml
+++ b/features/roomdetails/impl/src/main/res/values/localazy.xml
@@ -24,6 +24,17 @@
"Updating room…"
"Pending"
"Room members"
+ "Allow custom setting"
+ "Turning this on will override your default setting"
+ "Notify me in this chat for"
+ "You can change it in your %1$s."
+ "global settings"
+ "Default setting"
+ "An error occurred while loading notification settings."
+ "Failed restoring the default mode, please try again."
+ "Failed setting the mode, please try again."
+ "All messages"
+ "Mentions and Keywords only"
"Block"
"Blocked users won\'t be able to send you messages and all their messages will be hidden. You can unblock them anytime."
"Block user"
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceText.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceText.kt
index c8ae7487a6..9a5f6b9a41 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceText.kt
+++ b/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
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 77c2df4268..9f6d7322c3 100644
--- a/libraries/ui-strings/src/main/res/values-ru/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-ru/translations.xml
@@ -163,7 +163,7 @@
- "%1$d участников"
- - "%d голос"
+ - "1 голос"
- "%d голоса"
- "%d голосов"
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 14dd5626c8..fce3fadd01 100644
--- a/libraries/ui-strings/src/main/res/values-sk/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-sk/translations.xml
@@ -183,8 +183,6 @@
"Ďalšie nastavenia"
"Audio a video hovory"
"Priame konverzácie"
- "Pri priamych rozhovoroch ma upozorniť na"
- "Pri skupinových rozhovoroch ma upozorniť na"
"Povoliť oznámenia na tomto zariadení"
"Skupinové rozhovory"
"Zmienky"
diff --git a/tools/localazy/config.json b/tools/localazy/config.json
index fce6b317b5..b2568c7cd4 100644
--- a/tools/localazy/config.json
+++ b/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_.*"
]
},
{