diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 0bc720d5b..135ae33bc 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -232,8 +232,18 @@
     <string name="account_settings_sync_contacts_summary" msgid="8901452720940015928">"Synchronizovat kontakty také z tohoto účtu"</string>
     <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Synchronizovat kalendář"</string>
     <string name="account_settings_sync_calendar_summary" msgid="2456010694443333450">"Synchronizovat kalendář také z tohoto účtu"</string>
-    <string name="account_settings_vibrate_enable" msgid="8045133290388856478">"Vibrovat"</string>
-    <string name="account_settings_vibrate_summary" msgid="3690631050585589365">"Při obdržení e-mailu také vibrovat"</string>
+    <!-- no translation found for account_settings_vibrate_when_label (708477308761702671) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_summary (3991584445166247189) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_always (6739506816960483174) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_silent (6417076436551648924) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_never (3759680093309511614) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_dlg_title (308167729046312952) -->
+    <skip />
     <string name="account_settings_ringtone" msgid="7922187231467500404">"Zvolit vyzváněcí tón"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Nastavení serverů"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Odebrat účet"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index d59e392e5..1cbfc068c 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -89,7 +89,7 @@
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Bcc"</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"Emne"</string>
-    <string name="message_compose_body_hint" msgid="7575406246484103697">"Skriv mail"</string>
+    <string name="message_compose_body_hint" msgid="7575406246484103697">"Skriv e-mail"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Oprindelig besked --------"\n"Emne: <xliff:g id="SUBJECT">%s</xliff:g>"\n"Fra: <xliff:g id="SENDER">%s</xliff:g>"\n"Til: <xliff:g id="TO">%s</xliff:g>"\n"CC: <xliff:g id="CC_0">%s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> skrev:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Citeret tekst"</string>
@@ -205,7 +205,7 @@
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS er påkrævet, men understøttes ikke af serveren."</string>
     <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"Godkendelsesmetoderne understøttes ikke af serveren."</string>
     <string name="account_setup_failed_security" msgid="6142264248671379943">"Der kunne ikke åbnes en forbindelse til serveren på grund af en sikkerhedsfejl."</string>
-    <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"Der kunne ikke åbnes en forbindelse til serveren."</string>
+    <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"Der kunne oprettes forbindelse til serveren."</string>
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"Ekstern sikkerhedsadministration"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"Serveren <xliff:g id="SERVER">%s</xliff:g> kræver, at du giver den tilladelse til eksternt at kontrollere nogle af telefonens sikkerhedsfunktioner. Vil du afslutte opsætning af denne konto?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Denne server kræver sikkerhedsfunktioner, som telefonen ikke understøtter."</string>
@@ -232,8 +232,18 @@
     <string name="account_settings_sync_contacts_summary" msgid="8901452720940015928">"Synkroniser også kontakter fra denne konto"</string>
     <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Synkroniser kalender"</string>
     <string name="account_settings_sync_calendar_summary" msgid="2456010694443333450">"Synkroniser også kalender fra denne konto"</string>
-    <string name="account_settings_vibrate_enable" msgid="8045133290388856478">"Vibration"</string>
-    <string name="account_settings_vibrate_summary" msgid="3690631050585589365">"Vibration ved ny e-mail"</string>
+    <!-- no translation found for account_settings_vibrate_when_label (708477308761702671) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_summary (3991584445166247189) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_always (6739506816960483174) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_silent (6417076436551648924) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_never (3759680093309511614) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_dlg_title (308167729046312952) -->
+    <skip />
     <string name="account_settings_ringtone" msgid="7922187231467500404">"Vælg ringetone"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Indstillinger for server"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Fjern konto"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 7ceb43dfa..a460477f1 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -228,12 +228,22 @@
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Signatur"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Text an zu sendende Nachrichten anhängen"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Benachrichtigungseinstellungen"</string>
-    <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Kontakte synchronisieren"</string>
+    <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Kontakte synchr."</string>
     <string name="account_settings_sync_contacts_summary" msgid="8901452720940015928">"Kontakte dieses Kontos ebenfalls synchronisieren"</string>
     <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Kalender synchronisieren"</string>
     <string name="account_settings_sync_calendar_summary" msgid="2456010694443333450">"Kalender dieses Kontos ebenfalls synchronisieren"</string>
