diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index ad12ad246..19e67e702 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -178,10 +178,17 @@
     <string name="pref_title_mms_delete" msgid="7265878070847351664">"Limit multimediálních zpráv"</string>
     <string name="pref_title_notification_enabled" msgid="9118792213953729414">"Oznámení"</string>
     <string name="pref_summary_notification_enabled" msgid="619729096820999905">"Zobrazit oznámení o zprávě na stavovém řádku"</string>
-    <string name="pref_title_notification_vibrate" msgid="7076203487928035310">"Vibrace"</string>
-    <string name="pref_summary_notification_vibrate" msgid="6005751082181574289">"Při oznámení také vibrovat"</string>
+    <!-- no translation found for pref_title_notification_vibrateWhen (4251208067092761057) -->
+    <skip />
+    <!-- no translation found for pref_summary_notification_vibrateWhen (669655090822561447) -->
+    <skip />
     <string name="pref_title_notification_ringtone" msgid="5159574093788155149">"Vybrat vyzváněcí tón"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Nastavit počet ukládaných zpráv"</string>
+    <!-- no translation found for prefEntries_vibrateWhen:0 (2520871831815631409) -->
+    <!-- no translation found for prefEntries_vibrateWhen:1 (6069709696037750627) -->
+    <!-- no translation found for prefEntries_vibrateWhen:2 (7486145357487111435) -->
+    <!-- no translation found for prefDialogTitle_vibrateWhen (6419655771690242118) -->
+    <skip />
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Automatické načítání"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Automaticky načítat zprávy"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Automatické načítání při roamingu"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index a75d84a79..638f00457 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -152,7 +152,7 @@
     <string name="hidden_sender_address" msgid="2776075636669924968">"Skjult afsenderadresse"</string>
     <string name="yes" msgid="3246158147503160811">"OK"</string>
     <string name="no" msgid="4289742508556913860">"Annuller"</string>
-    <string name="set" msgid="4642365398263275979">"Indstil"</string>
+    <string name="set" msgid="4642365398263275979">"Angiv"</string>
     <string name="play" msgid="1888432400937785115">"Afspil"</string>
     <string name="edit" msgid="5912118407791492696">"Rediger"</string>
     <string name="resize" msgid="4308912589984220360">"Rediger størrelse"</string>
@@ -171,20 +171,26 @@
     <string name="pref_summary_delete_limit" msgid="597128041393045216">"<xliff:g id="COUNT">%1$s</xliff:g> beskeder pr. samtale"</string>
     <string name="pref_title_manage_sim_messages" msgid="7820895261757881177">"Adm. SIM-kortbeskeder"</string>
     <string name="pref_title_mms_delivery_reports" msgid="6666857926679451910">"Leveringsrapporter"</string>
-    <string name="pref_title_mms_read_reports" msgid="4882179829495828541">"Læs rapporter"</string>
+    <string name="pref_title_mms_read_reports" msgid="4882179829495828541">"Læsningsrapporter"</string>
     <string name="pref_title_sms_delivery_reports" msgid="876064208254451038">"Leveringsrapporter"</string>
     <string name="pref_title_auto_delete" msgid="7227835692631701134">"Slet gamle beskeder"</string>
-    <string name="pref_title_sms_delete" msgid="6890538316799296878">"Grænse for sms"</string>
+    <string name="pref_title_sms_delete" msgid="6890538316799296878">"Sms-begrænsning"</string>
     <string name="pref_title_mms_delete" msgid="7265878070847351664">"Mms-begrænsning"</string>
     <string name="pref_title_notification_enabled" msgid="9118792213953729414">"Meddelelser"</string>
-    <string name="pref_summary_notification_enabled" msgid="619729096820999905">"Vis beskedmeddelelser i statuslinjen"</string>
-    <string name="pref_title_notification_vibrate" msgid="7076203487928035310">"Vibration"</string>
-    <string name="pref_summary_notification_vibrate" msgid="6005751082181574289">"Vibration ved meddelt"</string>
+    <string name="pref_summary_notification_enabled" msgid="619729096820999905">"Vis meddelelser om beskeder på statusbjælken"</string>
+    <!-- no translation found for pref_title_notification_vibrateWhen (4251208067092761057) -->
+    <skip />
+    <string name="pref_summary_notification_vibrateWhen" msgid="669655090822561447">"Vibration ved meddelelse"</string>
     <string name="pref_title_notification_ringtone" msgid="5159574093788155149">"Vælg ringetone"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Angiv det antal beskeder, der skal gemmes"</string>
+    <!-- no translation found for prefEntries_vibrateWhen:0 (2520871831815631409) -->
+    <!-- no translation found for prefEntries_vibrateWhen:1 (6069709696037750627) -->
+    <!-- no translation found for prefEntries_vibrateWhen:2 (7486145357487111435) -->
+    <!-- no translation found for prefDialogTitle_vibrateWhen (6419655771690242118) -->
+    <skip />
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Automatisk hentning"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Hent automatisk beskeder"</string>
-    <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Aut. hent. u. roam."</string>
+    <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Aut. hent. u. roaming"</string>
     <string name="pref_summary_mms_retrieval_during_roaming" msgid="2427892806582531020">"Hent automatisk beskeder under roaming"</string>
     <string name="to_label" msgid="2355268818058389047">"Til "</string>
     <string name="confirm_dialog_title" msgid="5810813994465120375">"Slet"</string>
@@ -305,7 +311,7 @@
     <string name="send_using_mms_activity" msgid="3703434556280345726">"Send som mms-besked ..."</string>
     <string name="select_contact_method_activity" msgid="1743384358979323991">"Vælg kontaktmetode"</string>
     <string name="search_label" msgid="6042598929386174964">"Beskeder"</string>
