diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 5931255..0334093 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -172,17 +172,10 @@
     <string name="pref_title_sms_delete" msgid="6890538316799296878">"Teksboodskap-limiet"</string>
     <string name="pref_title_mms_delete" msgid="7265878070847351664">"Multimediaboodskap-limiet"</string>
     <string name="pref_title_notification_enabled" msgid="9118792213953729414">"Kennisgewings"</string>
-    <string name="pref_summary_notification_enabled" msgid="619729096820999905">"Vertoon boodskapkennisgewings in statusbalk"</string>
     <string name="pref_title_notification_vibrateWhen" msgid="4251208067092761057">"Vibreer"</string>
-    <string name="pref_summary_notification_vibrateWhen" msgid="669655090822561447">"Vibreer ook ter kennisgewing"</string>
-    <string name="pref_title_notification_ringtone" msgid="5467265237106229952">"Kies luitoon"</string>
+    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Klank"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Stel aantal boodskappe om te stoor"</string>
-  <string-array name="prefEntries_vibrateWhen">
-    <item msgid="2520871831815631409">"Altyd"</item>
-    <item msgid="6069709696037750627">"Net wanneer stil"</item>
-    <item msgid="7486145357487111435">"Nooit"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="6419655771690242118">"Vibreer"</string>
+    <string name="silent_ringtone" msgid="7981237991326592780">"Stil"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Herwin outomaties"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Gaan haal boodskappe outomaties"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Outoherwinning wanneer swerf"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 0fccc99..dc1e03a 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -172,17 +172,10 @@
     <string name="pref_title_sms_delete" msgid="6890538316799296878">"የፅሁፍ መልዕክትወሰን"</string>
     <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_vibrateWhen" msgid="4251208067092761057">"ንዘር"</string>
-    <string name="pref_summary_notification_vibrateWhen" msgid="669655090822561447">"ስታሳውቅ ንዘር"</string>
-    <string name="pref_title_notification_ringtone" msgid="5467265237106229952">"የደወል ቅላጼ ምረጥ"</string>
+    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"ድምፅ"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"ለማስቀመጥ የመልዕክቶች ቁጥር አዘጋጅ"</string>
-  <string-array name="prefEntries_vibrateWhen">
-    <item msgid="2520871831815631409">"ዘወትር"</item>
-    <item msgid="6069709696037750627">"ፀጥታ ሲሆን ብቻ"</item>
-    <item msgid="7486145357487111435">"በፍፁም"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="6419655771690242118">"ንዘር"</string>
+    <string name="silent_ringtone" msgid="7981237991326592780">"ፀጥታ"</string>
     <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-ar/strings.xml b/res/values-ar/strings.xml
index 277f590..d642172 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -172,17 +172,10 @@
     <string name="pref_title_sms_delete" msgid="6890538316799296878">"حد الرسالة النصية"</string>
     <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_vibrateWhen" msgid="4251208067092761057">"اهتزاز"</string>
-    <string name="pref_summary_notification_vibrateWhen" msgid="669655090822561447">"الاهتزاز عند إعلامي أيضًا"</string>
-    <string name="pref_title_notification_ringtone" msgid="5467265237106229952">"اختيار نغمة الرنين"</string>
+    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"الصوت"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"تعيين عدد الرسائل التي سيتم حفظها"</string>
-  <string-array name="prefEntries_vibrateWhen">
-    <item msgid="2520871831815631409">"دومًا"</item>
-    <item msgid="6069709696037750627">"فقط عندما يكون صامتًا"</item>
-    <item msgid="7486145357487111435">"مطلقًا"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="6419655771690242118">"اهتزاز"</string>
+    <string name="silent_ringtone" msgid="7981237991326592780">"صامت"</string>
     <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-be/strings.xml b/res/values-be/strings.xml
index 84bbc37..d6cb814 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -172,17 +172,10 @@
     <string name="pref_title_sms_delete" msgid="6890538316799296878">"Абмежаванне тэкставых паведамленняў"</string>
     <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_vibrateWhen" msgid="4251208067092761057">"Вібраваць"</string>
-    <string name="pref_summary_notification_vibrateWhen" msgid="669655090822561447">"Таксама вібраваць, калі атрымана апавяшчэнне"</string>
-    <string name="pref_title_notification_ringtone" msgid="5467265237106229952">"Выбраць рынгтон"</string>
+    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Гук"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Усталяваць колькасць паведамленняў для захавання"</string>
-  <string-array name="prefEntries_vibrateWhen">
-    <item msgid="2520871831815631409">"Заўсёды"</item>
-    <item msgid="6069709696037750627">"Толькі ў рэжыме без гуку"</item>
-    <item msgid="7486145357487111435">"Ніколі"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="6419655771690242118">"Вібрацыя"</string>
+    <string name="silent_ringtone" msgid="7981237991326592780">"Ціхі рэжым"</string>
     <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-bg/strings.xml b/res/values-bg/strings.xml
index 8377321..e09c2b2 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -172,17 +172,10 @@
     <string name="pref_title_sms_delete" msgid="6890538316799296878">"Ограничение за текстови съобщения"</string>
     <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_vibrateWhen" msgid="4251208067092761057">"Вибриране"</string>
-    <string name="pref_summary_notification_vibrateWhen" msgid="669655090822561447">"Да вибрира и при известяване"</string>
-    <string name="pref_title_notification_ringtone" msgid="5467265237106229952">"Избор на мелодия"</string>
+    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Звук"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Задайте броя съобщения за запазване"</string>
-  <string-array name="prefEntries_vibrateWhen">
-    <item msgid="2520871831815631409">"Винаги"</item>
-    <item msgid="6069709696037750627">"Само при тих режим"</item>
-    <item msgid="7486145357487111435">"Никога"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="6419655771690242118">"Вибриране"</string>
+    <string name="silent_ringtone" msgid="7981237991326592780">"Тих режим"</string>
     <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-ca/strings.xml b/res/values-ca/strings.xml
index 9984a2d..609cafd 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -172,17 +172,10 @@
     <string name="pref_title_sms_delete" msgid="6890538316799296878">"Límit de missatges de text"</string>
     <string name="pref_title_mms_delete" msgid="7265878070847351664">"Límit de missatges multimèdia"</string>
     <string name="pref_title_notification_enabled" msgid="9118792213953729414">"Notificacions"</string>
-    <string name="pref_summary_notification_enabled" msgid="619729096820999905">"Mostra les notificacions de missatges a la barra d\'estat"</string>
     <string name="pref_title_notification_vibrateWhen" msgid="4251208067092761057">"Vibra"</string>
-    <string name="pref_summary_notification_vibrateWhen" msgid="669655090822561447">"Vibra també en rebre una notificació"</string>
-    <string name="pref_title_notification_ringtone" msgid="5467265237106229952">"Tria un to"</string>
+    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"So"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Definiu el nombre de missatges que voleu desar"</string>
-  <string-array name="prefEntries_vibrateWhen">
-    <item msgid="2520871831815631409">"Sempre"</item>
-    <item msgid="6069709696037750627">"Només quan està en silenci"</item>
-    <item msgid="7486145357487111435">"Mai"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="6419655771690242118">"Vibra"</string>
+    <string name="silent_ringtone" msgid="7981237991326592780">"Silenci"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Recuperació automàtica"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Recupera automàticament els missatges"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Recuperació automàtica en itinerància"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 7fab010..b3a8ba1 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -172,17 +172,10 @@
     <string name="pref_title_sms_delete" msgid="6890538316799296878">"Limit textových zpráv"</string>
     <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">"Zobrazovat oznámení o zprávě na stavovém řádku"</string>
     <string name="pref_title_notification_vibrateWhen" msgid="4251208067092761057">"Vibrace"</string>
-    <string name="pref_summary_notification_vibrateWhen" msgid="669655090822561447">"Při oznámení také vibrovat"</string>
-    <string name="pref_title_notification_ringtone" msgid="5467265237106229952">"Zvolit vyzvánění"</string>
+    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Zvuk"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Nastavit počet ukládaných zpráv"</string>
-  <string-array name="prefEntries_vibrateWhen">
-    <item msgid="2520871831815631409">"Vždy"</item>
-    <item msgid="6069709696037750627">"Pouze v tichém režimu"</item>
-    <item msgid="7486145357487111435">"Nikdy"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="6419655771690242118">"Vibrace"</string>
+    <string name="silent_ringtone" msgid="7981237991326592780">"Tichý"</string>
     <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">"Autonačítání za roamingu"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index cf9629b..5539932 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -172,17 +172,10 @@
     <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">"Underretninger"</string>
-    <string name="pref_summary_notification_enabled" msgid="619729096820999905">"Vis underretninger vedr. beskeder på statusbjælken"</string>
     <string name="pref_title_notification_vibrateWhen" msgid="4251208067092761057">"Vibration"</string>
-    <string name="pref_summary_notification_vibrateWhen" msgid="669655090822561447">"Vibration ved meddelelse"</string>
-    <string name="pref_title_notification_ringtone" msgid="5467265237106229952">"Vælg ringetone"</string>
+    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Lyd"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Angiv det antal beskeder, der skal gemmes"</string>
-  <string-array name="prefEntries_vibrateWhen">
-    <item msgid="2520871831815631409">"Altid"</item>
-    <item msgid="6069709696037750627">"Kun ved lydløs"</item>
-    <item msgid="7486145357487111435">"Aldrig"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="6419655771690242118">"Vibration"</string>
+    <string name="silent_ringtone" msgid="7981237991326592780">"Lydløs"</string>
     <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. under roaming"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index a9af102..5468eb5 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -172,17 +172,10 @@
     <string name="pref_title_sms_delete" msgid="6890538316799296878">"Höchstzahl an SMS"</string>
     <string name="pref_title_mms_delete" msgid="7265878070847351664">"Höchstzahl an MMS"</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_vibrateWhen" msgid="4251208067092761057">"Vibration"</string>
-    <string name="pref_summary_notification_vibrateWhen" msgid="669655090822561447">"Bei Benachrichtigung vibrieren"</string>
-    <string name="pref_title_notification_ringtone" msgid="5467265237106229952">"Klingelton auswählen"</string>
+    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Töne"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Anzahl der zu speichernden Nachrichten festlegen"</string>
-  <string-array name="prefEntries_vibrateWhen">
-    <item msgid="2520871831815631409">"Immer"</item>
-    <item msgid="6069709696037750627">"Nur im Lautlos-Modus"</item>
-    <item msgid="7486145357487111435">"Nie"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="6419655771690242118">"Vibration"</string>
+    <string name="silent_ringtone" msgid="7981237991326592780">"Lautlos"</string>
     <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 f271bf9..cb1b469 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -172,17 +172,10 @@
     <string name="pref_title_sms_delete" msgid="6890538316799296878">"Όριο μηνύματος κειμένου"</string>
     <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_vibrateWhen" msgid="4251208067092761057">"Δόνηση"</string>
