Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ internal fun DisplayOptionsContent(
text = state.displayName.value,
errorMessage = state.displayName.error?.toResourceString(resources),
onTextChange = { onEvent(Event.OnDisplayNameChanged(it)) },
label = stringResource(id = R.string.account_setup_options_display_name_label),
label = stringResource(id = R.string.account_setup_options_your_name_label),
contentPadding = defaultItemPadding(),
isRequired = true,
modifier = Modifier.testTagAsResourceId("account_setup_display_options_display_name_input"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ private fun ValidateAccountNameError.toAccountNameErrorString(resources: Resourc

private fun ValidateDisplayNameError.toDisplayNameErrorString(resources: Resources): String {
return when (this) {
is EmptyDisplayName -> resources.getString(R.string.account_setup_options_display_name_error_required)
is EmptyDisplayName -> resources.getString(R.string.account_setup_options_your_name_error_required)
}
}

Expand Down
2 changes: 0 additions & 2 deletions feature/account/setup/src/main/res/values-ar/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<string name="account_setup_error_unknown">خطأ غير معروف</string>
<string name="account_setup_special_folders_loading_message">يتم الآن الحصول على قائمة المجلدات…</string>
<string name="account_setup_special_folders_drafts_folder_label">مجلد المسودات</string>
<string name="account_setup_options_display_name_label">الاسم</string>
<string name="account_setup_create_account_creating">جارٍ إنشاء الحساب…</string>
<string name="account_setup_create_account_created">تم إنشاء الحساب بنجاح</string>
<string name="account_setup_create_account_error">حدث خطأ ما أثناء محاولة إنشاء الحساب</string>
Expand Down Expand Up @@ -70,5 +69,4 @@
<string name="account_setup_options_email_signature_label">توقيع البريد الإلكتروني</string>
<string name="account_setup_options_show_notifications_label">عرض الإشعارات</string>
<string name="account_setup_auto_discovery_validation_error_email_address_required">يُرجى إدخال عنوان البريد الإلكتروني.</string>
<string name="account_setup_options_display_name_error_required">يُرجى ادخال الاسم.</string>
</resources>
2 changes: 0 additions & 2 deletions feature/account/setup/src/main/res/values-bg/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@
<string name="account_setup_auto_discovery_validation_error_email_address_not_supported">Този имейл адрес не се поддържа.</string>
<string name="account_setup_create_account_creating">Създаване на акаунт…</string>
<string name="account_setup_options_account_name_label">Име на акаунта</string>
<string name="account_setup_options_display_name_label">Вашето име</string>
<string name="account_setup_options_display_name_error_required">Име е задължително.</string>
<string name="account_setup_create_account_error">Възникна грешка при създаването на акаунта</string>
<string name="account_setup_options_email_check_frequency_never">Никога</string>
<string name="account_setup_options_section_sync_options">Настройки за синхронизация</string>
Expand Down
2 changes: 0 additions & 2 deletions feature/account/setup/src/main/res/values-ca/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,8 @@
<string name="account_setup_options_account_name_label">Nom del compte</string>
<string name="account_setup_auto_discovery_status_header_title_configuration_found">S\'ha trobat una configuració</string>
<string name="account_setup_auto_discovery_validation_error_email_address_required">Cal l\'adreça de correu electrònic.</string>
<string name="account_setup_options_display_name_label">El teu nom</string>
<string name="account_setup_auto_discovery_loading_error">Ha fallat la càrrega de la configuració de correu electrònic</string>
<string name="account_setup_auto_discovery_result_approval_checkbox_label">Confio en aquesta configuració</string>
<string name="account_setup_options_display_name_error_required">Es requereix el teu nom.</string>
<string name="account_setup_error_network">Error de xarxa. Comproveu l\'estat de la vostra connexió i torneu-ho a provar.</string>
<string name="account_setup_auto_discovery_validation_error_email_address_invalid">L\'adreça de correu electrònic no es reconeix com a vàlida.</string>
<string name="account_setup_options_email_check_frequency_never">Mai</string>
Expand Down
4 changes: 1 addition & 3 deletions feature/account/setup/src/main/res/values-co/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
<string name="account_setup_special_folders_folder_automatic">Autumaticu (%s)</string>
<string name="account_setup_options_section_display_options">Ozzioni d’affissera</string>
<string name="account_setup_options_account_name_error_blank">U nome di u contu ùn pò micca esse viotu.</string>
<string name="account_setup_options_display_name_error_required">U vostru nome hè richiestu.</string>
<string name="account_setup_options_email_signature_label">Segnatura di u messaghju elettronicu</string>
<string name="account_setup_options_account_check_frequency_label">Frequenza di cuntrollu</string>
<string name="account_setup_options_email_check_frequency_never">Mai</string>
Expand Down Expand Up @@ -52,11 +51,10 @@
<string name="account_setup_special_folders_spam_folder_label">Cartulare di i merzaghji (dispiacevule)</string>
<string name="account_setup_special_folders_trash_folder_label">Cartulare di a curbella</string>
<string name="account_setup_options_account_name_label">Nome di u contu</string>
<string name="account_setup_options_display_name_label">U vostru nome</string>
<string name="account_setup_options_section_sync_options">Ozzioni di sincrunizazione</string>
<string name="account_setup_options_email_signature_error_blank">A segnatura di u messaghju elettronicu ùn pò micca esse viota.</string>
<plurals name="account_setup_options_email_display_count_messages">
<item quantity="one">1 messaghju</item>
<item quantity="other">%d messaghji</item>
</plurals>
</resources>
</resources>
2 changes: 0 additions & 2 deletions feature/account/setup/src/main/res/values-cs/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,8 @@
<string name="account_setup_options_account_name_label">Název účtu</string>
<string name="account_setup_auto_discovery_status_header_title_configuration_found">Nastavení nalezeno</string>
<string name="account_setup_auto_discovery_validation_error_email_address_required">E-mailová adresa je vyžadována.</string>
<string name="account_setup_options_display_name_label">Vaše jméno</string>
<string name="account_setup_auto_discovery_loading_error">Nastavení e-mailu se nepodařilo nahrát</string>
<string name="account_setup_auto_discovery_result_approval_checkbox_label">Tomuto nastavení důvěřuji</string>
<string name="account_setup_options_display_name_error_required">Vaše jméno je vyžadováno.</string>
<string name="account_setup_error_network">Chyba sítě. Zkontrolujte prosím stav svého připojení a zkuste to znovu.</string>
<string name="account_setup_auto_discovery_validation_error_email_address_invalid">Toto není rozeznáno jako platná e-mailová adresa.</string>
<string name="account_setup_options_email_check_frequency_never">Nikdy</string>
Expand Down
4 changes: 1 addition & 3 deletions feature/account/setup/src/main/res/values-da/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,10 @@
<string name="account_setup_options_account_name_label">Konto navn</string>
<string name="account_setup_auto_discovery_status_header_title_configuration_found">Konfiguration fundet</string>
<string name="account_setup_auto_discovery_validation_error_email_address_required">Email adresse er påkrævet.</string>
<string name="account_setup_options_display_name_label">Vist navn</string>
<string name="account_setup_options_display_name_error_required">Vist navn er påkrævet.</string>
<string name="account_setup_error_network">Netværk</string>
<string name="account_setup_auto_discovery_validation_error_email_address_invalid">Email adresse er ugyldig.</string>
<string name="account_setup_options_email_check_frequency_never">Aldrig</string>
<string name="account_setup_options_section_sync_options">Synkroniserings indstillinger</string>
<string name="account_setup_options_show_notifications_label">Vis notifikationer</string>
<string name="account_setup_options_section_display_options">Visningsindstillinger</string>
</resources>
</resources>
2 changes: 0 additions & 2 deletions feature/account/setup/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,8 @@
<string name="account_setup_options_account_name_label">Kontoname</string>
<string name="account_setup_auto_discovery_status_header_title_configuration_found">Konfiguration gefunden</string>
<string name="account_setup_auto_discovery_validation_error_email_address_required">E-Mail-Adresse ist erforderlich.</string>
<string name="account_setup_options_display_name_label">Dein Name</string>
<string name="account_setup_auto_discovery_loading_error">E-Mail-Konfiguration konnte nicht geladen werden</string>
<string name="account_setup_auto_discovery_result_approval_checkbox_label">Ich vertraue dieser Konfiguration</string>
<string name="account_setup_options_display_name_error_required">Dein Name ist erforderlich.</string>
<string name="account_setup_error_network">Netzwerkfehler. Bitte überprüfe deinen Verbindungsstatus und versuche es erneut.</string>
<string name="account_setup_auto_discovery_validation_error_email_address_invalid">Diese Adresse wird nicht als gültige E-Mail-Adresse erkannt.</string>
<string name="account_setup_options_email_check_frequency_never">Niemals</string>
Expand Down
2 changes: 0 additions & 2 deletions feature/account/setup/src/main/res/values-el/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,8 @@
<string name="account_setup_options_account_name_label">Όνομα λογαριασμού</string>
<string name="account_setup_auto_discovery_status_header_title_configuration_found">Η διαμόρφωση βρέθηκε</string>
<string name="account_setup_auto_discovery_validation_error_email_address_required">Απαιτείται διεύθυνση email.</string>
<string name="account_setup_options_display_name_label">Το όνομά σας</string>
<string name="account_setup_auto_discovery_loading_error">Η φόρτωση της διαμόρφωσης email απέτυχε</string>
<string name="account_setup_auto_discovery_result_approval_checkbox_label">Εμπιστεύομαι αυτήν τη διαμόρφωση</string>
<string name="account_setup_options_display_name_error_required">Το όνομά σας είναι απαραίτητο.</string>
<string name="account_setup_create_account_error">Προέκυψε σφάλμα κατά την προσπάθεια δημιουργίας του λογαριασμού</string>
<string name="account_setup_error_network">Σφάλμα δικτύου. Ελέγξτε την κατάσταση της σύνδεσής σας και προσπαθήστε ξανά.</string>
<string name="account_setup_auto_discovery_validation_error_email_address_invalid">Η διεύθυνση email δεν αναγνωρίζεται ως έγκυρη.</string>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,8 @@
<string name="account_setup_options_account_name_label">Account name</string>
<string name="account_setup_auto_discovery_status_header_title_configuration_found">Configuration found</string>
<string name="account_setup_auto_discovery_validation_error_email_address_required">Email address is required.</string>
<string name="account_setup_options_display_name_label">Display name</string>
<string name="account_setup_auto_discovery_loading_error">Failed to load email configuration</string>
<string name="account_setup_auto_discovery_result_approval_checkbox_label">I trust this configuration</string>
<string name="account_setup_options_display_name_error_required">Display name is required.</string>
<string name="account_setup_create_account_error">An error occurred while trying to create the account</string>
<string name="account_setup_error_network">Network error. Please check your connection status and try again.</string>
<string name="account_setup_auto_discovery_validation_error_email_address_invalid">This is not recognised as a valid email address.</string>
Expand Down
2 changes: 0 additions & 2 deletions feature/account/setup/src/main/res/values-eo/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
<string name="account_setup_special_folders_drafts_folder_label">Malnetujo</string>
<string name="account_setup_special_folders_folder_automatic">Aŭtomate (%s)</string>
<string name="account_setup_options_account_name_label">Nomo de konto</string>
<string name="account_setup_options_display_name_label">Via nomo</string>
<string name="account_setup_create_account_creating">Kreante konton…</string>
<string name="account_setup_options_section_sync_options">Opcioj pri sinkronigado</string>
<plurals name="account_setup_options_email_check_frequency_minutes">
Expand Down Expand Up @@ -39,7 +38,6 @@
<string name="account_setup_options_section_display_options">Vidigan opcioj</string>
<string name="account_setup_create_account_error">Eraro okazis dum provo krei la konton</string>
<string name="account_setup_options_account_name_error_blank">La nomo konton ne povas esti malplena.</string>
<string name="account_setup_options_display_name_error_required">Via nomo necesas.</string>
<string name="account_setup_options_email_signature_label">Retletera subskribo</string>
<string name="account_setup_options_email_signature_error_blank">La retletera subskribo ne povas esti malplena.</string>
<string name="account_setup_create_account_created">Konto sukcese kreita</string>
Expand Down
4 changes: 1 addition & 3 deletions feature/account/setup/src/main/res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,8 @@
<string name="account_setup_options_account_name_label">Nombre de cuenta</string>
<string name="account_setup_auto_discovery_status_header_title_configuration_found">Configuración detectada</string>
<string name="account_setup_auto_discovery_validation_error_email_address_required">Es necesario proporcionar al menos una dirección de correo.</string>
<string name="account_setup_options_display_name_label">Su nombre</string>
<string name="account_setup_auto_discovery_loading_error">No se han podido encontrar ajustes para este servicio</string>
<string name="account_setup_auto_discovery_result_approval_checkbox_label">Me fío de los ajustes</string>
<string name="account_setup_options_display_name_error_required">Su nombre es requerido.</string>
<string name="account_setup_error_network">Error en la red. Comprueba el estado de tu conexión e inténtalo de nuevo.</string>
<string name="account_setup_auto_discovery_validation_error_email_address_invalid">No se reconoce como una dirección de correo electrónico válida.</string>
<string name="account_setup_options_email_check_frequency_never">Nunca</string>
Expand Down Expand Up @@ -62,4 +60,4 @@
<item quantity="many">%d mensajes</item>
<item quantity="other">%d mensajes</item>
</plurals>
</resources>
</resources>
4 changes: 1 addition & 3 deletions feature/account/setup/src/main/res/values-et/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@
<string name="account_setup_options_email_signature_error_blank">E-kirja allkiri ei saa olla tühi.</string>
<string name="account_setup_auto_discovery_result_approval_error_approval_required">On nõutav, et saa nõustud nende seadistustega.</string>
<string name="account_setup_options_account_name_label">Kasutajakonto nimi</string>
<string name="account_setup_options_display_name_label">Sinu nimi</string>
<string name="account_setup_options_display_name_error_required">Sinu nimi peab olema sisestatud.</string>
<string name="account_setup_options_email_check_frequency_never">Mitte kunagi</string>
<string name="account_setup_options_section_sync_options">Sünkroniseerimisvalikud</string>
<string name="account_setup_options_show_notifications_label">Näita teavitusi</string>
Expand Down Expand Up @@ -59,4 +57,4 @@
<item quantity="one">Kord minutis</item>
<item quantity="other">Iga %d minuti järel</item>
</plurals>
</resources>
</resources>
4 changes: 1 addition & 3 deletions feature/account/setup/src/main/res/values-eu/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,8 @@
<string name="account_setup_options_account_name_label">Kontu izena</string>
<string name="account_setup_auto_discovery_status_header_title_configuration_found">Ezarpenak aurkitu dira</string>
<string name="account_setup_auto_discovery_validation_error_email_address_required">E-mail helbidea nahitaezkoa da.</string>
<string name="account_setup_options_display_name_label">Zure izena</string>
<string name="account_setup_auto_discovery_loading_error">Akatsa e-mail konfigurazioa kargatzerakoan</string>
<string name="account_setup_auto_discovery_result_approval_checkbox_label">Konfigurazio honetan konfiantza dut</string>
<string name="account_setup_options_display_name_error_required">Zure izena beharrezkoa da.</string>
<string name="account_setup_error_network">Sareko errorea. Mesedez, egiaztatu zure konexioaren egoera eta saiatu berriro.</string>
<string name="account_setup_auto_discovery_validation_error_email_address_invalid">Helbide hau ez da helbide elektroniko zuzentzat jotzen.</string>
<string name="account_setup_options_email_check_frequency_never">Inoiz ere ez</string>
Expand Down Expand Up @@ -59,4 +57,4 @@
<item quantity="one">Mezu bat</item>
<item quantity="other">%d mezu</item>
</plurals>
</resources>
</resources>
4 changes: 1 addition & 3 deletions feature/account/setup/src/main/res/values-fa/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,8 @@
<string name="account_setup_auto_discovery_status_header_title_configuration_found">پیکربندی پیدا شد</string>
<string name="account_setup_special_folders_archive_folder_label">پوشه بایگانی</string>
<string name="account_setup_auto_discovery_validation_error_email_address_required">نشانی رایانامه اجباری است.</string>
<string name="account_setup_options_display_name_label">نام شما</string>
<string name="account_setup_auto_discovery_loading_error">شکست در بار کردن پیکربندی رایانامه</string>
<string name="account_setup_auto_discovery_result_approval_checkbox_label">من به این پیکربندی اعتماد دارم</string>
<string name="account_setup_options_display_name_error_required">نام نمایشی شما اجباری است.</string>
<string name="account_setup_create_account_error">در هنگام تلاش برای ایجاد حساب خطا رخ داده است</string>
<string name="account_setup_error_network">خطای شبکه. لطفا وضعیت اتّصال را بررسی کرده و دوباره تلاش کنید.</string>
<string name="account_setup_auto_discovery_validation_error_email_address_invalid">این نشانی رایانامه معتبر شناخته نشد.</string>
Expand All @@ -59,4 +57,4 @@
<item quantity="one">۱ پیام</item>
<item quantity="other">%d پیام</item>
</plurals>
</resources>
</resources>
4 changes: 1 addition & 3 deletions feature/account/setup/src/main/res/values-fi/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,8 @@
<string name="account_setup_options_account_name_label">Tilin nimi</string>
<string name="account_setup_auto_discovery_status_header_title_configuration_found">Määritys löytyi</string>
<string name="account_setup_auto_discovery_validation_error_email_address_required">Sähköpostiosoite vaaditaan.</string>
<string name="account_setup_options_display_name_label">Nimi</string>
<string name="account_setup_auto_discovery_loading_error">Sähköpostin määrityksen lataaminen epäonnistui</string>
<string name="account_setup_auto_discovery_result_approval_checkbox_label">Luotan tähän määritykseen</string>
<string name="account_setup_options_display_name_error_required">Nimi vaaditaan.</string>
<string name="account_setup_error_network">Verkkovirhe. Tarkista verkkoyhteyden tila ja yritä uudelleen.</string>
<string name="account_setup_auto_discovery_validation_error_email_address_invalid">Tätä ei tunnistettu kelvolliseksi sähköpostiosoitteeksi.</string>
<string name="account_setup_options_email_check_frequency_never">Ei koskaan</string>
Expand Down Expand Up @@ -58,4 +56,4 @@
<item quantity="one">Tunnin välein</item>
<item quantity="other">%d tunnin välein</item>
</plurals>
</resources>
</resources>
Loading