-    <string name="search_hint" msgid="7183732852849365466">"Søg i beskeder"</string>
+    <string name="search_hint" msgid="7183732852849365466">"Søg i Beskeder"</string>
     <string name="search" msgid="7560238620274735199">"Beskeder"</string>
     <string name="search_setting_description" msgid="4104004595086437572">"Tekst i dine beskeder"</string>
     <string name="search_empty" msgid="645052646985297065">"Der er ingen matches"</string>
@@ -317,7 +323,7 @@
     <string name="confirm_clear_search_title" msgid="8510295993632032904">"Ryd"</string>
     <string name="confirm_clear_search_text" msgid="8731877031837077478">"Søgeoversigten ryddes."</string>
     <string name="pref_mms_clear_search_history_title" msgid="6159758850628148164">"Ryd søgeoversigt"</string>
-    <string name="pref_mms_clear_search_history_summary" msgid="7960005384066460035">"Ryd tidligere Beskedsøgninger, så de ikke vises i søgefeltet"</string>
+    <string name="pref_mms_clear_search_history_summary" msgid="7960005384066460035">"Ryd tidligere søgninger i Beskeder, så de ikke vises i søgefeltet"</string>
     <string name="save" msgid="6847069284991531310">"Gem"</string>
     <string name="storage_limits_title" msgid="7074684882530693016">"Begræns beskeder"</string>
     <string name="storage_limits_message" msgid="8729608389698270388">"Ønsker du at begrænse antallet af beskeder, du gemmer pr. samtale?"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index c98d82acb..a5573bbac 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -160,7 +160,7 @@
     <string name="preferences_title" msgid="6650089610332670157">"Einstellungen"</string>
     <string name="restore_default" msgid="7165341506551155053">"Standardeinstellungen wiederherstellen"</string>
     <string name="pref_notification_settings_title" msgid="4860726154770053004">"Benachrichtigungseinstellungen"</string>
-    <string name="pref_mms_settings_title" msgid="2573616208360684392">"Einstellungen für Multimedia-Nachrichten (MMS)"</string>
+    <string name="pref_mms_settings_title" msgid="2573616208360684392">"Einstellungen für Multimedia-Nachr. (MMS)"</string>
     <string name="pref_sms_settings_title" msgid="9088516111717417514">"Einstellungen für Textnachrichten (SMS)"</string>
     <string name="pref_sms_storage_title" msgid="2531726671883516470">"Speichereinstellungen"</string>
     <string name="pref_summary_manage_sim_messages" msgid="4141349892597640864">"Auf der SIM-Karte gespeicherte Nachrichten verwalten"</string>
@@ -175,13 +175,20 @@
     <string name="pref_title_sms_delivery_reports" msgid="876064208254451038">"Zustellberichte"</string>
     <string name="pref_title_auto_delete" msgid="7227835692631701134">"Alte Nachrichten löschen"</string>
     <string name="pref_title_sms_delete" msgid="6890538316799296878">"Höchstzahl an Textnachrichten"</string>
-    <string name="pref_title_mms_delete" msgid="7265878070847351664">"Höchstzahl an Multimedia-Nachrichten"</string>
+    <string name="pref_title_mms_delete" msgid="7265878070847351664">"Max. Multimedia-Nachr."</string>
     <string name="pref_title_notification_enabled" msgid="9118792213953729414">"Benachrichtigungen"</string>
     <string name="pref_summary_notification_enabled" msgid="619729096820999905">"Bei Nachrichteneingang Benachrichtigung in Statuszeile anzeigen"</string>
-    <string name="pref_title_notification_vibrate" msgid="7076203487928035310">"Vibrieren"</string>
-    <string name="pref_summary_notification_vibrate" msgid="6005751082181574289">"Bei Benachrichtigung vibrieren"</string>
+    <!-- no translation found for pref_title_notification_vibrateWhen (4251208067092761057) -->
+    <skip />
+    <!-- no translation found for pref_summary_notification_vibrateWhen (669655090822561447) -->
+    <skip />
     <string name="pref_title_notification_ringtone" msgid="5159574093788155149">"Klingelton auswählen"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Anzahl der zu speichernden Nachrichten festlegen"</string>
+    <!-- no translation found for prefEntries_vibrateWhen:0 (2520871831815631409) -->
+    <!-- no translation found for prefEntries_vibrateWhen:1 (6069709696037750627) -->
+    <!-- no translation found for prefEntries_vibrateWhen:2 (7486145357487111435) -->
+    <!-- no translation found for prefDialogTitle_vibrateWhen (6419655771690242118) -->
+    <skip />
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Automatisch abrufen"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Nachrichten automatisch empfangen"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Autom. Roaming-Abruf"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 63b307139..b2021090e 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -178,10 +178,17 @@
     <string name="pref_title_mms_delete" msgid="7265878070847351664">"Όριο μηνύματος πολυμέσων"</string>
     <string name="pref_title_notification_enabled" msgid="9118792213953729414">"Ειδοποιήσεις"</string>
     <string name="pref_summary_notification_enabled" msgid="619729096820999905">"Προβολή ειδοποιήσεων μηνύματος στη γραμμή κατάστασης"</string>
-    <string name="pref_title_notification_vibrate" msgid="7076203487928035310">"Δόνηση"</string>
-    <string name="pref_summary_notification_vibrate" msgid="6005751082181574289">"Δόνηση κατά την ειδοποίηση"</string>
+    <!-- no translation found for pref_title_notification_vibrateWhen (4251208067092761057) -->
+    <skip />
+    <!-- no translation found for pref_summary_notification_vibrateWhen (669655090822561447) -->
+    <skip />
     <string name="pref_title_notification_ringtone" msgid="5159574093788155149">"Επιλογή ήχου κλήσης"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Ορισμός αριθμού μηνυμάτων για αποθήκευση"</string>