-    <string name="pref_summary_notification_vibrateWhen" msgid="669655090822561447">"Δόνηση κατά την ειδοποίηση"</string>
-    <string name="pref_title_notification_ringtone" msgid="5467265237106229952">"Επιλέξτε ήχο κλήσης"</string>
+    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Ήχος"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Ορισμός αριθμού μηνυμάτων για αποθήκευση"</string>
-  <string-array name="prefEntries_vibrateWhen">
-    <item msgid="2520871831815631409">"Πάντα"</item>
-    <item msgid="6069709696037750627">"Μόνο στο αθόρυβο"</item>
-    <item msgid="7486145357487111435">"Ποτέ"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="6419655771690242118">"Δόνηση"</string>
+    <string name="silent_ringtone" msgid="7981237991326592780">"Σίγαση"</string>
     <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-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index c80a222..b71aa4c 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -172,17 +172,10 @@
     <string name="pref_title_sms_delete" msgid="6890538316799296878">"Text-message limit"</string>
     <string name="pref_title_mms_delete" msgid="7265878070847351664">"Multimedia message limit"</string>
     <string name="pref_title_notification_enabled" msgid="9118792213953729414">"Notifications"</string>
-    <string name="pref_summary_notification_enabled" msgid="619729096820999905">"Display message notifications in status bar"</string>
     <string name="pref_title_notification_vibrateWhen" msgid="4251208067092761057">"Vibrate"</string>
-    <string name="pref_summary_notification_vibrateWhen" msgid="669655090822561447">"Also vibrate when notified"</string>
-    <string name="pref_title_notification_ringtone" msgid="5467265237106229952">"Choose ringtone"</string>
+    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Sound"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Set number of messages to save"</string>
-  <string-array name="prefEntries_vibrateWhen">
-    <item msgid="2520871831815631409">"Always"</item>
-    <item msgid="6069709696037750627">"Only when silent"</item>
-    <item msgid="7486145357487111435">"Never"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="6419655771690242118">"Vibrate"</string>
+    <string name="silent_ringtone" msgid="7981237991326592780">"Silent"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Auto-retrieve"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Automatically retrieve messages"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Roaming auto-retrieve"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 1f9c4a4..0f9700b 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -172,17 +172,10 @@
     <string name="pref_title_sms_delete" msgid="6890538316799296878">"Límite de mensajes de texto"</string>
     <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">"Mostrar notificaciones de mensaje en la barra de estado"</string>
     <string name="pref_title_notification_vibrateWhen" msgid="4251208067092761057">"Vibrar"</string>
-    <string name="pref_summary_notification_vibrateWhen" msgid="669655090822561447">"Vibrar cuando se reciba una notificación"</string>
-    <string name="pref_title_notification_ringtone" msgid="5467265237106229952">"Elegir un tono"</string>
+    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Sonido"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Establecer el número de mensajes que se deben guardar"</string>
-  <string-array name="prefEntries_vibrateWhen">
-    <item msgid="2520871831815631409">"Siempre"</item>
-    <item msgid="6069709696037750627">"Sólo cuando esté en silencio"</item>
-    <item msgid="7486145357487111435">"Nunca"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="6419655771690242118">"Vibrar"</string>
+    <string name="silent_ringtone" msgid="7981237991326592780">"Silencioso"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Recuperación 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">"Recuperación automática en roaming"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index fbe465a..12aa922 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -172,17 +172,10 @@
     <string name="pref_title_sms_delete" msgid="6890538316799296878">"Límite de mensajes de texto"</string>
     <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_vibrateWhen" msgid="4251208067092761057">"Vibración"</string>
-    <string name="pref_summary_notification_vibrateWhen" msgid="669655090822561447">"Vibrar también al notificar"</string>
-    <string name="pref_title_notification_ringtone" msgid="5467265237106229952">"Seleccionar tono"</string>
+    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Sonido"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Elige el número de mensajes que quieres guardar"</string>
-  <string-array name="prefEntries_vibrateWhen">
-    <item msgid="2520871831815631409">"Siempre"</item>
-    <item msgid="6069709696037750627">"Solo en modo silencio"</item>
-    <item msgid="7486145357487111435">"Nunca"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="6419655771690242118">"Vibración"</string>
+    <string name="silent_ringtone" msgid="7981237991326592780">"Silencio"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Recuperar automáticamente"</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">"En itinerancia"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 05b12e1..5eea627 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -172,17 +172,10 @@
     <string name="pref_title_sms_delete" msgid="6890538316799296878">"Tekstsõnumi piirang"</string>
     <string name="pref_title_mms_delete" msgid="7265878070847351664">"Multimeediumsõnumi limiit"</string>
     <string name="pref_title_notification_enabled" msgid="9118792213953729414">"Teadistused"</string>
-    <string name="pref_summary_notification_enabled" msgid="619729096820999905">"Kuva sõnumiteatisi olekuribal."</string>
     <string name="pref_title_notification_vibrateWhen" msgid="4251208067092761057">"Vibreering"</string>
-    <string name="pref_summary_notification_vibrateWhen" msgid="669655090822561447">"Vibreeri ka teavitamise ajal"</string>
-    <string name="pref_title_notification_ringtone" msgid="5467265237106229952">"Helina valimine"</string>
+    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Heli"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Määrake sõnumite arv salvestamiseks"</string>
-  <string-array name="prefEntries_vibrateWhen">
-    <item msgid="2520871831815631409">"Alati"</item>
-    <item msgid="6069709696037750627">"Ainult hääletus režiimis"</item>
-    <item msgid="7486145357487111435">"Mitte kunagi"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="6419655771690242118">"Vibreering"</string>
+    <string name="silent_ringtone" msgid="7981237991326592780">"Hääletu"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Võta automaatselt vastu"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Võta sõnumid automaatselt vastu"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Automaatne vastuvõtmine rändlusel"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 0d05b1c..895d0fd 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -172,17 +172,10 @@
     <string name="pref_title_sms_delete" msgid="6890538316799296878">"محدودیت پیام متنی"</string>
     <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_vibrateWhen" msgid="4251208067092761057">"لرزش"</string>
-    <string name="pref_summary_notification_vibrateWhen" msgid="669655090822561447">"همچنین لرزش هنگام اعلان"</string>
-    <string name="pref_title_notification_ringtone" msgid="5467265237106229952">"انتخاب آهنگ زنگ"</string>
+    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"صدا"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"تنظیم تعداد پیام‌ها برای ذخیره"</string>
-  <string-array name="prefEntries_vibrateWhen">
-    <item msgid="2520871831815631409">"همیشه"</item>
-    <item msgid="6069709696037750627">"فقط هنگام ساکت بودن"</item>
-    <item msgid="7486145357487111435">"هرگز"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="6419655771690242118">"لرزش"</string>
+    <string name="silent_ringtone" msgid="7981237991326592780">"بیصدا"</string>
     <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-fi/strings.xml b/res/values-fi/strings.xml
index 68dfdaf..594cc52 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -172,17 +172,10 @@
     <string name="pref_title_sms_delete" msgid="6890538316799296878">"Tekstiviestirajoitus"</string>
     <string name="pref_title_mms_delete" msgid="7265878070847351664">"Multimediaviestirajoitus"</string>
     <string name="pref_title_notification_enabled" msgid="9118792213953729414">"Ilmoitukset"</string>
-    <string name="pref_summary_notification_enabled" msgid="619729096820999905">"Näytä viesti-ilmoitukset tilapalkissa"</string>
     <string name="pref_title_notification_vibrateWhen" msgid="4251208067092761057">"Värinä"</string>
-    <string name="pref_summary_notification_vibrateWhen" msgid="669655090822561447">"Käytä värinää ilmoituksien yhteydessä"</string>
-    <string name="pref_title_notification_ringtone" msgid="5467265237106229952">"Valitse soittoääni"</string>
+    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Ääni"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Aseta tallennettavien viestien lukumäärä"</string>
-  <string-array name="prefEntries_vibrateWhen">
-    <item msgid="2520871831815631409">"Aina"</item>
-    <item msgid="6069709696037750627">"Vain puhelimen ollessa äänetön"</item>
-    <item msgid="7486145357487111435">"Ei koskaan"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="6419655771690242118">"Värinä"</string>
+    <string name="silent_ringtone" msgid="7981237991326592780">"Äänetön"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Automaattilataus"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Lataa viestit automaattisesti"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Automaattilataus roaming-tilassa"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index e569ff3..ce02238 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -172,17 +172,10 @@
     <string name="pref_title_sms_delete" msgid="6890538316799296878">"Limite pour les SMS"</string>
     <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_vibrateWhen" msgid="4251208067092761057">"Vibreur"</string>
-    <string name="pref_summary_notification_vibrateWhen" msgid="669655090822561447">"Vibrer également à la réception d\'une notification"</string>
-    <string name="pref_title_notification_ringtone" msgid="5467265237106229952">"Sélectionner une sonnerie"</string>
+    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Sonnerie"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Définir le nombre de messages à enregistrer"</string>
-  <string-array name="prefEntries_vibrateWhen">
-    <item msgid="2520871831815631409">"Toujours"</item>
-    <item msgid="6069709696037750627">"En mode silencieux"</item>
-    <item msgid="7486145357487111435">"Jamais"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="6419655771690242118">"Vibreur"</string>
+    <string name="silent_ringtone" msgid="7981237991326592780">"Mode silencieux"</string>
     <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-hi/strings.xml b/res/values-hi/strings.xml
index 93eea41..fe5810b 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -172,17 +172,10 @@
     <string name="pref_title_sms_delete" msgid="6890538316799296878">"पाठ संदेश सीमा"</string>
     <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_vibrateWhen" msgid="4251208067092761057">"कंपन"</string>
-    <string name="pref_summary_notification_vibrateWhen" msgid="669655090822561447">"सूचित किए जाने पर भी कंपन करें"</string>
-    <string name="pref_title_notification_ringtone" msgid="5467265237106229952">"रिंगटोन चुनें"</string>
+    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"ध्वनि"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"सहेजने के लिए संदेशों की संख्या सेट करें"</string>
-  <string-array name="prefEntries_vibrateWhen">
-    <item msgid="2520871831815631409">"हमेशा"</item>
-    <item msgid="6069709696037750627">"केवल मौन होने पर"</item>
-    <item msgid="7486145357487111435">"कभी नहीं"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="6419655771690242118">"कंपन"</string>
+    <string name="silent_ringtone" msgid="7981237991326592780">"मौन"</string>
     <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-hr/strings.xml b/res/values-hr/strings.xml
index 698448e..a086934 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -172,17 +172,10 @@
     <string name="pref_title_sms_delete" msgid="6890538316799296878">"Ograničenja za tekstualne poruke"</string>
     <string name="pref_title_mms_delete" msgid="7265878070847351664">"Ograničenje za multimedijske poruke"</string>
     <string name="pref_title_notification_enabled" msgid="9118792213953729414">"Obavijesti"</string>
-    <string name="pref_summary_notification_enabled" msgid="619729096820999905">"Prikaz obavijesti o porukama u traci statusa"</string>
     <string name="pref_title_notification_vibrateWhen" msgid="4251208067092761057">"Vibracija"</string>
-    <string name="pref_summary_notification_vibrateWhen" msgid="669655090822561447">"Po obavijesti također vibriraj"</string>
-    <string name="pref_title_notification_ringtone" msgid="5467265237106229952">"Odaberi melodiju zvona"</string>
+    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Zvuk"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Postavi broj poruka za spremanje"</string>
-  <string-array name="prefEntries_vibrateWhen">
-    <item msgid="2520871831815631409">"Uvijek"</item>
-    <item msgid="6069709696037750627">"Samo ako je bešumno"</item>
-    <item msgid="7486145357487111435">"Nikad"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="6419655771690242118">"Vibracija"</string>
+    <string name="silent_ringtone" msgid="7981237991326592780">"Bešumno"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Automatski dohvat"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Automatski dohvaćaj poruke"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Automatski dohvat u roamingu"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index f3f16ff..afbdd6a 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -172,17 +172,10 @@
     <string name="pref_title_sms_delete" msgid="6890538316799296878">"Szöveges üzenetek korlátja"</string>
     <string name="pref_title_mms_delete" msgid="7265878070847351664">"Multimédiás üzenetek korlátja"</string>
     <string name="pref_title_notification_enabled" msgid="9118792213953729414">"Értesítések"</string>
