Use new strings 2

app/src/main/java/org/thoughtcrime/securesms/onboarding/LinkDeviceActivity.kt

@@ -213,9 +213,7 @@ class LinkDeviceActivity : BaseActionBarActivity() {
         LaunchedEffect(Unit) {
             errors.collect { error ->
                 lifecycleScope.launch {
-                    scaffoldState.snackbarHostState.showSnackbar(
-                        message = error
-                    )
+                    scaffoldState.snackbarHostState.showSnackbar(message = error)
                 }
             }
         }

app/src/main/java/org/thoughtcrime/securesms/onboarding/pickname/PickDisplayNameActivity.kt

@@ -107,7 +107,7 @@ class PickDisplayNameActivity : BaseActionBarActivity() {
             OutlinedTextField(
                 value = state.displayName,
                 onValueChange = { onChange(it) },
-                placeholder = { Text(stringResource(R.string.activity_display_name_edit_text_hint)) },
+                placeholder = { Text(stringResource(R.string.displayNameEnter)) },
                 colors = outlinedTextFieldColors(state.error != null),
                 singleLine = true,
                 keyboardActions = KeyboardActions(

app/src/main/java/org/thoughtcrime/securesms/onboarding/pickname/PickDisplayNameViewModel.kt

@@ -48,8 +48,8 @@ class PickDisplayNameViewModel(
         val x25519KeyPair = keyPairGenerationResult.x25519KeyPair
 
         when {
-            displayName.isEmpty() -> { state.update { it.copy(error = R.string.activity_display_name_display_name_missing_error) } }
-            displayName.length > NAME_PADDED_LENGTH -> { state.update { it.copy(error = R.string.activity_display_name_display_name_too_long_error) } }
+            displayName.isEmpty() -> { state.update { it.copy(error = R.string.displayNameErrorDescription) } }
+            displayName.length > NAME_PADDED_LENGTH -> { state.update { it.copy(error = R.string.displayNameErrorDescriptionShorter) } }
             else -> {
                 prefs.setProfileName(displayName)
 
@@ -75,7 +75,7 @@ class PickDisplayNameViewModel(
     fun onChange(value: String) {
         state.update { state -> state.copy(
                 displayName = value,
-                error = value.takeIf { it.length > NAME_PADDED_LENGTH }?.let { R.string.activity_display_name_display_name_too_long_error }
+                error = value.takeIf { it.length > NAME_PADDED_LENGTH }?.let { R.string.displayNameErrorDescriptionShorter }
             )
         }
     }
@@ -99,15 +99,15 @@ class PickDisplayNameViewModel(
 }
 
 data class State(
-    @StringRes val title: Int = R.string.activity_display_name_title_2,
-    @StringRes val description: Int = R.string.activity_display_name_explanation,
+    @StringRes val title: Int = R.string.displayNamePick,
+    @StringRes val description: Int = R.string.displayNameDescription,
     @StringRes val error: Int? = null,
     val displayName: String = ""
 )
 
 fun pickNewNameState() = State(
-    title = R.string.activity_display_name_pick_a_new_display_name,
-    description = R.string.activity_display_name_unable_to_load_new_name_explanation
+    title = R.string.displayNameNew,
+    description = R.string.displayNameErrorNew
 )
 
 sealed interface Event {

app/src/main/res/layout/activity_settings.xml

@@ -394,7 +394,7 @@
                         android:textStyle="bold"
                         android:gravity="center"
                         android:layout_toEndOf="@+id/passwordContainer"
-                        android:text="@string/activity_settings_recovery_password_button_title"  />
+                        android:text="@string/sessionRecoveryPassword"  />
                 </RelativeLayout>
 
                 <View

app/src/main/res/values-ar-rSA/strings.xml

@@ -590,11 +590,11 @@
     <string name="activity_restore_title">استرجع حسابك</string>
     <string name="activity_restore_explanation">أدخل عبارة الأسترجاع التي اعطيت لك عندما سجلت الدخول لاِسترجاع حسابك.</string>
     <string name="activity_restore_seed_edit_text_hint">ادخل عبارة الاسترجاع</string>
-    <string name="activity_display_name_title_2">أختر اِسم الاِظهار</string>
-    <string name="activity_display_name_explanation">هذا سيكون اِسمك عندما تستخدم Session. قد يكون اِسمك الحقيقي, اِسم مستعار أو اي شيئ ترغب به.</string>
-    <string name="activity_display_name_edit_text_hint">ادخل اسم الِاظهار</string>
-    <string name="activity_display_name_display_name_missing_error">اِختر اسم من فضلك</string>
-    <string name="activity_display_name_display_name_too_long_error">اِختر اسم اقصر من فضلك</string>
+    <string name="displayNamePick">أختر اِسم الاِظهار</string>
+    <string name="displayNameDescription">هذا سيكون اِسمك عندما تستخدم Session. قد يكون اِسمك الحقيقي, اِسم مستعار أو اي شيئ ترغب به.</string>
+    <string name="displayNameEnter">ادخل اسم الِاظهار</string>
+    <string name="displayNameErrorDescription">اِختر اسم من فضلك</string>
+    <string name="displayNameErrorDescriptionShorter">اِختر اسم اقصر من فضلك</string>
     <string name="activity_pn_mode_recommended_option_tag">محبذ</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">اِختر</string>
     <string name="activity_home_empty_state_message">لا تملك اي متصلين لحد الان</string>
@@ -702,7 +702,6 @@
     <string name="activity_backup_restore_explanation_1">اِختر ملف النسخ الاحتياطي وأدخل عبارة المرور التي تم إنشاؤه بها.</string>
     <string name="activity_backup_restore_passphrase">جملة مرور مكونة من 30 عنصر</string>
     <string name="activity_link_device_skip_prompt">هذا يستغرق بعض الوقت، هل تريد أن تتخطى؟</string>
-    <string name="activity_link_device_link_device">اربط جهاز</string>
     <string name="activity_link_device_recovery_phrase">جملة الاسترجاع</string>
     <string name="activity_link_device_scan_qr_code">اِفحص رمز QR</string>
     <string name="activity_link_device_qr_message">اِذهب إلى التعديلات جملة الاِسترجاع في جهازك الاآخر لإظهار رمز QR الخاص بك.</string>
@@ -713,7 +712,6 @@
     <string name="activity_pn_mode_slow_mode">الوضع البطيء</string>
     <string name="activity_pn_mode_fast_mode_explanation">سوف يتم إشعارك بالرسائل بشكل موثوق و فوري بإستخدام خوادم جوجل للإشعارات.</string>
     <string name="activity_pn_mode_slow_mode_explanation">سيقوم سيشن بالتحقق من وجود رسائل جديدة بشكل دوري في الخلفية.</string>
-    <string name="fragment_recovery_phrase_title">عبارة الإسترداد</string>
     <string name="activity_prompt_passphrase_session_locked">إن سيشن مُقفَل</string>
     <string name="activity_prompt_passphrase_tap_to_unlock">انقر للفتح</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">أدخل اسم</string>

app/src/main/res/values-ar/strings.xml

@@ -590,11 +590,11 @@
     <string name="activity_restore_title">استرجع حسابك</string>
     <string name="activity_restore_explanation">أدخل عبارة الأسترجاع التي اعطيت لك عندما سجلت الدخول لاِسترجاع حسابك.</string>
     <string name="activity_restore_seed_edit_text_hint">ادخل عبارة الاسترجاع</string>
-    <string name="activity_display_name_title_2">أختر اِسم الاِظهار</string>
-    <string name="activity_display_name_explanation">هذا سيكون اِسمك عندما تستخدم Session. قد يكون اِسمك الحقيقي, اِسم مستعار أو اي شيئ ترغب به.</string>
-    <string name="activity_display_name_edit_text_hint">ادخل اسم الِاظهار</string>
-    <string name="activity_display_name_display_name_missing_error">اِختر اسم من فضلك</string>
-    <string name="activity_display_name_display_name_too_long_error">اِختر اسم اقصر من فضلك</string>
+    <string name="displayNamePick">أختر اِسم الاِظهار</string>
+    <string name="displayNameDescription">هذا سيكون اِسمك عندما تستخدم Session. قد يكون اِسمك الحقيقي, اِسم مستعار أو اي شيئ ترغب به.</string>
+    <string name="displayNameEnter">ادخل اسم الِاظهار</string>
+    <string name="displayNameErrorDescription">اِختر اسم من فضلك</string>
+    <string name="displayNameErrorDescriptionShorter">اِختر اسم اقصر من فضلك</string>
     <string name="activity_pn_mode_recommended_option_tag">محبذ</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">اِختر</string>
     <string name="activity_home_empty_state_message">لا تملك اي متصلين لحد الان</string>
@@ -702,7 +702,6 @@
     <string name="activity_backup_restore_explanation_1">اِختر ملف النسخ الاحتياطي وأدخل عبارة المرور التي تم إنشاؤه بها.</string>
     <string name="activity_backup_restore_passphrase">جملة مرور مكونة من 30 عنصر</string>
     <string name="activity_link_device_skip_prompt">هذا يستغرق بعض الوقت، هل تريد أن تتخطى؟</string>
-    <string name="activity_link_device_link_device">اربط جهاز</string>
     <string name="activity_link_device_recovery_phrase">جملة الاسترجاع</string>
     <string name="activity_link_device_scan_qr_code">اِفحص رمز QR</string>
     <string name="activity_link_device_qr_message">اِذهب إلى التعديلات جملة الاِسترجاع في جهازك الاآخر لإظهار رمز QR الخاص بك.</string>
@@ -713,7 +712,6 @@
     <string name="activity_pn_mode_slow_mode">الوضع البطيء</string>
     <string name="activity_pn_mode_fast_mode_explanation">سوف يتم إشعارك بالرسائل بشكل موثوق و فوري بإستخدام خوادم جوجل للإشعارات.</string>
     <string name="activity_pn_mode_slow_mode_explanation">سيقوم سيشن بالتحقق من وجود رسائل جديدة بشكل دوري في الخلفية.</string>
-    <string name="fragment_recovery_phrase_title">عبارة الإسترداد</string>
     <string name="activity_prompt_passphrase_session_locked">إن سيشن مُقفَل</string>
     <string name="activity_prompt_passphrase_tap_to_unlock">انقر للفتح</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">أدخل اسم</string>

app/src/main/res/values-az-rAZ/strings.xml

@@ -544,11 +544,11 @@
     <string name="activity_restore_title">Hesabınızı bərpa edin</string>
     <string name="activity_restore_explanation">Hesabınızı bərpa etmək üçün qeydiyyatdan keçərkən sizə verliən bərpa paroluunu daxil edin.</string>
     <string name="activity_restore_seed_edit_text_hint">Bərpa parolunu daxil edin</string>
-    <string name="activity_display_name_title_2">Ekran adınızı seçin</string>
-    <string name="activity_display_name_explanation">Bu, Session istifadə edərkən adınız olacaq. Gerçək adınız, ləqəbiniz və ya istədiyiniz başqa bir ad ola bilər.</string>
-    <string name="activity_display_name_edit_text_hint">Ekran adını daxil edin</string>
-    <string name="activity_display_name_display_name_missing_error">Zəhmət olmasa bir ekran adı seçin</string>
-    <string name="activity_display_name_display_name_too_long_error">Zəhmət olmasa qısa bir ekran adı seçin</string>
+    <string name="displayNamePick">Ekran adınızı seçin</string>
+    <string name="displayNameDescription">Bu, Session istifadə edərkən adınız olacaq. Gerçək adınız, ləqəbiniz və ya istədiyiniz başqa bir ad ola bilər.</string>
+    <string name="displayNameEnter">Ekran adını daxil edin</string>
+    <string name="displayNameErrorDescription">Zəhmət olmasa bir ekran adı seçin</string>
+    <string name="displayNameErrorDescriptionShorter">Zəhmət olmasa qısa bir ekran adı seçin</string>
     <string name="activity_pn_mode_recommended_option_tag">Tövsiyə edilən</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Zəhmət olmasa bir variant seçin</string>
     <string name="activity_home_empty_state_message">Hələ ki, heç bir əlaqəniz yoxdur</string>
@@ -656,7 +656,6 @@
     <string name="activity_backup_restore_explanation_1">Bir nüsxə faylı seçin və ya yaradılan vaxt verilən parolu daxil edin.</string>
     <string name="activity_backup_restore_passphrase">30 rəqəmli parol</string>
     <string name="activity_link_device_skip_prompt">Bu bir az vaxt apara bilər, ötürmək istəyirsiniz?</string>
-    <string name="activity_link_device_link_device">Bir cihazla əlaqə yarat</string>
     <string name="activity_link_device_recovery_phrase">Bərpa parolu</string>
     <string name="activity_link_device_scan_qr_code">QR kodu skan et</string>
     <string name="activity_link_device_qr_message">QR kodunu göstərmək üçün digər cihazınızda Tənzimləmələr → \"Bərpa parolu\"na gedin.</string>
@@ -667,7 +666,6 @@
     <string name="activity_pn_mode_slow_mode">Yavaş rejim</string>
     <string name="activity_pn_mode_fast_mode_explanation">Google-un bildiriş serverlərini istifadə edərək yeni mesajlardan dərhal və etibarlı şəkildə xəbərdar olacaqsınız.</string>
     <string name="activity_pn_mode_slow_mode_explanation">Session, arada arxaplanda yeni mesajları yoxlayacaq.</string>
-    <string name="fragment_recovery_phrase_title">Bərpa parolu</string>
     <string name="activity_prompt_passphrase_session_locked">Session kilidlidir</string>
     <string name="activity_prompt_passphrase_tap_to_unlock">Kilidi açmaq üçün toxunun</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">Bir ləqəb daxil edin</string>

app/src/main/res/values-az/strings.xml

@@ -542,11 +542,11 @@
     <string name="activity_restore_title">Hesabınızı bərpa edin</string>
     <string name="activity_restore_explanation">Hesabınızı bərpa etmək üçün qeydiyyatdan keçərkən sizə verliən bərpa paroluunu daxil edin.</string>
     <string name="activity_restore_seed_edit_text_hint">Bərpa parolunu daxil edin</string>
-    <string name="activity_display_name_title_2">Ekran adınızı seçin</string>
-    <string name="activity_display_name_explanation">Bu, Session istifadə edərkən adınız olacaq. Gerçək adınız, ləqəbiniz və ya istədiyiniz başqa bir ad ola bilər.</string>
-    <string name="activity_display_name_edit_text_hint">Ekran adını daxil edin</string>
-    <string name="activity_display_name_display_name_missing_error">Zəhmət olmasa bir ekran adı seçin</string>
-    <string name="activity_display_name_display_name_too_long_error">Zəhmət olmasa qısa bir ekran adı seçin</string>
+    <string name="displayNamePick">Ekran adınızı seçin</string>
+    <string name="displayNameDescription">Bu, Session istifadə edərkən adınız olacaq. Gerçək adınız, ləqəbiniz və ya istədiyiniz başqa bir ad ola bilər.</string>
+    <string name="displayNameEnter">Ekran adını daxil edin</string>
+    <string name="displayNameErrorDescription">Zəhmət olmasa bir ekran adı seçin</string>
+    <string name="displayNameErrorDescriptionShorter">Zəhmət olmasa qısa bir ekran adı seçin</string>
     <string name="activity_pn_mode_recommended_option_tag">Tövsiyə edilən</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Zəhmət olmasa bir variant seçin</string>
     <string name="activity_home_empty_state_message">Hələ ki, heç bir əlaqəniz yoxdur</string>
@@ -654,7 +654,6 @@
     <string name="activity_backup_restore_explanation_1">Bir nüsxə faylı seçin və ya yaradılan vaxt verilən parolu daxil edin.</string>
     <string name="activity_backup_restore_passphrase">30 rəqəmli parol</string>
     <string name="activity_link_device_skip_prompt">Bu bir az vaxt apara bilər, ötürmək istəyirsiniz?</string>
-    <string name="activity_link_device_link_device">Bir cihazla əlaqə yarat</string>
     <string name="activity_link_device_recovery_phrase">Bərpa parolu</string>
     <string name="activity_link_device_scan_qr_code">QR kodu skan et</string>
     <string name="activity_link_device_qr_message">QR kodunu göstərmək üçün digər cihazınızda Tənzimləmələr → \"Bərpa parolu\"na gedin.</string>
@@ -665,7 +664,6 @@
     <string name="activity_pn_mode_slow_mode">Yavaş rejim</string>
     <string name="activity_pn_mode_fast_mode_explanation">Google-un bildiriş serverlərini istifadə edərək yeni mesajlardan dərhal və etibarlı şəkildə xəbərdar olacaqsınız.</string>
     <string name="activity_pn_mode_slow_mode_explanation">Session, arada arxaplanda yeni mesajları yoxlayacaq.</string>
-    <string name="fragment_recovery_phrase_title">Bərpa parolu</string>
     <string name="activity_prompt_passphrase_session_locked">Session kilidlidir</string>
     <string name="activity_prompt_passphrase_tap_to_unlock">Kilidi açmaq üçün toxunun</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">Bir ləqəb daxil edin</string>

app/src/main/res/values-bal-rBA/strings.xml

@@ -442,11 +442,11 @@ memproses pertukaran kunci korupsi.</string>
     <string name="activity_restore_title">Kembalikan akun</string>
     <string name="activity_restore_explanation">Masukkan kata pemulihan yang diberikan saat anda mencoba masuk ke akun</string>
     <string name="activity_restore_seed_edit_text_hint">masukan kata pemulihan</string>
-    <string name="activity_display_name_title_2">Pilih nama yang ditampilkan</string>
-    <string name="activity_display_name_explanation">Ini akan menjadi nama anda ketika menggunakan Session. Bisa merupakan nama asli, alias, atau apapun yang anda suka</string>
-    <string name="activity_display_name_edit_text_hint">Masukkan nama</string>
-    <string name="activity_display_name_display_name_missing_error">Pilih nama yang ditampilkan</string>
-    <string name="activity_display_name_display_name_too_long_error">Nama yang dibuat terlalu panjang</string>
+    <string name="displayNamePick">Pilih nama yang ditampilkan</string>
+    <string name="displayNameDescription">Ini akan menjadi nama anda ketika menggunakan Session. Bisa merupakan nama asli, alias, atau apapun yang anda suka</string>
+    <string name="displayNameEnter">Masukkan nama</string>
+    <string name="displayNameErrorDescription">Pilih nama yang ditampilkan</string>
+    <string name="displayNameErrorDescriptionShorter">Nama yang dibuat terlalu panjang</string>
     <string name="activity_pn_mode_recommended_option_tag">Direkomendasikan</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Pilih salah satu opsi</string>
     <string name="activity_home_empty_state_message">Anda belum memiliki kontak</string>

app/src/main/res/values-bal/strings.xml

@@ -442,11 +442,11 @@ memproses pertukaran kunci korupsi.</string>
     <string name="activity_restore_title">Kembalikan akun</string>
     <string name="activity_restore_explanation">Masukkan kata pemulihan yang diberikan saat anda mencoba masuk ke akun</string>
     <string name="activity_restore_seed_edit_text_hint">masukan kata pemulihan</string>
-    <string name="activity_display_name_title_2">Pilih nama yang ditampilkan</string>
-    <string name="activity_display_name_explanation">Ini akan menjadi nama anda ketika menggunakan Session. Bisa merupakan nama asli, alias, atau apapun yang anda suka</string>
-    <string name="activity_display_name_edit_text_hint">Masukkan nama</string>
-    <string name="activity_display_name_display_name_missing_error">Pilih nama yang ditampilkan</string>
-    <string name="activity_display_name_display_name_too_long_error">Nama yang dibuat terlalu panjang</string>
+    <string name="displayNamePick">Pilih nama yang ditampilkan</string>
+    <string name="displayNameDescription">Ini akan menjadi nama anda ketika menggunakan Session. Bisa merupakan nama asli, alias, atau apapun yang anda suka</string>
+    <string name="displayNameEnter">Masukkan nama</string>
+    <string name="displayNameErrorDescription">Pilih nama yang ditampilkan</string>
+    <string name="displayNameErrorDescriptionShorter">Nama yang dibuat terlalu panjang</string>
     <string name="activity_pn_mode_recommended_option_tag">Direkomendasikan</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Pilih salah satu opsi</string>
     <string name="activity_home_empty_state_message">Anda belum memiliki kontak</string>

app/src/main/res/values-ca-rES/strings.xml

@@ -536,11 +536,11 @@ d\'intercanvi de claus!</string>
     <string name="activity_restore_title">Restableix el teu compte</string>
     <string name="activity_restore_explanation">Introdueix la frase de recuperació que se\'t va proporcionar quan et vas registrar per a restaurar el compte.</string>
     <string name="activity_restore_seed_edit_text_hint">Introdueix la frase de recuperació</string>
-    <string name="activity_display_name_title_2">Tria el nom que es mostrarà</string>
-    <string name="activity_display_name_explanation">Aquest serà el teu nom quan facis servir Session. Pot ser el teu nom real, un àlies o qualsevol altra cosa que t\'agradi.</string>
-    <string name="activity_display_name_edit_text_hint">Escriu el nom a mostrar</string>
-    <string name="activity_display_name_display_name_missing_error">Tria un nom a mostrar, si us plau</string>
-    <string name="activity_display_name_display_name_too_long_error">Selecciona un nom de visualització més curt</string>
+    <string name="displayNamePick">Tria el nom que es mostrarà</string>
+    <string name="displayNameDescription">Aquest serà el teu nom quan facis servir Session. Pot ser el teu nom real, un àlies o qualsevol altra cosa que t\'agradi.</string>
+    <string name="displayNameEnter">Escriu el nom a mostrar</string>
+    <string name="displayNameErrorDescription">Tria un nom a mostrar, si us plau</string>
+    <string name="displayNameErrorDescriptionShorter">Selecciona un nom de visualització més curt</string>
     <string name="activity_pn_mode_recommended_option_tag">Recomanat</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Selecciona una opció, si us plau</string>
     <string name="activity_home_empty_state_message">Encara no tens cap contacte</string>
@@ -637,7 +637,6 @@ d\'intercanvi de claus!</string>
     <string name="activity_backup_restore_explanation_1">Selecciona un fitxer de còpia de seguretat i entra la frase de pas amb el qual va ser creat.</string>
     <string name="activity_backup_restore_passphrase">Frase de pas de 30 dígits</string>
     <string name="activity_link_device_skip_prompt">Això triga un xic, t\'ho vols saltar?</string>
-    <string name="activity_link_device_link_device">Enllaça un dispositiu</string>
     <string name="activity_join_public_chat_join_rooms">O uneix-te a alguns d\'aquests…</string>
     <string name="activity_pn_mode_message_notifications">Notificacions de missatge</string>
     <string name="activity_pn_mode_explanation">Hi ha dues maneres per les quals Session et pot notificar els missatges nous.</string>
@@ -645,7 +644,6 @@ d\'intercanvi de claus!</string>
     <string name="activity_pn_mode_slow_mode">Mode lent</string>
     <string name="activity_pn_mode_fast_mode_explanation">Es notificaran els missatges de forma immediata i fiable fent servir els servidors de notificació de Google.</string>
     <string name="activity_pn_mode_slow_mode_explanation">Session ocasionalment comprovarà en pla secundari si hi ha nous missatges.</string>
-    <string name="fragment_recovery_phrase_title">Frase de recuperació</string>
     <string name="activity_prompt_passphrase_session_locked">El Session està blocat</string>
     <string name="activity_prompt_passphrase_tap_to_unlock">Toca per a desblocar</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">Introdueix una sobrenom</string>

app/src/main/res/values-ca/strings.xml

@@ -536,11 +536,11 @@ d\'intercanvi de claus!</string>
     <string name="activity_restore_title">Restableix el teu compte</string>
     <string name="activity_restore_explanation">Introdueix la frase de recuperació que se\'t va proporcionar quan et vas registrar per a restaurar el compte.</string>
     <string name="activity_restore_seed_edit_text_hint">Introdueix la frase de recuperació</string>
-    <string name="activity_display_name_title_2">Tria el nom que es mostrarà</string>
-    <string name="activity_display_name_explanation">Aquest serà el teu nom quan facis servir Session. Pot ser el teu nom real, un àlies o qualsevol altra cosa que t\'agradi.</string>
-    <string name="activity_display_name_edit_text_hint">Escriu el nom a mostrar</string>
-    <string name="activity_display_name_display_name_missing_error">Tria un nom a mostrar, si us plau</string>
-    <string name="activity_display_name_display_name_too_long_error">Selecciona un nom de visualització més curt</string>
+    <string name="displayNamePick">Tria el nom que es mostrarà</string>
+    <string name="displayNameDescription">Aquest serà el teu nom quan facis servir Session. Pot ser el teu nom real, un àlies o qualsevol altra cosa que t\'agradi.</string>
+    <string name="displayNameEnter">Escriu el nom a mostrar</string>
+    <string name="displayNameErrorDescription">Tria un nom a mostrar, si us plau</string>
+    <string name="displayNameErrorDescriptionShorter">Selecciona un nom de visualització més curt</string>
     <string name="activity_pn_mode_recommended_option_tag">Recomanat</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Selecciona una opció, si us plau</string>
     <string name="activity_home_empty_state_message">Encara no tens cap contacte</string>
@@ -637,7 +637,6 @@ d\'intercanvi de claus!</string>
     <string name="activity_backup_restore_explanation_1">Selecciona un fitxer de còpia de seguretat i entra la frase de pas amb el qual va ser creat.</string>
     <string name="activity_backup_restore_passphrase">Frase de pas de 30 dígits</string>
     <string name="activity_link_device_skip_prompt">Això triga un xic, t\'ho vols saltar?</string>
-    <string name="activity_link_device_link_device">Enllaça un dispositiu</string>
     <string name="activity_join_public_chat_join_rooms">O uneix-te a alguns d\'aquests…</string>
     <string name="activity_pn_mode_message_notifications">Notificacions de missatge</string>
     <string name="activity_pn_mode_explanation">Hi ha dues maneres per les quals Session et pot notificar els missatges nous.</string>
@@ -645,7 +644,6 @@ d\'intercanvi de claus!</string>
     <string name="activity_pn_mode_slow_mode">Mode lent</string>
     <string name="activity_pn_mode_fast_mode_explanation">Es notificaran els missatges de forma immediata i fiable fent servir els servidors de notificació de Google.</string>
     <string name="activity_pn_mode_slow_mode_explanation">Session ocasionalment comprovarà en pla secundari si hi ha nous missatges.</string>
-    <string name="fragment_recovery_phrase_title">Frase de recuperació</string>
     <string name="activity_prompt_passphrase_session_locked">El Session està blocat</string>
     <string name="activity_prompt_passphrase_tap_to_unlock">Toca per a desblocar</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">Introdueix una sobrenom</string>

app/src/main/res/values-cs-rCZ/strings.xml

@@ -566,11 +566,11 @@
     <string name="activity_restore_title">Obnovit účet</string>
     <string name="activity_restore_explanation">Zadejte frázi pro obnovení, která vám byla vygenerována během registrace účtu.</string>
     <string name="activity_restore_seed_edit_text_hint">Zadejte frázi pro obnovení</string>
-    <string name="activity_display_name_title_2">Vaše jméno</string>
-    <string name="activity_display_name_explanation">Toto bude váš pseudonym během používání Session. Může to být vaše skutečné jméno, alias, nebo cokoliv jiného, co se vám líbí.</string>
-    <string name="activity_display_name_edit_text_hint">Zadejte pseudonym</string>
-    <string name="activity_display_name_display_name_missing_error">Vyberte prosím pseudonym</string>
-    <string name="activity_display_name_display_name_too_long_error">Vyberte prosím kratší pseudonym</string>
+    <string name="displayNamePick">Vaše jméno</string>
+    <string name="displayNameDescription">Toto bude váš pseudonym během používání Session. Může to být vaše skutečné jméno, alias, nebo cokoliv jiného, co se vám líbí.</string>
+    <string name="displayNameEnter">Zadejte pseudonym</string>
+    <string name="displayNameErrorDescription">Vyberte prosím pseudonym</string>
+    <string name="displayNameErrorDescriptionShorter">Vyberte prosím kratší pseudonym</string>
     <string name="activity_pn_mode_recommended_option_tag">Doporučeno</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Prosím vyberte možnost</string>
     <string name="activity_home_empty_state_message">Zatím nemáte žádné kontakty</string>
@@ -678,7 +678,6 @@
     <string name="activity_backup_restore_explanation_1">Vyberte soubor se zálohou a vložte frázi pro obnovení, s níž byl vytvořen.</string>
     <string name="activity_backup_restore_passphrase">Přístupové heslo o délce 30 čísel</string>
     <string name="activity_link_device_skip_prompt">Trvá to trochu déle, chcete přeskočit?</string>
-    <string name="activity_link_device_link_device">Propojit zařízení</string>
     <string name="activity_link_device_recovery_phrase">Fráze pro obnovení</string>
     <string name="activity_link_device_scan_qr_code">Naskenovat QR kód</string>
     <string name="activity_link_device_qr_message">Přejděte do Nastavení → Fráze pro obnovení na vašem dalším zařízení a zobrazte svůj QR kód.</string>
@@ -689,7 +688,6 @@
     <string name="activity_pn_mode_slow_mode">Pomalý režim</string>
     <string name="activity_pn_mode_fast_mode_explanation">Budete spolehlivě a okamžitě informováni o nových zprávách pomocí oznamovacích serverů Google.</string>
     <string name="activity_pn_mode_slow_mode_explanation">Session občas zkontroluje nové zprávy na pozadí.</string>
-    <string name="fragment_recovery_phrase_title">Fráze pro obnovení</string>
     <string name="activity_prompt_passphrase_session_locked">Session je zamčený</string>
     <string name="activity_prompt_passphrase_tap_to_unlock">Klepněte pro odemčení</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">Zadej přezdívku</string>

app/src/main/res/values-cs/strings.xml

@@ -566,11 +566,11 @@
     <string name="activity_restore_title">Obnovit účet</string>
     <string name="activity_restore_explanation">Zadejte frázi pro obnovení, která vám byla vygenerována během registrace účtu.</string>
     <string name="activity_restore_seed_edit_text_hint">Zadejte frázi pro obnovení</string>
-    <string name="activity_display_name_title_2">Vaše jméno</string>
-    <string name="activity_display_name_explanation">Toto bude váš pseudonym během používání Session. Může to být vaše skutečné jméno, alias, nebo cokoliv jiného, co se vám líbí.</string>
-    <string name="activity_display_name_edit_text_hint">Zadejte pseudonym</string>
-    <string name="activity_display_name_display_name_missing_error">Vyberte prosím pseudonym</string>
-    <string name="activity_display_name_display_name_too_long_error">Vyberte prosím kratší pseudonym</string>
+    <string name="displayNamePick">Vaše jméno</string>
+    <string name="displayNameDescription">Toto bude váš pseudonym během používání Session. Může to být vaše skutečné jméno, alias, nebo cokoliv jiného, co se vám líbí.</string>
+    <string name="displayNameEnter">Zadejte pseudonym</string>
+    <string name="displayNameErrorDescription">Vyberte prosím pseudonym</string>
+    <string name="displayNameErrorDescriptionShorter">Vyberte prosím kratší pseudonym</string>
     <string name="activity_pn_mode_recommended_option_tag">Doporučeno</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Prosím vyberte možnost</string>
     <string name="activity_home_empty_state_message">Zatím nemáte žádné kontakty</string>
@@ -678,7 +678,6 @@
     <string name="activity_backup_restore_explanation_1">Vyberte soubor se zálohou a vložte frázi pro obnovení, s níž byl vytvořen.</string>
     <string name="activity_backup_restore_passphrase">Přístupové heslo o délce 30 čísel</string>
     <string name="activity_link_device_skip_prompt">Trvá to trochu déle, chcete přeskočit?</string>
-    <string name="activity_link_device_link_device">Propojit zařízení</string>
     <string name="activity_link_device_recovery_phrase">Fráze pro obnovení</string>
     <string name="activity_link_device_scan_qr_code">Naskenovat QR kód</string>
     <string name="activity_link_device_qr_message">Přejděte do Nastavení → Fráze pro obnovení na vašem dalším zařízení a zobrazte svůj QR kód.</string>
@@ -689,7 +688,6 @@
     <string name="activity_pn_mode_slow_mode">Pomalý režim</string>
     <string name="activity_pn_mode_fast_mode_explanation">Budete spolehlivě a okamžitě informováni o nových zprávách pomocí oznamovacích serverů Google.</string>
     <string name="activity_pn_mode_slow_mode_explanation">Session občas zkontroluje nové zprávy na pozadí.</string>
-    <string name="fragment_recovery_phrase_title">Fráze pro obnovení</string>
     <string name="activity_prompt_passphrase_session_locked">Session je zamčený</string>
     <string name="activity_prompt_passphrase_tap_to_unlock">Klepněte pro odemčení</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">Zadej přezdívku</string>

app/src/main/res/values-da-rDK/strings.xml

@@ -542,11 +542,11 @@ udveksel besked!</string>
     <string name="activity_restore_title">Gendan din konto</string>
     <string name="activity_restore_explanation">Angiv den genoprettelsessætning, du fik, da du tilmeldte dig, for at kunne gendanne din konto.</string>
     <string name="activity_restore_seed_edit_text_hint">Angiv din genoprettelsessætning</string>
-    <string name="activity_display_name_title_2">Vælg dit visningsnavn</string>
-    <string name="activity_display_name_explanation">Dette vil være dit navn, når du bruger Session. Det kan være dit rigtige navn, et alias eller noget helt andet.</string>
-    <string name="activity_display_name_edit_text_hint">Tast et visningsnavn</string>
-    <string name="activity_display_name_display_name_missing_error">Vælg venligst et display navn</string>
-    <string name="activity_display_name_display_name_too_long_error">Vælg venligst et kortere display navn</string>
+    <string name="displayNamePick">Vælg dit visningsnavn</string>
+    <string name="displayNameDescription">Dette vil være dit navn, når du bruger Session. Det kan være dit rigtige navn, et alias eller noget helt andet.</string>
+    <string name="displayNameEnter">Tast et visningsnavn</string>
+    <string name="displayNameErrorDescription">Vælg venligst et display navn</string>
+    <string name="displayNameErrorDescriptionShorter">Vælg venligst et kortere display navn</string>
     <string name="activity_pn_mode_recommended_option_tag">Anbefalet</string>
     <string name="activity_home_empty_state_message">Du har ingen kontakter endnu</string>
     <string name="activity_home_empty_state_button_title">Start en Session</string>
@@ -632,7 +632,6 @@ udveksel besked!</string>
     <string name="activity_backup_restore_title">Gendan sikkerhedskopi</string>
     <string name="activity_backup_restore_select_file">Vælg en fil</string>
     <string name="activity_link_device_skip_prompt">Dette tager et stykke tid, vil du gerne springe over?</string>
-    <string name="activity_link_device_link_device">Forbind en enhed</string>
     <string name="activity_link_device_recovery_phrase">Gendannelsessætning</string>
     <string name="activity_link_device_scan_qr_code">Skan QR-kode</string>
     <string name="activity_link_device_qr_message">Naviger til Indstillinger → Gendannelsessætning på din anden enhed, for at vise din QR-kode.</string>

app/src/main/res/values-da/strings.xml

@@ -542,11 +542,11 @@ udveksel besked!</string>
     <string name="activity_restore_title">Gendan din konto</string>
     <string name="activity_restore_explanation">Angiv den genoprettelsessætning, du fik, da du tilmeldte dig, for at kunne gendanne din konto.</string>
     <string name="activity_restore_seed_edit_text_hint">Angiv din genoprettelsessætning</string>
-    <string name="activity_display_name_title_2">Vælg dit visningsnavn</string>
-    <string name="activity_display_name_explanation">Dette vil være dit navn, når du bruger Session. Det kan være dit rigtige navn, et alias eller noget helt andet.</string>
-    <string name="activity_display_name_edit_text_hint">Tast et visningsnavn</string>
-    <string name="activity_display_name_display_name_missing_error">Vælg venligst et display navn</string>
-    <string name="activity_display_name_display_name_too_long_error">Vælg venligst et kortere display navn</string>
+    <string name="displayNamePick">Vælg dit visningsnavn</string>
+    <string name="displayNameDescription">Dette vil være dit navn, når du bruger Session. Det kan være dit rigtige navn, et alias eller noget helt andet.</string>
+    <string name="displayNameEnter">Tast et visningsnavn</string>
+    <string name="displayNameErrorDescription">Vælg venligst et display navn</string>
+    <string name="displayNameErrorDescriptionShorter">Vælg venligst et kortere display navn</string>
     <string name="activity_pn_mode_recommended_option_tag">Anbefalet</string>
     <string name="activity_home_empty_state_message">Du har ingen kontakter endnu</string>
     <string name="activity_home_empty_state_button_title">Start en Session</string>
@@ -632,7 +632,6 @@ udveksel besked!</string>
     <string name="activity_backup_restore_title">Gendan sikkerhedskopi</string>
     <string name="activity_backup_restore_select_file">Vælg en fil</string>
     <string name="activity_link_device_skip_prompt">Dette tager et stykke tid, vil du gerne springe over?</string>
-    <string name="activity_link_device_link_device">Forbind en enhed</string>
     <string name="activity_link_device_recovery_phrase">Gendannelsessætning</string>
     <string name="activity_link_device_scan_qr_code">Skan QR-kode</string>
     <string name="activity_link_device_qr_message">Naviger til Indstillinger → Gendannelsessætning på din anden enhed, for at vise din QR-kode.</string>

app/src/main/res/values-de-rDE/strings.xml

@@ -542,11 +542,11 @@
     <string name="activity_restore_title">Ihr Konto wiederherstellen</string>
     <string name="activity_restore_explanation">Geben Sie den Wiederherstellungssatz ein, den Sie bei der Anmeldung zur Wiederherstellung Ihres Kontos erhalten haben.</string>
     <string name="activity_restore_seed_edit_text_hint">Ihr Wiederherstellungssatz</string>
-    <string name="activity_display_name_title_2">Wählen Sie Ihren Anzeigenamen</string>
-    <string name="activity_display_name_explanation">Dies ist Ihr Name, wenn Sie Session verwenden. Es kann Ihr richtiger Name, ein Alias oder etwas andere sein.</string>
-    <string name="activity_display_name_edit_text_hint">Geben Sie einen Anzeigenamen ein</string>
-    <string name="activity_display_name_display_name_missing_error">Bitte wählen Sie einen Anzeigenamen</string>
-    <string name="activity_display_name_display_name_too_long_error">Bitte wählen Sie einen kürzeren Anzeigenamen</string>
+    <string name="displayNamePick">Wählen Sie Ihren Anzeigenamen</string>
+    <string name="displayNameDescription">Dies ist Ihr Name, wenn Sie Session verwenden. Es kann Ihr richtiger Name, ein Alias oder etwas andere sein.</string>
+    <string name="displayNameEnter">Geben Sie einen Anzeigenamen ein</string>
+    <string name="displayNameErrorDescription">Bitte wählen Sie einen Anzeigenamen</string>
+    <string name="displayNameErrorDescriptionShorter">Bitte wählen Sie einen kürzeren Anzeigenamen</string>
     <string name="activity_pn_mode_recommended_option_tag">Empfohlen</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Bitte wählen Sie eine Option aus.</string>
     <string name="activity_home_empty_state_message">Sie haben noch keine Kontakte.</string>
@@ -654,7 +654,6 @@
     <string name="activity_backup_restore_explanation_1">Wähle eine Sicherungs-Datei aus und gib die Passphrase von ihrer Erstellung ein.</string>
     <string name="activity_backup_restore_passphrase">30-stellige Passphrase</string>
     <string name="activity_link_device_skip_prompt">Dies dauert eine Weile, möchtest du überspringen?</string>
-    <string name="activity_link_device_link_device">Gerät verbinden</string>
     <string name="activity_link_device_recovery_phrase">Wiederherstellungssatz</string>
     <string name="activity_link_device_scan_qr_code">QR-Code scannen</string>
     <string name="activity_link_device_qr_message">Navigiere zu Einstellungen → Wiederherstellungssatz auf deinem anderen Gerät, um deinen QR-Code anzuzeigen.</string>
@@ -665,7 +664,6 @@
     <string name="activity_pn_mode_slow_mode">Langsamer Modus</string>
     <string name="activity_pn_mode_fast_mode_explanation">Du wirst über neue Nachrichten zuverlässig und sofort über Google\'s Server benachrichtigt.</string>
     <string name="activity_pn_mode_slow_mode_explanation">Session sucht gelegentlich nach neuen Nachrichten im Hintergrund.</string>
-    <string name="fragment_recovery_phrase_title">Sicherungs-Passphrase</string>
     <string name="activity_prompt_passphrase_session_locked">Session ist gesperrt</string>
     <string name="activity_prompt_passphrase_tap_to_unlock">Tippe zum entsperren</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">Spitznamen eingeben</string>

app/src/main/res/values-de/strings.xml

@@ -542,11 +542,11 @@
     <string name="activity_restore_title">Ihr Konto wiederherstellen</string>
     <string name="activity_restore_explanation">Geben Sie den Wiederherstellungssatz ein, den Sie bei der Anmeldung zur Wiederherstellung Ihres Kontos erhalten haben.</string>
     <string name="activity_restore_seed_edit_text_hint">Ihr Wiederherstellungssatz</string>
-    <string name="activity_display_name_title_2">Wählen Sie Ihren Anzeigenamen</string>
-    <string name="activity_display_name_explanation">Dies ist Ihr Name, wenn Sie Session verwenden. Es kann Ihr richtiger Name, ein Alias oder etwas andere sein.</string>
-    <string name="activity_display_name_edit_text_hint">Geben Sie einen Anzeigenamen ein</string>
-    <string name="activity_display_name_display_name_missing_error">Bitte wählen Sie einen Anzeigenamen</string>
-    <string name="activity_display_name_display_name_too_long_error">Bitte wählen Sie einen kürzeren Anzeigenamen</string>
+    <string name="displayNamePick">Wählen Sie Ihren Anzeigenamen</string>
+    <string name="displayNameDescription">Dies ist Ihr Name, wenn Sie Session verwenden. Es kann Ihr richtiger Name, ein Alias oder etwas andere sein.</string>
+    <string name="displayNameEnter">Geben Sie einen Anzeigenamen ein</string>
+    <string name="displayNameErrorDescription">Bitte wählen Sie einen Anzeigenamen</string>
+    <string name="displayNameErrorDescriptionShorter">Bitte wählen Sie einen kürzeren Anzeigenamen</string>
     <string name="activity_pn_mode_recommended_option_tag">Empfohlen</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Bitte wählen Sie eine Option aus.</string>
     <string name="activity_home_empty_state_message">Sie haben noch keine Kontakte.</string>
@@ -654,7 +654,6 @@
     <string name="activity_backup_restore_explanation_1">Wähle eine Sicherungs-Datei aus und gib die Passphrase von ihrer Erstellung ein.</string>
     <string name="activity_backup_restore_passphrase">30-stellige Passphrase</string>
     <string name="activity_link_device_skip_prompt">Dies dauert eine Weile, möchtest du überspringen?</string>
-    <string name="activity_link_device_link_device">Gerät verbinden</string>
     <string name="activity_link_device_recovery_phrase">Wiederherstellungssatz</string>
     <string name="activity_link_device_scan_qr_code">QR-Code scannen</string>
     <string name="activity_link_device_qr_message">Navigiere zu Einstellungen → Wiederherstellungssatz auf deinem anderen Gerät, um deinen QR-Code anzuzeigen.</string>
@@ -665,7 +664,6 @@
     <string name="activity_pn_mode_slow_mode">Langsamer Modus</string>
     <string name="activity_pn_mode_fast_mode_explanation">Du wirst über neue Nachrichten zuverlässig und sofort über Google\'s Server benachrichtigt.</string>
     <string name="activity_pn_mode_slow_mode_explanation">Session sucht gelegentlich nach neuen Nachrichten im Hintergrund.</string>
-    <string name="fragment_recovery_phrase_title">Sicherungs-Passphrase</string>
     <string name="activity_prompt_passphrase_session_locked">Session ist gesperrt</string>
     <string name="activity_prompt_passphrase_tap_to_unlock">Tippe zum entsperren</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">Spitznamen eingeben</string>

app/src/main/res/values-el-rGR/strings.xml

@@ -544,11 +544,11 @@
     <string name="activity_restore_title">Επαναφορά του λογαριασμού σας</string>
     <string name="activity_restore_explanation">Εισάγετε τη φράση ανάκτησης που σας δόθηκε κατά την εγγραφή σας για να επαναφέρετε το λογαριασμό σας.</string>
     <string name="activity_restore_seed_edit_text_hint">Εισάγετε τη φράση ανάκτησης σας</string>
-    <string name="activity_display_name_title_2">Επιλέξτε το εμφανιζόμενο όνομα σας</string>
-    <string name="activity_display_name_explanation">Αυτό θα είναι το όνομά σας όταν χρησιμοποιείτε το Session. Μπορεί να είναι το πραγματικό σας όνομα, ένα ψευδώνυμο ή οτιδήποτε άλλο θέλετε.</string>
-    <string name="activity_display_name_edit_text_hint">Εισάγετε όνομα εμφάνισης</string>
-    <string name="activity_display_name_display_name_missing_error">Παρακαλώ επιλέξτε ένα εμφανιζόμενο όνομα</string>
-    <string name="activity_display_name_display_name_too_long_error">Παρακαλώ επιλέξτε ένα μικρότερο όνομα εμφάνισης</string>
+    <string name="displayNamePick">Επιλέξτε το εμφανιζόμενο όνομα σας</string>
+    <string name="displayNameDescription">Αυτό θα είναι το όνομά σας όταν χρησιμοποιείτε το Session. Μπορεί να είναι το πραγματικό σας όνομα, ένα ψευδώνυμο ή οτιδήποτε άλλο θέλετε.</string>
+    <string name="displayNameEnter">Εισάγετε όνομα εμφάνισης</string>
+    <string name="displayNameErrorDescription">Παρακαλώ επιλέξτε ένα εμφανιζόμενο όνομα</string>
+    <string name="displayNameErrorDescriptionShorter">Παρακαλώ επιλέξτε ένα μικρότερο όνομα εμφάνισης</string>
     <string name="activity_pn_mode_recommended_option_tag">Προτεινόμενο</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Παρακαλούμε κάντε μια επιλογή</string>
     <string name="activity_home_empty_state_message">Δεν υπάρχουν επαφές</string>
@@ -656,7 +656,6 @@
     <string name="activity_backup_restore_explanation_1">Επιλέξτε ένα αντίγραφο ασφαλείας και εισάγετε τη φράση πρόσβασης με την οποία δημιουργήθηκε.</string>
     <string name="activity_backup_restore_passphrase">φράση 30-ψηφίων</string>
     <string name="activity_link_device_skip_prompt">Αυτό παίρνει λίγο χρόνο, θα θέλατε να παραλείψετε;</string>
-    <string name="activity_link_device_link_device">Σύνδεση Συσκευής</string>
     <string name="activity_link_device_recovery_phrase">Φράση Ανάκτησης</string>
     <string name="activity_link_device_scan_qr_code">Σάρωση QR κωδικού</string>
     <string name="activity_link_device_qr_message">Μεταβείτε στις Ρυθμίσεις → Φράση Ανάκτησης στην άλλη συσκευή σας για να εμφανίσετε τον QR κωδικό σας.</string>
@@ -667,7 +666,6 @@
     <string name="activity_pn_mode_slow_mode">Αργή Επιλογή</string>
     <string name="activity_pn_mode_fast_mode_explanation">Θα ειδοποιηθείτε για νέα μηνύματα αξιόπιστα και άμεσα χρησιμοποιώντας τους διακομιστές ειδοποιήσεων της Google.</string>
     <string name="activity_pn_mode_slow_mode_explanation">Το Session θα ελέγχει κατά καιρούς για νέα μηνύματα στο παρασκήνιο.</string>
-    <string name="fragment_recovery_phrase_title">Φράση Ανάκτησης</string>
     <string name="activity_prompt_passphrase_session_locked">Το Session είναι κλειδωμένο</string>
     <string name="activity_prompt_passphrase_tap_to_unlock">Πατήστε για ξεκλείδωμα</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">Εισαγωγή ψευδώνυμου</string>

app/src/main/res/values-el/strings.xml

@@ -544,11 +544,11 @@
     <string name="activity_restore_title">Επαναφορά του λογαριασμού σας</string>
     <string name="activity_restore_explanation">Εισάγετε τη φράση ανάκτησης που σας δόθηκε κατά την εγγραφή σας για να επαναφέρετε το λογαριασμό σας.</string>
     <string name="activity_restore_seed_edit_text_hint">Εισάγετε τη φράση ανάκτησης σας</string>
-    <string name="activity_display_name_title_2">Επιλέξτε το εμφανιζόμενο όνομα σας</string>
-    <string name="activity_display_name_explanation">Αυτό θα είναι το όνομά σας όταν χρησιμοποιείτε το Session. Μπορεί να είναι το πραγματικό σας όνομα, ένα ψευδώνυμο ή οτιδήποτε άλλο θέλετε.</string>
-    <string name="activity_display_name_edit_text_hint">Εισάγετε όνομα εμφάνισης</string>
-    <string name="activity_display_name_display_name_missing_error">Παρακαλώ επιλέξτε ένα εμφανιζόμενο όνομα</string>
-    <string name="activity_display_name_display_name_too_long_error">Παρακαλώ επιλέξτε ένα μικρότερο όνομα εμφάνισης</string>
+    <string name="displayNamePick">Επιλέξτε το εμφανιζόμενο όνομα σας</string>
+    <string name="displayNameDescription">Αυτό θα είναι το όνομά σας όταν χρησιμοποιείτε το Session. Μπορεί να είναι το πραγματικό σας όνομα, ένα ψευδώνυμο ή οτιδήποτε άλλο θέλετε.</string>
+    <string name="displayNameEnter">Εισάγετε όνομα εμφάνισης</string>
+    <string name="displayNameErrorDescription">Παρακαλώ επιλέξτε ένα εμφανιζόμενο όνομα</string>
+    <string name="displayNameErrorDescriptionShorter">Παρακαλώ επιλέξτε ένα μικρότερο όνομα εμφάνισης</string>
     <string name="activity_pn_mode_recommended_option_tag">Προτεινόμενο</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Παρακαλούμε κάντε μια επιλογή</string>
     <string name="activity_home_empty_state_message">Δεν υπάρχουν επαφές</string>
@@ -656,7 +656,6 @@
     <string name="activity_backup_restore_explanation_1">Επιλέξτε ένα αντίγραφο ασφαλείας και εισάγετε τη φράση πρόσβασης με την οποία δημιουργήθηκε.</string>
     <string name="activity_backup_restore_passphrase">φράση 30-ψηφίων</string>
     <string name="activity_link_device_skip_prompt">Αυτό παίρνει λίγο χρόνο, θα θέλατε να παραλείψετε;</string>
-    <string name="activity_link_device_link_device">Σύνδεση Συσκευής</string>
     <string name="activity_link_device_recovery_phrase">Φράση Ανάκτησης</string>
     <string name="activity_link_device_scan_qr_code">Σάρωση QR κωδικού</string>
     <string name="activity_link_device_qr_message">Μεταβείτε στις Ρυθμίσεις → Φράση Ανάκτησης στην άλλη συσκευή σας για να εμφανίσετε τον QR κωδικό σας.</string>
@@ -667,7 +666,6 @@
     <string name="activity_pn_mode_slow_mode">Αργή Επιλογή</string>
     <string name="activity_pn_mode_fast_mode_explanation">Θα ειδοποιηθείτε για νέα μηνύματα αξιόπιστα και άμεσα χρησιμοποιώντας τους διακομιστές ειδοποιήσεων της Google.</string>
     <string name="activity_pn_mode_slow_mode_explanation">Το Session θα ελέγχει κατά καιρούς για νέα μηνύματα στο παρασκήνιο.</string>
-    <string name="fragment_recovery_phrase_title">Φράση Ανάκτησης</string>
     <string name="activity_prompt_passphrase_session_locked">Το Session είναι κλειδωμένο</string>
     <string name="activity_prompt_passphrase_tap_to_unlock">Πατήστε για ξεκλείδωμα</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">Εισαγωγή ψευδώνυμου</string>

app/src/main/res/values-eo-rUY/strings.xml

@@ -543,11 +543,11 @@
     <string name="activity_restore_title">Restaŭri vian konton</string>
     <string name="activity_restore_explanation">Entajpu la riparan frazon, kiu estis donita al vi kiam vi aliĝis, por ripari vian konton.</string>
     <string name="activity_restore_seed_edit_text_hint">Entajpu vian riparan frazon</string>
-    <string name="activity_display_name_title_2">Elektu vian vidigan nomon</string>
-    <string name="activity_display_name_explanation">Ĉi tio estos via nomo kiam vi uzas Sesion. Ĝi povas esti via vera nomo, alinomo, aŭ io ajn alia vi volas.</string>
-    <string name="activity_display_name_edit_text_hint">Entajpu vidigan nomon</string>
-    <string name="activity_display_name_display_name_missing_error">Bonvolu elekti vidigan nomon</string>
-    <string name="activity_display_name_display_name_too_long_error">Bonvolu elekti plej mallongan vidigan nomon</string>
+    <string name="displayNamePick">Elektu vian vidigan nomon</string>
+    <string name="displayNameDescription">Ĉi tio estos via nomo kiam vi uzas Sesion. Ĝi povas esti via vera nomo, alinomo, aŭ io ajn alia vi volas.</string>
+    <string name="displayNameEnter">Entajpu vidigan nomon</string>
+    <string name="displayNameErrorDescription">Bonvolu elekti vidigan nomon</string>
+    <string name="displayNameErrorDescriptionShorter">Bonvolu elekti plej mallongan vidigan nomon</string>
     <string name="activity_pn_mode_recommended_option_tag">Rekomendate</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Bonvolu Elekti Opcion</string>
     <string name="activity_home_empty_state_message">Vi ankoraŭ ne havas kontaktojn</string>
@@ -648,7 +648,6 @@
     <string name="activity_backup_restore_title">Restaŭri savkopion</string>
     <string name="activity_backup_restore_select_file">Elekti dosieron</string>
     <string name="activity_backup_restore_passphrase">30-cifera pasfrazo</string>
-    <string name="activity_link_device_link_device">Ligi Aparaton</string>
     <string name="activity_link_device_recovery_phrase">Ripara Frazo</string>
     <string name="activity_link_device_scan_qr_code">Skani QR-Kodon</string>
     <string name="activity_join_public_chat_join_rooms">Aŭ aliĝu unu de ĉi tiuj…</string>
@@ -656,7 +655,6 @@
     <string name="activity_pn_mode_fast_mode">Rapida Reĝimo</string>
     <string name="activity_pn_mode_slow_mode">Malrapida Maniero</string>
     <string name="activity_pn_mode_slow_mode_explanation">Session foje serĉos novajn mesaĝojn en la fono.</string>
-    <string name="fragment_recovery_phrase_title">Ripara Frazo</string>
     <string name="activity_prompt_passphrase_session_locked">Session estas Ŝlosita</string>
     <string name="activity_prompt_passphrase_tap_to_unlock">Tuŝetu por Malŝlosi</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">Entajpu alnomon</string>

app/src/main/res/values-eo/strings.xml

@@ -543,11 +543,11 @@
     <string name="activity_restore_title">Restaŭri vian konton</string>
     <string name="activity_restore_explanation">Entajpu la riparan frazon, kiu estis donita al vi kiam vi aliĝis, por ripari vian konton.</string>
     <string name="activity_restore_seed_edit_text_hint">Entajpu vian riparan frazon</string>
-    <string name="activity_display_name_title_2">Elektu vian vidigan nomon</string>
-    <string name="activity_display_name_explanation">Ĉi tio estos via nomo kiam vi uzas Sesion. Ĝi povas esti via vera nomo, alinomo, aŭ io ajn alia vi volas.</string>
-    <string name="activity_display_name_edit_text_hint">Entajpu vidigan nomon</string>
-    <string name="activity_display_name_display_name_missing_error">Bonvolu elekti vidigan nomon</string>
-    <string name="activity_display_name_display_name_too_long_error">Bonvolu elekti plej mallongan vidigan nomon</string>
+    <string name="displayNamePick">Elektu vian vidigan nomon</string>
+    <string name="displayNameDescription">Ĉi tio estos via nomo kiam vi uzas Sesion. Ĝi povas esti via vera nomo, alinomo, aŭ io ajn alia vi volas.</string>
+    <string name="displayNameEnter">Entajpu vidigan nomon</string>
+    <string name="displayNameErrorDescription">Bonvolu elekti vidigan nomon</string>
+    <string name="displayNameErrorDescriptionShorter">Bonvolu elekti plej mallongan vidigan nomon</string>
     <string name="activity_pn_mode_recommended_option_tag">Rekomendate</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Bonvolu Elekti Opcion</string>
     <string name="activity_home_empty_state_message">Vi ankoraŭ ne havas kontaktojn</string>
@@ -648,7 +648,6 @@
     <string name="activity_backup_restore_title">Restaŭri savkopion</string>
     <string name="activity_backup_restore_select_file">Elekti dosieron</string>
     <string name="activity_backup_restore_passphrase">30-cifera pasfrazo</string>
-    <string name="activity_link_device_link_device">Ligi Aparaton</string>
     <string name="activity_link_device_recovery_phrase">Ripara Frazo</string>
     <string name="activity_link_device_scan_qr_code">Skani QR-Kodon</string>
     <string name="activity_join_public_chat_join_rooms">Aŭ aliĝu unu de ĉi tiuj…</string>
@@ -656,7 +655,6 @@
     <string name="activity_pn_mode_fast_mode">Rapida Reĝimo</string>
     <string name="activity_pn_mode_slow_mode">Malrapida Maniero</string>
     <string name="activity_pn_mode_slow_mode_explanation">Session foje serĉos novajn mesaĝojn en la fono.</string>
-    <string name="fragment_recovery_phrase_title">Ripara Frazo</string>
     <string name="activity_prompt_passphrase_session_locked">Session estas Ŝlosita</string>
     <string name="activity_prompt_passphrase_tap_to_unlock">Tuŝetu por Malŝlosi</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">Entajpu alnomon</string>

app/src/main/res/values-es-rES/strings.xml

@@ -543,11 +543,11 @@ de intercambio de claves!</string>
     <string name="activity_restore_title">Restaura tu cuenta</string>
     <string name="activity_restore_explanation">Ingresa la frase de recuperación que se te dio cuando te registraste para restaurar tu cuenta.</string>
     <string name="activity_restore_seed_edit_text_hint">Ingresa tu frase de recuperación</string>
-    <string name="activity_display_name_title_2">Elige tu nombre</string>
-    <string name="activity_display_name_explanation">Este será tu nombre al usar Session. Puede ser tu nombre real, un alias, o lo que prefieras.</string>
-    <string name="activity_display_name_edit_text_hint">Ingresa un nombre para mostrar</string>
-    <string name="activity_display_name_display_name_missing_error">Por favor, elige un nombre para mostrar</string>
-    <string name="activity_display_name_display_name_too_long_error">Por favor, elige un nombre para mostrar más corto</string>
+    <string name="displayNamePick">Elige tu nombre</string>
+    <string name="displayNameDescription">Este será tu nombre al usar Session. Puede ser tu nombre real, un alias, o lo que prefieras.</string>
+    <string name="displayNameEnter">Ingresa un nombre para mostrar</string>
+    <string name="displayNameErrorDescription">Por favor, elige un nombre para mostrar</string>
+    <string name="displayNameErrorDescriptionShorter">Por favor, elige un nombre para mostrar más corto</string>
     <string name="activity_pn_mode_recommended_option_tag">Recomendado</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Por favor, elige una opción</string>
     <string name="activity_home_empty_state_message">Aún no tienes contactos</string>
@@ -655,7 +655,6 @@ de intercambio de claves!</string>
     <string name="activity_backup_restore_explanation_1">Seleccione un archivo de copia de seguridad e introduzca la clave de acceso con la que fue creada.</string>
     <string name="activity_backup_restore_passphrase">Clave de acceso de 30 dígitos</string>
     <string name="activity_link_device_skip_prompt">Esto está tomando un tiempo, ¿te gustaría saltarlo?</string>
-    <string name="activity_link_device_link_device">Vincular un Dispositivo</string>
     <string name="activity_link_device_recovery_phrase">Frase de Recuperación</string>
     <string name="activity_link_device_scan_qr_code">Escanear Código QR</string>
     <string name="activity_link_device_qr_message">Navega a Ajustes → Frase de Recuperación en tu otro dispositivo para mostrar tu código QR.</string>
@@ -666,7 +665,6 @@ de intercambio de claves!</string>
     <string name="activity_pn_mode_slow_mode">Modo Lento</string>
     <string name="activity_pn_mode_fast_mode_explanation">Se le notificará de los nuevos mensajes de forma fiable e inmediata usando los servidores de notificaciones de Google.</string>
     <string name="activity_pn_mode_slow_mode_explanation">Session comprobará ocasionalmente si hay nuevos mensajes en segundo plano.</string>
-    <string name="fragment_recovery_phrase_title">Frase de recuperación</string>
     <string name="activity_prompt_passphrase_session_locked">Session está Bloqueado</string>
     <string name="activity_prompt_passphrase_tap_to_unlock">Toca para Desbloquear</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">Escriba un apodo</string>

app/src/main/res/values-es/strings.xml

@@ -543,11 +543,11 @@ de intercambio de claves!</string>
     <string name="activity_restore_title">Restaura tu cuenta</string>
     <string name="activity_restore_explanation">Ingresa la frase de recuperación que se te dio cuando te registraste para restaurar tu cuenta.</string>
     <string name="activity_restore_seed_edit_text_hint">Ingresa tu frase de recuperación</string>
-    <string name="activity_display_name_title_2">Elige tu nombre</string>
-    <string name="activity_display_name_explanation">Este será tu nombre al usar Session. Puede ser tu nombre real, un alias, o lo que prefieras.</string>
-    <string name="activity_display_name_edit_text_hint">Ingresa un nombre para mostrar</string>
-    <string name="activity_display_name_display_name_missing_error">Por favor, elige un nombre para mostrar</string>
-    <string name="activity_display_name_display_name_too_long_error">Por favor, elige un nombre para mostrar más corto</string>
+    <string name="displayNamePick">Elige tu nombre</string>
+    <string name="displayNameDescription">Este será tu nombre al usar Session. Puede ser tu nombre real, un alias, o lo que prefieras.</string>
+    <string name="displayNameEnter">Ingresa un nombre para mostrar</string>
+    <string name="displayNameErrorDescription">Por favor, elige un nombre para mostrar</string>
+    <string name="displayNameErrorDescriptionShorter">Por favor, elige un nombre para mostrar más corto</string>
     <string name="activity_pn_mode_recommended_option_tag">Recomendado</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Por favor, elige una opción</string>
     <string name="activity_home_empty_state_message">Aún no tienes contactos</string>
@@ -655,7 +655,6 @@ de intercambio de claves!</string>
     <string name="activity_backup_restore_explanation_1">Seleccione un archivo de copia de seguridad e introduzca la clave de acceso con la que fue creada.</string>
     <string name="activity_backup_restore_passphrase">Clave de acceso de 30 dígitos</string>
     <string name="activity_link_device_skip_prompt">Esto está tomando un tiempo, ¿te gustaría saltarlo?</string>
-    <string name="activity_link_device_link_device">Vincular un Dispositivo</string>
     <string name="activity_link_device_recovery_phrase">Frase de Recuperación</string>
     <string name="activity_link_device_scan_qr_code">Escanear Código QR</string>
     <string name="activity_link_device_qr_message">Navega a Ajustes → Frase de Recuperación en tu otro dispositivo para mostrar tu código QR.</string>
@@ -666,7 +665,6 @@ de intercambio de claves!</string>
     <string name="activity_pn_mode_slow_mode">Modo Lento</string>
     <string name="activity_pn_mode_fast_mode_explanation">Se le notificará de los nuevos mensajes de forma fiable e inmediata usando los servidores de notificaciones de Google.</string>
     <string name="activity_pn_mode_slow_mode_explanation">Session comprobará ocasionalmente si hay nuevos mensajes en segundo plano.</string>
-    <string name="fragment_recovery_phrase_title">Frase de recuperación</string>
     <string name="activity_prompt_passphrase_session_locked">Session está Bloqueado</string>
     <string name="activity_prompt_passphrase_tap_to_unlock">Toca para Desbloquear</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">Escriba un apodo</string>

app/src/main/res/values-fa-rIR/strings.xml

@@ -566,11 +566,11 @@
     <string name="activity_restore_title">حساب کاربری خود را بازیابی کنید</string>
     <string name="activity_restore_explanation">عبارت بازیابی را که هنگام نام‌نویسی برای بازیابی حساب به شما داده شده، وارد کنید.</string>
     <string name="activity_restore_seed_edit_text_hint">عبارت بازیابی خود را وارد کنید</string>
-    <string name="activity_display_name_title_2">نام خود را برای نمایش انتخاب کنید</string>
-    <string name="activity_display_name_explanation">این نام شما هنگام استفاده از Session خواهد بود. این نام می‌تواند نام واقعی شما، نام مستعار یا هر چیز دیگری که دوست دارید، باشد.</string>
-    <string name="activity_display_name_edit_text_hint">یک نام وارد کنید</string>
-    <string name="activity_display_name_display_name_missing_error">لطفا یک نام انتخاب کنید</string>
-    <string name="activity_display_name_display_name_too_long_error">لطفا نام کوتاه‌تری انتخاب کنید</string>
+    <string name="displayNamePick">نام خود را برای نمایش انتخاب کنید</string>
+    <string name="displayNameDescription">این نام شما هنگام استفاده از Session خواهد بود. این نام می‌تواند نام واقعی شما، نام مستعار یا هر چیز دیگری که دوست دارید، باشد.</string>
+    <string name="displayNameEnter">یک نام وارد کنید</string>
+    <string name="displayNameErrorDescription">لطفا یک نام انتخاب کنید</string>
+    <string name="displayNameErrorDescriptionShorter">لطفا نام کوتاه‌تری انتخاب کنید</string>
     <string name="activity_pn_mode_recommended_option_tag">گزینه پیشنهادی</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">لطفا یک گزینه را انتخاب کنید</string>
     <string name="activity_home_empty_state_message">فهرست مخاطبان شما خالی است.</string>
@@ -693,7 +693,6 @@
     <string name="activity_backup_restore_explanation_1">یک فایل پشتیبان انتخاب و عبارت عبوری که با آن ساخته شده است را وارد کنید.</string>
     <string name="activity_backup_restore_passphrase">عبارت عبور ۳۰رقمی</string>
     <string name="activity_link_device_skip_prompt">این فرآیند کمی طولانی است، دوست دارید ردش کنید؟</string>
-    <string name="activity_link_device_link_device">اتصال به یک دستگاه</string>
     <string name="activity_link_device_recovery_phrase">عبارت بازیابی</string>
     <string name="activity_link_device_scan_qr_code">اسکن کد QR</string>
     <string name="activity_link_device_qr_message">برای دیدن کد QR خود، در دستگاه دیگرتان به «تنظیمات ← عبارت بازیابی» مراجعه کنید.</string>
@@ -704,7 +703,6 @@
     <string name="activity_pn_mode_slow_mode">حالت آهسته</string>
     <string name="activity_pn_mode_fast_mode_explanation">با استفاده از سرورهای گوگل، شما به صورت سریع و مطمئن از پیام‌های جدید مطلع می‌شوید.</string>
     <string name="activity_pn_mode_slow_mode_explanation">Session هرازگاهی در پس زمینه وجود پیام‌های جدید را بررسی می‌کند.</string>
-    <string name="fragment_recovery_phrase_title">متن بازیابی</string>
     <string name="activity_prompt_passphrase_session_locked">نشست قفل شده‌است</string>
     <string name="activity_prompt_passphrase_tap_to_unlock"> ﺑﺮﺍﯼ ﮔﺸﻮﺩﻥ ﺿﺮﺑﻪ ﺑﺰﻧﻴﺪ</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">یک نام مستعار وارد کنید</string>

app/src/main/res/values-fa/strings.xml

@@ -543,11 +543,11 @@
     <string name="activity_restore_title">حساب کاربری خود را بازیابی کنید</string>
     <string name="activity_restore_explanation">عبارت بازیابی را که هنگام نام‌نویسی برای بازیابی حساب به شما داده شده، وارد کنید.</string>
     <string name="activity_restore_seed_edit_text_hint">عبارت بازیابی خود را وارد کنید</string>
-    <string name="activity_display_name_title_2">نام خود را برای نمایش انتخاب کنید</string>
-    <string name="activity_display_name_explanation">این نام شما هنگام استفاده از Session خواهد بود. این نام می‌تواند نام واقعی شما، نام مستعار یا هر چیز دیگری که دوست دارید، باشد.</string>
-    <string name="activity_display_name_edit_text_hint">نام نمایشی را وارد کنید</string>
-    <string name="activity_display_name_display_name_missing_error">لطفا نام نمایشی را انتخاب کنید</string>
-    <string name="activity_display_name_display_name_too_long_error">لطفا نام نمایشی کوتاه‌تری انتخاب کنید</string>
+    <string name="displayNamePick">نام خود را برای نمایش انتخاب کنید</string>
+    <string name="displayNameDescription">این نام شما هنگام استفاده از Session خواهد بود. این نام می‌تواند نام واقعی شما، نام مستعار یا هر چیز دیگری که دوست دارید، باشد.</string>
+    <string name="displayNameEnter">نام نمایشی را وارد کنید</string>
+    <string name="displayNameErrorDescription">لطفا نام نمایشی را انتخاب کنید</string>
+    <string name="displayNameErrorDescriptionShorter">لطفا نام نمایشی کوتاه‌تری انتخاب کنید</string>
     <string name="activity_pn_mode_recommended_option_tag">گزینه پیشنهادی</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">لطفا یک گزینه را انتخاب کنید</string>
     <string name="activity_home_empty_state_message">فهرست مخاطبان شما خالی است.</string>
@@ -655,7 +655,6 @@
     <string name="activity_backup_restore_explanation_1">یک فایل پشتیبان انتخاب و گذرمتنی که با آن ساخته شده است را وارد کنید.</string>
     <string name="activity_backup_restore_passphrase">گذرمتن ۳۰رقمی</string>
     <string name="activity_link_device_skip_prompt">این مقداری طول می‌کشد، دوست دارید ردش کنید؟</string>
-    <string name="activity_link_device_link_device">اتصال به یک دستگاه</string>
     <string name="activity_link_device_recovery_phrase">عبارت بازیابی</string>
     <string name="activity_link_device_scan_qr_code">اسکن کد QR</string>
     <string name="activity_link_device_qr_message">برای دیدن کد QR خود، در دستگاه دیگرتان به «تنظیمات ← عبارت بازیابی» مراجعه کنید.</string>
@@ -666,7 +665,6 @@
     <string name="activity_pn_mode_slow_mode">حالت آهسته</string>
     <string name="activity_pn_mode_fast_mode_explanation">شما سریع و مطمئن با استفاده از سرور‌های اطلاع‌رسانی گوگل از پیام‌های جدید مطلع می‌شوید.</string>
     <string name="activity_pn_mode_slow_mode_explanation">نشست هرازگاهی در پس زمینه وجود پیام‌های جدید را بررسی می‌کند.</string>
-    <string name="fragment_recovery_phrase_title">متن بازیابی</string>
     <string name="activity_prompt_passphrase_session_locked">نشست قفل شده‌است</string>
     <string name="activity_prompt_passphrase_tap_to_unlock"> ﺑﺮﺍﯼ ﮔﺸﻮﺩﻥ ﺿﺮﺑﻪ ﺑﺰﻧﻴﺪ</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">یک نام مستعار وارد کنید</string>

app/src/main/res/values-fi-rFI/strings.xml

@@ -542,11 +542,11 @@ on viallinen!</string>
     <string name="activity_restore_title">Palauta sinun tili</string>
     <string name="activity_restore_explanation">Syötä palautuslause joka annettiin sinulle, kun olet rekisteröitynyt palauttamaan tilisi.</string>
     <string name="activity_restore_seed_edit_text_hint">Syötä palautuslauseesi</string>
-    <string name="activity_display_name_title_2">Valitse näyttönimi</string>
-    <string name="activity_display_name_explanation">Tämä on nimesi, kun käytät Sessionia. Se voi olla oikea nimesi, kutsumanimi tai mitä tahansa muuta haluat.</string>
-    <string name="activity_display_name_edit_text_hint">Syötä näyttönimi</string>
-    <string name="activity_display_name_display_name_missing_error">Valitse näyttönimi</string>
-    <string name="activity_display_name_display_name_too_long_error">Valitse lyhyempi näyttönimi</string>
+    <string name="displayNamePick">Valitse näyttönimi</string>
+    <string name="displayNameDescription">Tämä on nimesi, kun käytät Sessionia. Se voi olla oikea nimesi, kutsumanimi tai mitä tahansa muuta haluat.</string>
+    <string name="displayNameEnter">Syötä näyttönimi</string>
+    <string name="displayNameErrorDescription">Valitse näyttönimi</string>
+    <string name="displayNameErrorDescriptionShorter">Valitse lyhyempi näyttönimi</string>
     <string name="activity_pn_mode_recommended_option_tag">Suositeltu</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Valitse vaihtoehto</string>
     <string name="activity_home_empty_state_message">Sinulla ei ole yhteystietoja</string>
@@ -654,7 +654,6 @@ on viallinen!</string>
     <string name="activity_backup_restore_explanation_1">Valitse varmuuskopiotiedosto ja kirjoita salasana, jonka kanssa se on luotu.</string>
     <string name="activity_backup_restore_passphrase">30-merkkinen pääsykoodi</string>
     <string name="activity_link_device_skip_prompt">Tämä kestää jonkin aikaa, haluaisitko ohittaa?</string>
-    <string name="activity_link_device_link_device">Yhdistä laite</string>
     <string name="activity_link_device_recovery_phrase">Palautusvirke</string>
     <string name="activity_link_device_scan_qr_code">Skannaa QR-koodi</string>
     <string name="activity_link_device_qr_message">Siirry asetuksiin → palautusvirke toisella laitteellasi näyttääksesi QR-koodisi.</string>
@@ -665,7 +664,6 @@ on viallinen!</string>
     <string name="activity_pn_mode_slow_mode">Hidastila</string>
     <string name="activity_pn_mode_fast_mode_explanation">Sinulle ilmoitetaan uusista viesteistä luotettavasti ja viivyttelemättä Applen ilmoituspalvelua käyttäen.</string>
     <string name="activity_pn_mode_slow_mode_explanation">Session tarkistaa taustalla ajoittain uudet viestit.</string>
-    <string name="fragment_recovery_phrase_title">Palautusvirke</string>
     <string name="activity_prompt_passphrase_session_locked">Session on lukittu</string>
     <string name="activity_prompt_passphrase_tap_to_unlock">Avaa napauttamalla</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">Anna nimimerkki</string>

app/src/main/res/values-fi/strings.xml

@@ -542,11 +542,11 @@ on viallinen!</string>
     <string name="activity_restore_title">Palauta sinun tili</string>
     <string name="activity_restore_explanation">Syötä palautuslause joka annettiin sinulle, kun olet rekisteröitynyt palauttamaan tilisi.</string>
     <string name="activity_restore_seed_edit_text_hint">Syötä palautuslauseesi</string>
-    <string name="activity_display_name_title_2">Valitse näyttönimi</string>
-    <string name="activity_display_name_explanation">Tämä on nimesi, kun käytät Sessionia. Se voi olla oikea nimesi, kutsumanimi tai mitä tahansa muuta haluat.</string>
-    <string name="activity_display_name_edit_text_hint">Syötä näyttönimi</string>
-    <string name="activity_display_name_display_name_missing_error">Valitse näyttönimi</string>
-    <string name="activity_display_name_display_name_too_long_error">Valitse lyhyempi näyttönimi</string>
+    <string name="displayNamePick">Valitse näyttönimi</string>
+    <string name="displayNameDescription">Tämä on nimesi, kun käytät Sessionia. Se voi olla oikea nimesi, kutsumanimi tai mitä tahansa muuta haluat.</string>
+    <string name="displayNameEnter">Syötä näyttönimi</string>
+    <string name="displayNameErrorDescription">Valitse näyttönimi</string>
+    <string name="displayNameErrorDescriptionShorter">Valitse lyhyempi näyttönimi</string>
     <string name="activity_pn_mode_recommended_option_tag">Suositeltu</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Valitse vaihtoehto</string>
     <string name="activity_home_empty_state_message">Sinulla ei ole yhteystietoja</string>
@@ -654,7 +654,6 @@ on viallinen!</string>
     <string name="activity_backup_restore_explanation_1">Valitse varmuuskopiotiedosto ja kirjoita salasana, jonka kanssa se on luotu.</string>
     <string name="activity_backup_restore_passphrase">30-merkkinen pääsykoodi</string>
     <string name="activity_link_device_skip_prompt">Tämä kestää jonkin aikaa, haluaisitko ohittaa?</string>
-    <string name="activity_link_device_link_device">Yhdistä laite</string>
     <string name="activity_link_device_recovery_phrase">Palautusvirke</string>
     <string name="activity_link_device_scan_qr_code">Skannaa QR-koodi</string>
     <string name="activity_link_device_qr_message">Siirry asetuksiin → palautusvirke toisella laitteellasi näyttääksesi QR-koodisi.</string>
@@ -665,7 +664,6 @@ on viallinen!</string>
     <string name="activity_pn_mode_slow_mode">Hidastila</string>
     <string name="activity_pn_mode_fast_mode_explanation">Sinulle ilmoitetaan uusista viesteistä luotettavasti ja viivyttelemättä Applen ilmoituspalvelua käyttäen.</string>
     <string name="activity_pn_mode_slow_mode_explanation">Session tarkistaa taustalla ajoittain uudet viestit.</string>
-    <string name="fragment_recovery_phrase_title">Palautusvirke</string>
     <string name="activity_prompt_passphrase_session_locked">Session on lukittu</string>
     <string name="activity_prompt_passphrase_tap_to_unlock">Avaa napauttamalla</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">Anna nimimerkki</string>

app/src/main/res/values-fr-rFR/strings.xml

@@ -569,11 +569,11 @@
     <string name="activity_restore_title">Restaurez votre compte</string>
     <string name="activity_restore_explanation">Pour restaurer votre compte, veuillez entrer la phrase de récupération qui vous a été fournie lors de la création de votre compte.</string>
     <string name="activity_restore_seed_edit_text_hint">Saisissez votre phrase de récupération</string>
-    <string name="activity_display_name_title_2">Choisissez votre nom d\'utilisateur</string>
-    <string name="activity_display_name_explanation">Ce sera votre nom lorsque vous utiliserez Session. Il peut s\'agir de votre vrai nom, d\'un pseudo ou de ce que vous voulez.</string>
-    <string name="activity_display_name_edit_text_hint">Saisissez un nom d\'utilisateur</string>
-    <string name="activity_display_name_display_name_missing_error">Veuillez choisir un nom d\'utilisateur</string>
-    <string name="activity_display_name_display_name_too_long_error">Veuillez choisir un nom d\'utilisateur plus court</string>
+    <string name="displayNamePick">Choisissez votre nom d\'utilisateur</string>
+    <string name="displayNameDescription">Ce sera votre nom lorsque vous utiliserez Session. Il peut s\'agir de votre vrai nom, d\'un pseudo ou de ce que vous voulez.</string>
+    <string name="displayNameEnter">Saisissez un nom d\'utilisateur</string>
+    <string name="displayNameErrorDescription">Veuillez choisir un nom d\'utilisateur</string>
+    <string name="displayNameErrorDescriptionShorter">Veuillez choisir un nom d\'utilisateur plus court</string>
     <string name="activity_pn_mode_recommended_option_tag">Recommandé</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Veuillez choisir une option</string>
     <string name="activity_home_empty_state_message">Vous n\'avez pas encore de contacts</string>
@@ -696,7 +696,6 @@
     <string name="activity_backup_restore_explanation_1">Sélectionnez un fichier de sauvegarde et entrez la phrase de passe avec laquelle il a été créé.</string>
     <string name="activity_backup_restore_passphrase">Phrase de passe de 30 caractères</string>
     <string name="activity_link_device_skip_prompt">Cela prend un certain temps, voulez-vous passer ?</string>
-    <string name="activity_link_device_link_device">Relier un appareil</string>
     <string name="activity_link_device_recovery_phrase">Phrase de récupération</string>
     <string name="activity_link_device_scan_qr_code">Scanner le QR Code</string>
     <string name="activity_link_device_qr_message">Allez dans Paramètres → Phrase de récupération sur votre autre appareil pour afficher votre QR code.</string>
@@ -707,7 +706,6 @@
     <string name="activity_pn_mode_slow_mode">Mode lent</string>
     <string name="activity_pn_mode_fast_mode_explanation">Vous serez averti de nouveaux messages de manière fiable et immédiate en utilisant les serveurs de notification de Google.</string>
     <string name="activity_pn_mode_slow_mode_explanation">Session vérifiera occasionnellement la présence de nouveaux messages en tâche de fond.</string>
-    <string name="fragment_recovery_phrase_title">Phrase de récupération</string>
     <string name="activity_prompt_passphrase_session_locked">Session est Verrouillé</string>
     <string name="activity_prompt_passphrase_tap_to_unlock">Toucher pour déverrouiller</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">Saisissez un nom</string>

app/src/main/res/values-fr/strings.xml

@@ -569,11 +569,11 @@
     <string name="activity_restore_title">Restaurez votre compte</string>
     <string name="activity_restore_explanation">Pour restaurer votre compte, veuillez entrer la phrase de récupération qui vous a été fournie lors de la création de votre compte.</string>
     <string name="activity_restore_seed_edit_text_hint">Saisissez votre phrase de récupération</string>
-    <string name="activity_display_name_title_2">Choisissez votre nom d\'utilisateur</string>
-    <string name="activity_display_name_explanation">Ce sera votre nom lorsque vous utiliserez Session. Il peut s\'agir de votre vrai nom, d\'un pseudo ou de ce que vous voulez.</string>
-    <string name="activity_display_name_edit_text_hint">Saisissez un nom d\'utilisateur</string>
-    <string name="activity_display_name_display_name_missing_error">Veuillez choisir un nom d\'utilisateur</string>
-    <string name="activity_display_name_display_name_too_long_error">Veuillez choisir un nom d\'utilisateur plus court</string>
+    <string name="displayNamePick">Choisissez votre nom d\'utilisateur</string>
+    <string name="displayNameDescription">Ce sera votre nom lorsque vous utiliserez Session. Il peut s\'agir de votre vrai nom, d\'un pseudo ou de ce que vous voulez.</string>
+    <string name="displayNameEnter">Saisissez un nom d\'utilisateur</string>
+    <string name="displayNameErrorDescription">Veuillez choisir un nom d\'utilisateur</string>
+    <string name="displayNameErrorDescriptionShorter">Veuillez choisir un nom d\'utilisateur plus court</string>
     <string name="activity_pn_mode_recommended_option_tag">Recommandé</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Veuillez choisir une option</string>
     <string name="activity_home_empty_state_message">Vous n\'avez pas encore de contacts</string>
@@ -696,7 +696,6 @@
     <string name="activity_backup_restore_explanation_1">Sélectionnez un fichier de sauvegarde et entrez la phrase de passe avec laquelle il a été créé.</string>
     <string name="activity_backup_restore_passphrase">Phrase de passe de 30 caractères</string>
     <string name="activity_link_device_skip_prompt">Cela prend un certain temps, voulez-vous passer ?</string>
-    <string name="activity_link_device_link_device">Relier un appareil</string>
     <string name="activity_link_device_recovery_phrase">Phrase de récupération</string>
     <string name="activity_link_device_scan_qr_code">Scanner le QR Code</string>
     <string name="activity_link_device_qr_message">Allez dans Paramètres → Phrase de récupération sur votre autre appareil pour afficher votre QR code.</string>
@@ -707,7 +706,6 @@
     <string name="activity_pn_mode_slow_mode">Mode lent</string>
     <string name="activity_pn_mode_fast_mode_explanation">Vous serez averti de nouveaux messages de manière fiable et immédiate en utilisant les serveurs de notification de Google.</string>
     <string name="activity_pn_mode_slow_mode_explanation">Session vérifiera occasionnellement la présence de nouveaux messages en tâche de fond.</string>
-    <string name="fragment_recovery_phrase_title">Phrase de récupération</string>
     <string name="activity_prompt_passphrase_session_locked">Session est Verrouillé</string>
     <string name="activity_prompt_passphrase_tap_to_unlock">Toucher pour déverrouiller</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">Saisissez un nom</string>

app/src/main/res/values-hi-rIN/strings.xml

@@ -543,11 +543,11 @@
     <string name="activity_restore_title">अकाउंट रिस्टोर करें</string>
     <string name="activity_restore_explanation">अकाउंट बनाते समय बनाया गया अपना रिकवरी वाक्य डालें।</string>
     <string name="activity_restore_seed_edit_text_hint">अपना पुनर्प्राप्ति वाक्यांश लिखें</string>
-    <string name="activity_display_name_title_2">अपना प्रदर्शन नाम चुनें</string>
-    <string name="activity_display_name_explanation">यह सेशन इस्तेमाल करते समय आपका नाम होगा। यह आपका असली नाम, उपनाम या कुछ और भी हो सकता है।</string>
-    <string name="activity_display_name_edit_text_hint">डिस्प्ले नाम डालें</string>
-    <string name="activity_display_name_display_name_missing_error">कृपया एक डिस्प्ले नाम चुनें</string>
-    <string name="activity_display_name_display_name_too_long_error">कृपया एक छोटा डिसप्ले नाम चुनें</string>
+    <string name="displayNamePick">अपना प्रदर्शन नाम चुनें</string>
+    <string name="displayNameDescription">यह सेशन इस्तेमाल करते समय आपका नाम होगा। यह आपका असली नाम, उपनाम या कुछ और भी हो सकता है।</string>
+    <string name="displayNameEnter">डिस्प्ले नाम डालें</string>
+    <string name="displayNameErrorDescription">कृपया एक डिस्प्ले नाम चुनें</string>
+    <string name="displayNameErrorDescriptionShorter">कृपया एक छोटा डिसप्ले नाम चुनें</string>
     <string name="activity_pn_mode_recommended_option_tag">सुझाया गया</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">कृपया एक विकल्प चुनें।</string>
     <string name="activity_home_empty_state_message">अभी तक आपके पास कोई कॉन्टैक्ट्स नहीं हैं</string>
@@ -655,7 +655,6 @@
     <string name="activity_backup_restore_explanation_1">एक बैकअप फ़ाइल चुनें और वह पासफ़्रेज़ दर्ज करें जिसके साथ इसे बनाया गया था।</string>
     <string name="activity_backup_restore_passphrase">30 अंक का पासफ्रेस</string>
     <string name="activity_link_device_skip_prompt">यह समय ले रहा है, इसे छोड़ दें?</string>
-    <string name="activity_link_device_link_device">डिवाइस को लिंक करें</string>
     <string name="activity_link_device_recovery_phrase">पुनर्प्राप्ति वाक्यांश</string>
     <string name="activity_link_device_scan_qr_code">QR कोड को स्कैन करें</string>
     <string name="activity_link_device_qr_message">अपना क्यूआर कोड दिखाने के लिए अपने अन्य डिवाइस पर सेटिंग्स →पुनर्प्राप्ति वाक्यांश में जाएंं।</string>
@@ -666,7 +665,6 @@
     <string name="activity_pn_mode_slow_mode">स्लो मोड</string>
     <string name="activity_pn_mode_fast_mode_explanation">आपको नई सूचनाओं के बारे में google के नोटीफिकेशन servers से तत्काल सूचित किया जाएगा।</string>
     <string name="activity_pn_mode_slow_mode_explanation">Session कभी-कभी पृष्ठभूमि में नए संदेशों की जांच करेगा।</string>
-    <string name="fragment_recovery_phrase_title">पुनर्प्राप्ति वाक्यांश</string>
     <string name="activity_prompt_passphrase_session_locked">Session लॉक है</string>
     <string name="activity_prompt_passphrase_tap_to_unlock">अनलॉक करने के लिए टैप करें</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">उपनाम चुनें</string>

app/src/main/res/values-hi/strings.xml

@@ -543,11 +543,11 @@
     <string name="activity_restore_title">अकाउंट रिस्टोर करें</string>
     <string name="activity_restore_explanation">अकाउंट बनाते समय बनाया गया अपना रिकवरी वाक्य डालें।</string>
     <string name="activity_restore_seed_edit_text_hint">अपना पुनर्प्राप्ति वाक्यांश लिखें</string>
-    <string name="activity_display_name_title_2">अपना प्रदर्शन नाम चुनें</string>
-    <string name="activity_display_name_explanation">यह सेशन इस्तेमाल करते समय आपका नाम होगा। यह आपका असली नाम, उपनाम या कुछ और भी हो सकता है।</string>
-    <string name="activity_display_name_edit_text_hint">डिस्प्ले नाम डालें</string>
-    <string name="activity_display_name_display_name_missing_error">कृपया एक डिस्प्ले नाम चुनें</string>
-    <string name="activity_display_name_display_name_too_long_error">कृपया एक छोटा डिसप्ले नाम चुनें</string>
+    <string name="displayNamePick">अपना प्रदर्शन नाम चुनें</string>
+    <string name="displayNameDescription">यह सेशन इस्तेमाल करते समय आपका नाम होगा। यह आपका असली नाम, उपनाम या कुछ और भी हो सकता है।</string>
+    <string name="displayNameEnter">डिस्प्ले नाम डालें</string>
+    <string name="displayNameErrorDescription">कृपया एक डिस्प्ले नाम चुनें</string>
+    <string name="displayNameErrorDescriptionShorter">कृपया एक छोटा डिसप्ले नाम चुनें</string>
     <string name="activity_pn_mode_recommended_option_tag">सुझाया गया</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">कृपया एक विकल्प चुनें।</string>
     <string name="activity_home_empty_state_message">अभी तक आपके पास कोई कॉन्टैक्ट्स नहीं हैं</string>
@@ -655,7 +655,6 @@
     <string name="activity_backup_restore_explanation_1">एक बैकअप फ़ाइल चुनें और वह पासफ़्रेज़ दर्ज करें जिसके साथ इसे बनाया गया था।</string>
     <string name="activity_backup_restore_passphrase">30 अंक का पासफ्रेस</string>
     <string name="activity_link_device_skip_prompt">यह समय ले रहा है, इसे छोड़ दें?</string>
-    <string name="activity_link_device_link_device">डिवाइस को लिंक करें</string>
     <string name="activity_link_device_recovery_phrase">पुनर्प्राप्ति वाक्यांश</string>
     <string name="activity_link_device_scan_qr_code">QR कोड को स्कैन करें</string>
     <string name="activity_link_device_qr_message">अपना क्यूआर कोड दिखाने के लिए अपने अन्य डिवाइस पर सेटिंग्स →पुनर्प्राप्ति वाक्यांश में जाएंं।</string>
@@ -666,7 +665,6 @@
     <string name="activity_pn_mode_slow_mode">स्लो मोड</string>
     <string name="activity_pn_mode_fast_mode_explanation">आपको नई सूचनाओं के बारे में google के नोटीफिकेशन servers से तत्काल सूचित किया जाएगा।</string>
     <string name="activity_pn_mode_slow_mode_explanation">Session कभी-कभी पृष्ठभूमि में नए संदेशों की जांच करेगा।</string>
-    <string name="fragment_recovery_phrase_title">पुनर्प्राप्ति वाक्यांश</string>
     <string name="activity_prompt_passphrase_session_locked">Session लॉक है</string>
     <string name="activity_prompt_passphrase_tap_to_unlock">अनलॉक करने के लिए टैप करें</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">उपनाम चुनें</string>

app/src/main/res/values-hu-rHU/strings.xml

@@ -545,11 +545,11 @@
     <string name="activity_restore_title">Fiók visszaállítása</string>
     <string name="activity_restore_explanation">Írja be azt a helyreállítási kifejezést, amelyet a fiók visszaállításához regisztrálásakor kapott.</string>
     <string name="activity_restore_seed_edit_text_hint">Írja be a helyreállítási kifejezést</string>
-    <string name="activity_display_name_title_2">Válassza ki a megjelenítendő nevet</string>
-    <string name="activity_display_name_explanation">Ez lesz az ön neve, amikor használja a Session alkalmazást. Ez lehet a valódi neve, álneve, vagy bármi más, ami tetszik.</string>
-    <string name="activity_display_name_edit_text_hint">Írja be a megjelenítendő nevet</string>
-    <string name="activity_display_name_display_name_missing_error">Kérjük, válassza ki a megjelenítendő nevet</string>
-    <string name="activity_display_name_display_name_too_long_error">Válasszon rövidebb megjelenítési nevet</string>
+    <string name="displayNamePick">Válassza ki a megjelenítendő nevet</string>
+    <string name="displayNameDescription">Ez lesz az ön neve, amikor használja a Session alkalmazást. Ez lehet a valódi neve, álneve, vagy bármi más, ami tetszik.</string>
+    <string name="displayNameEnter">Írja be a megjelenítendő nevet</string>
+    <string name="displayNameErrorDescription">Kérjük, válassza ki a megjelenítendő nevet</string>
+    <string name="displayNameErrorDescriptionShorter">Válasszon rövidebb megjelenítési nevet</string>
     <string name="activity_pn_mode_recommended_option_tag">Ajánlott</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Kérjük, válasszon egy lehetőséget</string>
     <string name="activity_home_empty_state_message">Még nincsenek névjegyei</string>
@@ -657,7 +657,6 @@
     <string name="activity_backup_restore_explanation_1">Válassz ki egy visszaállítási fájlt és add meg a hozzá tartozó visszaálítási kódmondatot.</string>
     <string name="activity_backup_restore_passphrase">30-betűs kódmondat</string>
     <string name="activity_link_device_skip_prompt">Ez eltarthat egy ideig, szeretnéd átugrani?</string>
-    <string name="activity_link_device_link_device">Eszköz társítása</string>
     <string name="activity_link_device_recovery_phrase">Visszaállítási kódmondat</string>
     <string name="activity_link_device_scan_qr_code">QR kód beolvasása</string>
     <string name="activity_link_device_qr_message">A QR-kód megjelenítéséhez nyissa meg a Beállítások → Helyreállítási kifejezés elemet másik eszközén. </string>
@@ -668,7 +667,6 @@
     <string name="activity_pn_mode_slow_mode">Lassított mód</string>
     <string name="activity_pn_mode_fast_mode_explanation">A Google értesítési szerverein keresztül megbízhatóan és azonnal értesítést kapsz az új üzenetekről.</string>
     <string name="activity_pn_mode_slow_mode_explanation">A Session alkalmanként, az új üzeneteket a háttérben fogja ellenőrizni.</string>
-    <string name="fragment_recovery_phrase_title">Visszaállítási kódmondat</string>
     <string name="activity_prompt_passphrase_session_locked">Session zárolva</string>
     <string name="activity_prompt_passphrase_tap_to_unlock">Koppintson a feloldáshoz</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">Írjon be egy becenevet</string>

app/src/main/res/values-hu/strings.xml

@@ -545,11 +545,11 @@
     <string name="activity_restore_title">Fiók visszaállítása</string>
     <string name="activity_restore_explanation">Írja be azt a helyreállítási kifejezést, amelyet a fiók visszaállításához regisztrálásakor kapott.</string>
     <string name="activity_restore_seed_edit_text_hint">Írja be a helyreállítási kifejezést</string>
-    <string name="activity_display_name_title_2">Válassza ki a megjelenítendő nevet</string>
-    <string name="activity_display_name_explanation">Ez lesz az ön neve, amikor használja a Session alkalmazást. Ez lehet a valódi neve, álneve, vagy bármi más, ami tetszik.</string>
-    <string name="activity_display_name_edit_text_hint">Írja be a megjelenítendő nevet</string>
-    <string name="activity_display_name_display_name_missing_error">Kérjük, válassza ki a megjelenítendő nevet</string>
-    <string name="activity_display_name_display_name_too_long_error">Válasszon rövidebb megjelenítési nevet</string>
+    <string name="displayNamePick">Válassza ki a megjelenítendő nevet</string>
+    <string name="displayNameDescription">Ez lesz az ön neve, amikor használja a Session alkalmazást. Ez lehet a valódi neve, álneve, vagy bármi más, ami tetszik.</string>
+    <string name="displayNameEnter">Írja be a megjelenítendő nevet</string>
+    <string name="displayNameErrorDescription">Kérjük, válassza ki a megjelenítendő nevet</string>
+    <string name="displayNameErrorDescriptionShorter">Válasszon rövidebb megjelenítési nevet</string>
     <string name="activity_pn_mode_recommended_option_tag">Ajánlott</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Kérjük, válasszon egy lehetőséget</string>
     <string name="activity_home_empty_state_message">Még nincsenek névjegyei</string>
@@ -657,7 +657,6 @@
     <string name="activity_backup_restore_explanation_1">Válassz ki egy visszaállítási fájlt és add meg a hozzá tartozó visszaálítási kódmondatot.</string>
     <string name="activity_backup_restore_passphrase">30-betűs kódmondat</string>
     <string name="activity_link_device_skip_prompt">Ez eltarthat egy ideig, szeretnéd átugrani?</string>
-    <string name="activity_link_device_link_device">Eszköz társítása</string>
     <string name="activity_link_device_recovery_phrase">Visszaállítási kódmondat</string>
     <string name="activity_link_device_scan_qr_code">QR kód beolvasása</string>
     <string name="activity_link_device_qr_message">A QR-kód megjelenítéséhez nyissa meg a Beállítások → Helyreállítási kifejezés elemet másik eszközén. </string>
@@ -668,7 +667,6 @@
     <string name="activity_pn_mode_slow_mode">Lassított mód</string>
     <string name="activity_pn_mode_fast_mode_explanation">A Google értesítési szerverein keresztül megbízhatóan és azonnal értesítést kapsz az új üzenetekről.</string>
     <string name="activity_pn_mode_slow_mode_explanation">A Session alkalmanként, az új üzeneteket a háttérben fogja ellenőrizni.</string>
-    <string name="fragment_recovery_phrase_title">Visszaállítási kódmondat</string>
     <string name="activity_prompt_passphrase_session_locked">Session zárolva</string>
     <string name="activity_prompt_passphrase_tap_to_unlock">Koppintson a feloldáshoz</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">Írjon be egy becenevet</string>

app/src/main/res/values-hy-rAM/strings.xml

@@ -551,11 +551,11 @@
     <string name="activity_restore_title">Վերականգնել ձեր հաշիվը</string>
     <string name="activity_restore_explanation">Մուտքագրեք վերականգնման բառակապակցությունը, որը տրվել է ձեզ, երբ գրանցվել եք ձեր հաշիվը վերականգնելու համար:</string>
     <string name="activity_restore_seed_edit_text_hint">Գրեք գաղտնի արտահայտությունը</string>
-    <string name="activity_display_name_title_2">Ընտրեք ցուցադրվող անուն</string>
-    <string name="activity_display_name_explanation">Այս անունը կցուցադրվի, երբ Դուք կօգտվեք Սեանսից։ Այն կարող է լինել Ձեր անունը, կեղծանուն, կամ որևիցե այլ բան։</string>
-    <string name="activity_display_name_edit_text_hint">Մուտքագրեք ցուցադրվող անուն</string>
-    <string name="activity_display_name_display_name_missing_error">Խնդրում ենք գրել անուն</string>
-    <string name="activity_display_name_display_name_too_long_error">Խնդրում ենք ընտրել կարճ անուն</string>
+    <string name="displayNamePick">Ընտրեք ցուցադրվող անուն</string>
+    <string name="displayNameDescription">Այս անունը կցուցադրվի, երբ Դուք կօգտվեք Սեանսից։ Այն կարող է լինել Ձեր անունը, կեղծանուն, կամ որևիցե այլ բան։</string>
+    <string name="displayNameEnter">Մուտքագրեք ցուցադրվող անուն</string>
+    <string name="displayNameErrorDescription">Խնդրում ենք գրել անուն</string>
+    <string name="displayNameErrorDescriptionShorter">Խնդրում ենք ընտրել կարճ անուն</string>
     <string name="activity_pn_mode_recommended_option_tag">[Խորհուրդ է տրվում]</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Խնդրում ենք ընտրել</string>
     <string name="activity_home_empty_state_message">Դուք չունեք կոնտակտներ</string>
@@ -663,7 +663,6 @@
     <string name="activity_backup_restore_explanation_1">Ընտրեք կրկնօրինակի ֆայլ և մուտքագրեք այն գաղտնաբառը, որով ստեղծվել է:</string>
     <string name="activity_backup_restore_passphrase">30֊թվանոց գախտնաբառ</string>
     <string name="activity_link_device_skip_prompt">Սա որոշ ժամանակ է տևում, կցանկանա՞ք բաց թողնել:</string>
-    <string name="activity_link_device_link_device">Ավելացնել սարք</string>
     <string name="activity_link_device_recovery_phrase">Վերականգնման բառակապակցություն</string>
     <string name="activity_link_device_scan_qr_code">Սկանավորել QR Կոդը</string>
     <string name="activity_link_device_qr_message">Անցեք Կարգավորումներ → Վերականգնման Բառակապակցություն՝ ձեր QR կոդը ցուցադրելու համար:</string>
@@ -674,7 +673,6 @@
     <string name="activity_pn_mode_slow_mode">Դանդաղ ռեժիմ</string>
     <string name="activity_pn_mode_fast_mode_explanation">Դուք մշտապես և անմիջապես կտեղեկացվեք նոր հաղորդագրությունների մասին՝ օգտագործելով Google-ի ծանուցումների սերվերները:</string>
     <string name="activity_pn_mode_slow_mode_explanation">Session-ը երբեմն, ֆոնային կստուգի նոր հաղորդագրությունների առկայությունը:</string>
-    <string name="fragment_recovery_phrase_title">Գաղտնի արտահայտություն</string>
     <string name="activity_prompt_passphrase_session_locked">Session֊ը արգելափակված է</string>
     <string name="activity_prompt_passphrase_tap_to_unlock">Հպեք՝ ապակողպելու համար</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">Մուտքագրե՛ք կեղծանունը</string>

app/src/main/res/values-hy/strings.xml

@@ -551,11 +551,11 @@
     <string name="activity_restore_title">Վերականգնել ձեր հաշիվը</string>
     <string name="activity_restore_explanation">Մուտքագրեք վերականգնման բառակապակցությունը, որը տրվել է ձեզ, երբ գրանցվել եք ձեր հաշիվը վերականգնելու համար:</string>
     <string name="activity_restore_seed_edit_text_hint">Գրեք գաղտնի արտահայտությունը</string>
-    <string name="activity_display_name_title_2">Ընտրեք ցուցադրվող անուն</string>
-    <string name="activity_display_name_explanation">Այս անունը կցուցադրվի, երբ Դուք կօգտվեք Սեանսից։ Այն կարող է լինել Ձեր անունը, կեղծանուն, կամ որևիցե այլ բան։</string>
-    <string name="activity_display_name_edit_text_hint">Մուտքագրեք ցուցադրվող անուն</string>
-    <string name="activity_display_name_display_name_missing_error">Խնդրում ենք գրել անուն</string>
-    <string name="activity_display_name_display_name_too_long_error">Խնդրում ենք ընտրել կարճ անուն</string>
+    <string name="displayNamePick">Ընտրեք ցուցադրվող անուն</string>
+    <string name="displayNameDescription">Այս անունը կցուցադրվի, երբ Դուք կօգտվեք Սեանսից։ Այն կարող է լինել Ձեր անունը, կեղծանուն, կամ որևիցե այլ բան։</string>
+    <string name="displayNameEnter">Մուտքագրեք ցուցադրվող անուն</string>
+    <string name="displayNameErrorDescription">Խնդրում ենք գրել անուն</string>
+    <string name="displayNameErrorDescriptionShorter">Խնդրում ենք ընտրել կարճ անուն</string>
     <string name="activity_pn_mode_recommended_option_tag">[Խորհուրդ է տրվում]</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Խնդրում ենք ընտրել</string>
     <string name="activity_home_empty_state_message">Դուք չունեք կոնտակտներ</string>
@@ -663,7 +663,6 @@
     <string name="activity_backup_restore_explanation_1">Ընտրեք կրկնօրինակի ֆայլ և մուտքագրեք այն գաղտնաբառը, որով ստեղծվել է:</string>
     <string name="activity_backup_restore_passphrase">30֊թվանոց գախտնաբառ</string>
     <string name="activity_link_device_skip_prompt">Սա որոշ ժամանակ է տևում, կցանկանա՞ք բաց թողնել:</string>
-    <string name="activity_link_device_link_device">Ավելացնել սարք</string>
     <string name="activity_link_device_recovery_phrase">Վերականգնման բառակապակցություն</string>
     <string name="activity_link_device_scan_qr_code">Սկանավորել QR Կոդը</string>
     <string name="activity_link_device_qr_message">Անցեք Կարգավորումներ → Վերականգնման Բառակապակցություն՝ ձեր QR կոդը ցուցադրելու համար:</string>
@@ -674,7 +673,6 @@
     <string name="activity_pn_mode_slow_mode">Դանդաղ ռեժիմ</string>
     <string name="activity_pn_mode_fast_mode_explanation">Դուք մշտապես և անմիջապես կտեղեկացվեք նոր հաղորդագրությունների մասին՝ օգտագործելով Google-ի ծանուցումների սերվերները:</string>
     <string name="activity_pn_mode_slow_mode_explanation">Session-ը երբեմն, ֆոնային կստուգի նոր հաղորդագրությունների առկայությունը:</string>
-    <string name="fragment_recovery_phrase_title">Գաղտնի արտահայտություն</string>
     <string name="activity_prompt_passphrase_session_locked">Session֊ը արգելափակված է</string>
     <string name="activity_prompt_passphrase_tap_to_unlock">Հպեք՝ ապակողպելու համար</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">Մուտքագրե՛ք կեղծանունը</string>

app/src/main/res/values-in-rID/strings.xml

@@ -419,11 +419,11 @@
     <string name="activity_restore_title">Memulihkan akun Anda</string>
     <string name="activity_restore_explanation">Masukkan kata pemulihan yang diberikan saat anda masuk untuk memulihkan akun anda.</string>
     <string name="activity_restore_seed_edit_text_hint">Masukan kata pemulihan</string>
-    <string name="activity_display_name_title_2">Pilih nama yang ditampilkan</string>
-    <string name="activity_display_name_explanation">Ini akan menjadi nama anda ketika menggunakan Session. Bisa merupakan nama asli, alias, atau apapun yang anda suka.</string>
-    <string name="activity_display_name_edit_text_hint">Masukkan nama</string>
-    <string name="activity_display_name_display_name_missing_error">Pilih nama yang ditampilkan</string>
-    <string name="activity_display_name_display_name_too_long_error">Pilih nama yang lebih pendek</string>
+    <string name="displayNamePick">Pilih nama yang ditampilkan</string>
+    <string name="displayNameDescription">Ini akan menjadi nama anda ketika menggunakan Session. Bisa merupakan nama asli, alias, atau apapun yang anda suka.</string>
+    <string name="displayNameEnter">Masukkan nama</string>
+    <string name="displayNameErrorDescription">Pilih nama yang ditampilkan</string>
+    <string name="displayNameErrorDescriptionShorter">Pilih nama yang lebih pendek</string>
     <string name="activity_pn_mode_recommended_option_tag">Direkomendasikan</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Pilih salah satu opsi</string>
     <string name="activity_home_empty_state_message">Anda belum memiliki kontak</string>

app/src/main/res/values-in/strings.xml

@@ -417,11 +417,11 @@
     <string name="activity_restore_title">Memulihkan akun Anda</string>
     <string name="activity_restore_explanation">Masukkan kata pemulihan yang diberikan saat anda masuk untuk memulihkan akun anda.</string>
     <string name="activity_restore_seed_edit_text_hint">Masukan kata pemulihan</string>
-    <string name="activity_display_name_title_2">Pilih nama yang ditampilkan</string>
-    <string name="activity_display_name_explanation">Ini akan menjadi nama anda ketika menggunakan Session. Bisa merupakan nama asli, alias, atau apapun yang anda suka.</string>
-    <string name="activity_display_name_edit_text_hint">Masukkan nama</string>
-    <string name="activity_display_name_display_name_missing_error">Pilih nama yang ditampilkan</string>
-    <string name="activity_display_name_display_name_too_long_error">Pilih nama yang lebih pendek</string>
+    <string name="displayNamePick">Pilih nama yang ditampilkan</string>
+    <string name="displayNameDescription">Ini akan menjadi nama anda ketika menggunakan Session. Bisa merupakan nama asli, alias, atau apapun yang anda suka.</string>
+    <string name="displayNameEnter">Masukkan nama</string>
+    <string name="displayNameErrorDescription">Pilih nama yang ditampilkan</string>
+    <string name="displayNameErrorDescriptionShorter">Pilih nama yang lebih pendek</string>
     <string name="activity_pn_mode_recommended_option_tag">Direkomendasikan</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Pilih salah satu opsi</string>
     <string name="activity_home_empty_state_message">Anda belum memiliki kontak</string>

app/src/main/res/values-it-rIT/strings.xml

@@ -544,11 +544,11 @@ scambia un altro messaggio!</string>
     <string name="activity_restore_title">Ripristina il tuo account</string>
     <string name="activity_restore_explanation">Inserisci la frase di recupero che ti è stata data quando ti sei registrato per ripristinare il tuo account.</string>
     <string name="activity_restore_seed_edit_text_hint">Inserisci la frase di recupero</string>
-    <string name="activity_display_name_title_2">Scegli il nome da visualizzare</string>
-    <string name="activity_display_name_explanation">Questo sarà il tuo nome quando usi una Sessione. Può essere il tuo vero nome, un soprannome o qualsiasi altra cosa.</string>
-    <string name="activity_display_name_edit_text_hint">Inserisci il nome da visualizzare</string>
-    <string name="activity_display_name_display_name_missing_error">Scegli il nome da visualizzare</string>
-    <string name="activity_display_name_display_name_too_long_error">Scegli un nome più breve</string>
+    <string name="displayNamePick">Scegli il nome da visualizzare</string>
+    <string name="displayNameDescription">Questo sarà il tuo nome quando usi una Sessione. Può essere il tuo vero nome, un soprannome o qualsiasi altra cosa.</string>
+    <string name="displayNameEnter">Inserisci il nome da visualizzare</string>
+    <string name="displayNameErrorDescription">Scegli il nome da visualizzare</string>
+    <string name="displayNameErrorDescriptionShorter">Scegli un nome più breve</string>
     <string name="activity_pn_mode_recommended_option_tag">Consigliato</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Scegli un\'opzione</string>
     <string name="activity_home_empty_state_message">Non hai ancora nessun contatto</string>
@@ -656,7 +656,6 @@ scambia un altro messaggio!</string>
     <string name="activity_backup_restore_explanation_1">Selezionare un file di backup ed inserire la passphrase con cui è stato creato.</string>
     <string name="activity_backup_restore_passphrase">Frase di recupero di 30 caratteri</string>
     <string name="activity_link_device_skip_prompt">Questo sta impiegando un po\' di tempo, vorresti saltare?</string>
-    <string name="activity_link_device_link_device">Collega dispositivo</string>
     <string name="activity_link_device_recovery_phrase">Frase di recupero</string>
     <string name="activity_link_device_scan_qr_code">Scansiona codice QR</string>
     <string name="activity_link_device_qr_message">Vai su Impostazioni → Frase di recupero sul tuo altro dispositivo per mostrare il tuo codice QR.</string>
@@ -667,7 +666,6 @@ scambia un altro messaggio!</string>
     <string name="activity_pn_mode_slow_mode">Modalità Lenta</string>
     <string name="activity_pn_mode_fast_mode_explanation">Riceverai notifiche di nuovi messaggi in modo affidabile e immediato utilizzando i server di notifica di Google.</string>
     <string name="activity_pn_mode_slow_mode_explanation">Session controllerà di tanto in tanto la presenza di nuovi messaggi in background.</string>
-    <string name="fragment_recovery_phrase_title">Frase di recupero</string>
     <string name="activity_prompt_passphrase_session_locked">Session è Bloccato</string>
     <string name="activity_prompt_passphrase_tap_to_unlock">Tocca per Sbloccare</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">Inserisci un nickname</string>

app/src/main/res/values-it/strings.xml

@@ -544,11 +544,11 @@ scambia un altro messaggio!</string>
     <string name="activity_restore_title">Ripristina il tuo account</string>
     <string name="activity_restore_explanation">Inserisci la frase di recupero che ti è stata data quando ti sei registrato per ripristinare il tuo account.</string>
     <string name="activity_restore_seed_edit_text_hint">Inserisci la frase di recupero</string>
-    <string name="activity_display_name_title_2">Scegli il nome da visualizzare</string>
-    <string name="activity_display_name_explanation">Questo sarà il tuo nome quando usi una Sessione. Può essere il tuo vero nome, un soprannome o qualsiasi altra cosa.</string>
-    <string name="activity_display_name_edit_text_hint">Inserisci il nome da visualizzare</string>
-    <string name="activity_display_name_display_name_missing_error">Scegli il nome da visualizzare</string>
-    <string name="activity_display_name_display_name_too_long_error">Scegli un nome più breve</string>
+    <string name="displayNamePick">Scegli il nome da visualizzare</string>
+    <string name="displayNameDescription">Questo sarà il tuo nome quando usi una Sessione. Può essere il tuo vero nome, un soprannome o qualsiasi altra cosa.</string>
+    <string name="displayNameEnter">Inserisci il nome da visualizzare</string>
+    <string name="displayNameErrorDescription">Scegli il nome da visualizzare</string>
+    <string name="displayNameErrorDescriptionShorter">Scegli un nome più breve</string>
     <string name="activity_pn_mode_recommended_option_tag">Consigliato</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Scegli un\'opzione</string>
     <string name="activity_home_empty_state_message">Non hai ancora nessun contatto</string>
@@ -656,7 +656,6 @@ scambia un altro messaggio!</string>
     <string name="activity_backup_restore_explanation_1">Selezionare un file di backup ed inserire la passphrase con cui è stato creato.</string>
     <string name="activity_backup_restore_passphrase">Frase di recupero di 30 caratteri</string>
     <string name="activity_link_device_skip_prompt">Questo sta impiegando un po\' di tempo, vorresti saltare?</string>
-    <string name="activity_link_device_link_device">Collega dispositivo</string>
     <string name="activity_link_device_recovery_phrase">Frase di recupero</string>
     <string name="activity_link_device_scan_qr_code">Scansiona codice QR</string>
     <string name="activity_link_device_qr_message">Vai su Impostazioni → Frase di recupero sul tuo altro dispositivo per mostrare il tuo codice QR.</string>
@@ -667,7 +666,6 @@ scambia un altro messaggio!</string>
     <string name="activity_pn_mode_slow_mode">Modalità Lenta</string>
     <string name="activity_pn_mode_fast_mode_explanation">Riceverai notifiche di nuovi messaggi in modo affidabile e immediato utilizzando i server di notifica di Google.</string>
     <string name="activity_pn_mode_slow_mode_explanation">Session controllerà di tanto in tanto la presenza di nuovi messaggi in background.</string>
-    <string name="fragment_recovery_phrase_title">Frase di recupero</string>
     <string name="activity_prompt_passphrase_session_locked">Session è Bloccato</string>
     <string name="activity_prompt_passphrase_tap_to_unlock">Tocca per Sbloccare</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">Inserisci un nickname</string>

app/src/main/res/values-ja-rJP/strings.xml

@@ -528,11 +528,11 @@
     <string name="activity_restore_title">アカウントを復元する</string>
     <string name="activity_restore_explanation">アカウントを復元するためにサインアップしたときに与えられたリカバリーフレーズを入力します。</string>
     <string name="activity_restore_seed_edit_text_hint">リカバリーフレーズを入力してください</string>
-    <string name="activity_display_name_title_2">表示名を選択してください</string>
-    <string name="activity_display_name_explanation">これは、Session を使用するときの名前になります。あなたの本当の名前、エイリアス、またはあなたが好きな他のものに設定することができます。</string>
-    <string name="activity_display_name_edit_text_hint">表示名を入力してください</string>
-    <string name="activity_display_name_display_name_missing_error">表示名を選択してください</string>
-    <string name="activity_display_name_display_name_too_long_error">短い表示名を選択してください</string>
+    <string name="displayNamePick">表示名を選択してください</string>
+    <string name="displayNameDescription">これは、Session を使用するときの名前になります。あなたの本当の名前、エイリアス、またはあなたが好きな他のものに設定することができます。</string>
+    <string name="displayNameEnter">表示名を入力してください</string>
+    <string name="displayNameErrorDescription">表示名を選択してください</string>
+    <string name="displayNameErrorDescriptionShorter">短い表示名を選択してください</string>
     <string name="activity_pn_mode_recommended_option_tag">オススメ</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">オプションを選択してください</string>
     <string name="activity_home_empty_state_message">まだ連絡先がありません</string>

app/src/main/res/values-ja/strings.xml

@@ -528,11 +528,11 @@
     <string name="activity_restore_title">アカウントを復元する</string>
     <string name="activity_restore_explanation">アカウントを復元するためにサインアップしたときに与えられたリカバリーフレーズを入力します。</string>
     <string name="activity_restore_seed_edit_text_hint">リカバリーフレーズを入力してください</string>
-    <string name="activity_display_name_title_2">表示名を選択してください</string>
-    <string name="activity_display_name_explanation">これは、Session を使用するときの名前になります。あなたの本当の名前、エイリアス、またはあなたが好きな他のものに設定することができます。</string>
-    <string name="activity_display_name_edit_text_hint">表示名を入力してください</string>
-    <string name="activity_display_name_display_name_missing_error">表示名を選択してください</string>
-    <string name="activity_display_name_display_name_too_long_error">短い表示名を選択してください</string>
+    <string name="displayNamePick">表示名を選択してください</string>
+    <string name="displayNameDescription">これは、Session を使用するときの名前になります。あなたの本当の名前、エイリアス、またはあなたが好きな他のものに設定することができます。</string>
+    <string name="displayNameEnter">表示名を入力してください</string>
+    <string name="displayNameErrorDescription">表示名を選択してください</string>
+    <string name="displayNameErrorDescriptionShorter">短い表示名を選択してください</string>
     <string name="activity_pn_mode_recommended_option_tag">オススメ</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">オプションを選択してください</string>
     <string name="activity_home_empty_state_message">まだ連絡先がありません</string>

app/src/main/res/values-ko-rKR/strings.xml

@@ -437,7 +437,6 @@
     <string name="activity_edit_closed_group_add_members">멤버 추가</string>
     <string name="activity_link_device_recovery_phrase">복구 코드</string>
     <string name="activity_link_device_scan_qr_code">QR 코드 스캔</string>
-    <string name="fragment_recovery_phrase_title">복구 코드</string>
     <string name="notify_type_all">모두</string>
     <string name="notify_type_mentions">멘션만</string>
     <string name="activity_settings_survey_feedback">피드백/설문 조사</string>

app/src/main/res/values-ko/strings.xml

@@ -437,7 +437,6 @@
     <string name="activity_edit_closed_group_add_members">멤버 추가</string>
     <string name="activity_link_device_recovery_phrase">복구 코드</string>
     <string name="activity_link_device_scan_qr_code">QR 코드 스캔</string>
-    <string name="fragment_recovery_phrase_title">복구 코드</string>
     <string name="notify_type_all">모두</string>
     <string name="notify_type_mentions">멘션만</string>
     <string name="activity_settings_survey_feedback">피드백/설문 조사</string>

app/src/main/res/values-lt-rLT/strings.xml

@@ -560,11 +560,11 @@
 
     <string name="activity_restore_title">Atkurkite savo paskyrą</string>
     <string name="activity_restore_seed_edit_text_hint">Įveskite savo atkūrimo frazę</string>
-    <string name="activity_display_name_title_2">Pasirinkite savo rodomą vardą</string>
-    <string name="activity_display_name_explanation">Tai bus jūsų vardas, kai naudositės Session. Tai gali būti jūsų tikras vardas, slapyvardis ar bet kas kita.</string>
-    <string name="activity_display_name_edit_text_hint">Įveskite pasirinktą rodomą vardą</string>
-    <string name="activity_display_name_display_name_missing_error">Pasirinkite rodomą vardą</string>
-    <string name="activity_display_name_display_name_too_long_error">Pasirinkite trumpesnį rodomą vardą</string>
+    <string name="displayNamePick">Pasirinkite savo rodomą vardą</string>
+    <string name="displayNameDescription">Tai bus jūsų vardas, kai naudositės Session. Tai gali būti jūsų tikras vardas, slapyvardis ar bet kas kita.</string>
+    <string name="displayNameEnter">Įveskite pasirinktą rodomą vardą</string>
+    <string name="displayNameErrorDescription">Pasirinkite rodomą vardą</string>
+    <string name="displayNameErrorDescriptionShorter">Pasirinkite trumpesnį rodomą vardą</string>
     <string name="activity_pn_mode_recommended_option_tag">Rekomenduojama</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Pasirinkite parinktį</string>
     <string name="activity_home_empty_state_message">Kol kas neturite jokių adresatų</string>
@@ -651,7 +651,6 @@
     <string name="details">Išsamiau</string>
     <string name="dialog_backup_activation_failed">Nepavyko aktyvuoti atsarginių kopijų. Bandykite dar kartą arba susisiekite su palaikymu.</string>
     <string name="activity_backup_restore_title">Atkurti atsarginę kopiją</string>
-    <string name="activity_link_device_link_device">Susieti įrenginį</string>
     <string name="activity_link_device_recovery_phrase">Atkūrimo frazė</string>
     <string name="activity_link_device_scan_qr_code">Skenuoti QR kodą</string>
     <string name="activity_join_public_chat_join_rooms">Arba prisijunkite prie vienos iš šių…</string>
@@ -661,7 +660,6 @@
     <string name="activity_pn_mode_slow_mode">Lėta veiksena</string>
     <string name="activity_pn_mode_fast_mode_explanation">Jums bus nedelsiant ir patikimai pranešama apie naujas žinutes, naudojant „Google“ pranešimų serverius.</string>
     <string name="activity_pn_mode_slow_mode_explanation">Session programėlė retkarčiais fone tikrins, ar yra naujų žinučių.</string>
-    <string name="fragment_recovery_phrase_title">Atkūrimo frazė</string>
     <string name="activity_prompt_passphrase_session_locked">Session yra užrakinta</string>
     <string name="activity_prompt_passphrase_tap_to_unlock">Bakstelėkite norėdami atrakinti</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">Įveskite slapyvardį</string>

app/src/main/res/values-lt/strings.xml

@@ -560,11 +560,11 @@
 
     <string name="activity_restore_title">Atkurkite savo paskyrą</string>
     <string name="activity_restore_seed_edit_text_hint">Įveskite savo atkūrimo frazę</string>
-    <string name="activity_display_name_title_2">Pasirinkite savo rodomą vardą</string>
-    <string name="activity_display_name_explanation">Tai bus jūsų vardas, kai naudositės Session. Tai gali būti jūsų tikras vardas, slapyvardis ar bet kas kita.</string>
-    <string name="activity_display_name_edit_text_hint">Įveskite pasirinktą rodomą vardą</string>
-    <string name="activity_display_name_display_name_missing_error">Pasirinkite rodomą vardą</string>
-    <string name="activity_display_name_display_name_too_long_error">Pasirinkite trumpesnį rodomą vardą</string>
+    <string name="displayNamePick">Pasirinkite savo rodomą vardą</string>
+    <string name="displayNameDescription">Tai bus jūsų vardas, kai naudositės Session. Tai gali būti jūsų tikras vardas, slapyvardis ar bet kas kita.</string>
+    <string name="displayNameEnter">Įveskite pasirinktą rodomą vardą</string>
+    <string name="displayNameErrorDescription">Pasirinkite rodomą vardą</string>
+    <string name="displayNameErrorDescriptionShorter">Pasirinkite trumpesnį rodomą vardą</string>
     <string name="activity_pn_mode_recommended_option_tag">Rekomenduojama</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Pasirinkite parinktį</string>
     <string name="activity_home_empty_state_message">Kol kas neturite jokių adresatų</string>
@@ -651,7 +651,6 @@
     <string name="details">Išsamiau</string>
     <string name="dialog_backup_activation_failed">Nepavyko aktyvuoti atsarginių kopijų. Bandykite dar kartą arba susisiekite su palaikymu.</string>
     <string name="activity_backup_restore_title">Atkurti atsarginę kopiją</string>
-    <string name="activity_link_device_link_device">Susieti įrenginį</string>
     <string name="activity_link_device_recovery_phrase">Atkūrimo frazė</string>
     <string name="activity_link_device_scan_qr_code">Skenuoti QR kodą</string>
     <string name="activity_join_public_chat_join_rooms">Arba prisijunkite prie vienos iš šių…</string>
@@ -661,7 +660,6 @@
     <string name="activity_pn_mode_slow_mode">Lėta veiksena</string>
     <string name="activity_pn_mode_fast_mode_explanation">Jums bus nedelsiant ir patikimai pranešama apie naujas žinutes, naudojant „Google“ pranešimų serverius.</string>
     <string name="activity_pn_mode_slow_mode_explanation">Session programėlė retkarčiais fone tikrins, ar yra naujų žinučių.</string>
-    <string name="fragment_recovery_phrase_title">Atkūrimo frazė</string>
     <string name="activity_prompt_passphrase_session_locked">Session yra užrakinta</string>
     <string name="activity_prompt_passphrase_tap_to_unlock">Bakstelėkite norėdami atrakinti</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">Įveskite slapyvardį</string>

app/src/main/res/values-nb-rNO/strings.xml

@@ -543,11 +543,11 @@ nøkkelutvekslingsmelding.</string>
     <string name="activity_restore_title">Gjenopprett kontoen din</string>
     <string name="activity_restore_explanation">Angi gjenopprettingsfrasen som ble gitt til deg når du registrerte deg for å gjenopprette din konto.</string>
     <string name="activity_restore_seed_edit_text_hint">Skriv inn din gjenopprettelsesfrase</string>
-    <string name="activity_display_name_title_2">Velg ditt visningsnavn</string>
-    <string name="activity_display_name_explanation">Dette vil være navnet ditt når du bruker Session. Det kan være ditt virkelige navn, en alias, eller alt annet du vil.</string>
-    <string name="activity_display_name_edit_text_hint">Skriv inn et visningsnavn</string>
-    <string name="activity_display_name_display_name_missing_error">Vennligst velg et visningsnavn</string>
-    <string name="activity_display_name_display_name_too_long_error">Vennligst velg et kortere visningsnavn</string>
+    <string name="displayNamePick">Velg ditt visningsnavn</string>
+    <string name="displayNameDescription">Dette vil være navnet ditt når du bruker Session. Det kan være ditt virkelige navn, en alias, eller alt annet du vil.</string>
+    <string name="displayNameEnter">Skriv inn et visningsnavn</string>
+    <string name="displayNameErrorDescription">Vennligst velg et visningsnavn</string>
+    <string name="displayNameErrorDescriptionShorter">Vennligst velg et kortere visningsnavn</string>
     <string name="activity_pn_mode_recommended_option_tag">Anbefalt</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Vennligst velg et alternativ</string>
     <string name="activity_home_empty_state_message">Du har ingen kontakter ennå</string>
@@ -655,7 +655,6 @@ nøkkelutvekslingsmelding.</string>
     <string name="activity_backup_restore_explanation_1">Velg en sikkerhetskopifil og skriv inn passordfrasen den ble opprettet med.</string>
     <string name="activity_backup_restore_passphrase">30-digit passphrase</string>
     <string name="activity_link_device_skip_prompt">Dette tar en stund, vil du hoppe over?</string>
-    <string name="activity_link_device_link_device">Koble til en enhet</string>
     <string name="activity_link_device_recovery_phrase">Gjenopprettingsfrase</string>
     <string name="activity_link_device_scan_qr_code">Skann QR-kode</string>
     <string name="activity_link_device_qr_message">Naviger til innstillinger → Gjenopprettingsfrasen på din andre enhet for å vise QR-koden.</string>
@@ -666,7 +665,6 @@ nøkkelutvekslingsmelding.</string>
     <string name="activity_pn_mode_slow_mode">Langsom Modus</string>
     <string name="activity_pn_mode_fast_mode_explanation">Du vil bli varslet om nye meldinger på en pålitelig måte, og umiddelbart ved hjelp av Googles varslingsservere.</string>
     <string name="activity_pn_mode_slow_mode_explanation">Session vil av og til sjekke nye meldinger i bakgrunnen.</string>
-    <string name="fragment_recovery_phrase_title">Gjenopprettingsfrase</string>
     <string name="activity_prompt_passphrase_session_locked">Session er låst</string>
     <string name="activity_prompt_passphrase_tap_to_unlock">Trykk for å låse opp</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">Skriv inn et kallenavn</string>

app/src/main/res/values-nb/strings.xml

@@ -543,11 +543,11 @@ nøkkelutvekslingsmelding.</string>
     <string name="activity_restore_title">Gjenopprett kontoen din</string>
     <string name="activity_restore_explanation">Angi gjenopprettingsfrasen som ble gitt til deg når du registrerte deg for å gjenopprette din konto.</string>
     <string name="activity_restore_seed_edit_text_hint">Skriv inn din gjenopprettelsesfrase</string>
-    <string name="activity_display_name_title_2">Velg ditt visningsnavn</string>
-    <string name="activity_display_name_explanation">Dette vil være navnet ditt når du bruker Session. Det kan være ditt virkelige navn, en alias, eller alt annet du vil.</string>
-    <string name="activity_display_name_edit_text_hint">Skriv inn et visningsnavn</string>
-    <string name="activity_display_name_display_name_missing_error">Vennligst velg et visningsnavn</string>
-    <string name="activity_display_name_display_name_too_long_error">Vennligst velg et kortere visningsnavn</string>
+    <string name="displayNamePick">Velg ditt visningsnavn</string>
+    <string name="displayNameDescription">Dette vil være navnet ditt når du bruker Session. Det kan være ditt virkelige navn, en alias, eller alt annet du vil.</string>
+    <string name="displayNameEnter">Skriv inn et visningsnavn</string>
+    <string name="displayNameErrorDescription">Vennligst velg et visningsnavn</string>
+    <string name="displayNameErrorDescriptionShorter">Vennligst velg et kortere visningsnavn</string>
     <string name="activity_pn_mode_recommended_option_tag">Anbefalt</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Vennligst velg et alternativ</string>
     <string name="activity_home_empty_state_message">Du har ingen kontakter ennå</string>
@@ -655,7 +655,6 @@ nøkkelutvekslingsmelding.</string>
     <string name="activity_backup_restore_explanation_1">Velg en sikkerhetskopifil og skriv inn passordfrasen den ble opprettet med.</string>
     <string name="activity_backup_restore_passphrase">30-digit passphrase</string>
     <string name="activity_link_device_skip_prompt">Dette tar en stund, vil du hoppe over?</string>
-    <string name="activity_link_device_link_device">Koble til en enhet</string>
     <string name="activity_link_device_recovery_phrase">Gjenopprettingsfrase</string>
     <string name="activity_link_device_scan_qr_code">Skann QR-kode</string>
     <string name="activity_link_device_qr_message">Naviger til innstillinger → Gjenopprettingsfrasen på din andre enhet for å vise QR-koden.</string>
@@ -666,7 +665,6 @@ nøkkelutvekslingsmelding.</string>
     <string name="activity_pn_mode_slow_mode">Langsom Modus</string>
     <string name="activity_pn_mode_fast_mode_explanation">Du vil bli varslet om nye meldinger på en pålitelig måte, og umiddelbart ved hjelp av Googles varslingsservere.</string>
     <string name="activity_pn_mode_slow_mode_explanation">Session vil av og til sjekke nye meldinger i bakgrunnen.</string>
-    <string name="fragment_recovery_phrase_title">Gjenopprettingsfrase</string>
     <string name="activity_prompt_passphrase_session_locked">Session er låst</string>
     <string name="activity_prompt_passphrase_tap_to_unlock">Trykk for å låse opp</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">Skriv inn et kallenavn</string>

app/src/main/res/values-nl-rNL/strings.xml

@@ -544,11 +544,11 @@
     <string name="activity_restore_title">Uw account herstellen</string>
     <string name="activity_restore_explanation">Voer de herstel zin in die u hebt gekregen toen u uwzelf hebt aangemeld om uw account te herstellen.</string>
     <string name="activity_restore_seed_edit_text_hint">Voer uw herstel zin in</string>
-    <string name="activity_display_name_title_2">Kies je weergavenaam</string>
-    <string name="activity_display_name_explanation">Dit is je naam wanneer je Sessie gebruikt. Het kan je echte naam zijn, een alias, of wat je maar wilt.</string>
-    <string name="activity_display_name_edit_text_hint">Voer een weergavenaam in</string>
-    <string name="activity_display_name_display_name_missing_error">Kies a.u.b. een weergavenaam</string>
-    <string name="activity_display_name_display_name_too_long_error">Kies a.u.b. een kortere weergavenaam</string>
+    <string name="displayNamePick">Kies je weergavenaam</string>
+    <string name="displayNameDescription">Dit is je naam wanneer je Sessie gebruikt. Het kan je echte naam zijn, een alias, of wat je maar wilt.</string>
+    <string name="displayNameEnter">Voer een weergavenaam in</string>
+    <string name="displayNameErrorDescription">Kies a.u.b. een weergavenaam</string>
+    <string name="displayNameErrorDescriptionShorter">Kies a.u.b. een kortere weergavenaam</string>
     <string name="activity_pn_mode_recommended_option_tag">Aanbevolen</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Gelieve een optie te selecteren</string>
     <string name="activity_home_empty_state_message">U heeft nog geen contactpersonen</string>
@@ -656,7 +656,6 @@
     <string name="activity_backup_restore_explanation_1">Selecteer een backup-bestand en voer de wachtwoordzin in waarmee het is gemaakt.</string>
     <string name="activity_backup_restore_passphrase">Wachtwoordzin met 30 tekens</string>
     <string name="activity_link_device_skip_prompt">Dit duurt een tijdje, wilt u het overslaan?</string>
-    <string name="activity_link_device_link_device">Koppel een apparaat</string>
     <string name="activity_link_device_recovery_phrase">Herstel zin</string>
     <string name="activity_link_device_scan_qr_code">QR-code scannen</string>
     <string name="activity_link_device_qr_message">Navigeer naar Instellingen → Herstel zin op je andere apparaat om je QR-code te tonen.</string>
@@ -667,7 +666,6 @@
     <string name="activity_pn_mode_slow_mode">Langzame modus</string>
     <string name="activity_pn_mode_fast_mode_explanation">U wordt op een betrouwbare en directe manier op de hoogte gebracht van nieuwe berichten via Googles notificatieservers.</string>
     <string name="activity_pn_mode_slow_mode_explanation">Sessie controleert af en toe op nieuwe berichten op de achtergrond.</string>
-    <string name="fragment_recovery_phrase_title">Herstel zin</string>
     <string name="activity_prompt_passphrase_session_locked">Sessie is vergrendeld</string>
     <string name="activity_prompt_passphrase_tap_to_unlock">Tik om te ontgrendelen</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">Bijnaam invoeren</string>

app/src/main/res/values-nl/strings.xml

@@ -544,11 +544,11 @@
     <string name="activity_restore_title">Uw account herstellen</string>
     <string name="activity_restore_explanation">Voer de herstel zin in die u hebt gekregen toen u uwzelf hebt aangemeld om uw account te herstellen.</string>
     <string name="activity_restore_seed_edit_text_hint">Voer uw herstel zin in</string>
-    <string name="activity_display_name_title_2">Kies je weergavenaam</string>
-    <string name="activity_display_name_explanation">Dit is je naam wanneer je Sessie gebruikt. Het kan je echte naam zijn, een alias, of wat je maar wilt.</string>
-    <string name="activity_display_name_edit_text_hint">Voer een weergavenaam in</string>
-    <string name="activity_display_name_display_name_missing_error">Kies a.u.b. een weergavenaam</string>
-    <string name="activity_display_name_display_name_too_long_error">Kies a.u.b. een kortere weergavenaam</string>
+    <string name="displayNamePick">Kies je weergavenaam</string>
+    <string name="displayNameDescription">Dit is je naam wanneer je Sessie gebruikt. Het kan je echte naam zijn, een alias, of wat je maar wilt.</string>
+    <string name="displayNameEnter">Voer een weergavenaam in</string>
+    <string name="displayNameErrorDescription">Kies a.u.b. een weergavenaam</string>
+    <string name="displayNameErrorDescriptionShorter">Kies a.u.b. een kortere weergavenaam</string>
     <string name="activity_pn_mode_recommended_option_tag">Aanbevolen</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Gelieve een optie te selecteren</string>
     <string name="activity_home_empty_state_message">U heeft nog geen contactpersonen</string>
@@ -656,7 +656,6 @@
     <string name="activity_backup_restore_explanation_1">Selecteer een backup-bestand en voer de wachtwoordzin in waarmee het is gemaakt.</string>
     <string name="activity_backup_restore_passphrase">Wachtwoordzin met 30 tekens</string>
     <string name="activity_link_device_skip_prompt">Dit duurt een tijdje, wilt u het overslaan?</string>
-    <string name="activity_link_device_link_device">Koppel een apparaat</string>
     <string name="activity_link_device_recovery_phrase">Herstel zin</string>
     <string name="activity_link_device_scan_qr_code">QR-code scannen</string>
     <string name="activity_link_device_qr_message">Navigeer naar Instellingen → Herstel zin op je andere apparaat om je QR-code te tonen.</string>
@@ -667,7 +666,6 @@
     <string name="activity_pn_mode_slow_mode">Langzame modus</string>
     <string name="activity_pn_mode_fast_mode_explanation">U wordt op een betrouwbare en directe manier op de hoogte gebracht van nieuwe berichten via Googles notificatieservers.</string>
     <string name="activity_pn_mode_slow_mode_explanation">Sessie controleert af en toe op nieuwe berichten op de achtergrond.</string>
-    <string name="fragment_recovery_phrase_title">Herstel zin</string>
     <string name="activity_prompt_passphrase_session_locked">Sessie is vergrendeld</string>
     <string name="activity_prompt_passphrase_tap_to_unlock">Tik om te ontgrendelen</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">Bijnaam invoeren</string>

app/src/main/res/values-pl-rPL/strings.xml

@@ -566,11 +566,11 @@
     <string name="activity_restore_title">Przywróć swoje konto</string>
     <string name="activity_restore_explanation">Wprowadź frazę odzyskiwania, która została Ci przekazana podczas rejestracji w celu przywrócenia konta.</string>
     <string name="activity_restore_seed_edit_text_hint">Wpisz swoją frazę odzyskiwania</string>
-    <string name="activity_display_name_title_2">Wybierz swoją nazwę wyświetlaną</string>
-    <string name="activity_display_name_explanation">To będzie twoje imię, kiedy będziesz używać Session. Może to być twoje prawdziwe imię, pseudonim lub cokolwiek innego, co lubisz.</string>
-    <string name="activity_display_name_edit_text_hint">Wprowadź wyświetlaną nazwę</string>
-    <string name="activity_display_name_display_name_missing_error">Wybierz wyświetlaną nazwę</string>
-    <string name="activity_display_name_display_name_too_long_error">Wybierz krótszą wyświetlaną nazwę</string>
+    <string name="displayNamePick">Wybierz swoją nazwę wyświetlaną</string>
+    <string name="displayNameDescription">To będzie twoje imię, kiedy będziesz używać Session. Może to być twoje prawdziwe imię, pseudonim lub cokolwiek innego, co lubisz.</string>
+    <string name="displayNameEnter">Wprowadź wyświetlaną nazwę</string>
+    <string name="displayNameErrorDescription">Wybierz wyświetlaną nazwę</string>
+    <string name="displayNameErrorDescriptionShorter">Wybierz krótszą wyświetlaną nazwę</string>
     <string name="activity_pn_mode_recommended_option_tag">Zalecana</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Wybierz opcję</string>
     <string name="activity_home_empty_state_message">Nie masz jeszcze żadnych kontaktów</string>
@@ -678,7 +678,6 @@
     <string name="activity_backup_restore_explanation_1">Wybierz plik kopii zapasowej i wpisz hasło, z którym został utworzony.</string>
     <string name="activity_backup_restore_passphrase">Hasło złożone z 30 znaków</string>
     <string name="activity_link_device_skip_prompt">To zajmuje chwilę, czy chcesz pominąć?</string>
-    <string name="activity_link_device_link_device">Połącz urządzenie</string>
     <string name="activity_link_device_recovery_phrase">Fraza odzyskiwania</string>
     <string name="activity_link_device_scan_qr_code">Skanuj kod QR</string>
     <string name="activity_link_device_qr_message">Przejdź do Ustawień → Fraza odzyskiwania na innym urządzeniu, aby wyświetlić kod QR.</string>
@@ -689,7 +688,6 @@
     <string name="activity_pn_mode_slow_mode">Tryb wolny</string>
     <string name="activity_pn_mode_fast_mode_explanation">Zostaniesz natychmiast powiadomiony o nowych wiadomościach w niezawodny sposób przy użyciu serwerów powiadomień Google.</string>
     <string name="activity_pn_mode_slow_mode_explanation">Session będzie czasami sprawdzać w tle czy są nowe wiadomości.</string>
-    <string name="fragment_recovery_phrase_title">Fraza odzyskiwania</string>
     <string name="activity_prompt_passphrase_session_locked">Session jest zablokowany</string>
     <string name="activity_prompt_passphrase_tap_to_unlock">Dotknij by odblokować</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">Wpisz pseudonim</string>

app/src/main/res/values-pl/strings.xml

@@ -566,11 +566,11 @@
     <string name="activity_restore_title">Przywróć swoje konto</string>
     <string name="activity_restore_explanation">Wprowadź frazę odzyskiwania, która została Ci przekazana podczas rejestracji w celu przywrócenia konta.</string>
     <string name="activity_restore_seed_edit_text_hint">Wpisz swoją frazę odzyskiwania</string>
-    <string name="activity_display_name_title_2">Wybierz swoją nazwę wyświetlaną</string>
-    <string name="activity_display_name_explanation">To będzie twoje imię, kiedy będziesz używać Session. Może to być twoje prawdziwe imię, pseudonim lub cokolwiek innego, co lubisz.</string>
-    <string name="activity_display_name_edit_text_hint">Wprowadź wyświetlaną nazwę</string>
-    <string name="activity_display_name_display_name_missing_error">Wybierz wyświetlaną nazwę</string>
-    <string name="activity_display_name_display_name_too_long_error">Wybierz krótszą wyświetlaną nazwę</string>
+    <string name="displayNamePick">Wybierz swoją nazwę wyświetlaną</string>
+    <string name="displayNameDescription">To będzie twoje imię, kiedy będziesz używać Session. Może to być twoje prawdziwe imię, pseudonim lub cokolwiek innego, co lubisz.</string>
+    <string name="displayNameEnter">Wprowadź wyświetlaną nazwę</string>
+    <string name="displayNameErrorDescription">Wybierz wyświetlaną nazwę</string>
+    <string name="displayNameErrorDescriptionShorter">Wybierz krótszą wyświetlaną nazwę</string>
     <string name="activity_pn_mode_recommended_option_tag">Zalecana</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Wybierz opcję</string>
     <string name="activity_home_empty_state_message">Nie masz jeszcze żadnych kontaktów</string>
@@ -678,7 +678,6 @@
     <string name="activity_backup_restore_explanation_1">Wybierz plik kopii zapasowej i wpisz hasło, z którym został utworzony.</string>
     <string name="activity_backup_restore_passphrase">Hasło złożone z 30 znaków</string>
     <string name="activity_link_device_skip_prompt">To zajmuje chwilę, czy chcesz pominąć?</string>
-    <string name="activity_link_device_link_device">Połącz urządzenie</string>
     <string name="activity_link_device_recovery_phrase">Fraza odzyskiwania</string>
     <string name="activity_link_device_scan_qr_code">Skanuj kod QR</string>
     <string name="activity_link_device_qr_message">Przejdź do Ustawień → Fraza odzyskiwania na innym urządzeniu, aby wyświetlić kod QR.</string>
@@ -689,7 +688,6 @@
     <string name="activity_pn_mode_slow_mode">Tryb wolny</string>
     <string name="activity_pn_mode_fast_mode_explanation">Zostaniesz natychmiast powiadomiony o nowych wiadomościach w niezawodny sposób przy użyciu serwerów powiadomień Google.</string>
     <string name="activity_pn_mode_slow_mode_explanation">Session będzie czasami sprawdzać w tle czy są nowe wiadomości.</string>
-    <string name="fragment_recovery_phrase_title">Fraza odzyskiwania</string>
     <string name="activity_prompt_passphrase_session_locked">Session jest zablokowany</string>
     <string name="activity_prompt_passphrase_tap_to_unlock">Dotknij by odblokować</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">Wpisz pseudonim</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -544,11 +544,11 @@
     <string name="activity_restore_title">Restaurar sua conta</string>
     <string name="activity_restore_explanation">Entre a frase de recuperação que lhe foi dada quando você fez signup para restaurar sua conta.</string>
     <string name="activity_restore_seed_edit_text_hint">Entre sua frase de recuperação</string>
-    <string name="activity_display_name_title_2">Escolha seu nome de display</string>
-    <string name="activity_display_name_explanation">Este será o seu nome quando você usar Session. Pode ser seu nome verdadeiro, um alias, ou qualquer outra coisa que você quiser.</string>
-    <string name="activity_display_name_edit_text_hint">Entre um nome de display</string>
-    <string name="activity_display_name_display_name_missing_error">Escolha um nome de display</string>
-    <string name="activity_display_name_display_name_too_long_error">Escolha um nome de exibição mais curto</string>
+    <string name="displayNamePick">Escolha seu nome de display</string>
+    <string name="displayNameDescription">Este será o seu nome quando você usar Session. Pode ser seu nome verdadeiro, um alias, ou qualquer outra coisa que você quiser.</string>
+    <string name="displayNameEnter">Entre um nome de display</string>
+    <string name="displayNameErrorDescription">Escolha um nome de display</string>
+    <string name="displayNameErrorDescriptionShorter">Escolha um nome de exibição mais curto</string>
     <string name="activity_pn_mode_recommended_option_tag">Recomendado</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Escolha uma opção</string>
     <string name="activity_home_empty_state_message">Você ainda não possui contatos</string>
@@ -656,7 +656,6 @@
     <string name="activity_backup_restore_explanation_1">Selecione uma cópia de segurança e coloque a senha frase que foi criada.</string>
     <string name="activity_backup_restore_passphrase">Senha de 30 dígitos</string>
     <string name="activity_link_device_skip_prompt">Isto está demorando um pouco, tu gostarias de pular?</string>
-    <string name="activity_link_device_link_device">Vincular um Dispositivo</string>
     <string name="activity_link_device_recovery_phrase">Frase de Recuperação</string>
     <string name="activity_link_device_scan_qr_code">Ler Código QR</string>
     <string name="activity_link_device_qr_message">Vá até as configurações → Frase de Recuperação em seu outro dispositivo para mostrar o seu código QR.</string>
@@ -667,7 +666,6 @@
     <string name="activity_pn_mode_slow_mode">Modo Lento</string>
     <string name="activity_pn_mode_fast_mode_explanation">Você será notificado de forma confiável e imediata sobre novas mensagens usando os servidores de notificação da Google.</string>
     <string name="activity_pn_mode_slow_mode_explanation">O session verificará ocasionalmente por novas mensagens em segundo plano.</string>
-    <string name="fragment_recovery_phrase_title">Frase de Recuperação</string>
     <string name="activity_prompt_passphrase_session_locked">Session está Trancado</string>
     <string name="activity_prompt_passphrase_tap_to_unlock">Toque para destrancar</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">Digite um apelido</string>

app/src/main/res/values-pt-rPT/strings.xml

@@ -539,11 +539,11 @@ foi recebida está corrompida!</string>
     <string name="activity_restore_title">Restaurar sua conta</string>
     <string name="activity_restore_explanation">Digite a frase de recuperação que lhe foi fornecida quando você se inscreveu para restaurar sua conta.</string>
     <string name="activity_restore_seed_edit_text_hint">Digite sua frase de recuperação</string>
-    <string name="activity_display_name_title_2">Escolha seu nome de exibição</string>
-    <string name="activity_display_name_explanation">Este será o seu nome quando usar o Session. Pode ser seu nome verdadeiro, um apelido ou qualquer outra coisa que você quiser.</string>
-    <string name="activity_display_name_edit_text_hint">Digite um nome de exibição</string>
-    <string name="activity_display_name_display_name_missing_error">Escolha um nome de exibição</string>
-    <string name="activity_display_name_display_name_too_long_error">Escolha um nome de exibição mais curto</string>
+    <string name="displayNamePick">Escolha seu nome de exibição</string>
+    <string name="displayNameDescription">Este será o seu nome quando usar o Session. Pode ser seu nome verdadeiro, um apelido ou qualquer outra coisa que você quiser.</string>
+    <string name="displayNameEnter">Digite um nome de exibição</string>
+    <string name="displayNameErrorDescription">Escolha um nome de exibição</string>
+    <string name="displayNameErrorDescriptionShorter">Escolha um nome de exibição mais curto</string>
     <string name="activity_pn_mode_recommended_option_tag">Recomendado</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Escolha uma opção</string>
     <string name="activity_home_empty_state_message">Você ainda não possui contatos</string>

app/src/main/res/values-pt/strings.xml

@@ -544,11 +544,11 @@
     <string name="activity_restore_title">Restaurar sua conta</string>
     <string name="activity_restore_explanation">Entre a frase de recuperação que lhe foi dada quando você fez signup para restaurar sua conta.</string>
     <string name="activity_restore_seed_edit_text_hint">Entre sua frase de recuperação</string>
-    <string name="activity_display_name_title_2">Escolha seu nome de display</string>
-    <string name="activity_display_name_explanation">Este será o seu nome quando você usar Session. Pode ser seu nome verdadeiro, um alias, ou qualquer outra coisa que você quiser.</string>
-    <string name="activity_display_name_edit_text_hint">Entre um nome de display</string>
-    <string name="activity_display_name_display_name_missing_error">Escolha um nome de display</string>
-    <string name="activity_display_name_display_name_too_long_error">Escolha um nome de exibição mais curto</string>
+    <string name="displayNamePick">Escolha seu nome de display</string>
+    <string name="displayNameDescription">Este será o seu nome quando você usar Session. Pode ser seu nome verdadeiro, um alias, ou qualquer outra coisa que você quiser.</string>
+    <string name="displayNameEnter">Entre um nome de display</string>
+    <string name="displayNameErrorDescription">Escolha um nome de display</string>
+    <string name="displayNameErrorDescriptionShorter">Escolha um nome de exibição mais curto</string>
     <string name="activity_pn_mode_recommended_option_tag">Recomendado</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Escolha uma opção</string>
     <string name="activity_home_empty_state_message">Você ainda não possui contatos</string>
@@ -656,7 +656,6 @@
     <string name="activity_backup_restore_explanation_1">Selecione uma cópia de segurança e coloque a senha frase que foi criada.</string>
     <string name="activity_backup_restore_passphrase">Senha de 30 dígitos</string>
     <string name="activity_link_device_skip_prompt">Isto está demorando um pouco, tu gostarias de pular?</string>
-    <string name="activity_link_device_link_device">Vincular um Dispositivo</string>
     <string name="activity_link_device_recovery_phrase">Frase de Recuperação</string>
     <string name="activity_link_device_scan_qr_code">Ler Código QR</string>
     <string name="activity_link_device_qr_message">Vá até as configurações → Frase de Recuperação em seu outro dispositivo para mostrar o seu código QR.</string>
@@ -667,7 +666,6 @@
     <string name="activity_pn_mode_slow_mode">Modo Lento</string>
     <string name="activity_pn_mode_fast_mode_explanation">Você será notificado de forma confiável e imediata sobre novas mensagens usando os servidores de notificação da Google.</string>
     <string name="activity_pn_mode_slow_mode_explanation">O session verificará ocasionalmente por novas mensagens em segundo plano.</string>
-    <string name="fragment_recovery_phrase_title">Frase de Recuperação</string>
     <string name="activity_prompt_passphrase_session_locked">Session está Trancado</string>
     <string name="activity_prompt_passphrase_tap_to_unlock">Toque para destrancar</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">Digite um apelido</string>

app/src/main/res/values-ro-rRO/strings.xml

@@ -558,10 +558,10 @@ schimbul de chei este corupt </string>
     <string name="activity_restore_title">Recuperează-ți contul</string>
     <string name="activity_restore_explanation">Introduceți fraza de recuperare care v-a fost dată atunci când v-ați înregistrat pentru a vă restaura contul.</string>
     <string name="activity_restore_seed_edit_text_hint">Introduceți fraza de recuperare</string>
-    <string name="activity_display_name_title_2">Alegeți numele afișat</string>
-    <string name="activity_display_name_explanation">Acesta va fi numele tău când folosești Session. Poate fi numele tău, un pseudonim, sau orice altceva dorești.</string>
-    <string name="activity_display_name_edit_text_hint">Alege un nume de afișat</string>
-    <string name="activity_display_name_display_name_missing_error">Vă rugăm să alegeți un nume de afișare</string>
+    <string name="displayNamePick">Alegeți numele afișat</string>
+    <string name="displayNameDescription">Acesta va fi numele tău când folosești Session. Poate fi numele tău, un pseudonim, sau orice altceva dorești.</string>
+    <string name="displayNameEnter">Alege un nume de afișat</string>
+    <string name="displayNameErrorDescription">Vă rugăm să alegeți un nume de afișare</string>
     <string name="activity_path_guard_node_row_title">Nod de intrare</string>
     <string name="activity_path_service_node_row_title">Nod servicii</string>
     <string name="activity_path_destination_row_title">Destinație</string>

app/src/main/res/values-ro/strings.xml

@@ -558,10 +558,10 @@ schimbul de chei este corupt </string>
     <string name="activity_restore_title">Recuperează-ți contul</string>
     <string name="activity_restore_explanation">Introduceți fraza de recuperare care v-a fost dată atunci când v-ați înregistrat pentru a vă restaura contul.</string>
     <string name="activity_restore_seed_edit_text_hint">Introduceți fraza de recuperare</string>
-    <string name="activity_display_name_title_2">Alegeți numele afișat</string>
-    <string name="activity_display_name_explanation">Acesta va fi numele tău când folosești Session. Poate fi numele tău, un pseudonim, sau orice altceva dorești.</string>
-    <string name="activity_display_name_edit_text_hint">Alege un nume de afișat</string>
-    <string name="activity_display_name_display_name_missing_error">Vă rugăm să alegeți un nume de afișare</string>
+    <string name="displayNamePick">Alegeți numele afișat</string>
+    <string name="displayNameDescription">Acesta va fi numele tău când folosești Session. Poate fi numele tău, un pseudonim, sau orice altceva dorești.</string>
+    <string name="displayNameEnter">Alege un nume de afișat</string>
+    <string name="displayNameErrorDescription">Vă rugăm să alegeți un nume de afișare</string>
     <string name="activity_path_guard_node_row_title">Nod de intrare</string>
     <string name="activity_path_service_node_row_title">Nod servicii</string>
     <string name="activity_path_destination_row_title">Destinație</string>

app/src/main/res/values-ru-rRU/strings.xml

@@ -568,11 +568,11 @@
     <string name="activity_restore_title">Восстановите свой аккаунт</string>
     <string name="activity_restore_explanation">Для восстановления учетной записи введите секретную фразу, которая была предоставлена вам при регистрации.</string>
     <string name="activity_restore_seed_edit_text_hint">Введите секретную фразу</string>
-    <string name="activity_display_name_title_2">Выберите ваше отображаемое имя</string>
-    <string name="activity_display_name_explanation">Это имя будет отображаться, когда вы используете Session. Это может быть ваше настоящее имя, псевдоним или что угодно по вашему выбору.</string>
-    <string name="activity_display_name_edit_text_hint">Введите отображаемое имя</string>
-    <string name="activity_display_name_display_name_missing_error">Пожалуйста, выберите отображаемое имя</string>
-    <string name="activity_display_name_display_name_too_long_error">Пожалуйста, выберите более короткое отображаемое имя</string>
+    <string name="displayNamePick">Выберите ваше отображаемое имя</string>
+    <string name="displayNameDescription">Это имя будет отображаться, когда вы используете Session. Это может быть ваше настоящее имя, псевдоним или что угодно по вашему выбору.</string>
+    <string name="displayNameEnter">Введите отображаемое имя</string>
+    <string name="displayNameErrorDescription">Пожалуйста, выберите отображаемое имя</string>
+    <string name="displayNameErrorDescriptionShorter">Пожалуйста, выберите более короткое отображаемое имя</string>
     <string name="activity_pn_mode_recommended_option_tag">Рекомендуется</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Пожалуйста, выберите метод</string>
     <string name="activity_home_empty_state_message">У вас еще нет контактов</string>
@@ -680,7 +680,6 @@
     <string name="activity_backup_restore_explanation_1">Выберите файл резервной копии и введите парольную фразу, с которой он был создан.</string>
     <string name="activity_backup_restore_passphrase">Фраза из 30 цифр</string>
     <string name="activity_link_device_skip_prompt">Это занимает некоторое время, хотите пропустить?</string>
-    <string name="activity_link_device_link_device">Привязать устройство</string>
     <string name="activity_link_device_recovery_phrase">Фраза для восстановления доступа</string>
     <string name="activity_link_device_scan_qr_code">Сканировать QR-код</string>
     <string name="activity_link_device_qr_message">Перейдите в Настройки → Фраза для восстановления доступа на другом устройстве, чтобы показать ваш QR код.</string>
@@ -691,7 +690,6 @@
     <string name="activity_pn_mode_slow_mode">Медленный режим</string>
     <string name="activity_pn_mode_fast_mode_explanation">Вы будете получать уведомления о новых сообщениях надежно и сразу же с помощью серверов уведомлений Google.</string>
     <string name="activity_pn_mode_slow_mode_explanation">Session время от времени в фоновом режиме будeт проверять и получать новые сообщения.</string>
-    <string name="fragment_recovery_phrase_title">Секретная фраза</string>
     <string name="activity_prompt_passphrase_session_locked">Session заблокирован</string>
     <string name="activity_prompt_passphrase_tap_to_unlock">Разблокировать</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">Введите ник</string>

app/src/main/res/values-ru/strings.xml

@@ -568,11 +568,11 @@
     <string name="activity_restore_title">Восстановите свой аккаунт</string>
     <string name="activity_restore_explanation">Для восстановления учетной записи введите секретную фразу, которая была предоставлена вам при регистрации.</string>
     <string name="activity_restore_seed_edit_text_hint">Введите секретную фразу</string>
-    <string name="activity_display_name_title_2">Выберите ваше отображаемое имя</string>
-    <string name="activity_display_name_explanation">Это имя будет отображаться, когда вы используете Session. Это может быть ваше настоящее имя, псевдоним или что угодно по вашему выбору.</string>
-    <string name="activity_display_name_edit_text_hint">Введите отображаемое имя</string>
-    <string name="activity_display_name_display_name_missing_error">Пожалуйста, выберите отображаемое имя</string>
-    <string name="activity_display_name_display_name_too_long_error">Пожалуйста, выберите более короткое отображаемое имя</string>
+    <string name="displayNamePick">Выберите ваше отображаемое имя</string>
+    <string name="displayNameDescription">Это имя будет отображаться, когда вы используете Session. Это может быть ваше настоящее имя, псевдоним или что угодно по вашему выбору.</string>
+    <string name="displayNameEnter">Введите отображаемое имя</string>
+    <string name="displayNameErrorDescription">Пожалуйста, выберите отображаемое имя</string>
+    <string name="displayNameErrorDescriptionShorter">Пожалуйста, выберите более короткое отображаемое имя</string>
     <string name="activity_pn_mode_recommended_option_tag">Рекомендуется</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Пожалуйста, выберите метод</string>
     <string name="activity_home_empty_state_message">У вас еще нет контактов</string>
@@ -680,7 +680,6 @@
     <string name="activity_backup_restore_explanation_1">Выберите файл резервной копии и введите парольную фразу, с которой он был создан.</string>
     <string name="activity_backup_restore_passphrase">Фраза из 30 цифр</string>
     <string name="activity_link_device_skip_prompt">Это занимает некоторое время, хотите пропустить?</string>
-    <string name="activity_link_device_link_device">Привязать устройство</string>
     <string name="activity_link_device_recovery_phrase">Фраза для восстановления доступа</string>
     <string name="activity_link_device_scan_qr_code">Сканировать QR-код</string>
     <string name="activity_link_device_qr_message">Перейдите в Настройки → Фраза для восстановления доступа на другом устройстве, чтобы показать ваш QR код.</string>
@@ -691,7 +690,6 @@
     <string name="activity_pn_mode_slow_mode">Медленный режим</string>
     <string name="activity_pn_mode_fast_mode_explanation">Вы будете получать уведомления о новых сообщениях надежно и сразу же с помощью серверов уведомлений Google.</string>
     <string name="activity_pn_mode_slow_mode_explanation">Session время от времени в фоновом режиме будeт проверять и получать новые сообщения.</string>
-    <string name="fragment_recovery_phrase_title">Секретная фраза</string>
     <string name="activity_prompt_passphrase_session_locked">Session заблокирован</string>
     <string name="activity_prompt_passphrase_tap_to_unlock">Разблокировать</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">Введите ник</string>

app/src/main/res/values-sk-rSK/strings.xml

@@ -556,11 +556,11 @@ výmeny kľúčov.</string>
     <string name="activity_restore_title">Obnoviť účet</string>
     <string name="activity_restore_explanation">Zadajte frázu na obnovenie, ktorá vám bola poskytnutá pri registrácii na obnovenie účtu.</string>
     <string name="activity_restore_seed_edit_text_hint">Zadajte vašu obnovovaciu frázu</string>
-    <string name="activity_display_name_title_2">Vyberte svoje zobrazované meno</string>
-    <string name="activity_display_name_explanation">Toto bude vaše meno pri používaní Session. Môže to byť vaše skutočné meno, prezývka alebo čokoľvek čo chcete.</string>
-    <string name="activity_display_name_edit_text_hint">Zadajte zobrazované meno</string>
-    <string name="activity_display_name_display_name_missing_error">Zvoľte prosím zobrazované meno</string>
-    <string name="activity_display_name_display_name_too_long_error">Zvoľte prosím kratšie zobrazované meno</string>
+    <string name="displayNamePick">Vyberte svoje zobrazované meno</string>
+    <string name="displayNameDescription">Toto bude vaše meno pri používaní Session. Môže to byť vaše skutočné meno, prezývka alebo čokoľvek čo chcete.</string>
+    <string name="displayNameEnter">Zadajte zobrazované meno</string>
+    <string name="displayNameErrorDescription">Zvoľte prosím zobrazované meno</string>
+    <string name="displayNameErrorDescriptionShorter">Zvoľte prosím kratšie zobrazované meno</string>
     <string name="activity_pn_mode_recommended_option_tag">Odporúčané</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Prosím, zvoľte možnosť</string>
     <string name="activity_home_empty_state_message">Zatiaľ nemáte žiadne kontakty</string>
@@ -646,7 +646,6 @@ výmeny kľúčov.</string>
     <string name="activity_backup_restore_select_file">Vybrať súbor</string>
     <string name="activity_backup_restore_explanation_1">Vyberte súbor zálohy a zadajte prístupovú frázu, pomocou ktorej bol vytvorený.</string>
     <string name="activity_backup_restore_passphrase">30-znaková prístupová fráza</string>
-    <string name="activity_link_device_link_device">Pripojiť zariadenie</string>
     <string name="activity_join_public_chat_join_rooms">Alebo sa pripojte k jednej z týchto…</string>
     <string name="activity_pn_mode_message_notifications">Upozornenia na správy</string>
     <string name="activity_pn_mode_fast_mode">Rýchly režim</string>

app/src/main/res/values-sk/strings.xml

@@ -556,11 +556,11 @@ výmeny kľúčov.</string>
     <string name="activity_restore_title">Obnoviť účet</string>
     <string name="activity_restore_explanation">Zadajte frázu na obnovenie, ktorá vám bola poskytnutá pri registrácii na obnovenie účtu.</string>
     <string name="activity_restore_seed_edit_text_hint">Zadajte vašu obnovovaciu frázu</string>
-    <string name="activity_display_name_title_2">Vyberte svoje zobrazované meno</string>
-    <string name="activity_display_name_explanation">Toto bude vaše meno pri používaní Session. Môže to byť vaše skutočné meno, prezývka alebo čokoľvek čo chcete.</string>
-    <string name="activity_display_name_edit_text_hint">Zadajte zobrazované meno</string>
-    <string name="activity_display_name_display_name_missing_error">Zvoľte prosím zobrazované meno</string>
-    <string name="activity_display_name_display_name_too_long_error">Zvoľte prosím kratšie zobrazované meno</string>
+    <string name="displayNamePick">Vyberte svoje zobrazované meno</string>
+    <string name="displayNameDescription">Toto bude vaše meno pri používaní Session. Môže to byť vaše skutočné meno, prezývka alebo čokoľvek čo chcete.</string>
+    <string name="displayNameEnter">Zadajte zobrazované meno</string>
+    <string name="displayNameErrorDescription">Zvoľte prosím zobrazované meno</string>
+    <string name="displayNameErrorDescriptionShorter">Zvoľte prosím kratšie zobrazované meno</string>
     <string name="activity_pn_mode_recommended_option_tag">Odporúčané</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Prosím, zvoľte možnosť</string>
     <string name="activity_home_empty_state_message">Zatiaľ nemáte žiadne kontakty</string>
@@ -646,7 +646,6 @@ výmeny kľúčov.</string>
     <string name="activity_backup_restore_select_file">Vybrať súbor</string>
     <string name="activity_backup_restore_explanation_1">Vyberte súbor zálohy a zadajte prístupovú frázu, pomocou ktorej bol vytvorený.</string>
     <string name="activity_backup_restore_passphrase">30-znaková prístupová fráza</string>
-    <string name="activity_link_device_link_device">Pripojiť zariadenie</string>
     <string name="activity_join_public_chat_join_rooms">Alebo sa pripojte k jednej z týchto…</string>
     <string name="activity_pn_mode_message_notifications">Upozornenia na správy</string>
     <string name="activity_pn_mode_fast_mode">Rýchly režim</string>

app/src/main/res/values-sr-rSP/strings.xml

@@ -510,7 +510,7 @@
     <string name="AppProtectionPreferenceFragment_none">Ништа</string>
     <!-- Conversation activity -->
     <!-- Session -->
-    <string name="activity_display_name_display_name_too_long_error">Молимо вас да изаберете краће приказно име</string>
+    <string name="displayNameErrorDescriptionShorter">Молимо вас да изаберете краће приказно име</string>
     <string name="activity_pn_mode_recommended_option_tag">Препоручено</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Молимо Вас да одаберете опцију</string>
     <string name="activity_home_empty_state_message">Још увек немате ниједан контакт</string>

app/src/main/res/values-sr/strings.xml

@@ -510,7 +510,7 @@
     <string name="AppProtectionPreferenceFragment_none">Ништа</string>
     <!-- Conversation activity -->
     <!-- Session -->
-    <string name="activity_display_name_display_name_too_long_error">Молимо вас да изаберете краће приказно име</string>
+    <string name="displayNameErrorDescriptionShorter">Молимо вас да изаберете краће приказно име</string>
     <string name="activity_pn_mode_recommended_option_tag">Препоручено</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Молимо Вас да одаберете опцију</string>
     <string name="activity_home_empty_state_message">Још увек немате ниједан контакт</string>

app/src/main/res/values-sv-rSE/strings.xml

@@ -543,11 +543,11 @@ för nyckelutbyte!</string>
     <string name="activity_restore_title">Återställ ditt konto</string>
     <string name="activity_restore_explanation">Ange den återställningsfras du fick när du skapade ditt konto för att kunna återställa ditt konto.</string>
     <string name="activity_restore_seed_edit_text_hint">Ange din återställningsfras</string>
-    <string name="activity_display_name_title_2">Välj visningsnamn</string>
-    <string name="activity_display_name_explanation">Detta blir ditt namn när du använder Session. Det kan vara ditt riktiga namn, ett alias eller något annat du gillar.</string>
-    <string name="activity_display_name_edit_text_hint">Ange ett visningsnamn</string>
-    <string name="activity_display_name_display_name_missing_error">Vänligen välj ett visningsnamn</string>
-    <string name="activity_display_name_display_name_too_long_error">Vänligen välj ett kortare visningsnamn</string>
+    <string name="displayNamePick">Välj visningsnamn</string>
+    <string name="displayNameDescription">Detta blir ditt namn när du använder Session. Det kan vara ditt riktiga namn, ett alias eller något annat du gillar.</string>
+    <string name="displayNameEnter">Ange ett visningsnamn</string>
+    <string name="displayNameErrorDescription">Vänligen välj ett visningsnamn</string>
+    <string name="displayNameErrorDescriptionShorter">Vänligen välj ett kortare visningsnamn</string>
     <string name="activity_pn_mode_recommended_option_tag">Rekommenderat</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Välj ett alternativ</string>
     <string name="activity_home_empty_state_message">Du har inga kontakter än</string>
@@ -655,7 +655,6 @@ för nyckelutbyte!</string>
     <string name="activity_backup_restore_explanation_1">Välj en säkerhetskopieringsfil och ange lösenfrasen som den skapades med.</string>
     <string name="activity_backup_restore_passphrase">30-siffrig lösenfras</string>
     <string name="activity_link_device_skip_prompt">Detta tar ett tag, vill du hoppa över?</string>
-    <string name="activity_link_device_link_device">Länka en enhet</string>
     <string name="activity_link_device_recovery_phrase">Återställningsfras</string>
     <string name="activity_link_device_scan_qr_code">Skanna QR-kod</string>
     <string name="activity_link_device_qr_message">Navigera till Inställningar → Återställningsfras på din andra enhet för att visa din QR-kod.</string>
@@ -666,7 +665,6 @@ för nyckelutbyte!</string>
     <string name="activity_pn_mode_slow_mode">Långsamt läge</string>
     <string name="activity_pn_mode_fast_mode_explanation">Du kommer att meddelas om nya meddelanden på ett tillförlitligt sätt och omedelbart genom att använda Googles aviseringsservrar.</string>
     <string name="activity_pn_mode_slow_mode_explanation">Session kommer då och då att leta efter nya meddelanden i bakgrunden.</string>
-    <string name="fragment_recovery_phrase_title">Återställningsfras</string>
     <string name="activity_prompt_passphrase_session_locked">Session är låst</string>
     <string name="activity_prompt_passphrase_tap_to_unlock">Tryck om du vill låsa upp</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">Ange smeknamn</string>

app/src/main/res/values-sv/strings.xml

@@ -543,11 +543,11 @@ för nyckelutbyte!</string>
     <string name="activity_restore_title">Återställ ditt konto</string>
     <string name="activity_restore_explanation">Ange den återställningsfras du fick när du skapade ditt konto för att kunna återställa ditt konto.</string>
     <string name="activity_restore_seed_edit_text_hint">Ange din återställningsfras</string>
-    <string name="activity_display_name_title_2">Välj visningsnamn</string>
-    <string name="activity_display_name_explanation">Detta blir ditt namn när du använder Session. Det kan vara ditt riktiga namn, ett alias eller något annat du gillar.</string>
-    <string name="activity_display_name_edit_text_hint">Ange ett visningsnamn</string>
-    <string name="activity_display_name_display_name_missing_error">Vänligen välj ett visningsnamn</string>
-    <string name="activity_display_name_display_name_too_long_error">Vänligen välj ett kortare visningsnamn</string>
+    <string name="displayNamePick">Välj visningsnamn</string>
+    <string name="displayNameDescription">Detta blir ditt namn när du använder Session. Det kan vara ditt riktiga namn, ett alias eller något annat du gillar.</string>
+    <string name="displayNameEnter">Ange ett visningsnamn</string>
+    <string name="displayNameErrorDescription">Vänligen välj ett visningsnamn</string>
+    <string name="displayNameErrorDescriptionShorter">Vänligen välj ett kortare visningsnamn</string>
     <string name="activity_pn_mode_recommended_option_tag">Rekommenderat</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Välj ett alternativ</string>
     <string name="activity_home_empty_state_message">Du har inga kontakter än</string>
@@ -655,7 +655,6 @@ för nyckelutbyte!</string>
     <string name="activity_backup_restore_explanation_1">Välj en säkerhetskopieringsfil och ange lösenfrasen som den skapades med.</string>
     <string name="activity_backup_restore_passphrase">30-siffrig lösenfras</string>
     <string name="activity_link_device_skip_prompt">Detta tar ett tag, vill du hoppa över?</string>
-    <string name="activity_link_device_link_device">Länka en enhet</string>
     <string name="activity_link_device_recovery_phrase">Återställningsfras</string>
     <string name="activity_link_device_scan_qr_code">Skanna QR-kod</string>
     <string name="activity_link_device_qr_message">Navigera till Inställningar → Återställningsfras på din andra enhet för att visa din QR-kod.</string>
@@ -666,7 +665,6 @@ för nyckelutbyte!</string>
     <string name="activity_pn_mode_slow_mode">Långsamt läge</string>
     <string name="activity_pn_mode_fast_mode_explanation">Du kommer att meddelas om nya meddelanden på ett tillförlitligt sätt och omedelbart genom att använda Googles aviseringsservrar.</string>
     <string name="activity_pn_mode_slow_mode_explanation">Session kommer då och då att leta efter nya meddelanden i bakgrunden.</string>
-    <string name="fragment_recovery_phrase_title">Återställningsfras</string>
     <string name="activity_prompt_passphrase_session_locked">Session är låst</string>
     <string name="activity_prompt_passphrase_tap_to_unlock">Tryck om du vill låsa upp</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">Ange smeknamn</string>

app/src/main/res/values-tr-rTR/strings.xml

@@ -543,11 +543,11 @@ iletisi alındı!</string>
     <string name="activity_restore_title">Hesabınızı geri yükleyin</string>
     <string name="activity_restore_explanation">Hesabınızı geri yüklemek için kaydolduğunuzda size verilen kurtarma ifadesini girin.</string>
     <string name="activity_restore_seed_edit_text_hint">Kurtarma ifadenizi girin</string>
-    <string name="activity_display_name_title_2">Görünen adınızı seçin</string>
-    <string name="activity_display_name_explanation">Bu, Session kullandığınızda adınız olacaktır. Gerçek adınız, takma adınız veya istediğiniz herhangi bir şey olabilir.</string>
-    <string name="activity_display_name_edit_text_hint">Bir görünen ad girin</string>
-    <string name="activity_display_name_display_name_missing_error">Lütfen bir görünen ad seçin</string>
-    <string name="activity_display_name_display_name_too_long_error">Lütfen daha kısa bir görünen ad seçin</string>
+    <string name="displayNamePick">Görünen adınızı seçin</string>
+    <string name="displayNameDescription">Bu, Session kullandığınızda adınız olacaktır. Gerçek adınız, takma adınız veya istediğiniz herhangi bir şey olabilir.</string>
+    <string name="displayNameEnter">Bir görünen ad girin</string>
+    <string name="displayNameErrorDescription">Lütfen bir görünen ad seçin</string>
+    <string name="displayNameErrorDescriptionShorter">Lütfen daha kısa bir görünen ad seçin</string>
     <string name="activity_pn_mode_recommended_option_tag">Önerilenler</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Lütfen Bir Seçenek Seçin</string>
     <string name="activity_home_empty_state_message">Henüz kayıtlı kişi yok</string>
@@ -655,7 +655,6 @@ iletisi alındı!</string>
     <string name="activity_backup_restore_explanation_1">Bir yedekleme dosyası seçin ve oluşturulduğu parolayı girin.</string>
     <string name="activity_backup_restore_passphrase">30 basamaklı parola</string>
     <string name="activity_link_device_skip_prompt">Bu biraz uzun sürüyor, atlamak ister misiniz?</string>
-    <string name="activity_link_device_link_device">Bir Cihazı Bağla</string>
     <string name="activity_link_device_recovery_phrase">Kurtarma Sözcük Grubu</string>
     <string name="activity_link_device_scan_qr_code">QR Kodunu Tara</string>
     <string name="activity_link_device_qr_message">QR kodunuzu göstermek için diğer cihazınızda Ayarlar → Kurtarma İfadesi\'ne gidin.</string>
@@ -666,7 +665,6 @@ iletisi alındı!</string>
     <string name="activity_pn_mode_slow_mode">Yavaş Mod</string>
     <string name="activity_pn_mode_fast_mode_explanation">Google\'ın bildirim sunucularını kullanarak yeni iletilerden güvenilir ve anında haberdar olacaksınız.</string>
     <string name="activity_pn_mode_slow_mode_explanation">Session ara sıra arka planda yeni mesajları kontrol eder.</string>
-    <string name="fragment_recovery_phrase_title">Kurtarma Sözcük Grubu</string>
     <string name="activity_prompt_passphrase_session_locked">Session kilitli</string>
     <string name="activity_prompt_passphrase_tap_to_unlock">Açmak için dokun</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">Bir kullanıcı adı girin</string>

app/src/main/res/values-tr/strings.xml

@@ -543,11 +543,11 @@ iletisi alındı!</string>
     <string name="activity_restore_title">Hesabınızı geri yükleyin</string>
     <string name="activity_restore_explanation">Hesabınızı geri yüklemek için kaydolduğunuzda size verilen kurtarma ifadesini girin.</string>
     <string name="activity_restore_seed_edit_text_hint">Kurtarma ifadenizi girin</string>
-    <string name="activity_display_name_title_2">Görünen adınızı seçin</string>
-    <string name="activity_display_name_explanation">Bu, Session kullandığınızda adınız olacaktır. Gerçek adınız, takma adınız veya istediğiniz herhangi bir şey olabilir.</string>
-    <string name="activity_display_name_edit_text_hint">Bir görünen ad girin</string>
-    <string name="activity_display_name_display_name_missing_error">Lütfen bir görünen ad seçin</string>
-    <string name="activity_display_name_display_name_too_long_error">Lütfen daha kısa bir görünen ad seçin</string>
+    <string name="displayNamePick">Görünen adınızı seçin</string>
+    <string name="displayNameDescription">Bu, Session kullandığınızda adınız olacaktır. Gerçek adınız, takma adınız veya istediğiniz herhangi bir şey olabilir.</string>
+    <string name="displayNameEnter">Bir görünen ad girin</string>
+    <string name="displayNameErrorDescription">Lütfen bir görünen ad seçin</string>
+    <string name="displayNameErrorDescriptionShorter">Lütfen daha kısa bir görünen ad seçin</string>
     <string name="activity_pn_mode_recommended_option_tag">Önerilenler</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Lütfen Bir Seçenek Seçin</string>
     <string name="activity_home_empty_state_message">Henüz kayıtlı kişi yok</string>
@@ -655,7 +655,6 @@ iletisi alındı!</string>
     <string name="activity_backup_restore_explanation_1">Bir yedekleme dosyası seçin ve oluşturulduğu parolayı girin.</string>
     <string name="activity_backup_restore_passphrase">30 basamaklı parola</string>
     <string name="activity_link_device_skip_prompt">Bu biraz uzun sürüyor, atlamak ister misiniz?</string>
-    <string name="activity_link_device_link_device">Bir Cihazı Bağla</string>
     <string name="activity_link_device_recovery_phrase">Kurtarma Sözcük Grubu</string>
     <string name="activity_link_device_scan_qr_code">QR Kodunu Tara</string>
     <string name="activity_link_device_qr_message">QR kodunuzu göstermek için diğer cihazınızda Ayarlar → Kurtarma İfadesi\'ne gidin.</string>
@@ -666,7 +665,6 @@ iletisi alındı!</string>
     <string name="activity_pn_mode_slow_mode">Yavaş Mod</string>
     <string name="activity_pn_mode_fast_mode_explanation">Google\'ın bildirim sunucularını kullanarak yeni iletilerden güvenilir ve anında haberdar olacaksınız.</string>
     <string name="activity_pn_mode_slow_mode_explanation">Session ara sıra arka planda yeni mesajları kontrol eder.</string>
-    <string name="fragment_recovery_phrase_title">Kurtarma Sözcük Grubu</string>
     <string name="activity_prompt_passphrase_session_locked">Session kilitli</string>
     <string name="activity_prompt_passphrase_tap_to_unlock">Açmak için dokun</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">Bir kullanıcı adı girin</string>

app/src/main/res/values-uk-rUA/strings.xml

@@ -569,11 +569,11 @@
     <string name="activity_restore_title">Відновити обліковий запис</string>
     <string name="activity_restore_explanation">Введіть фразу відновлення, яку вам було сказано записати на папері під час реєстрації, для відновлення облікового запису.</string>
     <string name="activity_restore_seed_edit_text_hint">Введіть вашу фразу відновлення</string>
-    <string name="activity_display_name_title_2">Виберіть ваш псевдонім для показу</string>
-    <string name="activity_display_name_explanation">Це буде ваше ім\'я яке ви використовуєте в Session. Воно може бути вашим дійсним ім\'ям, альясом або чимусь іншим.</string>
-    <string name="activity_display_name_edit_text_hint">Введіть відображуватинимий псевдонім</string>
-    <string name="activity_display_name_display_name_missing_error">Будь ласка, виберіть відображуватимий псевдонім</string>
-    <string name="activity_display_name_display_name_too_long_error">Будь ласка, виберіть коротший псевдонім</string>
+    <string name="displayNamePick">Виберіть ваш псевдонім для показу</string>
+    <string name="displayNameDescription">Це буде ваше ім\'я яке ви використовуєте в Session. Воно може бути вашим дійсним ім\'ям, альясом або чимусь іншим.</string>
+    <string name="displayNameEnter">Введіть відображуватинимий псевдонім</string>
+    <string name="displayNameErrorDescription">Будь ласка, виберіть відображуватимий псевдонім</string>
+    <string name="displayNameErrorDescriptionShorter">Будь ласка, виберіть коротший псевдонім</string>
     <string name="activity_pn_mode_recommended_option_tag">Рекомендовано</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Будь ласка виберіть варіант</string>
     <string name="activity_home_empty_state_message">У вас ще немає Session контактів</string>
@@ -681,7 +681,6 @@
     <string name="activity_backup_restore_explanation_1">Виберіть файл резервної копії та введіть секретну фразу, з якою він був створений.</string>
     <string name="activity_backup_restore_passphrase">30-символьний пароль</string>
     <string name="activity_link_device_skip_prompt">Це займає деякий час, ви б хотіли це пропустити?</string>
-    <string name="activity_link_device_link_device">Зв\'язати пристрій</string>
     <string name="activity_link_device_recovery_phrase">Фраза відновлення</string>
     <string name="activity_link_device_scan_qr_code">Сканувати QR-код</string>
     <string name="activity_link_device_qr_message">Перейдіть до Налаштувань → Фраза відновлення на вашому іншому пристрої, щоб відобразити ваш QR-код.</string>
@@ -692,7 +691,6 @@
     <string name="activity_pn_mode_slow_mode">Медленний режим</string>
     <string name="activity_pn_mode_fast_mode_explanation">Вас надійно повідомлятимуть про нові сповіщщеня негайно, використовуючи сервери сповіщень Google.</string>
     <string name="activity_pn_mode_slow_mode_explanation">Session буде періодично перевіряти наявність нових повідомлень у фоновому режимі.</string>
-    <string name="fragment_recovery_phrase_title">Фраза відновлення</string>
     <string name="activity_prompt_passphrase_session_locked">Ви заблоковали Session</string>
     <string name="activity_prompt_passphrase_tap_to_unlock">Торкніться, щоб розблокувати</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">Введіть псевдонім</string>

app/src/main/res/values-uk/strings.xml

@@ -569,11 +569,11 @@
     <string name="activity_restore_title">Відновити обліковий запис</string>
     <string name="activity_restore_explanation">Введіть фразу відновлення, яку вам було сказано записати на папері під час реєстрації, для відновлення облікового запису.</string>
     <string name="activity_restore_seed_edit_text_hint">Введіть вашу фразу відновлення</string>
-    <string name="activity_display_name_title_2">Виберіть ваш псевдонім для показу</string>
-    <string name="activity_display_name_explanation">Це буде ваше ім\'я яке ви використовуєте в Session. Воно може бути вашим дійсним ім\'ям, альясом або чимусь іншим.</string>
-    <string name="activity_display_name_edit_text_hint">Введіть відображуватинимий псевдонім</string>
-    <string name="activity_display_name_display_name_missing_error">Будь ласка, виберіть відображуватимий псевдонім</string>
-    <string name="activity_display_name_display_name_too_long_error">Будь ласка, виберіть коротший псевдонім</string>
+    <string name="displayNamePick">Виберіть ваш псевдонім для показу</string>
+    <string name="displayNameDescription">Це буде ваше ім\'я яке ви використовуєте в Session. Воно може бути вашим дійсним ім\'ям, альясом або чимусь іншим.</string>
+    <string name="displayNameEnter">Введіть відображуватинимий псевдонім</string>
+    <string name="displayNameErrorDescription">Будь ласка, виберіть відображуватимий псевдонім</string>
+    <string name="displayNameErrorDescriptionShorter">Будь ласка, виберіть коротший псевдонім</string>
     <string name="activity_pn_mode_recommended_option_tag">Рекомендовано</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Будь ласка виберіть варіант</string>
     <string name="activity_home_empty_state_message">У вас ще немає Session контактів</string>
@@ -681,7 +681,6 @@
     <string name="activity_backup_restore_explanation_1">Виберіть файл резервної копії та введіть секретну фразу, з якою він був створений.</string>
     <string name="activity_backup_restore_passphrase">30-символьний пароль</string>
     <string name="activity_link_device_skip_prompt">Це займає деякий час, ви б хотіли це пропустити?</string>
-    <string name="activity_link_device_link_device">Зв\'язати пристрій</string>
     <string name="activity_link_device_recovery_phrase">Фраза відновлення</string>
     <string name="activity_link_device_scan_qr_code">Сканувати QR-код</string>
     <string name="activity_link_device_qr_message">Перейдіть до Налаштувань → Фраза відновлення на вашому іншому пристрої, щоб відобразити ваш QR-код.</string>
@@ -692,7 +691,6 @@
     <string name="activity_pn_mode_slow_mode">Медленний режим</string>
     <string name="activity_pn_mode_fast_mode_explanation">Вас надійно повідомлятимуть про нові сповіщщеня негайно, використовуючи сервери сповіщень Google.</string>
     <string name="activity_pn_mode_slow_mode_explanation">Session буде періодично перевіряти наявність нових повідомлень у фоновому режимі.</string>
-    <string name="fragment_recovery_phrase_title">Фраза відновлення</string>
     <string name="activity_prompt_passphrase_session_locked">Ви заблоковали Session</string>
     <string name="activity_prompt_passphrase_tap_to_unlock">Торкніться, щоб розблокувати</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">Введіть псевдонім</string>

app/src/main/res/values-vi-rVN/strings.xml

@@ -349,11 +349,11 @@ trao đổi chìa khóa bị hỏng!</string>
     <string name="activity_restore_title">Khôi phục lại tài khoản của bạn</string>
     <string name="activity_restore_explanation">Nhập cụm từ khôi phục mà bạn nhận được khi đăng ký khôi phục tài khoản.</string>
     <string name="activity_restore_seed_edit_text_hint">Nhập cụm từ khôi phục của bạn.</string>
-    <string name="activity_display_name_title_2">Chọn tên hiển thị của bạn</string>
-    <string name="activity_display_name_explanation">Đây là tên của bạn khi sử dụng Session. Nó có thể là tên thật, tên gọi khác của bạn hoặc bất kì tên nào bạn thích.</string>
-    <string name="activity_display_name_edit_text_hint">Nhập một tên hiển thị</string>
-    <string name="activity_display_name_display_name_missing_error">Vui lòng chọn một tên hiển thị</string>
-    <string name="activity_display_name_display_name_too_long_error">Vui lòng chọn tên hiển thị ngắn hơn</string>
+    <string name="displayNamePick">Chọn tên hiển thị của bạn</string>
+    <string name="displayNameDescription">Đây là tên của bạn khi sử dụng Session. Nó có thể là tên thật, tên gọi khác của bạn hoặc bất kì tên nào bạn thích.</string>
+    <string name="displayNameEnter">Nhập một tên hiển thị</string>
+    <string name="displayNameErrorDescription">Vui lòng chọn một tên hiển thị</string>
+    <string name="displayNameErrorDescriptionShorter">Vui lòng chọn tên hiển thị ngắn hơn</string>
     <string name="activity_pn_mode_recommended_option_tag">Khuyến nghị</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Vui lòng lựa chọn </string>
     <string name="activity_home_empty_state_message">Bạn chưa có danh bạ </string>

app/src/main/res/values-vi/strings.xml

@@ -349,11 +349,11 @@ trao đổi chìa khóa bị hỏng!</string>
     <string name="activity_restore_title">Khôi phục lại tài khoản của bạn</string>
     <string name="activity_restore_explanation">Nhập cụm từ khôi phục mà bạn nhận được khi đăng ký khôi phục tài khoản.</string>
     <string name="activity_restore_seed_edit_text_hint">Nhập cụm từ khôi phục của bạn.</string>
-    <string name="activity_display_name_title_2">Chọn tên hiển thị của bạn</string>
-    <string name="activity_display_name_explanation">Đây là tên của bạn khi sử dụng Session. Nó có thể là tên thật, tên gọi khác của bạn hoặc bất kì tên nào bạn thích.</string>
-    <string name="activity_display_name_edit_text_hint">Nhập một tên hiển thị</string>
-    <string name="activity_display_name_display_name_missing_error">Vui lòng chọn một tên hiển thị</string>
-    <string name="activity_display_name_display_name_too_long_error">Vui lòng chọn tên hiển thị ngắn hơn</string>
+    <string name="displayNamePick">Chọn tên hiển thị của bạn</string>
+    <string name="displayNameDescription">Đây là tên của bạn khi sử dụng Session. Nó có thể là tên thật, tên gọi khác của bạn hoặc bất kì tên nào bạn thích.</string>
+    <string name="displayNameEnter">Nhập một tên hiển thị</string>
+    <string name="displayNameErrorDescription">Vui lòng chọn một tên hiển thị</string>
+    <string name="displayNameErrorDescriptionShorter">Vui lòng chọn tên hiển thị ngắn hơn</string>
     <string name="activity_pn_mode_recommended_option_tag">Khuyến nghị</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Vui lòng lựa chọn </string>
     <string name="activity_home_empty_state_message">Bạn chưa có danh bạ </string>

app/src/main/res/values-zh-rCN/strings.xml

@@ -531,11 +531,11 @@
     <string name="activity_restore_title">恢复您的帐号</string>
     <string name="activity_restore_explanation">在您重新登陆并需要恢复账户时，请输入您注册帐号时的恢复口令</string>
     <string name="activity_restore_seed_edit_text_hint">输入您的恢复口令</string>
-    <string name="activity_display_name_title_2">选择您想显示的名称</string>
-    <string name="activity_display_name_explanation">这就是您在使用Session时的名字。它可以是您的真实姓名，别名或您喜欢的其他任何名称</string>
-    <string name="activity_display_name_edit_text_hint">输入您想显示的名称</string>
-    <string name="activity_display_name_display_name_missing_error">请设定一个名称</string>
-    <string name="activity_display_name_display_name_too_long_error">请设定一个较短的名称</string>
+    <string name="displayNamePick">选择您想显示的名称</string>
+    <string name="displayNameDescription">这就是您在使用Session时的名字。它可以是您的真实姓名，别名或您喜欢的其他任何名称</string>
+    <string name="displayNameEnter">输入您想显示的名称</string>
+    <string name="displayNameErrorDescription">请设定一个名称</string>
+    <string name="displayNameErrorDescriptionShorter">请设定一个较短的名称</string>
     <string name="activity_pn_mode_recommended_option_tag">推荐的选项</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">请选择一个选项</string>
     <string name="activity_home_empty_state_message">您还没有任何联系人</string>
@@ -643,7 +643,6 @@
     <string name="activity_backup_restore_explanation_1">选择一个备份文件，并输入创建该文件时使用的密码</string>
     <string name="activity_backup_restore_passphrase">30位数的密码</string>
     <string name="activity_link_device_skip_prompt">这需要一点时间，您想要跳过吗？</string>
-    <string name="activity_link_device_link_device">关联设备</string>
     <string name="activity_link_device_recovery_phrase">恢复口令</string>
     <string name="activity_link_device_scan_qr_code">扫描二维码</string>
     <string name="activity_link_device_qr_message">在您的其他设备上导航到设置 -> 恢复口令以显示您的 QR 代码</string>
@@ -654,7 +653,6 @@
     <string name="activity_pn_mode_slow_mode">慢速模式</string>
     <string name="activity_pn_mode_fast_mode_explanation">新消息将通过 Google 通知服务器即时可靠地发送</string>
     <string name="activity_pn_mode_slow_mode_explanation">Session 将不时在后台获取新消息</string>
-    <string name="fragment_recovery_phrase_title">恢复口令</string>
     <string name="activity_prompt_passphrase_session_locked">Session 已锁定</string>
     <string name="activity_prompt_passphrase_tap_to_unlock">点击解锁</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">输入昵称</string>

app/src/main/res/values-zh-rTW/strings.xml

@@ -537,11 +537,11 @@
     <string name="activity_restore_title">恢復您的帳號</string>
     <string name="activity_restore_explanation">輸入您註冊時提供的恢復短語以恢復您的帳號。</string>
     <string name="activity_restore_seed_edit_text_hint">請輸入您的回復用字句</string>
-    <string name="activity_display_name_title_2">請輸入您的名稱</string>
-    <string name="activity_display_name_explanation">當您使用 Session 時，這將是您的名字。 它可以是您的真實姓名、別名或您喜歡的任何名稱。</string>
-    <string name="activity_display_name_edit_text_hint">輸入您的名稱</string>
-    <string name="activity_display_name_display_name_missing_error">請選擇一個名稱</string>
-    <string name="activity_display_name_display_name_too_long_error">請選擇一個較短的名稱</string>
+    <string name="displayNamePick">請輸入您的名稱</string>
+    <string name="displayNameDescription">當您使用 Session 時，這將是您的名字。 它可以是您的真實姓名、別名或您喜歡的任何名稱。</string>
+    <string name="displayNameEnter">輸入您的名稱</string>
+    <string name="displayNameErrorDescription">請選擇一個名稱</string>
+    <string name="displayNameErrorDescriptionShorter">請選擇一個較短的名稱</string>
     <string name="activity_pn_mode_recommended_option_tag">建議</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">請選擇其中一個選項</string>
     <string name="activity_home_empty_state_message">您尚未添加聯絡人</string>
@@ -649,7 +649,6 @@
     <string name="activity_backup_restore_explanation_1">選擇一個備份檔案，並輸入建立時的密碼。</string>
     <string name="activity_backup_restore_passphrase">30 位數密碼</string>
     <string name="activity_link_device_skip_prompt">這可能需要一些時間，要跳過嗎？</string>
-    <string name="activity_link_device_link_device">連結裝置</string>
     <string name="activity_link_device_recovery_phrase">回復用字句</string>
     <string name="activity_link_device_scan_qr_code">掃描 QR Code</string>
     <string name="activity_link_device_qr_message">請使用您其他的裝置並前往「設定」→「回復用字句」來顯示您的QR Code。</string>
@@ -660,7 +659,6 @@
     <string name="activity_pn_mode_slow_mode">慢速模式</string>
     <string name="activity_pn_mode_fast_mode_explanation">您將會透過 Google 的通知服務可靠且迅速的收到通知。</string>
     <string name="activity_pn_mode_slow_mode_explanation">Session 會偶爾在背景執行時檢查新訊息。</string>
-    <string name="fragment_recovery_phrase_title">回復用字句</string>
     <string name="activity_prompt_passphrase_session_locked">Session 已被鎖定</string>
     <string name="activity_prompt_passphrase_tap_to_unlock">輕觸即可解鎖</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">輸入暱稱</string>

app/src/main/res/values-zh/strings.xml

@@ -531,11 +531,11 @@
     <string name="activity_restore_title">恢复您的帐号</string>
     <string name="activity_restore_explanation">在您重新登陆并需要恢复账户时，请输入您注册帐号时的恢复口令。</string>
     <string name="activity_restore_seed_edit_text_hint">输入您的恢复口令</string>
-    <string name="activity_display_name_title_2">选择您想显示的名称</string>
-    <string name="activity_display_name_explanation">这就是您在使用Session时的名字。它可以是您的真实姓名，别名或您喜欢的其他任何名称。</string>
-    <string name="activity_display_name_edit_text_hint">输入您想显示的名称</string>
-    <string name="activity_display_name_display_name_missing_error">请设定一个名称</string>
-    <string name="activity_display_name_display_name_too_long_error">请设定一个较短的名称</string>
+    <string name="displayNamePick">选择您想显示的名称</string>
+    <string name="displayNameDescription">这就是您在使用Session时的名字。它可以是您的真实姓名，别名或您喜欢的其他任何名称。</string>
+    <string name="displayNameEnter">输入您想显示的名称</string>
+    <string name="displayNameErrorDescription">请设定一个名称</string>
+    <string name="displayNameErrorDescriptionShorter">请设定一个较短的名称</string>
     <string name="activity_pn_mode_recommended_option_tag">推荐的选项</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">请选择一个选项</string>
     <string name="activity_home_empty_state_message">您还没有任何联系人</string>
@@ -643,7 +643,6 @@
     <string name="activity_backup_restore_explanation_1">选择一个备份文件，并输入创建该文件时使用的密码。</string>
     <string name="activity_backup_restore_passphrase">30位数的密码</string>
     <string name="activity_link_device_skip_prompt">这需要一点时间，您想要跳过吗？</string>
-    <string name="activity_link_device_link_device">关联设备</string>
     <string name="activity_link_device_recovery_phrase">恢复口令</string>
     <string name="activity_link_device_scan_qr_code">扫描二维码</string>
     <string name="activity_link_device_qr_message">在您的其他设备上导航到设置 -> 恢复口令以显示您的 QR 代码。</string>
@@ -654,7 +653,6 @@
     <string name="activity_pn_mode_slow_mode">慢速模式</string>
     <string name="activity_pn_mode_fast_mode_explanation">新消息将通过 Google 通知服务器即时可靠地发送。</string>
     <string name="activity_pn_mode_slow_mode_explanation">Session 将不时在后台获取新消息。</string>
-    <string name="fragment_recovery_phrase_title">恢复口令</string>
     <string name="activity_prompt_passphrase_session_locked">Session 已锁定</string>
     <string name="activity_prompt_passphrase_tap_to_unlock">点击解锁</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">输入昵称</string>

app/src/main/res/values/strings.xml

@@ -744,15 +744,14 @@
     <string name="view_fake_chat_bubble_4">Using a combination of advanced anonymous routing and end-to-end encryption technologies.</string>
     <string name="view_fake_chat_bubble_5">Friends don\'t let friends use compromised messengers. You\'re welcome.</string>
     <string name="activity_restore_title">Restore your account</string>
-    <string name="activity_restore_explanation">Enter the recovery phrase that was given to you when you signed up to restore your account.</string>
     <string name="activity_restore_seed_edit_text_hint">Enter your recovery phrase</string>
-    <string name="activity_display_name_title_2">Pick your display name</string>
-    <string name="activity_display_name_pick_a_new_display_name">Pick a new display name</string>
-    <string name="activity_display_name_explanation">It can be your real name, an alias, or anything else you like — and you can change it any time.</string>
-    <string name="activity_display_name_unable_to_load_new_name_explanation">We were unable to load your display name. Please enter a new display name to continue.</string>
-    <string name="activity_display_name_edit_text_hint">Enter a display name</string>
-    <string name="activity_display_name_display_name_missing_error">Please pick a display name</string>
-    <string name="activity_display_name_display_name_too_long_error">Please pick a shorter display name</string>
+    <string name="displayNamePick">Pick your display name</string>
+    <string name="displayNameNew">Pick a new display name</string>
+    <string name="displayNameDescription">It can be your real name, an alias, or anything else you like — and you can change it any time.</string>
+    <string name="displayNameErrorNew">We were unable to load your display name. Please enter a new display name to continue.</string>
+    <string name="displayNameEnter">Enter a display name</string>
+    <string name="displayNameErrorDescription">Please pick a display name</string>
+    <string name="displayNameErrorDescriptionShorter">Please pick a shorter display name</string>
     <string name="activity_pn_mode_recommended_option_tag">Recommended</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Please Pick an Option</string>
     <string name="activity_home_empty_state_message">You don\'t have any contacts yet</string>
@@ -809,7 +808,6 @@
     <string name="activity_settings_devices_button_title">Devices</string>
     <string name="activity_settings_invite_button_title">Invite a Friend</string>
     <string name="activity_settings_faq_button_title">FAQ</string>
-    <string name="activity_settings_recovery_password_button_title">Recovery Password</string>
     <string name="activity_settings_clear_all_data_button_title">Clear Data</string>
     <string name="activity_settings_clear_all_data_and_network_button_title">Clear Data Including Network</string>
     <string name="activity_settings_help_translate_session">Help us Translate Session</string>
@@ -878,17 +876,13 @@
     <string name="activity_backup_restore_select_file">Select a file</string>
     <string name="activity_backup_restore_explanation_1">Select a backup file and enter the passphrase it was created with.</string>
     <string name="activity_backup_restore_passphrase">30-digit passphrase</string>
-    <string name="activity_link_device_skip_prompt">This is taking a while, would you like to skip?</string>
     <string name="qrScan">Scan QR Code</string>
     <string name="activity_link_device_qr_message">Navigate to Settings → Recovery Phrase on your other device to show your QR code.</string>
     <string name="activity_join_public_chat_join_rooms">Or join one of these…</string>
-    <string name="activity_pn_mode_message_notifications">Message Notifications</string>
-    <string name="activity_pn_mode_explanation">There are two ways Session can notify you of new messages.</string>
     <string name="activity_pn_mode_fast_mode">Fast Mode</string>
     <string name="activity_pn_mode_slow_mode">Slow Mode</string>
     <string name="activity_pn_mode_fast_mode_explanation">You’ll be notified of new messages reliably and immediately using Google’s notification servers.</string>
     <string name="activity_pn_mode_slow_mode_explanation">Session will occasionally check for new messages in the background.</string>
-    <string name="fragment_recovery_phrase_title">Recovery Phrase</string>
     <string name="activity_prompt_passphrase_session_locked">Session is Locked</string>
     <string name="activity_prompt_passphrase_tap_to_unlock">Tap to Unlock</string>
     <string name="fragment_user_details_bottom_sheet_edit_text_hint">Enter a nickname</string>