+    <!-- no translation found for prefEntries_vibrateWhen:0 (2520871831815631409) -->
+    <!-- no translation found for prefEntries_vibrateWhen:1 (6069709696037750627) -->
+    <!-- no translation found for prefEntries_vibrateWhen:2 (7486145357487111435) -->
+    <!-- no translation found for prefDialogTitle_vibrateWhen (6419655771690242118) -->
+    <skip />
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Αυτόματη ανάκτηση"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Αυτόματη ανάκτηση μηνυμάτων"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Αυτόματη ανάκτηση περιαγωγής"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 30b872a04..807549f07 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -178,10 +178,17 @@
     <string name="pref_title_mms_delete" msgid="7265878070847351664">"Límite de mensaje multimedia"</string>
     <string name="pref_title_notification_enabled" msgid="9118792213953729414">"Notificaciones"</string>
     <string name="pref_summary_notification_enabled" msgid="619729096820999905">"Visualizar notificaciones de mensaje en barra de estado"</string>
-    <string name="pref_title_notification_vibrate" msgid="7076203487928035310">"Vibrar"</string>
-    <string name="pref_summary_notification_vibrate" msgid="6005751082181574289">"También vibra cuando notifica"</string>
+    <!-- no translation found for pref_title_notification_vibrateWhen (4251208067092761057) -->
+    <skip />
+    <!-- no translation found for pref_summary_notification_vibrateWhen (669655090822561447) -->
+    <skip />
     <string name="pref_title_notification_ringtone" msgid="5159574093788155149">"Selecc.  Tono de timbre"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Establecer el número de mensajes que se deben guardar"</string>
+    <!-- no translation found for prefEntries_vibrateWhen:0 (2520871831815631409) -->
+    <!-- no translation found for prefEntries_vibrateWhen:1 (6069709696037750627) -->
+    <!-- no translation found for prefEntries_vibrateWhen:2 (7486145357487111435) -->
+    <!-- no translation found for prefDialogTitle_vibrateWhen (6419655771690242118) -->
+    <skip />
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Recup. automática"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Recuperar mensajes automáticamente"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Recup. Aut. en roaming"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 4d3217580..b3d551a40 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -178,10 +178,17 @@
     <string name="pref_title_mms_delete" msgid="7265878070847351664">"Límite de mensajes multimedia"</string>
     <string name="pref_title_notification_enabled" msgid="9118792213953729414">"Notificaciones"</string>
     <string name="pref_summary_notification_enabled" msgid="619729096820999905">"Mostrar notificación de mensajes en la barra de estado"</string>
-    <string name="pref_title_notification_vibrate" msgid="7076203487928035310">"Vibración"</string>
-    <string name="pref_summary_notification_vibrate" msgid="6005751082181574289">"Vibrar también al notificar"</string>
+    <!-- no translation found for pref_title_notification_vibrateWhen (4251208067092761057) -->
+    <skip />
+    <!-- no translation found for pref_summary_notification_vibrateWhen (669655090822561447) -->
+    <skip />
     <string name="pref_title_notification_ringtone" msgid="5159574093788155149">"Seleccionar tono"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Establecer número de mensajes que quieres guardar"</string>
+    <!-- no translation found for prefEntries_vibrateWhen:0 (2520871831815631409) -->
+    <!-- no translation found for prefEntries_vibrateWhen:1 (6069709696037750627) -->
+    <!-- no translation found for prefEntries_vibrateWhen:2 (7486145357487111435) -->
+    <!-- no translation found for prefDialogTitle_vibrateWhen (6419655771690242118) -->
+    <skip />
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Recuperación auto."</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Recuperar mensajes automáticamente"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Recup. auto. en itinerancia"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 35ec7d070..c0593405b 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -178,10 +178,17 @@
     <string name="pref_title_mms_delete" msgid="7265878070847351664">"Limite pour les MMS"</string>
     <string name="pref_title_notification_enabled" msgid="9118792213953729414">"Notifications"</string>
     <string name="pref_summary_notification_enabled" msgid="619729096820999905">"Afficher les notifications de message dans la barre d\'état"</string>
-    <string name="pref_title_notification_vibrate" msgid="7076203487928035310">"Vibreur"</string>
-    <string name="pref_summary_notification_vibrate" msgid="6005751082181574289">"Vibrer à la réception d\'une notification"</string>
+    <!-- no translation found for pref_title_notification_vibrateWhen (4251208067092761057) -->
+    <skip />
+    <!-- no translation found for pref_summary_notification_vibrateWhen (669655090822561447) -->
+    <skip />
     <string name="pref_title_notification_ringtone" msgid="5159574093788155149">"Sélectionner une sonnerie"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Définir le nombre de messages à enregistrer"</string>
+    <!-- no translation found for prefEntries_vibrateWhen:0 (2520871831815631409) -->
+    <!-- no translation found for prefEntries_vibrateWhen:1 (6069709696037750627) -->
+    <!-- no translation found for prefEntries_vibrateWhen:2 (7486145357487111435) -->
+    <!-- no translation found for prefDialogTitle_vibrateWhen (6419655771690242118) -->
+    <skip />
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Récupération auto"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Récupérer automatiquement les messages"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Itinérance"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 188d3df14..b06518e54 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -178,10 +178,17 @@
     <string name="pref_title_mms_delete" msgid="7265878070847351664">"Limite mess. multimediale"</string>
     <string name="pref_title_notification_enabled" msgid="9118792213953729414">"Notifiche"</string>
     <string name="pref_summary_notification_enabled" msgid="619729096820999905">"Visualizza notifiche messaggi nella barra di stato"</string>