-    <string name="pref_summary_notification_enabled" msgid="619729096820999905">"Üzenetekkel kapcsolatos értesítések megjelenítése az állapotsoron"</string>
     <string name="pref_title_notification_vibrateWhen" msgid="4251208067092761057">"Rezgés"</string>
-    <string name="pref_summary_notification_vibrateWhen" msgid="669655090822561447">"Rezgés értesítések esetén is"</string>
-    <string name="pref_title_notification_ringtone" msgid="5467265237106229952">"Válasszon csengőhangot"</string>
+    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Hang"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"A menteni kívánt üzenetek számának beállítása"</string>
-  <string-array name="prefEntries_vibrateWhen">
-    <item msgid="2520871831815631409">"Mindig"</item>
-    <item msgid="6069709696037750627">"Csak néma üzemmódban"</item>
-    <item msgid="7486145357487111435">"Soha"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="6419655771690242118">"Rezgés"</string>
+    <string name="silent_ringtone" msgid="7981237991326592780">"Néma"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Automatikus letöltés"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Üzenetek automatikus letöltése"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Automatikus letöltés barangolás során"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index f51278b..67b8486 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -172,17 +172,10 @@
     <string name="pref_title_sms_delete" msgid="6890538316799296878">"Batasan pesan teks"</string>
     <string name="pref_title_mms_delete" msgid="7265878070847351664">"Batasan pesan multimedia"</string>
     <string name="pref_title_notification_enabled" msgid="9118792213953729414">"Pemberitahuan"</string>
-    <string name="pref_summary_notification_enabled" msgid="619729096820999905">"Tampilkan pemberitahuan pesan pada bilah status"</string>
     <string name="pref_title_notification_vibrateWhen" msgid="4251208067092761057">"Getar"</string>
-    <string name="pref_summary_notification_vibrateWhen" msgid="669655090822561447">"Juga bergetar ketika diberi tahu"</string>
-    <string name="pref_title_notification_ringtone" msgid="5467265237106229952">"Pilih nada dering"</string>
+    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Suara"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Setel jumlah pesan yang akan disimpan"</string>
-  <string-array name="prefEntries_vibrateWhen">
-    <item msgid="2520871831815631409">"Selalu"</item>
-    <item msgid="6069709696037750627">"Hanya saat senyap"</item>
-    <item msgid="7486145357487111435">"Tidak pernah"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="6419655771690242118">"Getar"</string>
+    <string name="silent_ringtone" msgid="7981237991326592780">"Senyap"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Pungut otomatis"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Pungut pesan secara otomatis"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Pungut otomatis roaming"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 730ef48..e9011b6 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -172,17 +172,10 @@
     <string name="pref_title_sms_delete" msgid="6890538316799296878">"Limite SMS"</string>
     <string name="pref_title_mms_delete" msgid="7265878070847351664">"Limite MMS"</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_vibrateWhen" msgid="4251208067092761057">"Vibrazione"</string>
-    <string name="pref_summary_notification_vibrateWhen" msgid="669655090822561447">"Attiva anche vibrazione alla notifica"</string>
-    <string name="pref_title_notification_ringtone" msgid="5467265237106229952">"Scegli suoneria"</string>
+    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Suono"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Imposta numero di messaggi da salvare"</string>
-  <string-array name="prefEntries_vibrateWhen">
-    <item msgid="2520871831815631409">"Sempre"</item>
-    <item msgid="6069709696037750627">"Solo in modalità silenziosa"</item>
-    <item msgid="7486145357487111435">"Mai"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="6419655771690242118">"Vibrazione"</string>
+    <string name="silent_ringtone" msgid="7981237991326592780">"Silenzioso"</string>
     <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-iw/strings.xml b/res/values-iw/strings.xml
index 579e843..67f9061 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -60,9 +60,9 @@
     <string name="done" msgid="7479926268660505871">"סיום"</string>
     <string name="move_up" msgid="7307578107431739359">"העבר למעלה"</string>
     <string name="move_down" msgid="6356509518429479053">"העבר למטה"</string>
-    <string name="remove_slide" msgid="2225604354024914900">"הסר שקופית"</string>
-    <string name="add_slide" msgid="9140721399423564187">"הוסף שקופית"</string>
-    <string name="add_slide_hint" msgid="7351356961076244584">"גע כדי ליצור שקופית חדשה."</string>
+    <string name="remove_slide" msgid="2225604354024914900">"הסר שקף"</string>
+    <string name="add_slide" msgid="9140721399423564187">"הוסף שקף"</string>
+    <string name="add_slide_hint" msgid="7351356961076244584">"גע כדי ליצור שקף חדש."</string>
     <string name="discard_slideshow" msgid="5054239124146413609">"מחק מצגת"</string>
     <string name="slide_show_part" msgid="5077675385448696846">"חלק <xliff:g id="PART">%1$s</xliff:g>/<xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="remove_text" msgid="2164068850029476539">"הסר טקסט"</string>
@@ -120,7 +120,7 @@
     <string name="preview_slideshow" msgid="6824095909448728427">"תצוגה מקדימה"</string>
     <string name="replace_image" msgid="3171240952601443619">"החלף תמונה"</string>
     <string name="duration_sec" msgid="6617032324007824096">"תדירות (<xliff:g id="DURATION">%s</xliff:g> שניות)"</string>
-    <string name="duration_selector_title" msgid="5981097971537625852">"משך זמן של שקופית "</string>
+    <string name="duration_selector_title" msgid="5981097971537625852">"משך זמן של שקף "</string>
     <string name="layout_selector_title" msgid="7344600117972450771">"פריסת מצגת "</string>
     <string name="layout_top" msgid="6811021650398972346">"פריסה (למעלה)"</string>
     <string name="layout_bottom" msgid="5822765871095491843">"פריסה (בתחתית)"</string>
@@ -172,17 +172,10 @@
     <string name="pref_title_sms_delete" msgid="6890538316799296878">"מגבלה של הודעת טקסט"</string>
     <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_vibrateWhen" msgid="4251208067092761057">"רטט"</string>
-    <string name="pref_summary_notification_vibrateWhen" msgid="669655090822561447">"רטט גם בעת קבלת התראה"</string>
-    <string name="pref_title_notification_ringtone" msgid="5467265237106229952">"בחר רינגטון"</string>
+    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"צליל"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"הגדר מספר הודעות לשמירה"</string>
-  <string-array name="prefEntries_vibrateWhen">
-    <item msgid="2520871831815631409">"תמיד"</item>
-    <item msgid="6069709696037750627">"במצב שקט בלבד"</item>
-    <item msgid="7486145357487111435">"אף פעם"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="6419655771690242118">"רטט"</string>
+    <string name="silent_ringtone" msgid="7981237991326592780">"שקט"</string>
     <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>
@@ -291,7 +284,7 @@
     <string name="menu_insert_smiley" msgid="4964504393061025071">"הוסף סמיילי"</string>
     <string name="menu_group_participants" msgid="4288356090262299071">"משתתפי קבוצה"</string>
     <string name="select_link_title" msgid="3371818607625768447">"בחר פעולה"</string>
-    <string name="slide_number" msgid="1923958526266726635">"שקופית <xliff:g id="NUMBER">%s</xliff:g>"</string>
+    <string name="slide_number" msgid="1923958526266726635">"שקף <xliff:g id="NUMBER">%s</xliff:g>"</string>
   <plurals name="slide_duration">
     <item quantity="one" msgid="1654101988340583935">"שנייה <xliff:g id="NUMBER">%s</xliff:g>"</item>
     <item quantity="few" msgid="7887190171856293871">"<xliff:g id="NUMBER">%s</xliff:g> שניות"</item>
@@ -302,7 +295,7 @@
     <string name="change_duration_activity" msgid="7048606979485031693">"שנה את משך הזמן"</string>
     <string name="edit_slideshow_activity" msgid="8751493388760050529">"ערוך מצגת"</string>
     <string name="recipient_list_activity" msgid="1254938236543727019">"משתתפי קבוצה"</string>
-    <string name="edit_slide_activity" msgid="8752829671778696983">"ערוך שקופית"</string>
+    <string name="edit_slide_activity" msgid="8752829671778696983">"ערוך שקף"</string>
     <string name="slideshow_activity" msgid="5658249461317434432">"מצגת"</string>
     <string name="class_0_message_activity" msgid="6631339964159861048">"הודעה ברמה 0"</string>
     <string name="search_label" msgid="6042598929386174964">"סמס"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index d07ccf6..776df6f 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -172,17 +172,10 @@
     <string name="pref_title_sms_delete" msgid="6890538316799296878">"テキストメッセージの制限件数"</string>
     <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_vibrateWhen" msgid="4251208067092761057">"バイブレーション"</string>
-    <string name="pref_summary_notification_vibrateWhen" msgid="669655090822561447">"メッセージ受信の通知: バイブレーションON"</string>
-    <string name="pref_title_notification_ringtone" msgid="5467265237106229952">"着信音を選択"</string>
+    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"着信音"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"保存するメッセージ件数を設定"</string>
-  <string-array name="prefEntries_vibrateWhen">
-    <item msgid="2520871831815631409">"常に使用"</item>
-    <item msgid="6069709696037750627">"マナーモード時のみ"</item>
-    <item msgid="7486145357487111435">"使用しない"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="6419655771690242118">"バイブレーション"</string>
+    <string name="silent_ringtone" msgid="7981237991326592780">"マナーモード"</string>
     <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 ecd4c26..fbb40b5 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -26,7 +26,7 @@
     <string name="menu_send_email" msgid="671366308915241664">"<xliff:g id="NAME">%s</xliff:g>에게 이메일 보내기"</string>
     <string name="menu_compose_new" msgid="3763437973691046238">"새 메시지"</string>
     <string name="menu_preferences" msgid="4693148116114749414">"설정"</string>
-    <string name="menu_add_address_to_contacts" msgid="4491980950419914944">"피플에 <xliff:g id="CONTACTEMAILORNUMBER">%s</xliff:g> 추가"</string>
+    <string name="menu_add_address_to_contacts" msgid="4491980950419914944">"주소록에 <xliff:g id="CONTACTEMAILORNUMBER">%s</xliff:g> 추가"</string>
     <string name="menu_call" msgid="5877123227307074690">"전화걸기"</string>
     <string name="menu_search" msgid="2289469305728821360">"검색"</string>
     <string name="menu_delete_all" msgid="808729454898114735">"전체 대화목록 삭제"</string>
@@ -142,7 +142,7 @@
     <item msgid="7786079681602275449">"기타"</item>
   </string-array>
     <string name="menu_view_contact" msgid="1414670584423909451">"연락처 보기"</string>
-    <string name="menu_add_to_contacts" msgid="1258127580972228970">"피플에 추가"</string>
+    <string name="menu_add_to_contacts" msgid="1258127580972228970">"주소록에 추가"</string>
     <string name="hidden_sender_address" msgid="2776075636669924968">"숨은 발신자 주소"</string>
     <string name="yes" msgid="3246158147503160811">"확인"</string>
     <string name="no" msgid="4289742508556913860">"취소"</string>