-    <string name="account_settings_vibrate_enable" msgid="8045133290388856478">"Vibration"</string>
-    <string name="account_settings_vibrate_summary" msgid="3690631050585589365">"Bei E-Mail-Eingang zusätzlich vibrieren"</string>
+    <!-- no translation found for account_settings_vibrate_when_label (708477308761702671) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_summary (3991584445166247189) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_always (6739506816960483174) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_silent (6417076436551648924) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_never (3759680093309511614) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_dlg_title (308167729046312952) -->
+    <skip />
     <string name="account_settings_ringtone" msgid="7922187231467500404">"Klingelton auswählen"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Servereinstellungen"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Konto entfernen"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 79db7cee4..6bb332744 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -232,8 +232,18 @@
     <string name="account_settings_sync_contacts_summary" msgid="8901452720940015928">"Επίσης, συγχρονισμός επαφών από αυτόν τον λογαριασμό"</string>
     <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Συγχρονισμός ημερολογίου"</string>
     <string name="account_settings_sync_calendar_summary" msgid="2456010694443333450">"Επίσης, συγχρονισμός ημερολογίου από αυτόν το λογαριασμό"</string>
-    <string name="account_settings_vibrate_enable" msgid="8045133290388856478">"Δόνηση"</string>
-    <string name="account_settings_vibrate_summary" msgid="3690631050585589365">"Δόνηση κατά τη λήψη μηνύματος ηλεκτρονικού ταχυδρομείου"</string>
+    <!-- no translation found for account_settings_vibrate_when_label (708477308761702671) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_summary (3991584445166247189) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_always (6739506816960483174) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_silent (6417076436551648924) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_never (3759680093309511614) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_dlg_title (308167729046312952) -->
+    <skip />
     <string name="account_settings_ringtone" msgid="7922187231467500404">"Επιλογή ήχου κλήσης"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Ρυθμίσεις διακομιστή"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Κατάργηση λογαριασμού"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index ac3c79daf..37235c3f8 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -162,7 +162,7 @@
     <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Suprimir correo electrónico del servidor"</string>
     <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Nunca"</string>
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Cuándo suprimo desde la bandeja de entrada"</string>
-    <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"prefijo de ruta IMAP"</string>
+    <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Prefijo de ruta IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Opcional"</string>
     <string name="account_setup_outgoing_title" msgid="7437215562885986394">"Configuración saliente de servidor"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Servidor SMTP"</string>
@@ -232,8 +232,18 @@
     <string name="account_settings_sync_contacts_summary" msgid="8901452720940015928">"También sincronizar contactos desde esta cuenta"</string>
     <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Sincronizar calendario"</string>
     <string name="account_settings_sync_calendar_summary" msgid="2456010694443333450">"También sincronizar el calendario desde esta cuenta"</string>
-    <string name="account_settings_vibrate_enable" msgid="8045133290388856478">"Vibrar"</string>
-    <string name="account_settings_vibrate_summary" msgid="3690631050585589365">"Vibrar también cuando llegue un mensaje de correo electrónico"</string>
+    <!-- no translation found for account_settings_vibrate_when_label (708477308761702671) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_summary (3991584445166247189) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_always (6739506816960483174) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_silent (6417076436551648924) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_never (3759680093309511614) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_dlg_title (308167729046312952) -->
+    <skip />
     <string name="account_settings_ringtone" msgid="7922187231467500404">"Selecc. tono de llam."</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Configuración del servidor"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Eliminar cuenta"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 6426c21de..13879ea67 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -232,8 +232,18 @@
     <string name="account_settings_sync_contacts_summary" msgid="8901452720940015928">"Sincronizar también contactos de esta cuenta"</string>
     <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Sincronizar calendario"</string>
     <string name="account_settings_sync_calendar_summary" msgid="2456010694443333450">"Sincronizar también calendario desde esta cuenta"</string>
-    <string name="account_settings_vibrate_enable" msgid="8045133290388856478">"Vibrar"</string>
-    <string name="account_settings_vibrate_summary" msgid="3690631050585589365">"Vibrar también cuando llegue un mensaje"</string>
+    <!-- no translation found for account_settings_vibrate_when_label (708477308761702671) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_summary (3991584445166247189) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_always (6739506816960483174) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_silent (6417076436551648924) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_never (3759680093309511614) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_dlg_title (308167729046312952) -->
+    <skip />
     <string name="account_settings_ringtone" msgid="7922187231467500404">"Seleccionar tono de llamada"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Configuración del servidor"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Eliminar cuenta"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 5023b393f..01fbf2762 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -189,7 +189,7 @@
     <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Afficher une notification lors de la réception d\'un e-mail"</string>
     <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Synchroniser les contacts issus de ce compte"</string>
     <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Synchroniser l\'agenda à partir de ce compte"</string>