-    <string name="pref_title_notification_vibrate" msgid="7076203487928035310">"Vibrazione"</string>
-    <string name="pref_summary_notification_vibrate" msgid="6005751082181574289">"Vibrazione alla notifica"</string>
+    <!-- no translation found for pref_title_notification_vibrateWhen (4251208067092761057) -->
+    <skip />
+    <!-- no translation found for pref_summary_notification_vibrateWhen (669655090822561447) -->
+    <skip />
     <string name="pref_title_notification_ringtone" msgid="5159574093788155149">"Seleziona suoneria"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Imposta numero di messaggi da salvare"</string>
+    <!-- no translation found for prefEntries_vibrateWhen:0 (2520871831815631409) -->
+    <!-- no translation found for prefEntries_vibrateWhen:1 (6069709696037750627) -->
+    <!-- no translation found for prefEntries_vibrateWhen:2 (7486145357487111435) -->
+    <!-- no translation found for prefDialogTitle_vibrateWhen (6419655771690242118) -->
+    <skip />
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Recupero automatico"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Recupera messaggi automaticamente"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Recupero in roaming"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index f4631c466..df82e625f 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -178,10 +178,17 @@
     <string name="pref_title_mms_delete" msgid="7265878070847351664">"マルチメディアメッセージの制限件数"</string>
     <string name="pref_title_notification_enabled" msgid="9118792213953729414">"通知"</string>
     <string name="pref_summary_notification_enabled" msgid="619729096820999905">"メッセージ受信: ステータスバーで通知"</string>
-    <string name="pref_title_notification_vibrate" msgid="7076203487928035310">"バイブレーション"</string>
-    <string name="pref_summary_notification_vibrate" msgid="6005751082181574289">"メッセージ受信の通知: バイブレーションON"</string>
+    <!-- no translation found for pref_title_notification_vibrateWhen (4251208067092761057) -->
+    <skip />
+    <!-- no translation found for pref_summary_notification_vibrateWhen (669655090822561447) -->
+    <skip />
     <string name="pref_title_notification_ringtone" msgid="5159574093788155149">"着信音を選択"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"保存するメッセージ件数を設定"</string>
+    <!-- no translation found for prefEntries_vibrateWhen:0 (2520871831815631409) -->
+    <!-- no translation found for prefEntries_vibrateWhen:1 (6069709696037750627) -->
+    <!-- no translation found for prefEntries_vibrateWhen:2 (7486145357487111435) -->
+    <!-- no translation found for prefDialogTitle_vibrateWhen (6419655771690242118) -->
+    <skip />
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"自動で取得"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"メッセージを自動的に取得"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"ローミング時に自動取得"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index efd5229da..cc2a73bb4 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -178,10 +178,17 @@
     <string name="pref_title_mms_delete" msgid="7265878070847351664">"멀티미디어 메시지 한도"</string>
     <string name="pref_title_notification_enabled" msgid="9118792213953729414">"알림"</string>
     <string name="pref_summary_notification_enabled" msgid="619729096820999905">"상태 표시줄에 메시지 알림 표시"</string>
-    <string name="pref_title_notification_vibrate" msgid="7076203487928035310">"진동"</string>
-    <string name="pref_summary_notification_vibrate" msgid="6005751082181574289">"알림 시 진동도 함께 울림"</string>
+    <!-- no translation found for pref_title_notification_vibrateWhen (4251208067092761057) -->
+    <skip />
+    <!-- no translation found for pref_summary_notification_vibrateWhen (669655090822561447) -->
+    <skip />
     <string name="pref_title_notification_ringtone" msgid="5159574093788155149">"벨소리 선택"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"저장할 메시지 개수 설정"</string>
+    <!-- no translation found for prefEntries_vibrateWhen:0 (2520871831815631409) -->
+    <!-- no translation found for prefEntries_vibrateWhen:1 (6069709696037750627) -->
+    <!-- no translation found for prefEntries_vibrateWhen:2 (7486145357487111435) -->
+    <!-- no translation found for prefDialogTitle_vibrateWhen (6419655771690242118) -->
+    <skip />
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"자동 검색"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"메시지를 자동으로 검색"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"로밍 중에 자동 검색"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index b571d1a24..0aebc303d 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -178,10 +178,17 @@
     <string name="pref_title_mms_delete" msgid="7265878070847351664">"MMS-meldingsgrense"</string>
     <string name="pref_title_notification_enabled" msgid="9118792213953729414">"Varslinger"</string>
     <string name="pref_summary_notification_enabled" msgid="619729096820999905">"Vis meldingsvarslinger i statusfeltet"</string>
-    <string name="pref_title_notification_vibrate" msgid="7076203487928035310">"Vibrer"</string>
-    <string name="pref_summary_notification_vibrate" msgid="6005751082181574289">"Vibrer ved varsling"</string>
+    <!-- no translation found for pref_title_notification_vibrateWhen (4251208067092761057) -->
+    <skip />
+    <!-- no translation found for pref_summary_notification_vibrateWhen (669655090822561447) -->
+    <skip />
     <string name="pref_title_notification_ringtone" msgid="5159574093788155149">"Velg ringetone"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Angi antall meldinger som skal lagres"</string>
+    <!-- no translation found for prefEntries_vibrateWhen:0 (2520871831815631409) -->
+    <!-- no translation found for prefEntries_vibrateWhen:1 (6069709696037750627) -->
+    <!-- no translation found for prefEntries_vibrateWhen:2 (7486145357487111435) -->
+    <!-- no translation found for prefDialogTitle_vibrateWhen (6419655771690242118) -->
+    <skip />
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Autohent"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Hent meldinger automatisk"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Omstreifende autohent"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 53977fb07..888d70dfb 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -164,24 +164,31 @@
     <string name="pref_sms_settings_title" msgid="9088516111717417514">"Instellingen voor sms-berichten"</string>
     <string name="pref_sms_storage_title" msgid="2531726671883516470">"Instellingen voor opslag"</string>
     <string name="pref_summary_manage_sim_messages" msgid="4141349892597640864">"Berichten op uw SIM-kaart beheren"</string>