@@ -172,17 +172,10 @@
     <string name="pref_title_sms_delete" msgid="6890538316799296878">"문자 메시지 한도"</string>
     <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_vibrateWhen" msgid="4251208067092761057">"진동"</string>
-    <string name="pref_summary_notification_vibrateWhen" msgid="669655090822561447">"알림 시 진동도 함께 울림"</string>
-    <string name="pref_title_notification_ringtone" msgid="5467265237106229952">"벨소리 선택"</string>
+    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"소리"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"저장할 메시지 개수 설정"</string>
-  <string-array name="prefEntries_vibrateWhen">
-    <item msgid="2520871831815631409">"항상"</item>
-    <item msgid="6069709696037750627">"무음 시에만"</item>
-    <item msgid="7486145357487111435">"안함"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="6419655771690242118">"진동"</string>
+    <string name="silent_ringtone" msgid="7981237991326592780">"무음"</string>
     <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-lt/strings.xml b/res/values-lt/strings.xml
index e9e134e..147608a 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -172,17 +172,10 @@
     <string name="pref_title_sms_delete" msgid="6890538316799296878">"Teksto pranešimo apribojimas"</string>
     <string name="pref_title_mms_delete" msgid="7265878070847351664">"Daugialypės terpės pranešimo apribojimas"</string>
     <string name="pref_title_notification_enabled" msgid="9118792213953729414">"Įspėjimai"</string>
-    <string name="pref_summary_notification_enabled" msgid="619729096820999905">"Pateikti įspėjimus apie pranešimus būsenos juostoje"</string>
     <string name="pref_title_notification_vibrateWhen" msgid="4251208067092761057">"Vibruoti"</string>
-    <string name="pref_summary_notification_vibrateWhen" msgid="669655090822561447">"Taip pat vibruoti, kai įspėjama"</string>
-    <string name="pref_title_notification_ringtone" msgid="5467265237106229952">"Pasirinkti skambėjimo toną"</string>
+    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Garsas"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Nustatyti išsaugomų pranešimų skaičių"</string>
-  <string-array name="prefEntries_vibrateWhen">
-    <item msgid="2520871831815631409">"Visada"</item>
-    <item msgid="6069709696037750627">"Tik kai veikia tyliai"</item>
-    <item msgid="7486145357487111435">"Niekada"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="6419655771690242118">"Vibruoti"</string>
+    <string name="silent_ringtone" msgid="7981237991326592780">"Begarsis"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Automatiškai nuskaityti"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Automatiškai nuskaityti pranešimus"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Automatinis tarptinklinio ryšio nuskaitymas"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 19921ac..f53224d 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -172,17 +172,10 @@
     <string name="pref_title_sms_delete" msgid="6890538316799296878">"Īsziņu ierobežojums"</string>
     <string name="pref_title_mms_delete" msgid="7265878070847351664">"Multiziņu ierobežojums"</string>
     <string name="pref_title_notification_enabled" msgid="9118792213953729414">"Paziņojumi"</string>
-    <string name="pref_summary_notification_enabled" msgid="619729096820999905">"Attēlot statusa joslā paziņojumu par ziņojumu"</string>
     <string name="pref_title_notification_vibrateWhen" msgid="4251208067092761057">"Vibrēt"</string>
-    <string name="pref_summary_notification_vibrateWhen" msgid="669655090822561447">"Vibrēt, arī saņemot paziņojumu"</string>
-    <string name="pref_title_notification_ringtone" msgid="5467265237106229952">"Zvana signāla izvēle"</string>
+    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Signāls"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Iestatīt saglabājamo ziņojumu skaitu"</string>
-  <string-array name="prefEntries_vibrateWhen">
-    <item msgid="2520871831815631409">"Vienmēr"</item>
-    <item msgid="6069709696037750627">"Tikai klusuma režīmā"</item>
-    <item msgid="7486145357487111435">"Nekad"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="6419655771690242118">"Vibrēt"</string>
+    <string name="silent_ringtone" msgid="7981237991326592780">"Klusums"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Automātiski izgūt"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Automātiski izgūt ziņojumus"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Viesabonēšanas automātiska izgūšana"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index cbe9092..0ec3916 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -172,17 +172,10 @@
     <string name="pref_title_sms_delete" msgid="6890538316799296878">"Had mesej teks"</string>
     <string name="pref_title_mms_delete" msgid="7265878070847351664">"Had mesej multimedia"</string>
     <string name="pref_title_notification_enabled" msgid="9118792213953729414">"Pemberitahuan"</string>
-    <string name="pref_summary_notification_enabled" msgid="619729096820999905">"Memaparkan mesej pemberitahuan dalam bar status"</string>
     <string name="pref_title_notification_vibrateWhen" msgid="4251208067092761057">"Getar"</string>
-    <string name="pref_summary_notification_vibrateWhen" msgid="669655090822561447">"Juga bergetar apabila diberitahu"</string>
-    <string name="pref_title_notification_ringtone" msgid="5467265237106229952">"Pilih nada dering"</string>
+    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Bunyi"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Tetapkan bilangan mesej untuk disimpan"</string>
-  <string-array name="prefEntries_vibrateWhen">
-    <item msgid="2520871831815631409">"Sentiasa"</item>
-    <item msgid="6069709696037750627">"Apabila senyap sahaja"</item>
-    <item msgid="7486145357487111435">"Jangan sekali-kali"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="6419655771690242118">"Getar"</string>
+    <string name="silent_ringtone" msgid="7981237991326592780">"Senyap"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Auto dapat kembali"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Dapatkan semula mesej secara automatik"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Auto dapat kembali perayauan"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index dab187f..3dfe479 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -172,17 +172,10 @@
     <string name="pref_title_sms_delete" msgid="6890538316799296878">"SMS-meldingsgrense"</string>
     <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_vibrateWhen" msgid="4251208067092761057">"Vibrering"</string>
-    <string name="pref_summary_notification_vibrateWhen" msgid="669655090822561447">"Vibrer også ved varslinger"</string>
-    <string name="pref_title_notification_ringtone" msgid="5467265237106229952">"Velg ringetone"</string>
+    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Lyd"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Angi antall meldinger som skal lagres"</string>
-  <string-array name="prefEntries_vibrateWhen">
-    <item msgid="2520871831815631409">"Alltid"</item>
-    <item msgid="6069709696037750627">"Kun ved stille modus"</item>
-    <item msgid="7486145357487111435">"Aldri"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="6419655771690242118">"Vibrering"</string>
+    <string name="silent_ringtone" msgid="7981237991326592780">"Stille"</string>
     <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">"Automatisk henting ved bruk i utlandet"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 2f49f8b..c9cb43f 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -172,17 +172,10 @@
     <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_vibrateWhen" msgid="4251208067092761057">"Trillen"</string>
-    <string name="pref_summary_notification_vibrateWhen" msgid="669655090822561447">"Ook trillen bij melding"</string>
-    <string name="pref_title_notification_ringtone" msgid="5467265237106229952">"Beltoon kiezen"</string>
+    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Geluid"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Aantal berichten instellen voor opslaan"</string>
-  <string-array name="prefEntries_vibrateWhen">
-    <item msgid="2520871831815631409">"Altijd"</item>
-    <item msgid="6069709696037750627">"Alleen indien stil"</item>
-    <item msgid="7486145357487111435">"Nooit"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="6419655771690242118">"Trillen"</string>
+    <string name="silent_ringtone" msgid="7981237991326592780">"Stil"</string>
     <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">"Ophalen tijdens roaming"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 2560463..88772bb 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -172,17 +172,10 @@
     <string name="pref_title_sms_delete" msgid="6890538316799296878">"Limit wiadomości tekstowych"</string>
     <string name="pref_title_mms_delete" msgid="7265878070847351664">"Limit wiadomości MMS"</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_vibrateWhen" msgid="4251208067092761057">"Wibracje"</string>
-    <string name="pref_summary_notification_vibrateWhen" msgid="669655090822561447">"Wibracje również przy powiadomieniu"</string>
-    <string name="pref_title_notification_ringtone" msgid="5467265237106229952">"Wybierz dzwonek"</string>
+    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Dźwięk"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Ustaw liczbę zapisywanych wiadomości"</string>
-  <string-array name="prefEntries_vibrateWhen">
-    <item msgid="2520871831815631409">"Zawsze"</item>
-    <item msgid="6069709696037750627">"Tylko po wyciszeniu"</item>
-    <item msgid="7486145357487111435">"Nigdy"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="6419655771690242118">"Wibracje"</string>
+    <string name="silent_ringtone" msgid="7981237991326592780">"Wyciszony"</string>
     <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">"W roamingu"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index b41ea4f..0f9dca9 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -172,17 +172,10 @@
     <string name="pref_title_sms_delete" msgid="6890538316799296878">"Limite de mensagens de texto"</string>
     <string name="pref_title_mms_delete" msgid="7265878070847351664">"Limite mens. 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_vibrateWhen" msgid="4251208067092761057">"Vibrar"</string>
-    <string name="pref_summary_notification_vibrateWhen" msgid="669655090822561447">"Vibrar também quando notificado"</string>
-    <string name="pref_title_notification_ringtone" msgid="5467265237106229952">"Escolher toque"</string>
+    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Som"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Definir o número de mensagens a guardar"</string>
-  <string-array name="prefEntries_vibrateWhen">
-    <item msgid="2520871831815631409">"Sempre"</item>
-    <item msgid="6069709696037750627">"Apenas quando está em silêncio"</item>
-    <item msgid="7486145357487111435">"Nunca"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="6419655771690242118">"Vibrar"</string>
+    <string name="silent_ringtone" msgid="7981237991326592780">"Silencioso"</string>
     <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">"Recuper. em roaming"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 1ee10a8..28c8242 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -172,17 +172,10 @@
     <string name="pref_title_sms_delete" msgid="6890538316799296878">"Limite de mensagens de texto"</string>
     <string name="pref_title_mms_delete" msgid="7265878070847351664">"Limite de mens. 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_vibrateWhen" msgid="4251208067092761057">"Vibrar"</string>
-    <string name="pref_summary_notification_vibrateWhen" msgid="669655090822561447">"Também vibra quando notificado"</string>
-    <string name="pref_title_notification_ringtone" msgid="5467265237106229952">"Escolher toque"</string>
+    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Som"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Definir número de mensagens a serem salvas"</string>
-  <string-array name="prefEntries_vibrateWhen">
-    <item msgid="2520871831815631409">"Sempre"</item>
-    <item msgid="6069709696037750627">"Apenas quando estiver no silencioso"</item>
-    <item msgid="7486145357487111435">"Nunca"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="6419655771690242118">"Vibrar"</string>
+    <string name="silent_ringtone" msgid="7981237991326592780">"Silencioso"</string>
     <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">"Recuper. em roaming"</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 03b52e3..b59ee8d 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -202,18 +202,12 @@
     <string name="pref_title_sms_delete" msgid="6890538316799296878">"Limita dad SMS"</string>
     <string name="pref_title_mms_delete" msgid="7265878070847351664">"Limita per ils MMS"</string>
     <string name="pref_title_notification_enabled" msgid="9118792213953729414">"Avis"</string>
-    <string name="pref_summary_notification_enabled" msgid="619729096820999905">"Mussar in avis en la trav da status en cas da l\'entrada da novs messadis"</string>
     <string name="pref_title_notification_vibrateWhen" msgid="4251208067092761057">"Vibrar"</string>