-    <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"La configuration a échoué."</string>
+    <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"Échec de la configuration"</string>
     <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"Nombre de messages à synchroniser"</string>
     <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Un jour"</string>
     <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Trois jours"</string>
@@ -232,8 +232,18 @@
     <string name="account_settings_sync_contacts_summary" msgid="8901452720940015928">"Synchroniser également les contacts issus de ce compte"</string>
     <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Synchroniser l\'agenda"</string>
     <string name="account_settings_sync_calendar_summary" msgid="2456010694443333450">"Synchroniser également l\'agenda à partir de ce compte"</string>
-    <string name="account_settings_vibrate_enable" msgid="8045133290388856478">"Vibreur"</string>
-    <string name="account_settings_vibrate_summary" msgid="3690631050585589365">"Vibrer à la réception d\'un e-mail"</string>
+    <!-- no translation found for account_settings_vibrate_when_label (708477308761702671) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_summary (3991584445166247189) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_always (6739506816960483174) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_silent (6417076436551648924) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_never (3759680093309511614) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_dlg_title (308167729046312952) -->
+    <skip />
     <string name="account_settings_ringtone" msgid="7922187231467500404">"Sonnerie"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Paramètres du serveur"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Supprimer le compte"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 3c6d3f665..11cd316ec 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -232,8 +232,18 @@
     <string name="account_settings_sync_contacts_summary" msgid="8901452720940015928">"Sincronizza anche contatti da questo account"</string>
     <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Sincronizza calendario"</string>
     <string name="account_settings_sync_calendar_summary" msgid="2456010694443333450">"Sincronizza anche il calendario da questo account"</string>
-    <string name="account_settings_vibrate_enable" msgid="8045133290388856478">"Vibrazione"</string>
-    <string name="account_settings_vibrate_summary" msgid="3690631050585589365">"Attiva anche vibrazione all\'arrivo di email"</string>
+    <!-- no translation found for account_settings_vibrate_when_label (708477308761702671) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_summary (3991584445166247189) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_always (6739506816960483174) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_silent (6417076436551648924) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_never (3759680093309511614) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_dlg_title (308167729046312952) -->
+    <skip />
     <string name="account_settings_ringtone" msgid="7922187231467500404">"Seleziona suoneria"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Impostazioni server"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Rimuovi account"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 2ec4091ca..7b2660e72 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -232,8 +232,18 @@
     <string name="account_settings_sync_contacts_summary" msgid="8901452720940015928">"このアカウントからも連絡先を同期"</string>
     <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"カレンダーを同期"</string>
     <string name="account_settings_sync_calendar_summary" msgid="2456010694443333450">"このアカウントからもカレンダーを同期する"</string>
-    <string name="account_settings_vibrate_enable" msgid="8045133290388856478">"バイブレーション"</string>
-    <string name="account_settings_vibrate_summary" msgid="3690631050585589365">"メール受信: バイブレーションON"</string>
+    <!-- no translation found for account_settings_vibrate_when_label (708477308761702671) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_summary (3991584445166247189) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_always (6739506816960483174) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_silent (6417076436551648924) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_never (3759680093309511614) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_dlg_title (308167729046312952) -->
+    <skip />
     <string name="account_settings_ringtone" msgid="7922187231467500404">"着信音を選択"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"サーバー設定"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"アカウントを削除"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 90bd30b5c..3cde58533 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -146,7 +146,7 @@
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"계정 이름 지정(선택사항)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"이름(발신 메시지에 표시)"</string>
     <string name="account_setup_account_type_title" msgid="6645576356752495504">"새 이메일 계정 추가"</string>
-    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"계정 유형이 무엇입니까?"</string>
+    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"계정 유형을 선택하세요."</string>
     <string name="account_setup_incoming_title" msgid="6862032674547580337">"수신 서버 설정"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"사용자 이름"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"비밀번호"</string>
@@ -232,8 +232,18 @@
     <string name="account_settings_sync_contacts_summary" msgid="8901452720940015928">"또한 이 계정에서 연락처 동기화"</string>
     <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"캘린더 동기화"</string>
     <string name="account_settings_sync_calendar_summary" msgid="2456010694443333450">"또한 이 계정에서 캘린더 동기화"</string>