-    <string name="pref_summary_mms_delivery_reports" msgid="4874657984217756112">"Leveringsrapport voor elk verzonden bericht aanvragen"</string>
-    <string name="pref_summary_mms_read_reports" msgid="2748323864008907440">"Leesrapport voor elk verzonden bericht aanvragen"</string>
-    <string name="pref_summary_sms_delivery_reports" msgid="5852207702358546129">"Leveringsrapport voor elk verzonden bericht aanvragen"</string>
+    <string name="pref_summary_mms_delivery_reports" msgid="4874657984217756112">"Ontvangstbevestiging voor elk verzonden bericht aanvragen"</string>
+    <string name="pref_summary_mms_read_reports" msgid="2748323864008907440">"Leesbevestiging voor elk verzonden bericht aanvragen"</string>
+    <string name="pref_summary_sms_delivery_reports" msgid="5852207702358546129">"Ontvangstbevestiging voor elk verzonden bericht aanvragen"</string>
     <string name="pref_summary_auto_delete" msgid="7719538116486177613">"Oude berichten verwijderen wanneer limiet wordt bereikt"</string>
     <string name="pref_summary_delete_limit" msgid="597128041393045216">"<xliff:g id="COUNT">%1$s</xliff:g> berichten per conversatie"</string>
     <string name="pref_title_manage_sim_messages" msgid="7820895261757881177">"Berichten op SIM-kaart beheren"</string>
-    <string name="pref_title_mms_delivery_reports" msgid="6666857926679451910">"Leveringsrapporten"</string>
-    <string name="pref_title_mms_read_reports" msgid="4882179829495828541">"Rapporten lezen"</string>
-    <string name="pref_title_sms_delivery_reports" msgid="876064208254451038">"Leveringsrapporten"</string>
+    <string name="pref_title_mms_delivery_reports" msgid="6666857926679451910">"Ontvangstbevestigingen"</string>
+    <string name="pref_title_mms_read_reports" msgid="4882179829495828541">"Leesbevestigingen"</string>
+    <string name="pref_title_sms_delivery_reports" msgid="876064208254451038">"Ontvangstbevestigingen"</string>
     <string name="pref_title_auto_delete" msgid="7227835692631701134">"Oude berichten verwijderen"</string>
     <string name="pref_title_sms_delete" msgid="6890538316799296878">"Limiet voor sms"</string>
     <string name="pref_title_mms_delete" msgid="7265878070847351664">"Limiet voor MMS"</string>
     <string name="pref_title_notification_enabled" msgid="9118792213953729414">"Meldingen"</string>
     <string name="pref_summary_notification_enabled" msgid="619729096820999905">"Berichtmeldingen in statusbalk weergeven"</string>
-    <string name="pref_title_notification_vibrate" msgid="7076203487928035310">"Trillen"</string>
-    <string name="pref_summary_notification_vibrate" msgid="6005751082181574289">"Ook trillen bij melding"</string>
+    <!-- no translation found for pref_title_notification_vibrateWhen (4251208067092761057) -->
+    <skip />
+    <!-- no translation found for pref_summary_notification_vibrateWhen (669655090822561447) -->
+    <skip />
     <string name="pref_title_notification_ringtone" msgid="5159574093788155149">"Beltoon selecteren"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Aantal berichten instellen voor opslaan"</string>
+    <!-- no translation found for prefEntries_vibrateWhen:0 (2520871831815631409) -->
+    <!-- no translation found for prefEntries_vibrateWhen:1 (6069709696037750627) -->
+    <!-- no translation found for prefEntries_vibrateWhen:2 (7486145357487111435) -->
+    <!-- no translation found for prefDialogTitle_vibrateWhen (6419655771690242118) -->
+    <skip />
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Automatisch ophalen"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Berichten automatisch ophalen"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Automatisch ophalen tijdens roaming"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 00d05622c..961ba0270 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -178,10 +178,17 @@
     <string name="pref_title_mms_delete" msgid="7265878070847351664">"Limit wiadomości multimedialnych"</string>
     <string name="pref_title_notification_enabled" msgid="9118792213953729414">"Powiadomienia"</string>
     <string name="pref_summary_notification_enabled" msgid="619729096820999905">"Wyświetlaj powiadomienie o wiadomości na pasku stanu"</string>
-    <string name="pref_title_notification_vibrate" msgid="7076203487928035310">"Wibracje"</string>
-    <string name="pref_summary_notification_vibrate" msgid="6005751082181574289">"Przy powiadomieniu również wibruj"</string>
+    <!-- no translation found for pref_title_notification_vibrateWhen (4251208067092761057) -->
+    <skip />
+    <!-- no translation found for pref_summary_notification_vibrateWhen (669655090822561447) -->
+    <skip />
     <string name="pref_title_notification_ringtone" msgid="5159574093788155149">"Wybierz dzwonek"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Ustaw liczbę zapisywanych wiadomości"</string>