-    <string name="pref_summary_notification_vibrateWhen" msgid="669655090822561447">"Era vibrar cun ils avis"</string>
-    <!-- no translation found for pref_title_notification_ringtone (5467265237106229952) -->
+    <!-- no translation found for pref_title_notification_ringtone (8667533917574559659) -->
     <skip />
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Definir il dumber da messadis per memorisar"</string>
-  <string-array name="prefEntries_vibrateWhen">
-    <item msgid="2520871831815631409">"Adina"</item>
-    <item msgid="6069709696037750627">"Mo sche silenzius"</item>
-    <item msgid="7486145357487111435">"Mai"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="6419655771690242118">"Vibrar"</string>
+    <!-- no translation found for silent_ringtone (7981237991326592780) -->
+    <skip />
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Retschaiver automaticamain"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Retschaiver automaticamain ils messadis"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Retschaiver autom. cun roaming"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 11bf5b9..c4e8a81 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -172,17 +172,10 @@
     <string name="pref_title_sms_delete" msgid="6890538316799296878">"Limita mesajului text"</string>
     <string name="pref_title_mms_delete" msgid="7265878070847351664">"Limita pentru mesajele multimedia"</string>
     <string name="pref_title_notification_enabled" msgid="9118792213953729414">"Notificări"</string>
-    <string name="pref_summary_notification_enabled" msgid="619729096820999905">"Afişaţi notificări de mesaje în bara de stare"</string>
     <string name="pref_title_notification_vibrateWhen" msgid="4251208067092761057">"Vibrare"</string>
-    <string name="pref_summary_notification_vibrateWhen" msgid="669655090822561447">"Vibrare şi la notificări"</string>
-    <string name="pref_title_notification_ringtone" msgid="5467265237106229952">"Alegeţi un ton de sonerie"</string>
+    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Sunet"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Setaţi numărul de mesaje pentru salvare"</string>
-  <string-array name="prefEntries_vibrateWhen">
-    <item msgid="2520871831815631409">"Întotdeauna"</item>
-    <item msgid="6069709696037750627">"Numai când profilul este Silenţios"</item>
-    <item msgid="7486145357487111435">"Niciodată"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="6419655771690242118">"Vibrare"</string>
+    <string name="silent_ringtone" msgid="7981237991326592780">"Silențios"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Preluare automată"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Primiţi automat mesajele"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Preluare automată a mesajelor când este activat serviciul de roaming"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 0ab1164..f79f514 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -172,17 +172,10 @@
     <string name="pref_title_sms_delete" msgid="6890538316799296878">"Макс. количество SMS"</string>
     <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_vibrateWhen" msgid="4251208067092761057">"Вибросигнал"</string>
-    <string name="pref_summary_notification_vibrateWhen" msgid="669655090822561447">"Вибросигнал при получении уведомления"</string>
-    <string name="pref_title_notification_ringtone" msgid="5467265237106229952">"Выбрать рингтон"</string>
+    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Рингтон"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Установить макс. кол-во сообщений в цепочке для хранения"</string>
-  <string-array name="prefEntries_vibrateWhen">
-    <item msgid="2520871831815631409">"Всегда"</item>
-    <item msgid="6069709696037750627">"Только в режиме без звука"</item>
-    <item msgid="7486145357487111435">"Никогда"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="6419655771690242118">"Вибросигнал"</string>
+    <string name="silent_ringtone" msgid="7981237991326592780">"Без звука"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Автозагрузка"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Автоматически загружать MMS-сообщения"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Автозагрузка в роуминге"</string>
@@ -231,7 +224,7 @@
     <string name="sim_copy_to_phone_memory" product="tablet" msgid="3721000641648594602">"Копировать в память планшетного ПК"</string>
     <string name="sim_copy_to_phone_memory" product="default" msgid="5895767417844881971">"Копировать в память телефона"</string>
     <string name="sim_delete" msgid="610790510655316922">"Удалить"</string>
-    <string name="sim_manage_messages_title" msgid="3989147182100584333">"Текстовые сообщения на SIM-карте"</string>
+    <string name="sim_manage_messages_title" msgid="3989147182100584333">"SMS на SIM-карте"</string>
     <string name="sim_view" msgid="1997173541766393706">"Просмотр"</string>
     <string name="sim_empty" msgid="2356766833071636297">"На SIM-карте нет сообщений."</string>
     <string name="delivery_header_title" msgid="5361719578869045764">"Отчет"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index a25b577..14228bf 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -172,17 +172,10 @@
     <string name="pref_title_sms_delete" msgid="6890538316799296878">"Limit textových správ"</string>
     <string name="pref_title_mms_delete" msgid="7265878070847351664">"Limit multimediálnych správ"</string>
     <string name="pref_title_notification_enabled" msgid="9118792213953729414">"Upozornenia"</string>
-    <string name="pref_summary_notification_enabled" msgid="619729096820999905">"Zobraziť oznámenia o správe v stavovom riadku"</string>
     <string name="pref_title_notification_vibrateWhen" msgid="4251208067092761057">"Vibrovať"</string>
-    <string name="pref_summary_notification_vibrateWhen" msgid="669655090822561447">"Pri oznámení tiež vibrovať"</string>
-    <string name="pref_title_notification_ringtone" msgid="5467265237106229952">"Zvoliť tón zvonenia"</string>
+    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Zvuk"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Nastaviť počet ukladaných správ"</string>
-  <string-array name="prefEntries_vibrateWhen">
-    <item msgid="2520871831815631409">"Vždy"</item>
-    <item msgid="6069709696037750627">"Iba v tichom režime"</item>
-    <item msgid="7486145357487111435">"Nikdy"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="6419655771690242118">"Vibrovať"</string>
+    <string name="silent_ringtone" msgid="7981237991326592780">"Tichý"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Automatické načítanie"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Automaticky načítať správy"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Automatické načítanie pri roamingu"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 83ec7de..d99b9fa 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -172,17 +172,10 @@
     <string name="pref_title_sms_delete" msgid="6890538316799296878">"Omejitev besedilnega sporočila"</string>
     <string name="pref_title_mms_delete" msgid="7265878070847351664">"Omejitev večpredstavnega sporočila"</string>
     <string name="pref_title_notification_enabled" msgid="9118792213953729414">"Obvestila"</string>
-    <string name="pref_summary_notification_enabled" msgid="619729096820999905">"Prikaži obvestila o sporočilih v vrstici stanja"</string>
     <string name="pref_title_notification_vibrateWhen" msgid="4251208067092761057">"Vibriranje"</string>
-    <string name="pref_summary_notification_vibrateWhen" msgid="669655090822561447">"Vibriraj tudi pri obvestilu"</string>
-    <string name="pref_title_notification_ringtone" msgid="5467265237106229952">"Izberite melodijo zvonjenja"</string>
+    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Zvok"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Nastavi število sporočil za shranjevanje"</string>
-  <string-array name="prefEntries_vibrateWhen">
-    <item msgid="2520871831815631409">"Vedno"</item>
-    <item msgid="6069709696037750627">"Samo v tihem načinu"</item>
-    <item msgid="7486145357487111435">"Nikoli"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="6419655771690242118">"Vibriranje"</string>
+    <string name="silent_ringtone" msgid="7981237991326592780">"Tiho"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Samodejni prenos"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Samodejni prenos sporočil"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Samodejna pridobitev med gostovanjem"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 2f3721e..711ceab 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -172,17 +172,10 @@
     <string name="pref_title_sms_delete" msgid="6890538316799296878">"Ограничење за текстуалну поруку"</string>
     <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_vibrateWhen" msgid="4251208067092761057">"Вибрација"</string>
-    <string name="pref_summary_notification_vibrateWhen" msgid="669655090822561447">"Такође укључи вибрацију када добијем обавештење"</string>
-    <string name="pref_title_notification_ringtone" msgid="5467265237106229952">"Изабери мелодију звона"</string>
+    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Звук"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Подеси број порука за чување"</string>
-  <string-array name="prefEntries_vibrateWhen">
-    <item msgid="2520871831815631409">"Увек"</item>
-    <item msgid="6069709696037750627">"Само у нечујном режиму"</item>
-    <item msgid="7486145357487111435">"Никад"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="6419655771690242118">"Вибрација"</string>
+    <string name="silent_ringtone" msgid="7981237991326592780">"Нечујно"</string>
     <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 d31562d..e974e99 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -172,17 +172,10 @@
     <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">"Aviseringar"</string>
-    <string name="pref_summary_notification_enabled" msgid="619729096820999905">"Visa meddelandeaviseringar i statusfältet"</string>
     <string name="pref_title_notification_vibrateWhen" msgid="4251208067092761057">"Vibrera"</string>
-    <string name="pref_summary_notification_vibrateWhen" msgid="669655090822561447">"Vibrera även vid aviseringar"</string>
-    <string name="pref_title_notification_ringtone" msgid="5467265237106229952">"Välj ringsignal"</string>
+    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Ljud"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Ange hur många meddelanden som ska sparas"</string>
-  <string-array name="prefEntries_vibrateWhen">
-    <item msgid="2520871831815631409">"Alltid"</item>
-    <item msgid="6069709696037750627">"Bara vid tyst"</item>
-    <item msgid="7486145357487111435">"Aldrig"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="6419655771690242118">"Vibrera"</string>
+    <string name="silent_ringtone" msgid="7981237991326592780">"Tyst"</string>
     <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 roaming"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 6a2718f..e440db9 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -172,17 +172,10 @@
     <string name="pref_title_sms_delete" msgid="6890538316799296878">"Mpaka wa ujumbe wa maandishi"</string>
     <string name="pref_title_mms_delete" msgid="7265878070847351664">"Kikomo cha ujumbe wa media"</string>
     <string name="pref_title_notification_enabled" msgid="9118792213953729414">"Arifa"</string>
-    <string name="pref_summary_notification_enabled" msgid="619729096820999905">"Onyesha arifa za ujumbe kwenye mwambaa hali"</string>
     <string name="pref_title_notification_vibrateWhen" msgid="4251208067092761057">"Tetema"</string>
-    <string name="pref_summary_notification_vibrateWhen" msgid="669655090822561447">"Pia tikisa unapoarifiwa"</string>
-    <string name="pref_title_notification_ringtone" msgid="5467265237106229952">"Chagua mlio wa simu"</string>
+    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Sauti"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Weka nambari ya ujumbe wa kuhifadhi"</string>
-  <string-array name="prefEntries_vibrateWhen">
-    <item msgid="2520871831815631409">"Kila wakati"</item>
-    <item msgid="6069709696037750627">"Kukiwa kimya tu"</item>
-    <item msgid="7486145357487111435">"Katu"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="6419655771690242118">"Tetema"</string>
+    <string name="silent_ringtone" msgid="7981237991326592780">"Kimya"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Epua kiotomatiki"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Epua kiotomatiki ujumbe"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Kurejesha kiotomatiki urandaji"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 2cc3348..314c12e 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -172,17 +172,10 @@
     <string name="pref_title_sms_delete" msgid="6890538316799296878">"ข้อความตัวอักษรสูงสุด"</string>
     <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_vibrateWhen" msgid="4251208067092761057">"สั่น"</string>