-    <string name="account_settings_vibrate_enable" msgid="8045133290388856478">"진동"</string>
-    <string name="account_settings_vibrate_summary" msgid="3690631050585589365">"이메일이 오면 진동도 함께 울림"</string>
+    <!-- no translation found for account_settings_vibrate_when_label (708477308761702671) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_summary (3991584445166247189) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_always (6739506816960483174) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_silent (6417076436551648924) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_never (3759680093309511614) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_dlg_title (308167729046312952) -->
+    <skip />
     <string name="account_settings_ringtone" msgid="7922187231467500404">"벨소리 선택"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"서버 설정"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"계정 삭제"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 71b133637..2ea38efcf 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -127,7 +127,7 @@
     <string name="account_setup_basics_title" msgid="3969856368228940980">"Sett opp e-post"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Legg til en Exchange-konto"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Legg til en Exchange ActiveSync-konto"</string>
-    <string name="accounts_welcome" msgid="5901437782383439370">"Velkommen til oppsett av e-post!BREAK_0BREAK_1Du kan bruke en hvilken som helst e-postkonto. De mest populære e-postkontoene kan settes opp i to trinn!"</string>
+    <string name="accounts_welcome" msgid="5901437782383439370">"De mest populære e-postkontoene kan stilles inn i få trinn."</string>
     <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Du kan sette opp en Exchange-konto med bare noen få enkle steg."</string>
     <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Du kan konfigurere en Exchange ActiveSync-konto ved kun å følge noen få trinn."</string>
     <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"E-postadresse"</string>
@@ -232,8 +232,18 @@
     <string name="account_settings_sync_contacts_summary" msgid="8901452720940015928">"Synkroniser kontakter fra denne kontoen"</string>
     <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Synkroniser kalender"</string>
     <string name="account_settings_sync_calendar_summary" msgid="2456010694443333450">"Synkroniser også kalendere fra denne kontoen"</string>
-    <string name="account_settings_vibrate_enable" msgid="8045133290388856478">"Vibrer"</string>
-    <string name="account_settings_vibrate_summary" msgid="3690631050585589365">"Vibrer når det kommer e-post"</string>
+    <!-- no translation found for account_settings_vibrate_when_label (708477308761702671) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_summary (3991584445166247189) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_always (6739506816960483174) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_silent (6417076436551648924) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_never (3759680093309511614) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_dlg_title (308167729046312952) -->
+    <skip />
     <string name="account_settings_ringtone" msgid="7922187231467500404">"Velg ringetone"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Innstillinger for tjener"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Fjern"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index a2c9f9694..cf40e284b 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -145,7 +145,7 @@
     <string name="account_setup_names_instructions" msgid="2880279273965835007">"Uw account is ingesteld en er is e-mail onderweg."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Geef dit account een naam (optioneel)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Uw naam (wordt weergegeven in uitgaande berichten)"</string>
-    <string name="account_setup_account_type_title" msgid="6645576356752495504">"Nieuwe e-mailaccount toevoegen"</string>
+    <string name="account_setup_account_type_title" msgid="6645576356752495504">"Nieuw e-mailaccount toevoegen"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Welk type account is dit?"</string>
     <string name="account_setup_incoming_title" msgid="6862032674547580337">"Serverinstellingen inkomende e-mail"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Gebruikersnaam"</string>
@@ -232,8 +232,18 @@
     <string name="account_settings_sync_contacts_summary" msgid="8901452720940015928">"Contacten van dit account eveneens synchroniseren"</string>
     <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Agenda synchroniseren"</string>
     <string name="account_settings_sync_calendar_summary" msgid="2456010694443333450">"Agenda van dit account eveneens synchroniseren"</string>
-    <string name="account_settings_vibrate_enable" msgid="8045133290388856478">"Trillen"</string>
-    <string name="account_settings_vibrate_summary" msgid="3690631050585589365">"Ook trillen bij ontvangst van e-mail"</string>
+    <!-- no translation found for account_settings_vibrate_when_label (708477308761702671) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_summary (3991584445166247189) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_always (6739506816960483174) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_silent (6417076436551648924) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_never (3759680093309511614) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_dlg_title (308167729046312952) -->
+    <skip />
     <string name="account_settings_ringtone" msgid="7922187231467500404">"Beltoon selecteren"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Serverinstellingen"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Account verwijderen"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 066ae4ab7..53bfd9a87 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -232,8 +232,18 @@
     <string name="account_settings_sync_contacts_summary" msgid="8901452720940015928">"Synchronizuj również kontakty na tym koncie"</string>
     <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Synchronizuj kalendarz"</string>
     <string name="account_settings_sync_calendar_summary" msgid="2456010694443333450">"Synchronizuj również kalendarz na tym koncie"</string>
