merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 484231a..b5cc80e 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sinkroniseer e-pos"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sinkroniseer e-pos vir hierdie rekening"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibreer"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibreer ook wanneer e-pos aankom"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Altyd"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Net wanneer stil"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nooit"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibreer"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Kies \'n luitoon"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Bedienerinstellings"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Verwyder rekening"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index c76dc85..d1bc33a 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"ኢሜይል አመሳስል"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"ለእዚህ መለያ ኢሜይል አስምር"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"ንዘር"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"ኢሜይል ሲደርስ እንዲሁ ንዘር"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"ዘወትር"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"ፀጥታ ሲሆን ብቻ"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"በፍፁም"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"ንዘር"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"የደወል ቅላጼ ምረጥ"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"የአገልጋይ ቅንብሮች"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"መለያ አስወግድ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index cb41a1e..f914b9d 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"مزامنة البريد الإلكتروني"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"مزامنة البريد الإلكتروني لهذا الحساب"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"اهتزاز"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"الاهتزاز أيضًا عند استلام بريد إلكتروني"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"دومًا"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"فقط عندما يكون صامتًا"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"مطلقًا"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"اهتزاز"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"اختيار نغمة الرنين"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"إعدادات الخادم"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"إزالة الحساب"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index c276ad9..ef29e79 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Сінхранізаваць электронную пошту"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Сінхранізацыя электроннай пошты для гэтага ўліковага запісу"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Вібрацыя"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Таксама вібраваць пры атрыманні электроннага лiста"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Заўсёды"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Толькі ў рэжыме без гуку"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Ніколі"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Вібрацыя"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Выбраць рынгтон"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Налады сервера"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Выдаліць уліковы запіс"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 549fa8c..a288a25 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Синхрон на имейлите"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Синхрон на имейлите за този профил"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Вибриране"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Да вибрира и при нов имейл"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Винаги"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Само при тих режим"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Никога"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Вибриране"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Избор на мелодия"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Настройки на сървъра"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Премахване на профил"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index eda9ca9..7f048c8 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sincronitza el correu electrònic"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincr. miss. correu d\'aquest compte"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibra"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibra també quan arribi correu electrònic"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Sempre"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Només quan està en silenci"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Mai"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibra"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Tria un to"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Configuració del servidor"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Elimina el compte"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 7e4dd7c..af23d58 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Synchronizovat e-maily"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Synchronizovat e-mail pro tento účet"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrace"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Při příchodu e-mailu také vibrovat"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Vždy"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Pouze v tichém režimu"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nikdy"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrace"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Vybrat vyzvánění"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Nastavení serveru"</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 eb23493..0b1a914 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Synkroniser e-mails"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Synkroniser e-mail for denne konto"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibration"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibrer også, når der kommer e-mail"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Altid"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Kun ved lydløs"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Aldrig"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibration"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Vælg ringetone"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Serverindstillinger"</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 e51df51..fcc668d 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"E-Mails synchr."</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"E-Mails dieses Kontos synchronisieren"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibration"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Bei E-Mail-Eingang zusätzlich vibrieren"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Immer"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Nur im Lautlos-Modus"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nie"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibration"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"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 b4ad068..74e74ae 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Συγχρονισμός ηλεκτρονικού ταχυδρομείου"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Συγχρονισμός μηνυμάτων ηλεκτρονικού ταχυδρομείου για αυτόν τον λογαριασμό"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Δόνηση"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Δόνηση και κατά τη λήψη μηνύματος ηλεκτρονικού ταχυδρομείου"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Πάντα"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Μόνο στο αθόρυβο"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Ποτέ"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Δόνηση"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Επιλέξτε ήχο κλήσης"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Ρυθμίσεις διακομιστή"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Κατάργηση λογαριασμού"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 49f5442..d254454 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sync Email"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sync email for this account"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrate"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Also vibrate when email arrives"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Always"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Only when silent"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Never"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrate"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Choose ringtone"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Server settings"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Remove account"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 32ee6a6..60ef315 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sincronizar correo"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincronizar el correo de esta cuenta"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrar"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibrar también cuando llegue un correo"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Siempre"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Solo en modo silencioso"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nunca"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrar"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Seleccionar tono"</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 11dd9f2..1121964 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sincronizar correo"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincronizar correo de esta cuenta"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrar"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibrar también cuando llegue un mensaje"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Siempre"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Solo en modo silencio"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nunca"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibración"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Seleccionar tono"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Ajustes del servidor"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Eliminar cuenta"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index f4523ba..2e01766 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sünkrooni meil"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Konto meili sünkroonimine"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibreering"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibreeri ka meilisõnumi saabumisel"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Alati"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Ainult hääletus režiimis"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Mitte kunagi"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibreering"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Vali helin"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Serveri seaded"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Konto eemaldamine"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index e1b2063..beecdb8 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"همگام‌سازی ایمیل"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"همگام‌سازی ایمیل برای این حساب"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"لرزش"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"همچنین لرزش هنگام دریافت ایمیل"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"همیشه"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"فقط هنگام ساکت بودن"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"هرگز"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"لرزش"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"انتخاب آهنگ زنگ"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"تنظیمات سرور"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"حذف حساب"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index e0244cc..8130638 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Synkronoi sähköposti"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Synkronoi tämän tilin sähköpostit"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Värinä"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Käytä värinää, kun sähköpostiviesti saapuu"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Aina"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Vain äänettömässä tilassa"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Ei koskaan"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Värinä"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Valitse soittoääni"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Palvelinasetukset"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Poista tili"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 543f03f..83e9e2d 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Synchr. messagerie"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Synchroniser les e-mails pour ce compte"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibreur"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibrer à la réception d\'un e-mail"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Toujours"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"En mode silencieux"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Jamais"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibreur"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Sélectionner une 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-hi/strings.xml b/res/values-hi/strings.xml
index dac7591..faf4429 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"ईमेल समन्‍वयित करें"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"इस खाते के लिए ईमेल सिंक करें"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"कंपन"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"जब ईमेल आए, तो कंपन भी करें"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"हमेशा"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"केवल मौन होने पर"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"कभी नहीं"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"कंपन"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"रिंगटोन चुनें"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"सर्वर सेटिंग"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"खाता निकालें"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 42a3e99..5c15db6 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sink. e-pošte"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sink. e-pošte za ovaj račun"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibracija"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibracija i kad stigne e-pošta"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Uvijek"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Samo ako je bešumno"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nikad"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibracija"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Odaberite melodiju zvona"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Postavke poslužitelja"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Ukloni račun"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 5a77070..536081b 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"E-mail szinkroniz."</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"A fiók e-mailjeinek szinkronizálása"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Rezgés"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Rezgés e-mail érkezésekor is"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Mindig"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Csak néma üzemmódban"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Soha"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Rezgés"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Válasszon csengőhangot"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Szerverbeállítások"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Fiók törlése"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index a0aeeb2..876a64b 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sinkronkan email"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sinkronkan email untuk akun ini"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Getar"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Juga bergetar ketika email tiba"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Selalu"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Hanya saat senyap"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Tidak pernah"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Getar"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Pilih nada dering"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Setelan server"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Hapus akun"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 6dad0c1..78c7952 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sincronizza email"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincronizza le email per questo account"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrazione"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Attiva anche vibrazione all\'arrivo di email"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Sempre"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Solo in modalità silenziosa"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Mai"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrazione"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Scegli 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-iw/strings.xml b/res/values-iw/strings.xml
index c9f1a52..4993d8e 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"סנכרן דוא\"ל"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"סנכרן דוא\"ל בחשבון זה"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"רטט"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"הוסף גם רטט כשמגיע דוא\"ל"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"תמיד"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"במצב שקט בלבד"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"אף פעם"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"רטט"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"בחר רינגטון"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"הגדרות שרת"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"הסר חשבון"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index ff80379..558ca89 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"メールを同期する"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"このアカウントのメールを同期"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"バイブレーション"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"メール受信: バイブレーションON"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"常に使用"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"マナーモード時のみ"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"使用しない"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"バイブレーション"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"着信音を選択"</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 ed96d4c..302f19e 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"이메일 동기화"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"이 계정의 이메일을 동기화합니다."</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"진동"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"이메일이 오면 진동도 함께 울림"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"항상"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"무음 시에만"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"안함"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"진동"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"벨소리 선택"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"서버 설정"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"계정 삭제"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index c12e7e7..b2a0599 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sinchron. el. paštą"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sinchron. šios paskyros el. paštą"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibruoti"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Taip pat vibruoti, kai gaunamas el. laiškas"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Visada"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Tik kai veikia tyliai"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Niekada"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibruoti"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Pasirinkti skambėjimo toną"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Serverio nustatymai"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Pašalinti paskyrą"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 92e0f48..843453d 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sinhronizēt e-pastu"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sinhronizēt e-pastu šim kontam"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrozvans"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Izmantot vibrozvanu, kad tiek saņemts e-pasta ziņojums"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Vienmēr"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Tikai klusuma režīmā"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nekad"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrozvans"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Izvēlēties zvana signālu"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Servera iestatījumi"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Konta noņemšana"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index e9ee2de..effce35 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Segerakkan e-mel"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Segerakkan e-mel untuk akaun ini"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Getar"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Juga bergetar semasa e-mel diterima"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Sentiasa"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Apabila senyap sahaja"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Jangan sekali-kali"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Getar"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Pilih nada dering"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Tetapan pelayan"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Alih keluar akaun"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 44941d2..d157c64 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Synkroniser e-post"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Synkroniser e-postmeldinger fra denne kontoen"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrering"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibrer også når nye e-postmeldinger mottas"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Alltid"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Kun i stillemodus"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Aldri"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrering"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"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 b7996b9..94b50de 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"E-mail synch."</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"E-mail voor dit account synchroniseren"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Trillen"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Ook trillen wanneer er e-mail binnenkomt"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Altijd"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Alleen indien stil"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nooit"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Trillen"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Beltoon kiezen"</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 67def9f..9f1ce15 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Synchronizuj e-maile"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Synchronizuj wiadomości e-mail dla tego konta"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Wibracje"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Wibracje także po otrzymaniu e-maila"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Zawsze"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Tylko po wyciszeniu"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nigdy"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Wibracje"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"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 afc508b..b16c53d 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sincronizar e-mail"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincronizar e-mail para esta conta"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrar"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibrar também quando chega e-mail"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Sempre"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Apenas quando está em silêncio"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nunca"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrar"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Escolher 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 e6c7814..bf28ec3 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sincronizar e-mail"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincronizar e-mail para esta conta"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrar"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibrar também quando chegar e-mails"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Sempre"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Apenas quando estiver no silencioso"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nunca"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrar"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"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-rm/strings.xml b/res/values-rm/strings.xml
index 428d07c..84a7d99 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -558,11 +558,6 @@
     <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="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Era vibrar sch\'in e-mail arriva"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Adina"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Mo sche silenzius"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Mai"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"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 e3ddd23..b3307de 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sincroniz. e-mailul"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincron. e-mail pt. acest cont"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrare"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibrare şi la sosirea mesajelor de e-mail"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Întotdeauna"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Numai când profilul este Silenţios"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Niciodată"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrare"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Alegeţi un ton de sonerie"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Setări server"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Eliminaţi contul"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 5072dad..17c7eec 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Синхр. почту"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Синхронизировать почту этого аккаунта"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Вибросигнал"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Вибросигнал при получении сообщения"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Всегда"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Только в режиме без звука"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Никогда"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Вибросигнал"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Выбрать рингтон"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Настройки сервера"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Удалить аккаунт"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 06abbd9..3d321ee 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Synchroniz. e-mail"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Synchr. e-mail pre tento účet"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrovať"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibrovať aj pri príchode e-mailu"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Vždy"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Iba v tichom režime"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nikdy"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrovať"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Zvoliť vyzváňací tón"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Nastavenia servera"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Odstrániť účet"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index e986652..2f9542d 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sinhroniz. e-pošte"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sinhroniziraj e-pošto za ta račun"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibriranje"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibriraj tudi, ko prejmem e-pošto"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Vedno"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Samo v tihem načinu"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nikoli"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibriranje"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Izberite melodijo zvonjenja"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Nastavitve strežnika"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Odstrani račun"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index e60095f..70e9124 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Синхронизуј е-пошту"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Синхронизуј е-пошту за овај налог"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Вибрација"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Вибрирај и када стигне порука е-поште"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Увек"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Само у нечујном режиму"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Никад"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Вибрација"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Изабери мелодију звона"</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 f755b38..3aef2c4 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Synkronisera e-post"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Synkronisera e-post för det här kontot"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrera"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibrerar även vid inkommande e-post"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Alltid"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Bara vid tyst"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Aldrig"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrera"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"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-sw/strings.xml b/res/values-sw/strings.xml