-    <string name="pref_summary_notification_vibrateWhen" msgid="669655090822561447">"สั่นด้วยเมื่อมีการแจ้งเตือน"</string>
-    <string name="pref_title_notification_ringtone" msgid="5467265237106229952">"เลือกเสียงเรียกเข้า"</string>
+    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"เสียง"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"ตั้งค่าจำนวนข้อความที่จะบันทึก"</string>
-  <string-array name="prefEntries_vibrateWhen">
-    <item msgid="2520871831815631409">"ทุกครั้ง"</item>
-    <item msgid="6069709696037750627">"เฉพาะเมื่อปิดเสียง"</item>
-    <item msgid="7486145357487111435">"ไม่ต้องเลย"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="6419655771690242118">"สั่น"</string>
+    <string name="silent_ringtone" msgid="7981237991326592780">"ปิดเสียง"</string>
     <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-tl/strings.xml b/res/values-tl/strings.xml
index 70426f0..0d9dede 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -172,17 +172,10 @@
     <string name="pref_title_sms_delete" msgid="6890538316799296878">"Limitasyon ng text message"</string>
     <string name="pref_title_mms_delete" msgid="7265878070847351664">"Limitasyon ng multimedia na mensahe"</string>
     <string name="pref_title_notification_enabled" msgid="9118792213953729414">"Mga Notification"</string>
-    <string name="pref_summary_notification_enabled" msgid="619729096820999905">"Ipakita ang mga notification ng mensahe sa bar ng katayuan"</string>
     <string name="pref_title_notification_vibrateWhen" msgid="4251208067092761057">"I-vibrate"</string>
-    <string name="pref_summary_notification_vibrateWhen" msgid="669655090822561447">"Mag-vibrate din kapag na-notify"</string>
-    <string name="pref_title_notification_ringtone" msgid="5467265237106229952">"Pumili ng ringtone"</string>
+    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Tunog"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Itakda ang bilang ng mga mensaheng ise-save"</string>
-  <string-array name="prefEntries_vibrateWhen">
-    <item msgid="2520871831815631409">"Palagi"</item>
-    <item msgid="6069709696037750627">"Kapag tahimik lang"</item>
-    <item msgid="7486145357487111435">"Hindi kailanman"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="6419655771690242118">"I-vibrate"</string>
+    <string name="silent_ringtone" msgid="7981237991326592780">"Tahimik"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"I-auto-retrieve"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Awtomatikong bawiin ang mga mensahe"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Niro-roam ang auto-retrieve"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 214c409..3f95d99 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -172,17 +172,10 @@
     <string name="pref_title_sms_delete" msgid="6890538316799296878">"Kısa mesaj sınırı"</string>
     <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_vibrateWhen" msgid="4251208067092761057">"Titreşim"</string>
-    <string name="pref_summary_notification_vibrateWhen" msgid="669655090822561447">"Bildirildiğinde aynı zamanda titret"</string>
-    <string name="pref_title_notification_ringtone" msgid="5467265237106229952">"Zil sesi seç"</string>
+    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Ses"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Kaydedilecek iletilerin sayısını ayarla"</string>
-  <string-array name="prefEntries_vibrateWhen">
-    <item msgid="2520871831815631409">"Her zaman"</item>
-    <item msgid="6069709696037750627">"Yalnızca sessizken"</item>
-    <item msgid="7486145357487111435">"Hiçbir zaman"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="6419655771690242118">"Titreşim"</string>
+    <string name="silent_ringtone" msgid="7981237991326592780">"Sessiz"</string>
     <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-uk/strings.xml b/res/values-uk/strings.xml
index feeb234..c4687d6 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -172,17 +172,10 @@
     <string name="pref_title_sms_delete" msgid="6890538316799296878">"Ліміт текст. повідомл."</string>
     <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_vibrateWhen" msgid="4251208067092761057">"Вібросигнал"</string>
-    <string name="pref_summary_notification_vibrateWhen" msgid="669655090822561447">"Також вібр. при отрим. сповіщ."</string>
-    <string name="pref_title_notification_ringtone" msgid="5467265237106229952">"Вибрати сигнал дзвінка"</string>
+    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Звук"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Установ. к-сть повід. для зберіг."</string>
-  <string-array name="prefEntries_vibrateWhen">
-    <item msgid="2520871831815631409">"Завжди"</item>
-    <item msgid="6069709696037750627">"Лише в беззвуч. реж."</item>
-    <item msgid="7486145357487111435">"Ніколи"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="6419655771690242118">"Вібросигнал"</string>
+    <string name="silent_ringtone" msgid="7981237991326592780">"Без звуку"</string>
     <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-vi/strings.xml b/res/values-vi/strings.xml
index 212134e..b3e2057 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -172,17 +172,10 @@
     <string name="pref_title_sms_delete" msgid="6890538316799296878">"Giới hạn tin nhắn văn bản"</string>
     <string name="pref_title_mms_delete" msgid="7265878070847351664">"Giới hạn tin nhắn đa phương tiện"</string>
     <string name="pref_title_notification_enabled" msgid="9118792213953729414">"Thông báo"</string>
-    <string name="pref_summary_notification_enabled" msgid="619729096820999905">"Hiển thị thông báo tin nhắn trên thanh trạng thái"</string>
     <string name="pref_title_notification_vibrateWhen" msgid="4251208067092761057">"Rung"</string>
-    <string name="pref_summary_notification_vibrateWhen" msgid="669655090822561447">"Cũng rung khi được thông báo"</string>
-    <string name="pref_title_notification_ringtone" msgid="5467265237106229952">"Chọn nhạc chuông"</string>
+    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Âm thanh"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Đặt số tin nhắn sẽ lưu"</string>
-  <string-array name="prefEntries_vibrateWhen">
-    <item msgid="2520871831815631409">"Luôn luôn"</item>
-    <item msgid="6069709696037750627">"Chỉ khi ở chế độ im lặng"</item>
-    <item msgid="7486145357487111435">"Chưa bao giờ"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="6419655771690242118">"Rung"</string>
+    <string name="silent_ringtone" msgid="7981237991326592780">"Im lặng"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Tự động truy xuất"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Tự động truy xuất tin nhắn"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Tự động truy xuất khi chuyển vùng"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 64e8cea..cd6cf0c 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -172,17 +172,10 @@
     <string name="pref_title_sms_delete" msgid="6890538316799296878">"短信限制"</string>
     <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_vibrateWhen" msgid="4251208067092761057">"振动"</string>
-    <string name="pref_summary_notification_vibrateWhen" msgid="669655090822561447">"收到通知时还振动提醒"</string>
-    <string name="pref_title_notification_ringtone" msgid="5467265237106229952">"选择铃声"</string>
+    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"提示音"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"设置要保存的信息数量"</string>
-  <string-array name="prefEntries_vibrateWhen">
-    <item msgid="2520871831815631409">"始终"</item>
-    <item msgid="6069709696037750627">"仅在静音时"</item>
-    <item msgid="7486145357487111435">"永不"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="6419655771690242118">"振动"</string>
+    <string name="silent_ringtone" msgid="7981237991326592780">"静音"</string>
     <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>
@@ -306,7 +299,7 @@
     <string name="slideshow_activity" msgid="5658249461317434432">"播放幻灯片"</string>
     <string name="class_0_message_activity" msgid="6631339964159861048">"0 类短信"</string>
     <string name="search_label" msgid="6042598929386174964">"短信"</string>
-    <string name="search_hint" msgid="7273727663577472044">"搜索“短信”"</string>
+    <string name="search_hint" msgid="7273727663577472044">"搜索短信"</string>
     <string name="search" msgid="7560238620274735199">"短信"</string>
     <string name="search_setting_description" msgid="4104004595086437572">"消息中的文字"</string>
     <string name="search_empty" msgid="2109551478056039278">"没有匹配项。"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 501edc6..61b8602 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -172,17 +172,10 @@
     <string name="pref_title_sms_delete" msgid="6890538316799296878">"簡訊限制"</string>
     <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_vibrateWhen" msgid="4251208067092761057">"震動"</string>
-    <string name="pref_summary_notification_vibrateWhen" msgid="669655090822561447">"收到通知時震動提醒"</string>
-    <string name="pref_title_notification_ringtone" msgid="5467265237106229952">"選擇鈴聲"</string>
+    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"音效"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"設定儲存的訊息數量"</string>
-  <string-array name="prefEntries_vibrateWhen">
-    <item msgid="2520871831815631409">"一律"</item>
-    <item msgid="6069709696037750627">"靜音時才啟用"</item>
-    <item msgid="7486145357487111435">"永遠不要"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="6419655771690242118">"震動"</string>
+    <string name="silent_ringtone" msgid="7981237991326592780">"靜音"</string>
     <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-zu/strings.xml b/res/values-zu/strings.xml
index cf3c011..2e828d6 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -172,17 +172,10 @@
     <string name="pref_title_sms_delete" msgid="6890538316799296878">"Umkhawulo womyalezo wombhalo"</string>
     <string name="pref_title_mms_delete" msgid="7265878070847351664">"Umkhawulo womyalezo wokuxhumana okuxubile"</string>
     <string name="pref_title_notification_enabled" msgid="9118792213953729414">"Izaziso"</string>
-    <string name="pref_summary_notification_enabled" msgid="619729096820999905">"Bonisa izaziso zomlayezo kwibha yomumo"</string>
     <string name="pref_title_notification_vibrateWhen" msgid="4251208067092761057">"Dlidliza"</string>
-    <string name="pref_summary_notification_vibrateWhen" msgid="669655090822561447">"Iyadlidliza futhi uma yazisiwe"</string>
-    <string name="pref_title_notification_ringtone" msgid="5467265237106229952">"Khetha ithoni yokukhala"</string>
+    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Umsindo"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Hlela inani lemiyalezo ozoyigcina"</string>
-  <string-array name="prefEntries_vibrateWhen">
-    <item msgid="2520871831815631409">"Njao"</item>
-    <item msgid="6069709696037750627">"Kuphela uma ithulile"</item>
-    <item msgid="7486145357487111435">"Akusoze"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="6419655771690242118">"Dlidliza"</string>
+    <string name="silent_ringtone" msgid="7981237991326592780">"Thulile"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Thola ngokuzenzakalekayo"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Ngokuzenzakalekayo ithola imiyalezo"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Izulazula ukuthola okuzenzakalekayo"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index cfd4920..7e1c01d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -349,44 +349,20 @@
     <string name="pref_title_mms_delete">Multimedia message limit</string>
     <!-- Settings item for boolean option to display message notifications -->
     <string name="pref_title_notification_enabled">Notifications</string>
-    <!-- Settings item description for boolean message notification option -->
-    <string name="pref_summary_notification_enabled">Display message notifications in status bar</string>
     <!-- Settings item for boolean option to vibrate during message notification -->
     <string name="pref_title_notification_vibrateWhen">Vibrate</string>
-    <!-- Settings item description for boolean vibrate option -->
-    <string name="pref_summary_notification_vibrateWhen">Also vibrate when notified</string>
     <!-- Settings item for entering ringtone selection screen -->
-    <string name="pref_title_notification_ringtone">Choose ringtone</string>
+    <string name="pref_title_notification_ringtone">Sound</string>
     <!-- Settings item for setting the number of message to save for each conversation -->
     <string name="pref_messages_to_save">Set number of messages to save</string>
+    <!-- Settings screen, what to display for Ringtone when the user chooses "silent" [CHAR LIMIT=100]-->
+    <string name="silent_ringtone">Silent</string>
 