+    <!-- no translation found for prefEntries_vibrateWhen:0 (2520871831815631409) -->
+    <!-- no translation found for prefEntries_vibrateWhen:1 (6069709696037750627) -->
+    <!-- no translation found for prefEntries_vibrateWhen:2 (7486145357487111435) -->
+    <!-- no translation found for prefDialogTitle_vibrateWhen (6419655771690242118) -->
+    <skip />
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Autoodbieranie"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Odbierz wiadomości automatycznie"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Autoodbieranie w roamingu"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index b78c455f4..629773a9c 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -174,14 +174,21 @@
     <string name="pref_title_mms_read_reports" msgid="4882179829495828541">"Relatórios de leitura"</string>
     <string name="pref_title_sms_delivery_reports" msgid="876064208254451038">"Relatórios de entrega"</string>
     <string name="pref_title_auto_delete" msgid="7227835692631701134">"Eliminar mensagens antigas"</string>
-    <string name="pref_title_sms_delete" msgid="6890538316799296878">"Limite da mensagem de texto"</string>
-    <string name="pref_title_mms_delete" msgid="7265878070847351664">"Limite da mensagem multimédia"</string>
+    <string name="pref_title_sms_delete" msgid="6890538316799296878">"Limite de mensagens de texto"</string>
+    <string name="pref_title_mms_delete" msgid="7265878070847351664">"Limite de mensagens multimédia"</string>
     <string name="pref_title_notification_enabled" msgid="9118792213953729414">"Notificações"</string>
     <string name="pref_summary_notification_enabled" msgid="619729096820999905">"Apresentar notificações de mensagem na barra de estado"</string>
-    <string name="pref_title_notification_vibrate" msgid="7076203487928035310">"Vibrar"</string>
-    <string name="pref_summary_notification_vibrate" msgid="6005751082181574289">"Vibrar também quando notificado"</string>
+    <!-- no translation found for pref_title_notification_vibrateWhen (4251208067092761057) -->
+    <skip />
+    <!-- no translation found for pref_summary_notification_vibrateWhen (669655090822561447) -->
+    <skip />
     <string name="pref_title_notification_ringtone" msgid="5159574093788155149">"Seleccionar toque"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Definir o número de mensagens a guardar"</string>
+    <!-- no translation found for prefEntries_vibrateWhen:0 (2520871831815631409) -->
+    <!-- no translation found for prefEntries_vibrateWhen:1 (6069709696037750627) -->
+    <!-- no translation found for prefEntries_vibrateWhen:2 (7486145357487111435) -->
+    <!-- no translation found for prefDialogTitle_vibrateWhen (6419655771690242118) -->
+    <skip />
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Retoma automática"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Retomar mensagens automaticamente"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Retoma automática em roaming"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 5f6351d73..817a330c4 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -167,24 +167,31 @@
     <string name="pref_summary_mms_delivery_reports" msgid="4874657984217756112">"Solicita um relatório de entrega para cada mensagem enviada"</string>
     <string name="pref_summary_mms_read_reports" msgid="2748323864008907440">"Solicita um relatório de leitura para cada mensagem enviada"</string>
     <string name="pref_summary_sms_delivery_reports" msgid="5852207702358546129">"Solicita um relatório de entrega para cada mensagem enviada"</string>
-    <string name="pref_summary_auto_delete" msgid="7719538116486177613">"Excluir mensagens antigas à medida que os limites forem atingidos"</string>
+    <string name="pref_summary_auto_delete" msgid="7719538116486177613">"Excluir antigas à medida que os limites forem atingidos"</string>
     <string name="pref_summary_delete_limit" msgid="597128041393045216">"<xliff:g id="COUNT">%1$s</xliff:g> mensagens por conversa"</string>
     <string name="pref_title_manage_sim_messages" msgid="7820895261757881177">"Gerenciar mensagens SIM"</string>
     <string name="pref_title_mms_delivery_reports" msgid="6666857926679451910">"Relatórios de entrega"</string>
-    <string name="pref_title_mms_read_reports" msgid="4882179829495828541">"Ler relatórios"</string>
+    <string name="pref_title_mms_read_reports" msgid="4882179829495828541">"Relatórios de leitura"</string>
     <string name="pref_title_sms_delivery_reports" msgid="876064208254451038">"Relatórios de entrega"</string>
-    <string name="pref_title_auto_delete" msgid="7227835692631701134">"Excluir mensagens antigas"</string>
+    <string name="pref_title_auto_delete" msgid="7227835692631701134">"Excluir antigas"</string>
     <string name="pref_title_sms_delete" msgid="6890538316799296878">"Limite de mensagens de texto"</string>
     <string name="pref_title_mms_delete" msgid="7265878070847351664">"Limite de mensagens multimídia"</string>
     <string name="pref_title_notification_enabled" msgid="9118792213953729414">"Notificações"</string>
     <string name="pref_summary_notification_enabled" msgid="619729096820999905">"Exibe notificações de mensagem na barra de status"</string>
-    <string name="pref_title_notification_vibrate" msgid="7076203487928035310">"Vibrar"</string>
-    <string name="pref_summary_notification_vibrate" msgid="6005751082181574289">"Também vibra quando notificado"</string>
+    <!-- no translation found for pref_title_notification_vibrateWhen (4251208067092761057) -->
+    <skip />
+    <!-- no translation found for pref_summary_notification_vibrateWhen (669655090822561447) -->
+    <skip />
     <string name="pref_title_notification_ringtone" msgid="5159574093788155149">"Selecionar toque"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Definir número de mensagens a serem salvas"</string>
+    <!-- no translation found for prefEntries_vibrateWhen:0 (2520871831815631409) -->
+    <!-- no translation found for prefEntries_vibrateWhen:1 (6069709696037750627) -->
+    <!-- no translation found for prefEntries_vibrateWhen:2 (7486145357487111435) -->
+    <!-- no translation found for prefDialogTitle_vibrateWhen (6419655771690242118) -->
+    <skip />
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Recuperação automática"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Recupera mensagens automaticamente"</string>
-    <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Recuperação em roaming"</string>
+    <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Recuper. em roaming"</string>
     <string name="pref_summary_mms_retrieval_during_roaming" msgid="2427892806582531020">"Recupera mensagens automaticamente em roaming"</string>
     <string name="to_label" msgid="2355268818058389047">"Para "</string>
     <string name="confirm_dialog_title" msgid="5810813994465120375">"Excluir"</string>