-    <string name="account_settings_vibrate_enable" msgid="8045133290388856478">"Wibracje"</string>
-    <string name="account_settings_vibrate_summary" msgid="3690631050585589365">"Sygnalizuj otrzymanie e-maila wibracją"</string>
+    <!-- no translation found for account_settings_vibrate_when_label (708477308761702671) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_summary (3991584445166247189) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_always (6739506816960483174) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_silent (6417076436551648924) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_never (3759680093309511614) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_dlg_title (308167729046312952) -->
+    <skip />
     <string name="account_settings_ringtone" msgid="7922187231467500404">"Wybierz dzwonek"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Ustawienia serwera"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Usuń konto"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 615521282..dc6853d78 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -232,8 +232,18 @@
     <string name="account_settings_sync_contacts_summary" msgid="8901452720940015928">"Sincronizar também contactos a partir desta conta"</string>
     <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Sincronizar calendário"</string>
     <string name="account_settings_sync_calendar_summary" msgid="2456010694443333450">"Sincronizar também calendário a partir desta conta"</string>
-    <string name="account_settings_vibrate_enable" msgid="8045133290388856478">"Vibrar"</string>
-    <string name="account_settings_vibrate_summary" msgid="3690631050585589365">"Vibrar também quando chega e-mail"</string>
+    <!-- no translation found for account_settings_vibrate_when_label (708477308761702671) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_summary (3991584445166247189) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_always (6739506816960483174) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_silent (6417076436551648924) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_never (3759680093309511614) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_dlg_title (308167729046312952) -->
+    <skip />
     <string name="account_settings_ringtone" msgid="7922187231467500404">"Seleccionar toque"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Definições do servidor"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Remover conta"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index e88784df0..c4b82c483 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -232,8 +232,18 @@
     <string name="account_settings_sync_contacts_summary" msgid="8901452720940015928">"Também sincronizar contatos desta conta"</string>
     <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Sincronizar agenda"</string>
     <string name="account_settings_sync_calendar_summary" msgid="2456010694443333450">"Também sincronizar a agenda desta conta"</string>
-    <string name="account_settings_vibrate_enable" msgid="8045133290388856478">"Vibrar"</string>
-    <string name="account_settings_vibrate_summary" msgid="3690631050585589365">"Vibrar também quando chegarem os e-mails"</string>
+    <!-- no translation found for account_settings_vibrate_when_label (708477308761702671) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_summary (3991584445166247189) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_always (6739506816960483174) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_silent (6417076436551648924) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_never (3759680093309511614) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_dlg_title (308167729046312952) -->
+    <skip />
     <string name="account_settings_ringtone" msgid="7922187231467500404">"Selecionar toque"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Configurações do servidor"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Remover conta"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index af22aa379..9e892c68e 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -232,8 +232,18 @@
     <string name="account_settings_sync_contacts_summary" msgid="8901452720940015928">"Также синхронизировать контакты из этого аккаунта"</string>
     <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Синхронизировать календарь"</string>
     <string name="account_settings_sync_calendar_summary" msgid="2456010694443333450">"Также синхронизировать календарь из этого аккаунта"</string>
-    <string name="account_settings_vibrate_enable" msgid="8045133290388856478">"Вибровызов"</string>
-    <string name="account_settings_vibrate_summary" msgid="3690631050585589365">"Вибросигнал при получении сообщения"</string>
+    <!-- no translation found for account_settings_vibrate_when_label (708477308761702671) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_summary (3991584445166247189) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_always (6739506816960483174) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_silent (6417076436551648924) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_never (3759680093309511614) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_dlg_title (308167729046312952) -->
+    <skip />
     <string name="account_settings_ringtone" msgid="7922187231467500404">"Выбрать мелодию"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Настройки сервера"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Удалить аккаунт"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index e78b6e7b4..411dae35d 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -232,8 +232,18 @@
     <string name="account_settings_sync_contacts_summary" msgid="8901452720940015928">"Synkronisera även kontakter från det här kontot"</string>
     <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Synkronisera kalender"</string>
     <string name="account_settings_sync_calendar_summary" msgid="2456010694443333450">"Synkronisera även kalendrar från det här kontot"</string>
