diff options
58 files changed, 59 insertions, 360 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 8414c9215..3ac586962 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -276,7 +276,7 @@ </activity> <activity android:name=".activity.setup.EmailPreferenceActivity" - android:label="@string/settings_activity_title" + android:label="@string/activity_preferences" android:exported="false" > <intent-filter> <action android:name="android.intent.action.EDIT" /> @@ -291,7 +291,7 @@ </activity> <activity android:name="com.android.mail.ui.settings.PublicPreferenceActivity" - android:label="@string/settings_activity_title" + android:label="@string/activity_preferences" android:exported="true" android:theme="@android:style/Theme.NoDisplay" > <!-- Must be exported in order for the AccountManager to launch it --> @@ -326,7 +326,7 @@ </activity> <activity android:name=".provider.FolderPickerActivity" - android:label="@string/folder_picker_title" + android:label="@string/app_name" > <intent-filter> <action android:name="android.intent.action.EDIT" /> diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml index cec3a3b41..a3e13de0e 100644 --- a/res/values-af/strings.xml +++ b/res/values-af/strings.xml @@ -248,7 +248,7 @@ <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Sinkroniseer kalendergebeurtenis uit hierdie rekening"</string> <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Sinkroniseer e-pos"</string> <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Sinkroniseer e-pos vir hierdie rekening"</string> - <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"Vibreer"</string> + <string name="label_notification_vibrate_title" msgid="361069844540266098">"Vibreer"</string> <string name="account_settings_ringtone" msgid="2238523918221865167">"Kies \'n luitoon"</string> <string name="account_settings_servers" msgid="3386185135392642067">"Bedienerinstellings"</string> <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Sinkroniseeropsies"</string> diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml index b7d707f5d..b7fc53bb5 100644 --- a/res/values-am/strings.xml +++ b/res/values-am/strings.xml @@ -248,7 +248,7 @@ <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"ለእዚህ መለያ የቀን መቁጠሪያ ክስተት አስምር"</string> <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"ኢሜይል አስምር"</string> <string name="account_settings_sync_email_summary" msgid="71710510041953351">"ለእዚህ መለያ ኢሜይል አስምር"</string> - <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"ንዘር"</string> + <string name="label_notification_vibrate_title" msgid="361069844540266098">"ንዘር"</string> <string name="account_settings_ringtone" msgid="2238523918221865167">"የደወል ቅላጼ ምረጥ"</string> <string name="account_settings_servers" msgid="3386185135392642067">"የአገልጋይ ቅንብሮች"</string> <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"አስምር አማራጮች"</string> diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index 547cce6a5..c6a7e7c99 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -248,7 +248,7 @@ <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"مزامنة حدث التقويم لهذا الحساب"</string> <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"مزامنة البريد الإلكتروني"</string> <string name="account_settings_sync_email_summary" msgid="71710510041953351">"مزامنة البريد الإلكتروني لهذا الحساب"</string> - <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"اهتزاز"</string> + <string name="label_notification_vibrate_title" msgid="361069844540266098">"اهتزاز"</string> <string name="account_settings_ringtone" msgid="2238523918221865167">"اختيار نغمة الرنين"</string> <string name="account_settings_servers" msgid="3386185135392642067">"إعدادات الخادم"</string> <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"خيارات المزامنة"</string> diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index 6e2f0623c..87bf69456 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -248,7 +248,7 @@ <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Синхр. на календарно събитие за профила"</string> <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Синхрон на имейлите"</string> <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Синхрон на имейлите за този профил"</string> - <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"Вибриране"</string> + <string name="label_notification_vibrate_title" msgid="361069844540266098">"Вибриране"</string> <string name="account_settings_ringtone" msgid="2238523918221865167">"Избор на мелодия"</string> <string name="account_settings_servers" msgid="3386185135392642067">"Настройки на сървъра"</string> <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Опции за синхронизиране"</string> diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index a42313f9d..b33724ef7 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -248,7 +248,7 @@ <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Sincronitza els esdeveniments del calendari del compte"</string> <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Sincronitza el correu electrònic"</string> <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Sincronitza el correu del compte"</string> - <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"Vibra"</string> + <string name="label_notification_vibrate_title" msgid="361069844540266098">"Vibra"</string> <string name="account_settings_ringtone" msgid="2238523918221865167">"Tria un so"</string> <string name="account_settings_servers" msgid="3386185135392642067">"Configuració del servidor"</string> <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Opcions de sincronització"</string> diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 7eb0d0ef5..d529a752d 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -248,7 +248,7 @@ <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Synchronizovat události kalendáře pro tento účet"</string> <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Synchronizovat e-maily"</string> <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Synchronizovat e-maily pro tento účet"</string> - <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"Vibrace"</string> + <string name="label_notification_vibrate_title" msgid="361069844540266098">"Vibrace"</string> <string name="account_settings_ringtone" msgid="2238523918221865167">"Vybrat vyzvánění"</string> <string name="account_settings_servers" msgid="3386185135392642067">"Nastavení serveru"</string> <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Možnosti synchronizace"</string> diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index 09323be39..3c4eeb9c5 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -248,7 +248,7 @@ <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Synkroniser begivenhed for konto"</string> <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Synkroniser e-mails"</string> <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Synkroniser e-mail for denne konto"</string> - <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"Vibration"</string> + <string name="label_notification_vibrate_title" msgid="361069844540266098">"Vibration"</string> <string name="account_settings_ringtone" msgid="2238523918221865167">"Vælg ringetone"</string> <string name="account_settings_servers" msgid="3386185135392642067">"Serverindstillinger"</string> <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Indstillinger for synkronisering"</string> diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 107f52180..ea4acfa41 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -248,7 +248,7 @@ <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Termin für dieses Kontos synchronisieren"</string> <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"E-Mails synchronisieren"</string> <string name="account_settings_sync_email_summary" msgid="71710510041953351">"E-Mails dieses Kontos synchronisieren"</string> - <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"Vibration"</string> + <string name="label_notification_vibrate_title" msgid="361069844540266098">"Vibration"</string> <string name="account_settings_ringtone" msgid="2238523918221865167">"Klingelton auswählen"</string> <string name="account_settings_servers" msgid="3386185135392642067">"Servereinstellungen"</string> <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Synchronisierungsoptionen"</string> diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index 138b19283..bf07e41c2 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -248,7 +248,7 @@ <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Συγχρον. συμβ. ημερολ. λογαριασμού"</string> <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Συγχρονισμός ηλεκτρονικού ταχυδρομείου"</string> <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Συγχρονισμός μηνυμάτων ηλεκτρονικού ταχυδρομείου για αυτόν τον λογαριασμό"</string> - <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"Δόνηση"</string> + <string name="label_notification_vibrate_title" msgid="361069844540266098">"Δόνηση"</string> <string name="account_settings_ringtone" msgid="2238523918221865167">"Επιλέξτε ήχο κλήσης"</string> <string name="account_settings_servers" msgid="3386185135392642067">"Ρυθμίσεις διακομιστή"</string> <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Επιλογές συγχρονισμού"</string> diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index 2b18e5246..e03be4270 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -248,7 +248,7 @@ <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Sync calendar event for this account"</string> <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Sync Email"</string> <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Sync email for this account"</string> - <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"Vibrate"</string> + <string name="label_notification_vibrate_title" msgid="361069844540266098">"Vibrate"</string> <string name="account_settings_ringtone" msgid="2238523918221865167">"Choose ringtone"</string> <string name="account_settings_servers" msgid="3386185135392642067">"Server settings"</string> <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Sync options"</string> diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml index 2b18e5246..e03be4270 100644 --- a/res/values-en-rIN/strings.xml +++ b/res/values-en-rIN/strings.xml @@ -248,7 +248,7 @@ <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Sync calendar event for this account"</string> <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Sync Email"</string> <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Sync email for this account"</string> - <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"Vibrate"</string> + <string name="label_notification_vibrate_title" msgid="361069844540266098">"Vibrate"</string> <string name="account_settings_ringtone" msgid="2238523918221865167">"Choose ringtone"</string> <string name="account_settings_servers" msgid="3386185135392642067">"Server settings"</string> <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Sync options"</string> diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index 381d45ff3..2775b6352 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -248,7 +248,7 @@ <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Sincronizar evento de calendario de esta cuenta"</string> <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Sincronizar correo"</string> <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Sincronizar el correo de esta cuenta"</string> - <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"Vibrar"</string> + <string name="label_notification_vibrate_title" msgid="361069844540266098">"Vibrar"</string> <string name="account_settings_ringtone" msgid="2238523918221865167">"Seleccionar tono"</string> <string name="account_settings_servers" msgid="3386185135392642067">"Configuración del servidor"</string> <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Opciones de sincronización"</string> diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 4b04e3f20..963e38733 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -248,7 +248,7 @@ <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Sincronizar eventos de calendario para esta cuenta"</string> <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Sincronizar correo"</string> <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Sincronizar correo de esta cuenta"</string> - <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"Vibrar"</string> + <string name="label_notification_vibrate_title" msgid="361069844540266098">"Vibrar"</string> <string name="account_settings_ringtone" msgid="2238523918221865167">"Seleccionar tono"</string> <string name="account_settings_servers" msgid="3386185135392642067">"Ajustes del servidor"</string> <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Ajustes de sincronización"</string> diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml index 63b373365..1c4b3c163 100644 --- a/res/values-et-rEE/strings.xml +++ b/res/values-et-rEE/strings.xml @@ -248,7 +248,7 @@ <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Sünkrooni konto kalendri sündmused"</string> <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Sünkrooni meil"</string> <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Konto meili sünkroonimine"</string> - <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"Vibreering"</string> + <string name="label_notification_vibrate_title" msgid="361069844540266098">"Vibreering"</string> <string name="account_settings_ringtone" msgid="2238523918221865167">"Vali helin"</string> <string name="account_settings_servers" msgid="3386185135392642067">"Serveri seaded"</string> <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Sünkroonimisvalikud"</string> diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index 8739c3097..3f743b070 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -248,7 +248,7 @@ <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"همگامسازی رویداد تقویم برای این حساب"</string> <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"همگامسازی ایمیل"</string> <string name="account_settings_sync_email_summary" msgid="71710510041953351">"همگامسازی ایمیل برای این حساب"</string> - <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"لرزش"</string> + <string name="label_notification_vibrate_title" msgid="361069844540266098">"لرزش"</string> <string name="account_settings_ringtone" msgid="2238523918221865167">"انتخاب آهنگ زنگ"</string> <string name="account_settings_servers" msgid="3386185135392642067">"تنظیمات سرور"</string> <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"گزینههای همگامسازی"</string> diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index d5b2adb30..42ab9e030 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -248,7 +248,7 @@ <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Synkronoi tilin kalenteritapahtuma"</string> <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Synkronoi sähköposti"</string> <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Synkronoi tämän tilin sähköpostit"</string> - <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"Värinä"</string> + <string name="label_notification_vibrate_title" msgid="361069844540266098">"Värinä"</string> <string name="account_settings_ringtone" msgid="2238523918221865167">"Valitse soittoääni"</string> <string name="account_settings_servers" msgid="3386185135392642067">"Palvelinasetukset"</string> <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Synkronointiasetukset"</string> diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml index 3463b5469..0676e39b0 100644 --- a/res/values-fr-rCA/strings.xml +++ b/res/values-fr-rCA/strings.xml @@ -248,7 +248,7 @@ <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Synchro événement agenda pour ce compte"</string> <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Synchr. messagerie"</string> <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Synchroniser les courriels pour ce compte"</string> - <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"Vibreur"</string> + <string name="label_notification_vibrate_title" msgid="361069844540266098">"Vibreur"</string> <string name="account_settings_ringtone" msgid="2238523918221865167">"Sélectionner une sonnerie"</string> <string name="account_settings_servers" msgid="3386185135392642067">"Paramètres du serveur"</string> <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Options de synchronisation"</string> diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 5ba085daf..7abbbcbd8 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -248,7 +248,7 @@ <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Synchro événement agenda pour ce compte"</string> <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Synchr. messagerie"</string> <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Synchroniser les e-mails pour ce compte"</string> - <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"Vibreur"</string> + <string name="label_notification_vibrate_title" msgid="361069844540266098">"Vibreur"</string> <string name="account_settings_ringtone" msgid="2238523918221865167">"Sélectionner une sonnerie"</string> <string name="account_settings_servers" msgid="3386185135392642067">"Paramètres du serveur"</string> <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Options de synchronisation"</string> diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index c00919560..ee32174af 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -248,7 +248,7 @@ <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"A fiók naptárának szinkronizálása"</string> <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"E-mail szinkroniz."</string> <string name="account_settings_sync_email_summary" msgid="71710510041953351">"A fiók e-mailjeinek szinkronizálása"</string> - <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"Rezgés"</string> + <string name="label_notification_vibrate_title" msgid="361069844540266098">"Rezgés"</string> <string name="account_settings_ringtone" msgid="2238523918221865167">"Válasszon csengőhangot"</string> <string name="account_settings_servers" msgid="3386185135392642067">"Szerverbeállítások"</string> <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Szinkronizálási beállítások"</string> diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml index e6efba3ee..e182872ec 100644 --- a/res/values-hy-rAM/strings.xml +++ b/res/values-hy-rAM/strings.xml @@ -250,7 +250,7 @@ <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Համաժամեցնել օրացուցային իրադարձությունը այս հաշվում"</string> <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Համաժամեցնել էլփոստը"</string> <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Համաժամեցնել Էլփոստը այս հաշվում"</string> - <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"Թրթռալ"</string> + <string name="label_notification_vibrate_title" msgid="361069844540266098">"Թրթռալ"</string> <string name="account_settings_ringtone" msgid="2238523918221865167">"Ընտրեք զանգերանգը"</string> <string name="account_settings_servers" msgid="3386185135392642067">"Սերվերի կարգավորումներ"</string> <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Համաժամեցման ընտրանքներ"</string> diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index f28f972f0..588cdd699 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -248,7 +248,7 @@ <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Sinkronkan acara kalender akun ini"</string> <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Sinkronkan email"</string> <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Sinkronkan email untuk akun ini"</string> - <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"Getar"</string> + <string name="label_notification_vibrate_title" msgid="361069844540266098">"Getar"</string> <string name="account_settings_ringtone" msgid="2238523918221865167">"Pilih nada dering"</string> <string name="account_settings_servers" msgid="3386185135392642067">"Setelan server"</string> <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Opsi sinkronisasi"</string> diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 3ec516792..d7da3ac84 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -248,7 +248,7 @@ <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Sincron. evento calendario account"</string> <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Sincronizza email"</string> <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Sincronizza le email per questo account"</string> - <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"Vibrazione"</string> + <string name="label_notification_vibrate_title" msgid="361069844540266098">"Vibrazione"</string> <string name="account_settings_ringtone" msgid="2238523918221865167">"Scegli suoneria"</string> <string name="account_settings_servers" msgid="3386185135392642067">"Impostazioni server"</string> <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Opzioni di sincronizzazione"</string> diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index 5c0dc31f2..aa50a02bf 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -248,7 +248,7 @@ <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"סינכרון אירוע לוח שנה עבור חשבון זה"</string> <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"סנכרן דוא\"ל"</string> <string name="account_settings_sync_email_summary" msgid="71710510041953351">"סנכרן דוא\"ל בחשבון זה"</string> - <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"רטט"</string> + <string name="label_notification_vibrate_title" msgid="361069844540266098">"רטט"</string> <string name="account_settings_ringtone" msgid="2238523918221865167">"בחר רינגטון"</string> <string name="account_settings_servers" msgid="3386185135392642067">"הגדרות שרת"</string> <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"אפשרויות סינכרון"</string> diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 53736df3d..572c07a1d 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -248,7 +248,7 @@ <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"このアカウントのカレンダーの予定を同期"</string> <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"メールを同期する"</string> <string name="account_settings_sync_email_summary" msgid="71710510041953351">"このアカウントのメールを同期"</string> - <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"バイブレーション"</string> + <string name="label_notification_vibrate_title" msgid="361069844540266098">"バイブレーション"</string> <string name="account_settings_ringtone" msgid="2238523918221865167">"着信音を選択"</string> <string name="account_settings_servers" msgid="3386185135392642067">"サーバー設定"</string> <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"同期オプション"</string> diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml index b6b37e189..11801b91d 100644 --- a/res/values-ka-rGE/strings.xml +++ b/res/values-ka-rGE/strings.xml @@ -248,7 +248,7 @@ <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"ამ ანგარიშისთვის კალენდრის ღონისძიების სინქრონიზაცია"</string> <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"ელფოსტის სინქრონიზაცია"</string> <string name="account_settings_sync_email_summary" msgid="71710510041953351">"ანგარიშის ელფოსტის სინქრონიზაცია"</string> - <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"ვიბრაცია"</string> + <string name="label_notification_vibrate_title" msgid="361069844540266098">"ვიბრაცია"</string> <string name="account_settings_ringtone" msgid="2238523918221865167">"ზარის მელოდიის არჩევა"</string> <string name="account_settings_servers" msgid="3386185135392642067">"სერვერის პარამეტრები"</string> <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"სინქრონიზაციის პარამეტრები"</string> diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 1c524a30c..3a2d9faf4 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -248,7 +248,7 @@ <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"이 계정의 캘린더 일정을 동기화합니다."</string> <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"이메일 동기화"</string> <string name="account_settings_sync_email_summary" msgid="71710510041953351">"이 계정의 이메일을 동기화합니다."</string> - <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"진동"</string> + <string name="label_notification_vibrate_title" msgid="361069844540266098">"진동"</string> <string name="account_settings_ringtone" msgid="2238523918221865167">"벨소리 선택"</string> <string name="account_settings_servers" msgid="3386185135392642067">"서버 설정"</string> <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"동기화 옵션"</string> diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml index 0e89129e6..6c1328610 100644 --- a/res/values-lo-rLA/strings.xml +++ b/res/values-lo-rLA/strings.xml @@ -248,7 +248,7 @@ <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"ຊິ້ງຂໍ້ມູນນັດໝາຍຂອງປະຕິທິນສຳລັບບັນຊີນີ້"</string> <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"ຊິ້ງຂໍ້ມູນອີເມວ"</string> <string name="account_settings_sync_email_summary" msgid="71710510041953351">"ຊິ້ງຂໍ້ມູນອີເມວຈາກບັນຊີນີ້"</string> - <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"ສັ່ນເຕືອນ"</string> + <string name="label_notification_vibrate_title" msgid="361069844540266098">"ສັ່ນເຕືອນ"</string> <string name="account_settings_ringtone" msgid="2238523918221865167">"ເລືອກສຽງຣິງໂທນ"</string> <string name="account_settings_servers" msgid="3386185135392642067">"ການຕັ້ງຄ່າເຊີບເວີ"</string> <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"ຕົວເລືອກການຊິ້ງຂໍ້ມູນ"</string> diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index f60f13324..f2acfedc2 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -248,7 +248,7 @@ <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Sinchronizuoti šios paskyros kalendorių"</string> <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Sinchron. el. paštą"</string> <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Sinchron. šios paskyros el. paštą"</string> - <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"Vibruoti"</string> + <string name="label_notification_vibrate_title" msgid="361069844540266098">"Vibruoti"</string> <string name="account_settings_ringtone" msgid="2238523918221865167">"Pasirinkti skambėjimo toną"</string> <string name="account_settings_servers" msgid="3386185135392642067">"Serverio nustatymai"</string> <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Sinchronizavimo parinktys"</string> diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index 66602ec7e..c6a41e780 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -248,7 +248,7 @@ <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Sinhr. šī konta kalendāra notikumus"</string> <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Sinhronizēt e-pastu"</string> <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Sinhronizēt e-pastu šim kontam"</string> - <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"Vibrozvans"</string> + <string name="label_notification_vibrate_title" msgid="361069844540266098">"Vibrozvans"</string> <string name="account_settings_ringtone" msgid="2238523918221865167">"Izvēlēties zvana signālu"</string> <string name="account_settings_servers" msgid="3386185135392642067">"Servera iestatījumi"</string> <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Sinhronizācijas opcijas"</string> diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml index c95ebeb6b..82c1ffaad 100644 --- a/res/values-mn-rMN/strings.xml +++ b/res/values-mn-rMN/strings.xml @@ -248,7 +248,7 @@ <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Энэ акаунтын календарийн үйл явдлуудыг синк хийх"</string> <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Имэйлийг синк хийх"</string> <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Энэ акаунтын имэйлийг синк хийх"</string> - <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"Чичиргэх"</string> + <string name="label_notification_vibrate_title" msgid="361069844540266098">"Чичиргэх"</string> <string name="account_settings_ringtone" msgid="2238523918221865167">"Хонхны ая сонгох"</string> <string name="account_settings_servers" msgid="3386185135392642067">"Серверийн тохиргоо"</string> <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Синк сонголтууд"</string> diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml index ca67613a2..e19c361e7 100644 --- a/res/values-ms-rMY/strings.xml +++ b/res/values-ms-rMY/strings.xml @@ -248,7 +248,7 @@ <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Segerakkan acara kalendar untuk akaun ini"</string> <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Segerakkan e-mel"</string> <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Segerakkan e-mel untuk akaun ini"</string> - <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"Getar"</string> + <string name="label_notification_vibrate_title" msgid="361069844540266098">"Getar"</string> <string name="account_settings_ringtone" msgid="2238523918221865167">"Pilih nada dering"</string> <string name="account_settings_servers" msgid="3386185135392642067">"Tetapan pelayan"</string> <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Pilihan segerak"</string> diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 243d11e9b..ddbf84274 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -248,7 +248,7 @@ <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Synkroniser kalenderaktivitet for denne kontoen"</string> <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Synkroniser e-post"</string> <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Synkr. e-poster for denne kontoen"</string> - <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"Vibrer"</string> + <string name="label_notification_vibrate_title" msgid="361069844540266098">"Vibrer"</string> <string name="account_settings_ringtone" msgid="2238523918221865167">"Velg ringetone"</string> <string name="account_settings_servers" msgid="3386185135392642067">"Innstillinger for tjener"</string> <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Synkroniseringsalternativer"</string> diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 2bf6cdc52..ab3d63080 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -248,7 +248,7 @@ <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Agenda-afspraak voor dit account synchroniseren"</string> <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"E-mail synchroniseren"</string> <string name="account_settings_sync_email_summary" msgid="71710510041953351">"E-mail voor dit account synchroniseren"</string> - <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"Trillen"</string> + <string name="label_notification_vibrate_title" msgid="361069844540266098">"Trillen"</string> <string name="account_settings_ringtone" msgid="2238523918221865167">"Beltoon kiezen"</string> <string name="account_settings_servers" msgid="3386185135392642067">"Serverinstellingen"</string> <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Synchronisatieopties"</string> diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 11aeb6356..7811178d3 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -248,7 +248,7 @@ <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Synchronizuj kalendarz dla tego konta"</string> <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Synchronizuj e-maile"</string> <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Synchronizuj wiadomości e-mail dla tego konta"</string> - <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"Wibracje"</string> + <string name="label_notification_vibrate_title" msgid="361069844540266098">"Wibracje"</string> <string name="account_settings_ringtone" msgid="2238523918221865167">"Wybierz dzwonek"</string> <string name="account_settings_servers" msgid="3386185135392642067">"Ustawienia serwera"</string> <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Opcje synchronizacji"</string> diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index e4ececdd4..ce5625f7c 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -248,7 +248,7 @@ <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Sinc. evento do cal. p. esta conta"</string> <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Sincronizar email"</string> <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Sincronizar email para esta conta"</string> - <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"Vibrar"</string> + <string name="label_notification_vibrate_title" msgid="361069844540266098">"Vibrar"</string> <string name="account_settings_ringtone" msgid="2238523918221865167">"Escolher toque"</string> <string name="account_settings_servers" msgid="3386185135392642067">"Definições do servidor"</string> <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Opções de sincronização"</string> diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index 82e8ba85e..bfbb1ecb1 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -248,7 +248,7 @@ <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Sinc. evento agenda p/ esta conta"</string> <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Sincronizar e-mail"</string> <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Sincronizar e-mail para esta conta"</string> - <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"Vibrar"</string> + <string name="label_notification_vibrate_title" msgid="361069844540266098">"Vibrar"</string> <string name="account_settings_ringtone" msgid="2238523918221865167">"Selecionar toque"</string> <string name="account_settings_servers" msgid="3386185135392642067">"Configurações do servidor"</string> <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Opções de sincronização"</string> diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml index 870cdbfec..e24a6de76 100644 --- a/res/values-rm/strings.xml +++ b/res/values-rm/strings.xml @@ -419,7 +419,7 @@ <!-- no translation found for account_settings_sync_email_enable (3754115565685222477) --> <skip /> <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincronisar ils e-mails per quest conto"</string> - <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrar"</string> + <string name="label_notification_vibrate_title" msgid="708477308761702671">"Vibrar"</string> <!-- no translation found for account_settings_ringtone (8229878374785575207) --> <skip /> <string name="account_settings_servers" msgid="4925493817981624242">"Parameters dal server"</string> diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index 51055e33e..d24310d8e 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -248,7 +248,7 @@ <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Sincron. evenim. calendar pt. cont"</string> <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Sincroniz. e-mailul"</string> <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Sincron. e-mail pt. acest cont"</string> - <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"Vibrare"</string> + <string name="label_notification_vibrate_title" msgid="361069844540266098">"Vibrare"</string> <string name="account_settings_ringtone" msgid="2238523918221865167">"Alegeţi un ton de sonerie"</string> <string name="account_settings_servers" msgid="3386185135392642067">"Setări server"</string> <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Opţiuni de sincronizare"</string> diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index fe30111b2..90b59b77c 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -248,7 +248,7 @@ <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Синхронизировать календарь этого аккаунта"</string> <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Синхронизировать почту"</string> <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Синхронизировать почту этого аккаунта"</string> - <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"Вибросигнал"</string> + <string name="label_notification_vibrate_title" msgid="361069844540266098">"Вибросигнал"</string> <string name="account_settings_ringtone" msgid="2238523918221865167">"Выбрать рингтон"</string> <string name="account_settings_servers" msgid="3386185135392642067">"Настройки сервера"</string> <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Параметры синхронизации"</string> diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index f22e81ef3..2748ea986 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -248,7 +248,7 @@ <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Synchr. udalosti kalendára pre účet"</string> <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Synchr. poštu"</string> <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Synchr. poštu pre tento účet"</string> - <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"Vibrovať"</string> + <string name="label_notification_vibrate_title" msgid="361069844540266098">"Vibrovať"</string> <string name="account_settings_ringtone" msgid="2238523918221865167">"Zvoliť tón zvonenia"</string> <string name="account_settings_servers" msgid="3386185135392642067">"Nastavenia servera"</string> <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Možnosti synchronizácie"</string> diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index fd639f4a2..ed70a760e 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -248,7 +248,7 @@ <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Sinhr. dogodek iz kol. za ta račun"</string> <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Sinhroniz. e-pošte"</string> <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Sinhroniziraj e-pošto za ta račun"</string> - <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"Vibriranje"</string> + <string name="label_notification_vibrate_title" msgid="361069844540266098">"Vibriranje"</string> <string name="account_settings_ringtone" msgid="2238523918221865167">"Izberite melodijo zvonjenja"</string> <string name="account_settings_servers" msgid="3386185135392642067">"Nastavitve strežnika"</string> <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Možnosti sinhronizacije"</string> diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index e291bc553..0dbfab223 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -248,7 +248,7 @@ <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Синхр. дог. календара за овај налог"</string> <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Синхронизуј е-пошту"</string> <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Синхронизуј е-пошту за овај налог"</string> - <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"Вибрација"</string> + <string name="label_notification_vibrate_title" msgid="361069844540266098">"Вибрација"</string> <string name="account_settings_ringtone" msgid="2238523918221865167">"Изабери мелодију звона"</string> <string name="account_settings_servers" msgid="3386185135392642067">"Подешавања сервера"</string> <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Опције синхронизације"</string> diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index 3be4c94d3..2889694b8 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -248,7 +248,7 @@ <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Synka kalenderhändelse för kontot"</string> <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Synkronisera e-post"</string> <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Synkronisera e-post för det här kontot"</string> - <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"Vibrera"</string> + <string name="label_notification_vibrate_title" msgid="361069844540266098">"Vibrera"</string> <string name="account_settings_ringtone" msgid="2238523918221865167">"Välj ringsignal"</string> <string name="account_settings_servers" msgid="3386185135392642067">"Serverinställningar"</string> <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Synkroniseringsalternativ"</string> diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml index 05bd7fdb0..749336a6d 100644 --- a/res/values-sw/strings.xml +++ b/res/values-sw/strings.xml @@ -248,7 +248,7 @@ <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Sawazisha tukio lililo kwenye kalenda la akaunti hii"</string> <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Sawazisha barua pepe"</string> <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Sawazisha barua pepe za akaunti hii"</string> - <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"Tetema"</string> + <string name="label_notification_vibrate_title" msgid="361069844540266098">"Tetema"</string> <string name="account_settings_ringtone" msgid="2238523918221865167">"Chagua toni ya mlio"</string> <string name="account_settings_servers" msgid="3386185135392642067">"Mipangilio ya seva"</string> <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Chaguo za kusawazisha"</string> diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index a124e641e..800269a92 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -248,7 +248,7 @@ <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"ซิงค์กิจกรรมในปฏิทินสำหรับบัญชีนี้"</string> <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"ซิงค์อีเมล"</string> <string name="account_settings_sync_email_summary" msgid="71710510041953351">"ซิงค์อีเมลสำหรับบัญชีนี้"</string> - <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"สั่น"</string> + <string name="label_notification_vibrate_title" msgid="361069844540266098">"สั่น"</string> <string name="account_settings_ringtone" msgid="2238523918221865167">"เลือกเสียงเรียกเข้า"</string> <string name="account_settings_servers" msgid="3386185135392642067">"การตั้งค่าเซิร์ฟเวอร์"</string> <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"ตัวเลือกการซิงค์"</string> diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml index 8dacc916f..650115131 100644 --- a/res/values-tl/strings.xml +++ b/res/values-tl/strings.xml @@ -248,7 +248,7 @@ <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"I-sync ang kalendaryo ng kaganapan para sa account"</string> <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"I-sync ang email"</string> <string name="account_settings_sync_email_summary" msgid="71710510041953351">"I-sync ang email sa account na ito"</string> - <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"I-vibrate"</string> + <string name="label_notification_vibrate_title" msgid="361069844540266098">"I-vibrate"</string> <string name="account_settings_ringtone" msgid="2238523918221865167">"Pumili ng ringtone"</string> <string name="account_settings_servers" msgid="3386185135392642067">"Mga setting ng server"</string> <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Mga pagpipilian sa pag-sync"</string> diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 4797a3e0f..6e60bf525 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -248,7 +248,7 @@ <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Bu hesabın takvim etkinliğini senkronize et"</string> <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"E-postayı senk. et"</string> <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Bu hesaba ilişkin e-postaları senkronize et"</string> - <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"Titreşim"</string> + <string name="label_notification_vibrate_title" msgid="361069844540266098">"Titreşim"</string> <string name="account_settings_ringtone" msgid="2238523918221865167">"Zil sesi seçin"</string> <string name="account_settings_servers" msgid="3386185135392642067">"Sunucu ayarları"</string> <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Senkronizasyon seçenekleri"</string> diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index eada8794f..d5d4fe03b 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -248,7 +248,7 @@ <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Синхроніз. календар із цим обл.зап."</string> <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Синхроніз. ел.пошту"</string> <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Синхрон. ел. пошту для обл. запису"</string> - <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"Вібросигнал"</string> + <string name="label_notification_vibrate_title" msgid="361069844540266098">"Вібросигнал"</string> <string name="account_settings_ringtone" msgid="2238523918221865167">"Вибрати сигнал дзвінка"</string> <string name="account_settings_servers" msgid="3386185135392642067">"Налашт-ня сервера"</string> <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Параметри синхронізації"</string> diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index f84986a08..79593e208 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -248,7 +248,7 @@ <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Đồng bộ hóa sự kiện lịch cho tài khoản này"</string> <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Đồng bộ hóa email"</string> <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Đồng bộ hóa email cho tài khoản này"</string> - <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"Rung"</string> + <string name="label_notification_vibrate_title" msgid="361069844540266098">"Rung"</string> <string name="account_settings_ringtone" msgid="2238523918221865167">"Chọn nhạc chuông"</string> <string name="account_settings_servers" msgid="3386185135392642067">"Cài đặt máy chủ"</string> <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Tùy chọn đồng bộ hóa"</string> diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 25222a8d5..6caa89746 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -248,7 +248,7 @@ <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"同步此帐户中的日历活动"</string> <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"同步电子邮件"</string> <string name="account_settings_sync_email_summary" msgid="71710510041953351">"同步此帐户中的电子邮件"</string> - <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"振动"</string> + <string name="label_notification_vibrate_title" msgid="361069844540266098">"振动"</string> <string name="account_settings_ringtone" msgid="2238523918221865167">"选择铃声"</string> <string name="account_settings_servers" msgid="3386185135392642067">"服务器设置"</string> <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"同步选项"</string> diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml index 5c6783d14..316ae8f04 100644 --- a/res/values-zh-rHK/strings.xml +++ b/res/values-zh-rHK/strings.xml @@ -248,7 +248,7 @@ <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"保持這個帳戶的日曆活動同步"</string> <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"同步處理電子郵件"</string> <string name="account_settings_sync_email_summary" msgid="71710510041953351">"同步處理這個帳戶的電子郵件"</string> - <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"震動"</string> + <string name="label_notification_vibrate_title" msgid="361069844540266098">"震動"</string> <string name="account_settings_ringtone" msgid="2238523918221865167">"選擇鈴聲"</string> <string name="account_settings_servers" msgid="3386185135392642067">"伺服器設定"</string> <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"同步處理選項"</string> diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 8d2d4823a..66461468a 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -248,7 +248,7 @@ <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"同步處理這個帳戶的日曆活動"</string> <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"同步處理電子郵件"</string> <string name="account_settings_sync_email_summary" msgid="71710510041953351">"同步處理此帳戶的電子郵件"</string> - <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"震動"</string> + <string name="label_notification_vibrate_title" msgid="361069844540266098">"震動"</string> <string name="account_settings_ringtone" msgid="2238523918221865167">"選擇鈴聲"</string> <string name="account_settings_servers" msgid="3386185135392642067">"伺服器設定"</string> <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"同步處理選項"</string> diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml index f027c4587..d0a0f248b 100644 --- a/res/values-zu/strings.xml +++ b/res/values-zu/strings.xml @@ -248,7 +248,7 @@ <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Vumelanisa umcimbi wekhalenda kule akhawunti"</string> <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Vumelanisa i-imeyli"</string> <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Vumelanisa i-imeyli yale akhawunti"</string> - <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"Dlidliza"</string> + <string name="label_notification_vibrate_title" msgid="361069844540266098">"Dlidliza"</string> <string name="account_settings_ringtone" msgid="2238523918221865167">"Khetha ithoni yokukhala"</string> <string name="account_settings_servers" msgid="3386185135392642067">"Izilungiselelo zeseva"</string> <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Vumelanisa okukhethwa kukho"</string> diff --git a/res/values/strings.xml b/res/values/strings.xml index 4d8add132..c156d51c2 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -37,32 +37,12 @@ <!-- Menu item used to create a new quick response [CHAR_LIMIT=16] --> <string name="create_action">Create new</string> + <!-- Message informing user when a list that would contain quick responses is empty [CHAR_LIMIT=80] --> <string name="quick_responses_empty_view">No quick responses.</string> <!-- Menu item --> <string name="account_settings_action">Account settings</string> - <!-- Appears in message list view when there's a network error. --> - <!-- Also appears in a toast, in the message viewer, when there's a network error. --> - <string name="status_network_error">Connection problem.</string> - <!-- Text shown with dragged messages to indicate how many are being dragged [CHAR LIMIT=40]--> - <plurals name="move_messages"> - <item quantity="one">Move message</item> - <item quantity="other">Move messages</item> - </plurals> - <!-- Toast shown when a message(s) can't be moved because it's not supported by the POP3 - protocol. [CHAR LIMIT=none]--> - <string name="cannot_move_protocol_not_supported_toast">Move isn\'t supported on POP3 accounts. - </string> - <!-- Toast shown when messages can't be moved because the selection contains multiple accounts' - messages. [CHAR LIMIT=none]--> - <string name="cannot_move_multiple_accounts_toast">Can\'t move because selection contains multiple - accounts.</string> - <!-- Toast shown when messages can't be moved because they're in a special mailbox. "Drafts", - "Outbox" and "Sent". [CHAR LIMIT=none]--> - <string name="cannot_move_special_mailboxes_toast">Messages in Drafts, Outbox, and Sent can\'t be - moved.</string> - <!-- The next set of strings are used in local display and may be localized. --> <!-- In the UI, the inbox will be displayed with this name --> <string name="mailbox_name_display_inbox">Inbox</string> @@ -96,26 +76,12 @@ <string name="debug_clear_webview_cache" translatable="false"> Clear WebView cache</string> <!-- Do Not Translate. Checkbox label, shown on debug screen. --> - <string name="debug_disable_graphics_acceleration_label" translatable="false"> - Disable hardware graphics acceleration</string> - <!-- Do Not Translate. Checkbox label, shown on debug screen. --> <string name="debug_force_one_minute_refresh_label" translatable="false"> Force 1-minute refresh for POP/IMAP</string> <!-- Do Not Translate. Checkbox label, shown on debug screen. --> <string name="debug_enable_strict_mode_label" translatable="false"> Enable strict mode (with logging)</string> - <!-- The summary section entry in the AccountFolder list to display all inboxes --> - <string name="account_folder_list_summary_inbox">Inbox</string> - <!-- The summary section entry in the AccountFolder list to display all starred - [CHAR LIMIT=200dip] --> - <string name="account_folder_list_summary_starred">Starred</string> - <!-- The summary section entry in the AccountFolder list to display all drafts - [CHAR LIMIT=200dip] --> - <string name="account_folder_list_summary_drafts">Drafts</string> - <!-- The summary section entry in the AccountFolder list to display all outboxes - [CHAR LIMIT=200dip] --> - <string name="account_folder_list_summary_outbox">Outbox</string> <!-- Label shown in the account selector to select "Combined view", which contains Combined Inbox, Combined Outbox, etc. [CHAR LIMIT=30] --> @@ -133,10 +99,6 @@ <string name="message_view_attachment_background_load">One or more attachments in your forwarded message will be downloaded prior to sending.</string> - <!-- Error banner when an attachment could not be downloaded due to a problem at the server - [CHAR LIMIT=100] --> - <string name="attachment_not_found">Couldn\'t download the attachment.</string> - <!-- String used in place of a message that could not be properly decoded (e.g. bad base64 data was received.) [CHAR LIMIT=none] --> <string name="message_decode_error">There was an error while decoding the message.</string> @@ -152,27 +114,6 @@ <!-- Notification title when email account authentication fails [CHAR LIMIT=30]--> <string name="login_failed_title">Couldn\'t sign in</string> - <!-- Size unit for bytes for attachments [CHAR LIMIT=10] --> - <plurals name="message_view_attachment_bytes"> - <item quantity="one" ><xliff:g id="size_in_bytes" example="1" >%d</xliff:g>B</item> - <item quantity="other"><xliff:g id="size_in_bytes" example="279">%d</xliff:g>B</item> - </plurals> - <!-- Size unit for kilo bytes for attachments [CHAR LIMIT=10] --> - <plurals name="message_view_attachment_kilobytes"> - <item quantity="one" ><xliff:g id="size_in_kilobytes" example="1" >%d</xliff:g>KB</item> - <item quantity="other"><xliff:g id="size_in_kilobytes" example="279">%d</xliff:g>KB</item> - </plurals> - <!-- Size unit for mega bytes for attachments [CHAR LIMIT=10] --> - <plurals name="message_view_attachment_megabytes"> - <item quantity="one" ><xliff:g id="size_in_megabytes" example="1" >%d</xliff:g>MB</item> - <item quantity="other"><xliff:g id="size_in_megabytes" example="279">%d</xliff:g>MB</item> - </plurals> - <!-- Size unit for giga bytes for attachments [CHAR LIMIT=10] --> - <plurals name="message_view_attachment_gigabytes"> - <item quantity="one" ><xliff:g id="size_in_gigabytes" example="1" >%d</xliff:g>GB</item> - <item quantity="other"><xliff:g id="size_in_gigabytes" example="279">%d</xliff:g>GB</item> - </plurals> - <!-- Title of screen when setting up new email account [CHAR LIMIT=45] --> <string name="account_setup_basics_title">Account setup</string> <!-- Title of screen when trying to get oauth authentication --> @@ -213,10 +154,6 @@ <string name="clear_authentication_label">Clear authentication</string> <!-- Button name on "Set up email" screen, with action underlined using html [CHAR LIMIT=20] --> <string name="account_setup_basics_manual_setup_action">Manual setup</string> - <!-- Do not translate. Button name on "Set up email" screen [CHAR LIMIT=20] TODO: This is a temporary workaround - to allow initiating the OAuth setup flow before we have the real design working. This string - should be removed. --> - <string name="account_setup_basics_oauth_setup_action" translatable="false">OAuth</string> <!-- Toast when we can't build a URI from the given email & password --> <!-- Note, the error message in the toast is purposefully vague, because I *don't* know exactly what's wrong. --> @@ -248,8 +185,6 @@ <!-- Explanatory text that appears on the "Confirm account type" screen [CHAR LIMIT=none] --> <string name="account_setup_ab_instructions_format">You indicated <xliff:g id="email">%1$s</xliff:g> uses <xliff:g id="userProtocol">%2$s</xliff:g>, but the account may use <xliff:g id="providerProtocol">%3$s</xliff:g></string> - <!-- Title of "Set up email" screen after success [CHAR LIMIT=45] --> - <string name="account_setup_names_title">Account setup</string> <!-- Text that appears on "Set up email" screen after successfully setting up an account [CHAR LIMIT=none] --> <string name="account_setup_names_headline"> @@ -261,15 +196,11 @@ <string name="account_setup_names_user_name_label"> Your name (displayed on outgoing messages)</string> - <!-- Activity Title for the account type selector (IMAP or POP3 or EAS) [CHAR LIMIT=45] --> - <string name="account_setup_account_type_title">Account setup</string> <!-- Headline for the the account type selector (IMAP or POP3 or EAS) [CHAR LIMIT=none] --> <string name="account_setup_account_type_headline">Account type</string> <!-- "Add new email account" screen, text that appears on screen --> <string name="account_setup_account_type_instructions">What type of account is this?</string> - <!-- "Incoming server settings" screen, title [CHAR LIMIT=45] --> - <string name="account_setup_incoming_title">Account setup</string> <!-- "Incoming server settings" screen, headline (text over divider) [CHAR LIMIT=none] --> <string name="account_setup_incoming_headline">Incoming server settings</string> <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable --> @@ -317,8 +248,6 @@ <!-- "Incoming server settings" screen, hint for setting IMAP path prefix: --> <string name="account_setup_incoming_imap_path_prefix_hint">Optional</string> - <!-- "Outgoing server settings" screen, title [CHAR LIMIT=45] --> - <string name="account_setup_outgoing_title">Account setup</string> <!-- "Outgoing server settings" screen, headline (text over divider) [CHAR LIMIT=none] --> <string name="account_setup_outgoing_headline">Outgoing server settings</string> <!-- On "Outgoing server settings" screen, label for text field, should be uppercase where applicable --> @@ -331,8 +260,6 @@ <string name="account_setup_outgoing_require_login_label">Require signin</string> <!-- On "Outgoing server settings" screen, label for text field, should be uppercase where applicable--> <string name="account_setup_outgoing_username_label">USERNAME</string> - <!-- On "Outgoing server settings" screen, label for text field, should be uppercase where applicable --> - <string name="account_setup_outgoing_password_label">PASSWORD</string> <!-- On "Exchange" setup screen, a heading title for the current client certificate, should be uppercase where applicable [CHAR LIMIT=50] --> <string name="account_setup_exchange_certificate_title">CLIENT CERTIFICATE</string> @@ -348,8 +275,6 @@ <!-- On "Exchange" setup screen, the exchange device-id label, should be uppercase where applicable [CHAR LIMIT=30] --> <string name="account_setup_exchange_device_id_label">MOBILE DEVICE ID</string> - <!-- In Account setup options screen, Activity title [CHAR LIMIT=45] --> - <string name="account_setup_options_title">Account settings</string> <!-- In Account setup options screen, Activity headline [CHAR LIMIT=none] --> <string name="account_setup_options_headline">Account options</string> <!-- In Account setup options screen, label for email check frequency selector --> @@ -403,8 +328,6 @@ <!-- "Setup could not finish" dialog text; e.g., Username or password incorrect --> <string name="account_setup_failed_dlg_auth_message">Username or password is incorrect.</string> - <!-- "Setup could not finish" dialog text; e.g., Username or password incorrect\n(ERR01 Account does not exist) --> - <string name="account_setup_failed_dlg_auth_message_fmt">Login failed.\n(<xliff:g id="error">%s</xliff:g>)</string> <!-- Account setup autodiscover auth failure dialog title. This is shown when autodiscover hits an "access denied" server error, which could imply incorrect username/password or that no @@ -475,9 +398,6 @@ <string name="account_setup_failed_security_policies_unsupported"> This server requires security features that your Android device doesn\'t support, including: <xliff:g id="error">%s</xliff:g></string> - <!-- The user name can only be changed during initial account setup. [CHAR LIMIT=none] --> - <string name="account_setup_username_uneditable_error">You can\'t change an account\'s username. - To add an account with a different username, touch Add Account.</string> <!-- Warning given to users when they request disabling device administration (i.e. that their administered accounts will be deleted) [CHAR LIMIT=none] --> <string name="disable_admin_warning">WARNING: Deactivating the Email app\'s authority @@ -558,20 +478,6 @@ without checking/saving [CHAR LIMIT=none]--> <string name="account_settings_exit_server_settings">Discard unsaved changes?</string> - <!-- On AccountSettingsXL, dialog title if you were brought here due to a login failure. - [CHAR_LIMIT=40] --> - <string name="account_settings_login_dialog_title">Couldn\'t sign in</string> - <!-- Dialog content if you were brought here due to a login failure. - [CHAR_LIMIT=none] --> - <string name="account_settings_login_dialog_content_fmt"> - The username or password for <xliff:g id="account">%s</xliff:g> is incorrect. - Do you want to update them now?</string> - <!-- Dialog content if you were brought here due to a login failure, and the server provided a reason - [CHAR_LIMIT=none] --> - <string name="account_settings_login_dialog_reason_fmt"> - Your login to <xliff:g id="account">%s</xliff:g> failed; the server said: <xliff:g id="reason">%s</xliff:g> - Do you want to update your username and/or password?</string> - <!-- On Settings screen, setting option name --> <!-- Title of account preference for downloading attachments in background [CHAR LIMIT=32] --> <string name="account_settings_background_attachments_label"> @@ -653,7 +559,7 @@ <string name="account_settings_sync_email_summary">Sync email for this account</string> <!-- On Settings screen, vibrate pop-up menu label --> - <string name="account_settings_vibrate_when_label">Vibrate</string> + <string name="label_notification_vibrate_title">Vibrate</string> <!-- On Settings screen, setting option name --> <string name="account_settings_ringtone">Choose ringtone</string> @@ -671,15 +577,6 @@ <!-- On mailbox settings screen: Mailbox sync window (the number of days to synchronize email for) setting label [CHAR LIMIT=none] --> <string name="mailbox_settings_mailbox_sync_window_label">Days of mail to sync</string> - <!-- Dialog title for the choosing whether to show checkboxes or sender image [CHAR LIMIT=200] --> - <string name="prefDialogTitle_conversationListIcon">Sender image</string> - - <!-- Message that appears when adding a Windows Live Hotmail Plus account --> - <string name="provider_note_live">Only some \"Plus\" accounts include POP access - allowing this program to connect. If you\'re not able to sign in with - your correct email address and password, you may not have a paid - \"Plus\" account. Launch the web browser to gain access to - these email accounts.</string> <!-- Message that appears when adding a T-Online account --> <string name="provider_note_t_online">Before setting up this email account, visit the T-Online website and create a password for POP3 email access.</string> @@ -697,32 +594,6 @@ <!-- Long-form description of the DeviceAdmin (2nd line in settings & in user conf. screen) --> <string name="device_admin_description">Enables server-specified security policies</string> - <!-- Settings activity title [CHAR LIMIT=40]--> - <string name="settings_activity_title">Settings</string> - - <!-- General Preferences Screen --> - <!-- Label in preferences header to describe general preferences [CHAR LIMIT=32] --> - <string name="header_label_general_preferences">General settings</string> - - <!-- General preference: Label of the setting for requiring confirmation before - message deletion [CHAR LIMIT=32] --> - <string name="general_preference_confirm_delete_label">Confirm before deleting</string> - <!-- General preference: Description of the setting for requiring confirmation before - message deletion [CHAR LIMIT=64] --> - <!-- General preference: Label of the setting for requiring confirmation before - message sending [CHAR LIMIT=32] --> - <string name="general_preference_confirm_send_label">Confirm before sending</string> - <!-- General preference: Description of the setting for requiring confirmation before - message sending [CHAR LIMIT=32] --> - - <!-- Generic string shown instead of regular numbers, when a number is larger than 999. - This should not be altered if the original string ("999+") makes sense in the - target language. Typical alternatives include "+999" and ">999". [CHAR_LIMIT=4] --> - <string name="more_than_999">999+</string> - - <!-- The hint used in the search box when searching all mailboxes [CHAR LIMIT=35] --> - <string name="search_hint">Search email</string> - <!-- A policy disallowing the user of the device's camera [CHAR LIMIT=50] --> <string name="policy_dont_allow_camera">Disallow use of the device\'s camera</string> <!-- A policy requiring a device lock screen password [CHAR LIMIT=50] --> @@ -753,21 +624,13 @@ <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] --> <string name="quick_4">Let\'s set up a meeting to discuss this.</string> - <!-- This is the message warning the user that they must sync manually when roaming. [CHAR LIMIT=none]--> - <string name="require_manual_sync_message">Background sync for this account is disabled while\ - roaming.</string> - <!-- This is shown when a user responds to a meeting invitation [CHAR LIMIT=none]--> <string name="confirm_response">Sending response…</string> - <!-- Displayed in the middle of the screen when the inbox is empty [CHAR LIMIT 100]--> - <string name="no_conversations">No messages.</string> - <!-- Used by AccountManager --> <string name="imap_name">IMAP</string> <string name="pop3_name">POP3</string> - <string name="folder_picker_title">Folder picker</string> <!-- Displayed when the user must pick his server's trash folder from a list [CHAR LIMIT 30]--> <string name="trash_folder_selection_title">Select server trash folder for <xliff:g id="account">%s</xliff:g></string> <!-- Displayed when the user must pick his server's sent items folder from a list [CHAR LIMIT 30]--> diff --git a/res/xml/account_settings_preferences.xml b/res/xml/account_settings_preferences.xml index 0eba071ca..3cdd47486 100755 --- a/res/xml/account_settings_preferences.xml +++ b/res/xml/account_settings_preferences.xml @@ -104,7 +104,7 @@ android:key="notification-vibrate" android:dependency="notifications-enabled" android:defaultValue="false" - android:title="@string/account_settings_vibrate_when_label" /> + android:title="@string/label_notification_vibrate_title" /> </PreferenceCategory> diff --git a/src/com/android/email/activity/UiUtilities.java b/src/com/android/email/activity/UiUtilities.java index 51d2e5c3d..c00310717 100644 --- a/src/com/android/email/activity/UiUtilities.java +++ b/src/com/android/email/activity/UiUtilities.java @@ -28,45 +28,6 @@ public class UiUtilities { } /** - * Formats the given size as a String in bytes, kB, MB or GB. Ex: 12,315,000 = 11 MB - */ - public static String formatSize(Context context, long size) { - final Resources res = context.getResources(); - final long KB = 1024; - final long MB = (KB * 1024); - final long GB = (MB * 1024); - - int resId; - int value; - - if (size < KB) { - resId = R.plurals.message_view_attachment_bytes; - value = (int) size; - } else if (size < MB) { - resId = R.plurals.message_view_attachment_kilobytes; - value = (int) (size / KB); - } else if (size < GB) { - resId = R.plurals.message_view_attachment_megabytes; - value = (int) (size / MB); - } else { - resId = R.plurals.message_view_attachment_gigabytes; - value = (int) (size / GB); - } - return res.getQuantityString(resId, value, value); - } - - public static String getMessageCountForUi(Context context, int count, - boolean replaceZeroWithBlank) { - if (replaceZeroWithBlank && (count == 0)) { - return ""; - } else if (count > 999) { - return context.getString(R.string.more_than_999); - } else { - return Integer.toString(count); - } - } - - /** * Same as {@link View#findViewById}, but crashes if there's no view. */ @SuppressWarnings("unchecked") @@ -93,13 +54,6 @@ public class UiUtilities { /** * Same as {@link View#setVisibility(int)}, but doesn't crash even if {@code view} is null. */ - public static void setVisibilitySafe(Activity parent, int viewId, int visibility) { - setVisibilitySafe(parent.findViewById(viewId), visibility); - } - - /** - * Same as {@link View#setVisibility(int)}, but doesn't crash even if {@code view} is null. - */ public static void setVisibilitySafe(View parent, int viewId, int visibility) { setVisibilitySafe(parent.findViewById(viewId), visibility); } diff --git a/tests/src/com/android/email/activity/UiUtilitiesTests.java b/tests/src/com/android/email/activity/UiUtilitiesTests.java deleted file mode 100644 index 3492a9e83..000000000 --- a/tests/src/com/android/email/activity/UiUtilitiesTests.java +++ /dev/null @@ -1,118 +0,0 @@ -/* - * Copyright (C) 2011 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.email.activity; - -import com.android.email.R; - -import android.app.Activity; -import android.content.Context; -import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.SmallTest; -import android.view.View; - -import java.util.Locale; - -@SmallTest -public class UiUtilitiesTests extends AndroidTestCase { - public void brokentestFormatSize() { - if (!"en".equalsIgnoreCase(Locale.getDefault().getLanguage())) { - return; // Only works on the EN locale. - } - assertEquals("0B", UiUtilities.formatSize(getContext(), 0)); - assertEquals("1B", UiUtilities.formatSize(getContext(), 1)); - assertEquals("1023B", UiUtilities.formatSize(getContext(), 1023)); - assertEquals("1KB", UiUtilities.formatSize(getContext(), 1024)); - assertEquals("1023KB", UiUtilities.formatSize(getContext(), 1024 * 1024 - 1)); - assertEquals("1MB", UiUtilities.formatSize(getContext(), 1024 * 1024)); - assertEquals("1023MB", UiUtilities.formatSize(getContext(), 1024 * 1024 * 1024 - 1)); - assertEquals("1GB", UiUtilities.formatSize(getContext(), 1024 * 1024 * 1024)); - assertEquals("5GB", UiUtilities.formatSize(getContext(), 5L * 1024 * 1024 * 1024)); - } - - public void brokentestGetMessageCountForUi() { - final Context c = getContext(); - - // Negavive valeus not really expected, but at least shouldn't crash. - assertEquals("-1", UiUtilities.getMessageCountForUi(c, -1, true)); - assertEquals("-1", UiUtilities.getMessageCountForUi(c, -1, false)); - - assertEquals("", UiUtilities.getMessageCountForUi(c, 0, true)); - assertEquals("0", UiUtilities.getMessageCountForUi(c, 0, false)); - - assertEquals("1", UiUtilities.getMessageCountForUi(c, 1, true)); - assertEquals("1", UiUtilities.getMessageCountForUi(c, 1, false)); - - assertEquals("999", UiUtilities.getMessageCountForUi(c, 999, true)); - assertEquals("999", UiUtilities.getMessageCountForUi(c, 999, false)); - - final String moreThan999 = c.getString(R.string.more_than_999); - - assertEquals(moreThan999, UiUtilities.getMessageCountForUi(c, 1000, true)); - assertEquals(moreThan999, UiUtilities.getMessageCountForUi(c, 1000, false)); - - assertEquals(moreThan999, UiUtilities.getMessageCountForUi(c, 1001, true)); - assertEquals(moreThan999, UiUtilities.getMessageCountForUi(c, 1001, false)); - } - - public void brokentestSetVisibilitySafe() { - { - DummyView v = new DummyView(getContext()); - UiUtilities.setVisibilitySafe(v, View.VISIBLE); - assertEquals(View.VISIBLE, v.mVisibility); - - // Shouldn't crash - UiUtilities.setVisibilitySafe(null, View.VISIBLE); - } - - { - DummyActivity a = new DummyActivity(); - DummyView v = new DummyView(getContext()); - a.mDummyViewId = 3; - a.mDummyView = v; - - UiUtilities.setVisibilitySafe(a, 3, View.VISIBLE); - assertEquals(View.VISIBLE, v.mVisibility); - - // shouldn't crash - UiUtilities.setVisibilitySafe(a, 5, View.VISIBLE); - } - // No test for setVisibilitySafe(View, int, int) -- see testGetView(). - } - - private static class DummyActivity extends Activity { - public int mDummyViewId; - public View mDummyView; - - @Override - public View findViewById(int id) { - return (id == mDummyViewId) ? mDummyView : null; - } - } - - private static class DummyView extends View { - public int mVisibility = View.GONE; - - public DummyView(Context context) { - super(context); - } - - @Override - public void setVisibility(int visibility) { - mVisibility = visibility; - } - } -} |