@@ -231,7 +238,7 @@
     <string name="sim_view" msgid="1997173541766393706">"Visualizar"</string>
     <string name="sim_empty" msgid="1763174398613486328">"Não há mensagens no cartão SIM."</string>
     <string name="delivery_header_title" msgid="5361719578869045764">"Relatar"</string>
-    <string name="status_none" msgid="8253075950774894961">"(Nenhuma)"</string>
+    <string name="status_none" msgid="8253075950774894961">"(Nenhum)"</string>
     <string name="status_pending" msgid="2739860824607984892">"Pendente"</string>
     <string name="status_read" msgid="7576195253780627332">"Ler"</string>
     <string name="status_received" msgid="7264334589461906965">"Recebido"</string>
@@ -257,7 +264,7 @@
     <string name="sim_full_title" msgid="1809829051697702810">"O cartão SIM está cheio"</string>
     <string name="sim_full_body" msgid="6241664980790322925">"Exclua algumas mensagens para criar espaço para mais."</string>
     <string name="sms_full_title" msgid="6041287140125011854">"Memória para mensagens de texto cheia"</string>
-    <string name="sms_full_body" msgid="7757490997215434514">"Mensagem recebida rejeitada devido à memória cheia. Exclua mensagens antigas."</string>
+    <string name="sms_full_body" msgid="7757490997215434514">"Mensagem recebida rejeitada devido à memória cheia. Excluir antigas."</string>
     <string name="sms_rejected_title" msgid="8548394922491529811">"Mensagem de texto rejeitada"</string>
     <string name="sms_rejected_body" msgid="7187754586609631934">"Mensagem recebida rejeitada devido a uma razão desconhecida."</string>
     <string name="type_audio" msgid="3842064092332309756">"áudio"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index cb13f3f03..df1532e54 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -179,10 +179,17 @@
     <string name="pref_title_mms_delete" msgid="7265878070847351664">"Предел количества MMS"</string>
     <string name="pref_title_notification_enabled" msgid="9118792213953729414">"Уведомления"</string>
     <string name="pref_summary_notification_enabled" msgid="619729096820999905">"Отображать уведомления о сообщениях в строке состояния"</string>
-    <string name="pref_title_notification_vibrate" msgid="7076203487928035310">"Вибровызов"</string>
-    <string name="pref_summary_notification_vibrate" msgid="6005751082181574289">"Вибросигнал при получении уведомления"</string>
+    <!-- no translation found for pref_title_notification_vibrateWhen (4251208067092761057) -->
+    <skip />
+    <!-- no translation found for pref_summary_notification_vibrateWhen (669655090822561447) -->
+    <skip />
     <string name="pref_title_notification_ringtone" msgid="5159574093788155149">"Мелодия звонка"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Установить количество сообщений для сохранения"</string>
+    <!-- no translation found for prefEntries_vibrateWhen:0 (2520871831815631409) -->
+    <!-- no translation found for prefEntries_vibrateWhen:1 (6069709696037750627) -->
+    <!-- no translation found for prefEntries_vibrateWhen:2 (7486145357487111435) -->
+    <!-- no translation found for prefDialogTitle_vibrateWhen (6419655771690242118) -->
+    <skip />
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Автополучение"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Автоматически получать сообщения"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Автополучение в роуминге"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index d1b5f79a0..6dc0bab48 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -178,10 +178,17 @@
     <string name="pref_title_mms_delete" msgid="7265878070847351664">"MMS-begränsning"</string>
     <string name="pref_title_notification_enabled" msgid="9118792213953729414">"Aviseringar"</string>
     <string name="pref_summary_notification_enabled" msgid="619729096820999905">"Visa meddelandeaviseringar i statusfältet"</string>
-    <string name="pref_title_notification_vibrate" msgid="7076203487928035310">"Vibrera"</string>
-    <string name="pref_summary_notification_vibrate" msgid="6005751082181574289">"Vibrera även vid aviseringar"</string>
+    <!-- no translation found for pref_title_notification_vibrateWhen (4251208067092761057) -->
+    <skip />
+    <!-- no translation found for pref_summary_notification_vibrateWhen (669655090822561447) -->
+    <skip />
     <string name="pref_title_notification_ringtone" msgid="5159574093788155149">"Välj ringsignal"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Ange hur många meddelanden som ska sparas"</string>
+    <!-- no translation found for prefEntries_vibrateWhen:0 (2520871831815631409) -->
+    <!-- no translation found for prefEntries_vibrateWhen:1 (6069709696037750627) -->
+    <!-- no translation found for prefEntries_vibrateWhen:2 (7486145357487111435) -->
+    <!-- no translation found for prefDialogTitle_vibrateWhen (6419655771690242118) -->
+    <skip />
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Autohämtning"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Hämta meddelanden automatiskt"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Autohämtning vid roam."</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index ee6fb2eda..caad1f1d7 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -178,10 +178,17 @@
     <string name="pref_title_mms_delete" msgid="7265878070847351664">"Multimedya iletisi sınırı"</string>
     <string name="pref_title_notification_enabled" msgid="9118792213953729414">"Bildirimler"</string>
     <string name="pref_summary_notification_enabled" msgid="619729096820999905">"Durum çubuğunda ileti bildirimleri görüntüle"</string>