index 6515cc0..896d20a 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Landanisha barua pepe"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sawazisha barua pepe za akaunti hii"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Tetema"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Pia tetema barua pepe inapofika"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Kila wakati"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Kukiwa kimya tu"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Katu"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Tetema"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Chagua toni ya mlio"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Mipangilio ya seva"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Ondoa akaunti"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index d9d659b..0b6e1e7 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"ซิงค์อีเมล"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"ซิงค์อีเมลสำหรับบัญชีนี้"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"สั่น"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"สั่นเมื่อมีอีเมลเข้า"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"ทุกครั้ง"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"เฉพาะเมื่อปิดเสียง"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"ไม่ต้องเลย"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"สั่น"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"เลือกเสียงเรียกเข้า"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"การตั้งค่าเซิร์ฟเวอร์"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"ลบบัญชี"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 6a1ec3b..47766ec 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"I-sync ang email"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"I-sync ang email sa account na ito"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"I-vibrate"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"I-vibrate rin kapag dumating ang email"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Palagi"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Kapag tahimik lang"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Hindi kailanman"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"I-vibrate"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Pumili ng ringtone"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Mga setting ng server"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Alisin ang account"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 8d75772..6a575bd 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"E-postayı senk. et"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Bu hesaba ilişkin e-postaları senkronize et"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Titreşim"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"E-posta geldiğinde aynı zamanda titret"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Her zaman"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Yalnızca sessizken"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Hiçbir zaman"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Titreşim"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Zil sesi seçin"</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-uk/strings.xml b/res/values-uk/strings.xml
index d2501b6..a35be39 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Синхроніз. ел.пошту"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Синхрон. ел. пошту для обл. запису"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Вібросигнал"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Також вібрув., коли надійде лист"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Завжди"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Лише в беззвуч. реж."</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Ніколи"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Вібросигнал"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Вибрати сигнал дзвінка"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Налашт-ня сервера"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Видал. обл. зап."</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 8012fc1..1e778bb 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Đồng bộ hóa email"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Đồng bộ hóa email cho tài khoản này"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Rung"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Cũng rung khi email đến"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Luôn luôn"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Chỉ khi ở chế độ im lặng"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Chưa bao giờ"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Rung"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Chọn nhạc chuông"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Cài đặt máy chủ"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Xóa tài khoản"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 146a701..053fd32 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"同步电子邮件"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"同步此帐户的电子邮件"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"振动"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"收到电子邮件时也振动"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"始终"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"仅在静音时"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"永不"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"振动"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"选择铃声"</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 6f58b57..32bb0b6 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"同步處理電子郵件"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"同步處理此帳戶的電子郵件"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"震動"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"收到電子郵件時震動提醒"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"一律"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"靜音時才啟用"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"永遠不要"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"震動"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"選擇鈴聲"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"伺服器設定"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"移除帳戶"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 2fbd9df..cff871e 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Vumelanisa i-imeyli"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Vumelanisa i-imeyli yale akhawunti"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Dlidliza"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Iyadlidliza futhi lapho i-imeyli ifika"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Njalo"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Kuphela uma ithulile"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Akusoze"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Dlidliza"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Khetha ithoni yokukhala"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Izilungiselelo Zeseva"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Khipha i-akhawunti"</string>