-    <!-- The vibrate notification modes -->
-    <string-array name="prefEntries_vibrateWhen">
-        <!-- Always -->
-        <item>Always</item>
-        <!-- Only when the phone is in Silent mode -->
-        <item>Only when silent</item>
-        <!-- Never -->
-        <item>Never</item>
-    </string-array>
-
-    <!-- The default vibrateWhen value, when none is set -->
-    <string translatable="false" name="prefDefault_vibrateWhen">never</string>
     <!-- The value to use when migrating from old versions for a true vibrate setting -->
     <string translatable="false" name="prefDefault_vibrate_true">always</string>
     <!-- The value to use when migrating from old versions for a false vibrate setting -->
     <string translatable="false" name="prefDefault_vibrate_false">never</string>
 
-    <!-- The vibrateWhen values -->
-    <string-array translatable="false" name="prefValues_vibrateWhen">
-        <item>always</item>
-        <item>silent</item>
-        <item>never</item>
-    </string-array>
-
-    <!-- Dialog title for the Vibrate dialog -->
-    <string name="prefDialogTitle_vibrateWhen">Vibrate</string>
-
     <!-- Settings item for boolean option to auto-retrieve incoming MMS messages -->
     <string name="pref_title_mms_auto_retrieval">Auto-retrieve</string>
     <!-- Settings item description for boolean MMS auto-retrieve option -->
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index fd80c5a..54ebb4b 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -78,22 +78,15 @@
   <PreferenceCategory android:title="@string/pref_notification_settings_title">
     <CheckBoxPreference android:key="pref_key_enable_notifications"
                         android:title="@string/pref_title_notification_enabled"
-                        android:summary="@string/pref_summary_notification_enabled"
                         android:defaultValue="true" />
-    <RingtonePreference android:layout="?android:attr/preferenceLayoutChild"
-                        android:dependency="pref_key_enable_notifications"
-                        android:key="pref_key_ringtone"
+    <RingtonePreference android:key="pref_key_ringtone"
                         android:title="@string/pref_title_notification_ringtone"
                         android:ringtoneType="notification"
-                        android:defaultValue="content://settings/system/notification_sound" />
-    <ListPreference     android:layout="?android:attr/preferenceLayoutChild"
                         android:dependency="pref_key_enable_notifications"
-                        android:key="pref_key_vibrateWhen"
-                        android:defaultValue="@string/prefDefault_vibrateWhen"
+                        android:defaultValue="content://settings/system/notification_sound" />
+    <CheckBoxPreference android:key="pref_key_vibrate"
                         android:title="@string/pref_title_notification_vibrateWhen"
-                        android:summary="@string/pref_summary_notification_vibrateWhen"
-                        android:entries="@array/prefEntries_vibrateWhen"
-                        android:entryValues="@array/prefValues_vibrateWhen"
-                        android:dialogTitle="@string/prefDialogTitle_vibrateWhen" />
+                        android:dependency="pref_key_enable_notifications"
+                        android:defaultValue="false" />
   </PreferenceCategory>
 </PreferenceScreen>
diff --git a/src/com/android/mms/MmsApp.java b/src/com/android/mms/MmsApp.java
index 241ae6b..74f4043 100644
--- a/src/com/android/mms/MmsApp.java
+++ b/src/com/android/mms/MmsApp.java
@@ -80,7 +80,6 @@
             }
         };
         mCountryDetector.addCountryListener(mCountryListener, getMainLooper());
-        mCountryIso = mCountryDetector.detectCountry().getCountryIso();
 
         Context context = getApplicationContext();
         mPduLoaderManager = new PduLoaderManager(context);
@@ -152,7 +151,14 @@
         return mRecentSuggestions;
     }
 
+    // This function CAN return null.
     public String getCurrentCountryIso() {
+        if (mCountryIso == null) {
+            Country country = mCountryDetector.detectCountry();
+            if (country != null) {
+                mCountryIso = country.getCountryIso();
+            }
+        }
         return mCountryIso;
     }
 