-    <string name="pref_title_notification_vibrate" msgid="7076203487928035310">"Titreşim"</string>
-    <string name="pref_summary_notification_vibrate" msgid="6005751082181574289">"Bildirildiğinde aynı zamanda titret"</string>
+    <!-- no translation found for pref_title_notification_vibrateWhen (4251208067092761057) -->
+    <skip />
+    <!-- no translation found for pref_summary_notification_vibrateWhen (669655090822561447) -->
+    <skip />
     <string name="pref_title_notification_ringtone" msgid="5159574093788155149">"Zil sesini seç"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Kaydedilecek iletilerin sayısını ayarla"</string>
+    <!-- no translation found for prefEntries_vibrateWhen:0 (2520871831815631409) -->
+    <!-- no translation found for prefEntries_vibrateWhen:1 (6069709696037750627) -->
+    <!-- no translation found for prefEntries_vibrateWhen:2 (7486145357487111435) -->
+    <!-- no translation found for prefDialogTitle_vibrateWhen (6419655771690242118) -->
+    <skip />
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Otomatik al"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"İletileri otomatik olarak al"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Dolaşımda otomatik al"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 2aac33a58..5f21f3357 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -178,10 +178,17 @@
     <string name="pref_title_mms_delete" msgid="7265878070847351664">"彩信限制"</string>
     <string name="pref_title_notification_enabled" msgid="9118792213953729414">"通知"</string>
     <string name="pref_summary_notification_enabled" msgid="619729096820999905">"在状态栏中显示信息通知"</string>
-    <string name="pref_title_notification_vibrate" msgid="7076203487928035310">"振动"</string>
-    <string name="pref_summary_notification_vibrate" msgid="6005751082181574289">"在收到通知的同时还振动"</string>
+    <!-- no translation found for pref_title_notification_vibrateWhen (4251208067092761057) -->
+    <skip />
+    <!-- no translation found for pref_summary_notification_vibrateWhen (669655090822561447) -->
+    <skip />
     <string name="pref_title_notification_ringtone" msgid="5159574093788155149">"选择铃声"</string>
-    <string name="pref_messages_to_save" msgid="3202539743892934926">"设置要保存的短信的数量"</string>
+    <string name="pref_messages_to_save" msgid="3202539743892934926">"设置要保存的彩信数量"</string>
+    <!-- no translation found for prefEntries_vibrateWhen:0 (2520871831815631409) -->
+    <!-- no translation found for prefEntries_vibrateWhen:1 (6069709696037750627) -->
+    <!-- no translation found for prefEntries_vibrateWhen:2 (7486145357487111435) -->
+    <!-- no translation found for prefDialogTitle_vibrateWhen (6419655771690242118) -->
+    <skip />
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"自动检索"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"自动检索信息"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"漫游时自动检索"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 8b749c8fc..ab5287f94 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -80,7 +80,7 @@
     <string name="subject_hint" msgid="4296714962311604126">"主旨"</string>
     <string name="add_attachment" msgid="7103751293360532684">"附加"</string>
     <string name="add_subject" msgid="7616134948428265870">"新增主旨"</string>
-    <string name="discard" msgid="1624800293064498479">"放棄"</string>
+    <string name="discard" msgid="1624800293064498479">"捨棄"</string>
     <string name="view" msgid="7929667761715467136">"檢視"</string>
     <string name="replace" msgid="7587904998114459388">"取代"</string>
     <string name="remove" msgid="4625444913256213175">"移除"</string>
@@ -100,7 +100,7 @@
     <string name="failed_to_resize_image" msgid="5608354151631833669">"圖片大小未改變。"</string>
     <string name="resize_image_error_information" msgid="4897031754321114959">"很抱歉，縮小後的圖片仍然太大、無法傳送。"</string>
     <string name="forward_prefix" msgid="276280492803486464">"Fwd: "</string>
-    <string name="discard_message" msgid="6078326880056142781">"放棄"</string>
+    <string name="discard_message" msgid="6078326880056142781">"捨棄"</string>
     <string name="discard_message_reason" msgid="2667664943003796133">"由於收件者地址無效，您的訊息將被捨棄。"</string>
     <string name="has_invalid_recipient" msgid="1485388396900997383">"無效收件者：(<xliff:g id="NAME">%1$s</xliff:g>)"</string>
     <string name="invalid_destination" msgid="7643854177921895615">"您輸入的地址無效。"</string>
@@ -178,10 +178,17 @@
     <string name="pref_title_mms_delete" msgid="7265878070847351664">"多媒體訊息限制"</string>
     <string name="pref_title_notification_enabled" msgid="9118792213953729414">"通知"</string>
     <string name="pref_summary_notification_enabled" msgid="619729096820999905">"在狀態列顯示簡訊通知"</string>
-    <string name="pref_title_notification_vibrate" msgid="7076203487928035310">"震動"</string>
-    <string name="pref_summary_notification_vibrate" msgid="6005751082181574289">"收到通知時震動提醒"</string>
+    <!-- no translation found for pref_title_notification_vibrateWhen (4251208067092761057) -->
+    <skip />
+    <!-- no translation found for pref_summary_notification_vibrateWhen (669655090822561447) -->
+    <skip />
     <string name="pref_title_notification_ringtone" msgid="5159574093788155149">"選取鈴聲"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"設定儲存的訊息數量"</string>
+    <!-- no translation found for prefEntries_vibrateWhen:0 (2520871831815631409) -->
+    <!-- no translation found for prefEntries_vibrateWhen:1 (6069709696037750627) -->
+    <!-- no translation found for prefEntries_vibrateWhen:2 (7486145357487111435) -->
+    <!-- no translation found for prefDialogTitle_vibrateWhen (6419655771690242118) -->
+    <skip />
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"自動擷取"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"自動擷取簡訊"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"漫遊時自動擷取"</string>