-    <string name="account_settings_vibrate_enable" msgid="8045133290388856478">"Vibrera"</string>
-    <string name="account_settings_vibrate_summary" msgid="3690631050585589365">"Vibrerar även vid inkommande e-post"</string>
+    <!-- no translation found for account_settings_vibrate_when_label (708477308761702671) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_summary (3991584445166247189) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_always (6739506816960483174) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_silent (6417076436551648924) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_never (3759680093309511614) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_dlg_title (308167729046312952) -->
+    <skip />
     <string name="account_settings_ringtone" msgid="7922187231467500404">"Välj ringsignal"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Serverinställningar"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Ta bort konto"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 65b4971ff..911d5c3d5 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -50,8 +50,8 @@
     <string name="remove_account_action" msgid="3789169090601376209">"Hesabı kaldır"</string>
     <string name="folders_action" msgid="7502431531355227666">"Klasörler"</string>
     <string name="accounts_action" msgid="901105887272231493">"Hesaplar"</string>
-    <string name="mark_as_read_action" msgid="5031651846998842419">"Okundu olarak işaretle"</string>
-    <string name="mark_as_unread_action" msgid="3766298115778767554">"Okunmadı olarak işaretle"</string>
+    <string name="mark_as_read_action" msgid="5031651846998842419">"Okundu diye işaretle"</string>
+    <string name="mark_as_unread_action" msgid="3766298115778767554">"Okunmadı diye işaretle"</string>
     <string name="add_cc_bcc_action" msgid="5569074812077509737">"Cc/Bcc ekle"</string>
     <string name="add_attachment_action" msgid="2696013743130573897">"Ek ekle"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"Döküm ayarları"</string>
@@ -232,8 +232,18 @@
     <string name="account_settings_sync_contacts_summary" msgid="8901452720940015928">"Bu hesaptaki kişileri de senkronize et"</string>
     <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Takvimi senkronize et"</string>
     <string name="account_settings_sync_calendar_summary" msgid="2456010694443333450">"Bu hesaptaki takvimi de senkronize et"</string>
-    <string name="account_settings_vibrate_enable" msgid="8045133290388856478">"Titret"</string>
-    <string name="account_settings_vibrate_summary" msgid="3690631050585589365">"E-posta geldiğinde aynı zamanda titret"</string>
+    <!-- no translation found for account_settings_vibrate_when_label (708477308761702671) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_summary (3991584445166247189) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_always (6739506816960483174) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_silent (6417076436551648924) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_never (3759680093309511614) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_dlg_title (308167729046312952) -->
+    <skip />
     <string name="account_settings_ringtone" msgid="7922187231467500404">"Zil sesini seç"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Sunucu ayarları"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Hesabı kaldır"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 7292b3712..2a1c9e0d0 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -232,8 +232,18 @@
     <string name="account_settings_sync_contacts_summary" msgid="8901452720940015928">"也同步此帐户下的联系人"</string>
     <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"同步日历"</string>
     <string name="account_settings_sync_calendar_summary" msgid="2456010694443333450">"也同步此帐户下的日历"</string>
-    <string name="account_settings_vibrate_enable" msgid="8045133290388856478">"振动"</string>
-    <string name="account_settings_vibrate_summary" msgid="3690631050585589365">"在收到电子邮件的同时振动"</string>
+    <!-- no translation found for account_settings_vibrate_when_label (708477308761702671) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_summary (3991584445166247189) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_always (6739506816960483174) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_silent (6417076436551648924) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_never (3759680093309511614) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_dlg_title (308167729046312952) -->
+    <skip />
     <string name="account_settings_ringtone" msgid="7922187231467500404">"选择铃声"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"服务器设置"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"删除帐户"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 0143b9069..988cad197 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -232,8 +232,18 @@
     <string name="account_settings_sync_contacts_summary" msgid="8901452720940015928">"也同步處理此帳戶的聯絡人"</string>
     <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"同步處理日曆"</string>
     <string name="account_settings_sync_calendar_summary" msgid="2456010694443333450">"同時同步處理此帳戶的日曆"</string>
-    <string name="account_settings_vibrate_enable" msgid="8045133290388856478">"震動"</string>
-    <string name="account_settings_vibrate_summary" msgid="3690631050585589365">"收到電子郵件時震動提醒"</string>
+    <!-- no translation found for account_settings_vibrate_when_label (708477308761702671) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_summary (3991584445166247189) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_always (6739506816960483174) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_silent (6417076436551648924) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_never (3759680093309511614) -->
+    <skip />
+    <!-- no translation found for account_settings_vibrate_when_dlg_title (308167729046312952) -->
+    <skip />
     <string name="account_settings_ringtone" msgid="7922187231467500404">"選取鈴聲"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"伺服器設定"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"移除帳戶"</string>