diff --git a/src/com/android/mms/transaction/MessagingNotification.java b/src/com/android/mms/transaction/MessagingNotification.java
index 334707e..e52ad3f 100644
--- a/src/com/android/mms/transaction/MessagingNotification.java
+++ b/src/com/android/mms/transaction/MessagingNotification.java
@@ -893,27 +893,24 @@
 
         if (isNew) {
             SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
-            String vibrateWhen;
-            if (sp.contains(MessagingPreferenceActivity.NOTIFICATION_VIBRATE_WHEN)) {
-                vibrateWhen =
-                    sp.getString(MessagingPreferenceActivity.NOTIFICATION_VIBRATE_WHEN, null);
-            } else if (sp.contains(MessagingPreferenceActivity.NOTIFICATION_VIBRATE)) {
-                vibrateWhen =
-                        sp.getBoolean(MessagingPreferenceActivity.NOTIFICATION_VIBRATE, false) ?
-                    context.getString(R.string.prefDefault_vibrate_true) :
-                    context.getString(R.string.prefDefault_vibrate_false);
-            } else {
-                vibrateWhen = context.getString(R.string.prefDefault_vibrateWhen);
+
+            boolean vibrate = false;
+            if (sp.contains(MessagingPreferenceActivity.NOTIFICATION_VIBRATE)) {
+                // The most recent change to the vibrate preference is to store a boolean
+                // value in NOTIFICATION_VIBRATE. If prefs contain that preference, use that
+                // first.
+                vibrate = sp.getBoolean(MessagingPreferenceActivity.NOTIFICATION_VIBRATE,
+                        false);
+            } else if (sp.contains(MessagingPreferenceActivity.NOTIFICATION_VIBRATE_WHEN)) {
+                // This is to support the pre-JellyBean MR1.1 version of vibrate preferences
+                // when vibrate was a tri-state setting. As soon as the user opens the Messaging
+                // app's settings, it will migrate this setting from NOTIFICATION_VIBRATE_WHEN
+                // to the boolean value stored in NOTIFICATION_VIBRATE.
+                String vibrateWhen =
+                        sp.getString(MessagingPreferenceActivity.NOTIFICATION_VIBRATE_WHEN, null);
+                vibrate = "always".equals(vibrateWhen);
             }
-
-            boolean vibrateAlways = vibrateWhen.equals("always");
-            boolean vibrateSilent = vibrateWhen.equals("silent");
-            AudioManager audioManager =
-                (AudioManager)context.getSystemService(Context.AUDIO_SERVICE);
-            boolean nowSilent =
-                audioManager.getRingerMode() == AudioManager.RINGER_MODE_VIBRATE;
-
-            if (vibrateAlways || vibrateSilent && nowSilent) {
+            if (vibrate) {
                 defaults |= Notification.DEFAULT_VIBRATE;
             }
 
diff --git a/src/com/android/mms/ui/ComposeMessageActivity.java b/src/com/android/mms/ui/ComposeMessageActivity.java
index 42bda28..020a0e6 100644
--- a/src/com/android/mms/ui/ComposeMessageActivity.java
+++ b/src/com/android/mms/ui/ComposeMessageActivity.java
@@ -2090,7 +2090,7 @@
                 mWorkingMessage.unDiscard();    // it was discarded in onStop().
 
                 sanityCheckConversation();
-            } else if (isRecipientsEditorVisible()) {
+            } else if (isRecipientsEditorVisible() && recipientCount() > 0) {
                 if (LogTag.VERBOSE) {
                     log("onRestart: goToConversationList");
                 }
@@ -3921,31 +3921,34 @@
      * @param listSizeChange the amount the message list view size has vertically changed
      */
     private void smoothScrollToEnd(boolean force, int listSizeChange) {
-        int last = mMsgListView.getLastVisiblePosition();
-        int newPosition = mMsgListAdapter.getCount() - 1;
-        if (last < 0 || newPosition < 0) {
+        int lastItemVisible = mMsgListView.getLastVisiblePosition();
+        int lastItemInList = mMsgListAdapter.getCount() - 1;
+        if (lastItemVisible < 0 || lastItemInList < 0) {
             if (LogTag.VERBOSE || Log.isLoggable(LogTag.APP, Log.VERBOSE)) {
-                Log.v(TAG, "smoothScrollToEnd: last=" + last + ", newPos=" + newPosition +
+                Log.v(TAG, "smoothScrollToEnd: lastItemVisible=" + lastItemVisible +
+                        ", lastItemInList=" + lastItemInList +
                         ", mMsgListView not ready");
             }
             return;
         }
 
-        View lastChild = mMsgListView.getChildAt(last - mMsgListView.getFirstVisiblePosition());
-        int bottom = 0;
-        int height = 0;
-        if (lastChild != null) {
-            bottom = lastChild.getBottom();
-            height = lastChild.getHeight();
+        View lastChildVisible =
+                mMsgListView.getChildAt(lastItemVisible - mMsgListView.getFirstVisiblePosition());
+        int lastVisibleItemBottom = 0;
+        int lastVisibleItemHeight = 0;
+        if (lastChildVisible != null) {
+            lastVisibleItemBottom = lastChildVisible.getBottom();
+            lastVisibleItemHeight = lastChildVisible.getHeight();
         }
 
         if (LogTag.VERBOSE || Log.isLoggable(LogTag.APP, Log.VERBOSE)) {
-            Log.v(TAG, "smoothScrollToEnd newPosition: " + newPosition +
+            Log.v(TAG, "smoothScrollToEnd newPosition: " + lastItemInList +
                     " mLastSmoothScrollPosition: " + mLastSmoothScrollPosition +
                     " first: " + mMsgListView.getFirstVisiblePosition() +
-                    " last: " + last +
-                    " bottom: " + bottom +
-                    " bottom + listSizeChange: " + (bottom + listSizeChange) +
+                    " lastItemVisible: " + lastItemVisible +
+                    " lastVisibleItemBottom: " + lastVisibleItemBottom +
+                    " lastVisibleItemBottom + listSizeChange: " +
+                    (lastVisibleItemBottom + listSizeChange) +
                     " mMsgListView.getHeight() - mMsgListView.getPaddingBottom(): " +
                     (mMsgListView.getHeight() - mMsgListView.getPaddingBottom()) +
                     " listSizeChange: " + listSizeChange);
@@ -3964,45 +3967,50 @@
         // attachment thumbnail, such as picture. In this situation, we want to scroll the list so
         // the bottom of the thumbnail is visible and the top of the item is scroll off the screen.
         int listHeight = mMsgListView.getHeight();
-        if (force || ((listSizeChange != 0 || newPosition != mLastSmoothScrollPosition) &&
-                bottom + listSizeChange <=
-                        listHeight - mMsgListView.getPaddingBottom()) ||
-                        height > listHeight) {
+        boolean lastItemTooTall = lastVisibleItemHeight > listHeight;
+        boolean willScroll = force ||
+                ((listSizeChange != 0 || lastItemInList != mLastSmoothScrollPosition) &&
+                lastVisibleItemBottom + listSizeChange <=
+                    listHeight - mMsgListView.getPaddingBottom());
+        if (willScroll || (lastItemTooTall && lastItemInList == lastItemVisible)) {
             if (Math.abs(listSizeChange) > SMOOTH_SCROLL_THRESHOLD) {
                 // When the keyboard comes up, the window manager initiates a cross fade
                 // animation that conflicts with smooth scroll. Handle that case by jumping the
                 // list directly to the end.
                 if (LogTag.VERBOSE || Log.isLoggable(LogTag.APP, Log.VERBOSE)) {
-                    Log.v(TAG, "keyboard state changed. setSelection=" + newPosition);
+                    Log.v(TAG, "keyboard state changed. setSelection=" + lastItemInList);
                 }
-                if (height > listHeight) {
+                if (lastItemTooTall) {
                     // If the height of the last item is taller than the whole height of the list,
                     // we need to scroll that item so that its top is negative or above the top of
                     // the list. That way, the bottom of the last item will be exposed above the
                     // keyboard.
-                    mMsgListView.setSelectionFromTop(newPosition, listHeight - height);
+                    mMsgListView.setSelectionFromTop(lastItemInList,
+                            listHeight - lastVisibleItemHeight);
                 } else {
-                    mMsgListView.setSelection(newPosition);
+                    mMsgListView.setSelection(lastItemInList);
                 }
-            } else if (newPosition - last > MAX_ITEMS_TO_INVOKE_SCROLL_SHORTCUT) {
+            } else if (lastItemInList - lastItemVisible > MAX_ITEMS_TO_INVOKE_SCROLL_SHORTCUT) {
                 if (LogTag.VERBOSE || Log.isLoggable(LogTag.APP, Log.VERBOSE)) {
-                    Log.v(TAG, "too many to scroll, setSelection=" + newPosition);
+                    Log.v(TAG, "too many to scroll, setSelection=" + lastItemInList);
                 }
-                mMsgListView.setSelection(newPosition);
+                mMsgListView.setSelection(lastItemInList);
             } else {
                 if (LogTag.VERBOSE || Log.isLoggable(LogTag.APP, Log.VERBOSE)) {
-                    Log.v(TAG, "smooth scroll to " + newPosition);
+                    Log.v(TAG, "smooth scroll to " + lastItemInList);
                 }
-                if (height > listHeight) {
+                if (lastItemTooTall) {
                     // If the height of the last item is taller than the whole height of the list,
                     // we need to scroll that item so that its top is negative or above the top of
                     // the list. That way, the bottom of the last item will be exposed above the
-                    // keyboard.
-                    mMsgListView.setSelectionFromTop(newPosition, listHeight - height);
+                    // keyboard. We should use smoothScrollToPositionFromTop here, but it doesn't
+                    // seem to work -- the list ends up scrolling to a random position.
+                    mMsgListView.setSelectionFromTop(lastItemInList,
+                            listHeight - lastVisibleItemHeight);
                 } else {
-                    mMsgListView.smoothScrollToPosition(newPosition);
+                    mMsgListView.smoothScrollToPosition(lastItemInList);
                 }
-                mLastSmoothScrollPosition = newPosition;
+                mLastSmoothScrollPosition = lastItemInList;
             }
         }
     }
diff --git a/src/com/android/mms/ui/ConversationList.java b/src/com/android/mms/ui/ConversationList.java
index 4d5ca6b..ac71baa 100644
--- a/src/com/android/mms/ui/ConversationList.java
+++ b/src/com/android/mms/ui/ConversationList.java
@@ -109,6 +109,12 @@
     private TextView mUnreadConvCount;
     private MenuItem mSearchItem;
     private SearchView mSearchView;
+    private int mSavedFirstVisiblePosition = AdapterView.INVALID_POSITION;
+    private int mSavedFirstItemOffset;
+
+    // keys for extras and icicles
+    private final static String LAST_LIST_POS = "last_list_pos";
+    private final static String LAST_LIST_OFFSET = "last_list_offset";
 
     static private final String CHECKED_MESSAGE_LIMITS = "checked_message_limits";
 
@@ -142,6 +148,36 @@
         if (!checkedMessageLimits || DEBUG) {
             runOneTimeStorageLimitCheckForLegacyMessages();
         }
+
+        if (savedInstanceState != null) {
+            mSavedFirstVisiblePosition = savedInstanceState.getInt(LAST_LIST_POS,
+                    AdapterView.INVALID_POSITION);
+            mSavedFirstItemOffset = savedInstanceState.getInt(LAST_LIST_OFFSET, 0);
+        } else {
+            mSavedFirstVisiblePosition = AdapterView.INVALID_POSITION;
+            mSavedFirstItemOffset = 0;
+        }
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+
+        outState.putInt(LAST_LIST_POS, mSavedFirstVisiblePosition);
+        outState.putInt(LAST_LIST_OFFSET, mSavedFirstItemOffset);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+
+        // Remember where the list is scrolled to so we can restore the scroll position
+        // when we come back to this activity and *after* we complete querying for the
+        // conversations.
+        ListView listView = getListView();
+        mSavedFirstVisiblePosition = listView.getFirstVisiblePosition();
+        View firstChild = listView.getChildAt(0);
+        mSavedFirstItemOffset = (firstChild == null) ? 0 : firstChild.getTop();
     }
 
     private void setupActionBar() {
@@ -756,6 +792,12 @@
                     // 2. Mark all the conversations as seen.
                     Conversation.markAllConversationsAsSeen(getApplicationContext());
                 }
+                if (mSavedFirstVisiblePosition != AdapterView.INVALID_POSITION) {
+                    // Restore the list to its previous position.
+                    getListView().setSelectionFromTop(mSavedFirstVisiblePosition,
+                            mSavedFirstItemOffset);
+                    mSavedFirstVisiblePosition = AdapterView.INVALID_POSITION;
+                }
                 break;
 
             case UNREAD_THREADS_QUERY_TOKEN:
diff --git a/src/com/android/mms/ui/MessagingPreferenceActivity.java b/src/com/android/mms/ui/MessagingPreferenceActivity.java
index 1d498cb..d1deb57 100755
--- a/src/com/android/mms/ui/MessagingPreferenceActivity.java
+++ b/src/com/android/mms/ui/MessagingPreferenceActivity.java
@@ -18,12 +18,16 @@
 package com.android.mms.ui;
 
 import android.app.ActionBar;
+import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.media.Ringtone;
+import android.media.RingtoneManager;
+import android.net.Uri;
 import android.os.Bundle;
 import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
@@ -33,6 +37,7 @@
 import android.preference.PreferenceCategory;
 import android.preference.PreferenceManager;
 import android.preference.PreferenceScreen;
+import android.preference.RingtonePreference;
 import android.provider.SearchRecentSuggestions;
 import android.text.TextUtils;
 import android.view.Menu;
@@ -76,14 +81,13 @@
     private Preference mMmsReadReportPref;
     private Preference mManageSimPref;
     private Preference mClearHistoryPref;
-    private ListPreference mVibrateWhenPref;
+    private CheckBoxPreference mVibratePref;
     private CheckBoxPreference mEnableNotificationsPref;
     private CheckBoxPreference mMmsAutoRetrievialPref;
+    private RingtonePreference mRingtonePref;
     private Recycler mSmsRecycler;
     private Recycler mMmsRecycler;
     private static final int CONFIRM_CLEAR_SEARCH_HISTORY_DIALOG = 3;
-    private CharSequence[] mVibrateEntries;
-    private CharSequence[] mVibrateValues;
 
     @Override
     protected void onCreate(Bundle icicle) {
@@ -118,10 +122,8 @@
         mClearHistoryPref = findPreference("pref_key_mms_clear_history");
         mEnableNotificationsPref = (CheckBoxPreference) findPreference(NOTIFICATION_ENABLED);
         mMmsAutoRetrievialPref = (CheckBoxPreference) findPreference(AUTO_RETRIEVAL);
-        mVibrateWhenPref = (ListPreference) findPreference(NOTIFICATION_VIBRATE_WHEN);
-
-        mVibrateEntries = getResources().getTextArray(R.array.prefEntries_vibrateWhen);
-        mVibrateValues = getResources().getTextArray(R.array.prefValues_vibrateWhen);
+        mVibratePref = (CheckBoxPreference) findPreference(NOTIFICATION_VIBRATE);
+        mRingtonePref = (RingtonePreference) findPreference(NOTIFICATION_RINGTONE);
 
         setMessagePreferences();
     }
@@ -184,14 +186,18 @@
 
         setEnabledNotificationsPref();
 
-        // If needed, migrate vibration setting from a previous version
+        // If needed, migrate vibration setting from the previous tri-state setting stored in
+        // NOTIFICATION_VIBRATE_WHEN to the boolean setting stored in NOTIFICATION_VIBRATE.
         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
-        if (!sharedPreferences.contains(NOTIFICATION_VIBRATE_WHEN) &&
-                sharedPreferences.contains(NOTIFICATION_VIBRATE)) {
-            int stringId = sharedPreferences.getBoolean(NOTIFICATION_VIBRATE, false) ?
-                    R.string.prefDefault_vibrate_true :
-                    R.string.prefDefault_vibrate_false;
-            mVibrateWhenPref.setValue(getString(stringId));
+        if (sharedPreferences.contains(NOTIFICATION_VIBRATE_WHEN)) {
+            String vibrateWhen = sharedPreferences.
+                    getString(MessagingPreferenceActivity.NOTIFICATION_VIBRATE_WHEN, null);
+            boolean vibrate = "always".equals(vibrateWhen);
+            SharedPreferences.Editor prefsEditor = sharedPreferences.edit();
+            prefsEditor.putBoolean(NOTIFICATION_VIBRATE, vibrate);
+            prefsEditor.remove(NOTIFICATION_VIBRATE_WHEN);  // remove obsolete setting
+            prefsEditor.apply();
+            mVibratePref.setChecked(vibrate);
         }
 
         mSmsRecycler = Recycler.getSmsRecycler();
@@ -201,7 +207,15 @@
         setSmsDisplayLimit();
         setMmsDisplayLimit();
 
-        adjustVibrateSummary(mVibrateWhenPref.getValue());
+        String soundValue = sharedPreferences.getString(NOTIFICATION_RINGTONE, null);
+        setRingtoneSummary(soundValue);
+    }
+
+    private void setRingtoneSummary(String soundValue) {
+        Uri soundUri = TextUtils.isEmpty(soundValue) ? null : Uri.parse(soundValue);
+        Ringtone tone = soundUri != null ? RingtoneManager.getRingtone(this, soundUri) : null;
+        mRingtonePref.setSummary(tone != null ? tone.getTitle(this)
+                : getResources().getString(R.string.silent_ringtone));
     }
 
     private void setEnabledNotificationsPref() {
@@ -345,29 +359,18 @@
     }
 
     private void registerListeners() {
-        mVibrateWhenPref.setOnPreferenceChangeListener(this);
+        mRingtonePref.setOnPreferenceChangeListener(this);
     }
 
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         boolean result = false;
-        if (preference == mVibrateWhenPref) {
-            adjustVibrateSummary((String)newValue);
+        if (preference == mRingtonePref) {
+            setRingtoneSummary((String)newValue);
             result = true;
         }
         return result;
     }
 
-    private void adjustVibrateSummary(String value) {
-        int len = mVibrateValues.length;
-        for (int i = 0; i < len; i++) {
-            if (mVibrateValues[i].equals(value)) {
-                mVibrateWhenPref.setSummary(mVibrateEntries[i]);
-                return;
-            }
-        }
-        mVibrateWhenPref.setSummary(null);
-    }
-
     // For the group mms feature to be enabled, the following must be true:
     //  1. the feature is enabled in mms_config.xml (currently on by default)
     //  2. the feature is enabled in the mms settings page
diff --git a/src/com/android/mms/ui/RecipientsEditor.java b/src/com/android/mms/ui/RecipientsEditor.java
index 0baeff8..7cbb066 100644
--- a/src/com/android/mms/ui/RecipientsEditor.java
+++ b/src/com/android/mms/ui/RecipientsEditor.java
@@ -274,7 +274,7 @@
             for (Contact c : list) {
                 // Calling setText to set the recipients won't create chips,
                 // but calling append() will.
-                append(contactToToken(c) + ", ");
+                append(contactToToken(c) + ",");
             }
         }
     }