Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/packages/apps/Calendar into 1.1mr1.1-staging

Android 4.2.2 release 1

Conflicts:
	res/values-nl/strings.xml

Change-Id: I34dffaec7b7eacd428d7546c03a7f5f1b49700ea

56 files changed, 194 insertions, 517 deletions

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 3d6e9844..b0c72f3c 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -159,7 +159,7 @@
     <string name="menu_about_preferences" msgid="6124375438237674973">"Meer oor Kalender"</string>
     <string name="preferences_title" msgid="8045855493262131773">"Instellings"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"Kalender-instellings"</string>
-    <string name="preferences_reminder_title" msgid="6940022527071973010">"Herinneringsinstellings"</string>
+    <string name="preferences_reminder_title" msgid="5199606534191180129">"Kennisgewings en onthounotas"</string>
     <string name="preferences_hide_declined_title" msgid="1849295943669890034">"Versteek afgewysde gebeurtenisse"</string>
     <string name="preferences_week_start_day_title" msgid="4619489296444901622">"Week begin op"</string>
     <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"Week begin op"</string>
@@ -168,7 +168,7 @@
     <string name="search_history_cleared" msgid="1536707558435227567">"Soekgeskiedenis uitgevee."</string>
     <string name="preferences_alerts_title" msgid="6636088008103904020">"Kennisgewings"</string>
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"Vibreer"</string>
-    <string name="preferences_alerts_ringtone_title" msgid="7872809411438804447">"Kies luitoon"</string>
+    <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"Klank"</string>
     <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"Opspringerkennisgewing"</string>
     <string name="preferences_default_reminder_title" msgid="5188861433342733905">"Verstek herinneringstyd"</string>
     <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"Verstek herinneringstyd"</string>
@@ -179,12 +179,6 @@
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Wys weeknommer"</string>
     <string name="preferences_about_title" msgid="2810624892412097879">"Meer oor"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Bouweergawe"</string>
-  <string-array name="prefEntries_alerts_vibrateWhen">
-    <item msgid="2539376794936035639">"Altyd"</item>
-    <item msgid="8091719131860840185">"Net wanneer stil"</item>
-    <item msgid="4552962311897985633">"Nooit"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="8995274609647451109">"Vibreer"</string>
     <string name="gadget_title" msgid="939918875331310945">"Kalender"</string>
   <plurals name="month_more_events">
     <item quantity="one" msgid="8971334808414201327">"+1"</item>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 0b44ea46..f2659f68 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -159,7 +159,7 @@
     <string name="menu_about_preferences" msgid="6124375438237674973">"ስለ ቀን መቁጠሪያ"</string>
     <string name="preferences_title" msgid="8045855493262131773">"ቅንብሮች"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"የቀን መቁጠሪያ ማያ ቅንብር"</string>
-    <string name="preferences_reminder_title" msgid="6940022527071973010">"ማስታወሻ ቅንብሮች"</string>
+    <string name="preferences_reminder_title" msgid="5199606534191180129">"ማሳወቂያዎች እና ማስታወሻዎች"</string>
     <string name="preferences_hide_declined_title" msgid="1849295943669890034">"ውድቅ ክስተቶችን ደብቅ"</string>
     <string name="preferences_week_start_day_title" msgid="4619489296444901622">"ሣምንት በ ይጀምራል"</string>
     <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"ሣምንት በ ይጀምራል"</string>
@@ -168,7 +168,7 @@
     <string name="search_history_cleared" msgid="1536707558435227567">"የፍለጋ ታሪክ ጠርቷል።"</string>
     <string name="preferences_alerts_title" msgid="6636088008103904020">"ማሳወቂያዎች"</string>
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"ንዘር"</string>
-    <string name="preferences_alerts_ringtone_title" msgid="7872809411438804447">"የደወል ቅላጼ ምረጥ"</string>
+    <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"ድምፅ"</string>
     <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"ብቅ ባይ ማሳወቂያ"</string>
     <string name="preferences_default_reminder_title" msgid="5188861433342733905">"ነባሪ ማስታወሻ ሰዓት"</string>
     <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"ነባሪ ማስታወሻ ሰዓት"</string>
@@ -179,12 +179,6 @@
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"የሣምንት ቁጥር አሳይ"</string>
     <string name="preferences_about_title" msgid="2810624892412097879">"ስለ"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"የግንባታ ሥሪት"</string>
-  <string-array name="prefEntries_alerts_vibrateWhen">
-    <item msgid="2539376794936035639">"ዘወትር"</item>
-    <item msgid="8091719131860840185">"ፀጥታ ሲሆን ብቻ"</item>
-    <item msgid="4552962311897985633">"በፍፁም"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="8995274609647451109">"ንዘር"</string>
     <string name="gadget_title" msgid="939918875331310945">"የቀን አቆጣጠር"</string>
   <plurals name="month_more_events">
     <item quantity="one" msgid="8971334808414201327">"+1"</item>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 1072be73..bf7ee9b3 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -159,7 +159,7 @@
     <string name="menu_about_preferences" msgid="6124375438237674973">"حول التقويم"</string>
     <string name="preferences_title" msgid="8045855493262131773">"الإعدادات"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"إعداد عرض التقويم"</string>
-    <string name="preferences_reminder_title" msgid="6940022527071973010">"إعدادات التذكير"</string>
+    <string name="preferences_reminder_title" msgid="5199606534191180129">"الإشعارات والتذكيرات"</string>
     <string name="preferences_hide_declined_title" msgid="1849295943669890034">"إخفاء الأحداث التي تم رفضها"</string>
     <string name="preferences_week_start_day_title" msgid="4619489296444901622">"يبدأ الأسبوع يوم"</string>
     <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"يبدأ الأسبوع يوم"</string>
@@ -168,7 +168,7 @@
     <string name="search_history_cleared" msgid="1536707558435227567">"تم محو سجل البحث."</string>
     <string name="preferences_alerts_title" msgid="6636088008103904020">"التنبيهات"</string>
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"اهتزاز"</string>
-    <string name="preferences_alerts_ringtone_title" msgid="7872809411438804447">"اختيار نغمة الرنين"</string>
+    <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"الصوت"</string>
     <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"التنبيه المنبثق"</string>
     <string name="preferences_default_reminder_title" msgid="5188861433342733905">"وقت التذكير الافتراضي"</string>
     <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"وقت التذكير الافتراضي"</string>
@@ -179,12 +179,6 @@
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"إظهار رقم الأسبوع"</string>
     <string name="preferences_about_title" msgid="2810624892412097879">"حول"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"نسخة الإصدار"</string>
-  <string-array name="prefEntries_alerts_vibrateWhen">
-    <item msgid="2539376794936035639">"دومًا"</item>
-    <item msgid="8091719131860840185">"فقط عندما يكون صامتًا"</item>
-    <item msgid="4552962311897985633">"مطلقًا"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="8995274609647451109">"اهتزاز"</string>
     <string name="gadget_title" msgid="939918875331310945">"التقويم"</string>
   <plurals name="month_more_events">
     <item quantity="one" msgid="8971334808414201327">"1+"</item>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 5c2e0d1c..3a68c62b 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -159,7 +159,7 @@
     <string name="menu_about_preferences" msgid="6124375438237674973">"Пра Calendar"</string>
     <string name="preferences_title" msgid="8045855493262131773">"Налады"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"Каляндарны рэжым прагляду налад"</string>
-    <string name="preferences_reminder_title" msgid="6940022527071973010">"Налады напамінаў"</string>
+    <string name="preferences_reminder_title" msgid="5199606534191180129">"Апавяшчэнні і напаміны"</string>
     <string name="preferences_hide_declined_title" msgid="1849295943669890034">"Схаваць адхіленыя падзеі"</string>
     <string name="preferences_week_start_day_title" msgid="4619489296444901622">"Тыдзень пачынаецца з"</string>
     <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"Тыдзень пачынаецца з"</string>
@@ -168,7 +168,7 @@
     <string name="search_history_cleared" msgid="1536707558435227567">"Гісторыя пошуку выдалена."</string>
     <string name="preferences_alerts_title" msgid="6636088008103904020">"Апавяшчэнні"</string>
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"Вібрацыя"</string>
-    <string name="preferences_alerts_ringtone_title" msgid="7872809411438804447">"Выбраць рынгтон"</string>
+    <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"Гук"</string>
     <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"Усплывальнае апавяшчэнне"</string>
     <string name="preferences_default_reminder_title" msgid="5188861433342733905">"Час напаміну па змаўчанні"</string>
     <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"Час напаміну па змаўчанні"</string>
@@ -179,12 +179,6 @@
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Паказаць нумар тыдня"</string>
     <string name="preferences_about_title" msgid="2810624892412097879">"Звесткі"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Версія зборкі"</string>
-  <string-array name="prefEntries_alerts_vibrateWhen">
-    <item msgid="2539376794936035639">"Заўсёды"</item>
-    <item msgid="8091719131860840185">"Толькі ў рэжыме без гуку"</item>
-    <item msgid="4552962311897985633">"Ніколі"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="8995274609647451109">"Вібрацыя"</string>
     <string name="gadget_title" msgid="939918875331310945">"Каляндар"</string>
   <plurals name="month_more_events">
     <item quantity="one" msgid="8971334808414201327">"+1"</item>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 498ea8e3..8bd2bb71 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -159,7 +159,7 @@
     <string name="menu_about_preferences" msgid="6124375438237674973">"Всичко за Google Календар"</string>
     <string name="preferences_title" msgid="8045855493262131773">"Настройки"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"Настройки за преглед на календар"</string>
-    <string name="preferences_reminder_title" msgid="6940022527071973010">"Настройки за напомняне"</string>
+    <string name="preferences_reminder_title" msgid="5199606534191180129">"Известия и напомняния"</string>
     <string name="preferences_hide_declined_title" msgid="1849295943669890034">"Скриване на отказани събития"</string>
     <string name="preferences_week_start_day_title" msgid="4619489296444901622">"Седмицата започва от"</string>
     <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"Седмицата започва от"</string>
@@ -168,7 +168,7 @@
     <string name="search_history_cleared" msgid="1536707558435227567">"Историята на търсенията е изчистена."</string>
     <string name="preferences_alerts_title" msgid="6636088008103904020">"Известия"</string>
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"Вибриране"</string>
-    <string name="preferences_alerts_ringtone_title" msgid="7872809411438804447">"Избор на мелодия"</string>
+    <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"Звук"</string>
     <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"Изскачащо известие"</string>
     <string name="preferences_default_reminder_title" msgid="5188861433342733905">"Стандартен час за напомняне"</string>
     <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"Стандартен час за напомняне"</string>
@@ -179,12 +179,6 @@
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Показване на номера на седмицата"</string>
     <string name="preferences_about_title" msgid="2810624892412097879">"Информация"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Версия"</string>
-  <string-array name="prefEntries_alerts_vibrateWhen">
-    <item msgid="2539376794936035639">"Винаги"</item>
-    <item msgid="8091719131860840185">"Само при тих режим"</item>
-    <item msgid="4552962311897985633">"Никога"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="8995274609647451109">"Вибриране"</string>
     <string name="gadget_title" msgid="939918875331310945">"Календар"</string>
   <plurals name="month_more_events">
     <item quantity="one" msgid="8971334808414201327">"+1"</item>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index 65ed3c34..97e207d9 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="reminder_methods_labels">
-    <item msgid="5172236776878811487">"Notificac."</item>
+    <item msgid="5172236776878811487">"Notificació"</item>
     <item msgid="1751151680520784746">"Correu electrònic"</item>
     <item msgid="2658001219380695677">"SMS"</item>
     <item msgid="7926918288165444873">"Alarma"</item>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 5d559caf..a829d2fe 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -159,7 +159,7 @@
     <string name="menu_about_preferences" msgid="6124375438237674973">"Quant a Calendar"</string>
     <string name="preferences_title" msgid="8045855493262131773">"Configuració"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"Configuració de la visualització del calendari"</string>
-    <string name="preferences_reminder_title" msgid="6940022527071973010">"Configuració de recordatori"</string>
+    <string name="preferences_reminder_title" msgid="5199606534191180129">"Notificacions i recordatoris"</string>
     <string name="preferences_hide_declined_title" msgid="1849295943669890034">"Amaga els esdeveniments rebutjats"</string>
     <string name="preferences_week_start_day_title" msgid="4619489296444901622">"La setmana comença"</string>
     <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"La setmana comença"</string>
@@ -168,7 +168,7 @@
     <string name="search_history_cleared" msgid="1536707558435227567">"S\'ha buidat l\'historial de cerca."</string>
     <string name="preferences_alerts_title" msgid="6636088008103904020">"Notificacions"</string>
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"Vibra"</string>
-    <string name="preferences_alerts_ringtone_title" msgid="7872809411438804447">"Tria d\'un to"</string>
+    <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"So"</string>
     <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"Notificació de finestra emergent"</string>
     <string name="preferences_default_reminder_title" msgid="5188861433342733905">"Temps de recordatori predeterminat"</string>
     <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"Temps de recordatori predeterminat"</string>
@@ -179,12 +179,6 @@
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Mostra el número de setmana"</string>
     <string name="preferences_about_title" msgid="2810624892412097879">"Quant a"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Versió de compilació"</string>
-  <string-array name="prefEntries_alerts_vibrateWhen">
-    <item msgid="2539376794936035639">"Sempre"</item>
-    <item msgid="8091719131860840185">"Només quan està en silenci"</item>
-    <item msgid="4552962311897985633">"Mai"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="8995274609647451109">"Vibra"</string>
     <string name="gadget_title" msgid="939918875331310945">"Calendari"</string>
   <plurals name="month_more_events">
     <item quantity="one" msgid="8971334808414201327">"+1"</item>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 92ab8f30..f2c914ea 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -159,7 +159,7 @@
     <string name="menu_about_preferences" msgid="6124375438237674973">"O Kalendáři"</string>
     <string name="preferences_title" msgid="8045855493262131773">"Nastavení"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"Nastavení zobrazení kalendáře"</string>
-    <string name="preferences_reminder_title" msgid="6940022527071973010">"Nastavení připomenutí"</string>
+    <string name="preferences_reminder_title" msgid="5199606534191180129">"Oznámení a připomenutí"</string>
     <string name="preferences_hide_declined_title" msgid="1849295943669890034">"Skrýt odmítnuté události"</string>
     <string name="preferences_week_start_day_title" msgid="4619489296444901622">"Začátek týdne"</string>
     <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"Začátek týdne"</string>
@@ -168,7 +168,7 @@
     <string name="search_history_cleared" msgid="1536707558435227567">"Historie vyhledávání vymazána"</string>
     <string name="preferences_alerts_title" msgid="6636088008103904020">"Oznámení"</string>
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"Vibrace"</string>
-    <string name="preferences_alerts_ringtone_title" msgid="7872809411438804447">"Zvolit vyzvánění"</string>
+    <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"Zvuk"</string>
     <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"Vyskakovací oznámení"</string>
     <string name="preferences_default_reminder_title" msgid="5188861433342733905">"Výchozí čas připomenutí"</string>
     <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"Výchozí čas připomenutí"</string>
@@ -179,12 +179,6 @@
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Zobrazovat číslo týdne"</string>
     <string name="preferences_about_title" msgid="2810624892412097879">"O aplikaci"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Verze sestavení"</string>
-  <string-array name="prefEntries_alerts_vibrateWhen">
-    <item msgid="2539376794936035639">"Vždy"</item>
-    <item msgid="8091719131860840185">"Pouze v tichém režimu"</item>
-    <item msgid="4552962311897985633">"Nikdy"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="8995274609647451109">"Vibrace"</string>
     <string name="gadget_title" msgid="939918875331310945">"Kalendář"</string>
   <plurals name="month_more_events">
     <item quantity="one" msgid="8971334808414201327">"+1"</item>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 737648d9..f66cee60 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -159,7 +159,7 @@
     <string name="menu_about_preferences" msgid="6124375438237674973">"Om Kalender"</string>
     <string name="preferences_title" msgid="8045855493262131773">"Indstillinger"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"Indstillinger for kalendervisning"</string>
-    <string name="preferences_reminder_title" msgid="6940022527071973010">"Indstillinger for påmindelser"</string>
+    <string name="preferences_reminder_title" msgid="5199606534191180129">"Underretninger og påmindelser"</string>
     <string name="preferences_hide_declined_title" msgid="1849295943669890034">"Skjul afviste begivenhed."</string>
     <string name="preferences_week_start_day_title" msgid="4619489296444901622">"Ugen starter"</string>
     <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"Ugen starter"</string>
@@ -168,7 +168,7 @@
     <string name="search_history_cleared" msgid="1536707558435227567">"Søgeoversigten er ryddet."</string>
     <string name="preferences_alerts_title" msgid="6636088008103904020">"Underretninger"</string>
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"Vibration"</string>
-    <string name="preferences_alerts_ringtone_title" msgid="7872809411438804447">"Vælg ringetone"</string>
+    <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"Lyd"</string>
     <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"Pop op-underretning"</string>
     <string name="preferences_default_reminder_title" msgid="5188861433342733905">"Standard påmindelsestid"</string>
     <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"Standard påmindelsestid"</string>
@@ -179,12 +179,6 @@
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Vis ugenummer"</string>
     <string name="preferences_about_title" msgid="2810624892412097879">"Om"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Version"</string>
-  <string-array name="prefEntries_alerts_vibrateWhen">
-    <item msgid="2539376794936035639">"Altid"</item>
-    <item msgid="8091719131860840185">"Kun ved lydløs"</item>
-    <item msgid="4552962311897985633">"Aldrig"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="8995274609647451109">"Vibration"</string>
     <string name="gadget_title" msgid="939918875331310945">"Kalender"</string>
   <plurals name="month_more_events">
     <item quantity="one" msgid="8971334808414201327">"+1"</item>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index 460b2f75..a2450535 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -102,7 +102,7 @@
     <item msgid="4921622452710220193">"Brüssel"</item>
     <item msgid="727296339287965963">"Sarajevo"</item>
     <item msgid="5997630882187580225">"Windhoek"</item>
-    <item msgid="3828800493609994208">"W. Africa Time"</item>
+    <item msgid="3828800493609994208">"West Africa Time"</item>
     <item msgid="7527935722014187591">"Amman, Jordanien"</item>
     <item msgid="672509109295227133">"Athen, Istanbul"</item>
     <item msgid="1835470340349221646">"Beirut, Libanon"</item>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 9b6f6b99..e504e33f 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -113,10 +113,10 @@
     <string name="quick_response_dialog_title" msgid="2681309456412199207">"Kurzantwort auswählen"</string>
     <string name="quick_response_email_failed" msgid="5544066405231853245">"Das E-Mail-Programm konnte nicht gefunden werden."</string>
   <string-array name="quick_response_defaults">
-    <item msgid="1524421198348168403">"Hat einige Minuten Verspätung"</item>
-    <item msgid="6215158751728689832">"Startet in etwa 10 Minuten"</item>
-    <item msgid="4485794001743679338">"Soll ohne mich anfangen"</item>
-    <item msgid="8036557974294987511">"Ich schaffe es leider nicht. Wir müssen einen neuen Termin ausmachen."</item>
+    <item msgid="1524421198348168403">"Bin einige Minuten verspätet"</item>
+    <item msgid="6215158751728689832">"Bin in etwa 10 Minuten da"</item>
+    <item msgid="4485794001743679338">"Fangt ohne mich an"</item>
+    <item msgid="8036557974294987511">"Schaffe es leider nicht. Können wir neuen Termin ausmachen?"</item>
   </string-array>
     <string name="quick_response_custom_msg" msgid="7265035125070482285">"Benutzerdefinierte Nachricht..."</string>
     <string name="event_info_organizer" msgid="9138683335394832629">"Organisator:"</string>
@@ -159,7 +159,7 @@
     <string name="menu_about_preferences" msgid="6124375438237674973">"Über Google Kalender"</string>
     <string name="preferences_title" msgid="8045855493262131773">"Einstellungen"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"Einstellungen für Kalenderansicht"</string>
-    <string name="preferences_reminder_title" msgid="6940022527071973010">"Erinnerungseinstellungen"</string>
+    <string name="preferences_reminder_title" msgid="5199606534191180129">"Benachrichtigungen &amp; Erinnerungen"</string>
     <string name="preferences_hide_declined_title" msgid="1849295943669890034">"Abgelehnte Termine ausbl."</string>
     <string name="preferences_week_start_day_title" msgid="4619489296444901622">"Woche beginnt am"</string>
     <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"Woche beginnt am"</string>
@@ -168,7 +168,7 @@
     <string name="search_history_cleared" msgid="1536707558435227567">"Suchverlauf gelöscht"</string>
     <string name="preferences_alerts_title" msgid="6636088008103904020">"Benachrichtigungen"</string>
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"Vibration"</string>
-    <string name="preferences_alerts_ringtone_title" msgid="7872809411438804447">"Klingelton auswählen"</string>
+    <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"Töne"</string>
     <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"Pop-up-Benachrichtigung"</string>
     <string name="preferences_default_reminder_title" msgid="5188861433342733905">"Standard-Erinnerungszeit"</string>
     <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"Standard-Erinnerungszeit"</string>
@@ -179,12 +179,6 @@
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Wochennummer anzeigen"</string>
     <string name="preferences_about_title" msgid="2810624892412097879">"Details"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Build-Version"</string>
-  <string-array name="prefEntries_alerts_vibrateWhen">
-    <item msgid="2539376794936035639">"Immer"</item>
-    <item msgid="8091719131860840185">"Nur im Lautlos-Modus"</item>
-    <item msgid="4552962311897985633">"Nie"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="8995274609647451109">"Vibration"</string>
     <string name="gadget_title" msgid="939918875331310945">"Kalender"</string>
   <plurals name="month_more_events">
     <item quantity="one" msgid="8971334808414201327">"+1"</item>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 5d90cb15..12215460 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -159,7 +159,7 @@
     <string name="menu_about_preferences" msgid="6124375438237674973">"Σχετικά με το Ημερολόγιο"</string>
     <string name="preferences_title" msgid="8045855493262131773">"Ρυθμίσεις"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"Ρυθμίσεις προβολής ημερολογίου"</string>
-    <string name="preferences_reminder_title" msgid="6940022527071973010">"Ρυθμίσεις υπενθύμισης"</string>
+    <string name="preferences_reminder_title" msgid="5199606534191180129">"Ειδοποιήσεις και υπενθυμίσεις"</string>
     <string name="preferences_hide_declined_title" msgid="1849295943669890034">"Απόκρυψη συμβάντων που έχουν απορριφθεί"</string>
     <string name="preferences_week_start_day_title" msgid="4619489296444901622">"Έναρξη εβδομάδας:"</string>
     <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"Έναρξη εβδομάδας:"</string>
@@ -168,7 +168,7 @@
     <string name="search_history_cleared" msgid="1536707558435227567">"Έγινε εκκαθάριση ιστορικού αναζήτησης."</string>
     <string name="preferences_alerts_title" msgid="6636088008103904020">"Ειδοποιήσεις"</string>
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"Δόνηση"</string>
-    <string name="preferences_alerts_ringtone_title" msgid="7872809411438804447">"Επιλέξτε ήχο κλήσης"</string>
+    <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"Ήχος"</string>
     <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"Αναδυόμενη ειδοποίηση"</string>
     <string name="preferences_default_reminder_title" msgid="5188861433342733905">"Προεπιλεγμένος χρόνος υπενθύμισης"</string>
     <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"Προεπιλεγμένος χρόνος υπενθύμισης"</string>
@@ -179,12 +179,6 @@
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Εμφάνιση αριθμού εβδομάδας"</string>
     <string name="preferences_about_title" msgid="2810624892412097879">"Σχετικά με"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Έκδοση Build"</string>
-  <string-array name="prefEntries_alerts_vibrateWhen">
-    <item msgid="2539376794936035639">"Πάντα"</item>
-    <item msgid="8091719131860840185">"Μόνο στο αθόρυβο"</item>
-    <item msgid="4552962311897985633">"Ποτέ"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="8995274609647451109">"Δόνηση"</string>
     <string name="gadget_title" msgid="939918875331310945">"Ημερολόγιο"</string>
   <plurals name="month_more_events">
     <item quantity="one" msgid="8971334808414201327">"+1"</item>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 1593a5dc..62c05c80 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -159,7 +159,7 @@
     <string name="menu_about_preferences" msgid="6124375438237674973">"About Calendar"</string>
     <string name="preferences_title" msgid="8045855493262131773">"Settings"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"Calendar view setting"</string>
-    <string name="preferences_reminder_title" msgid="6940022527071973010">"Reminder settings"</string>
+    <string name="preferences_reminder_title" msgid="5199606534191180129">"Notifications &amp; reminders"</string>
     <string name="preferences_hide_declined_title" msgid="1849295943669890034">"Hide declined events"</string>
     <string name="preferences_week_start_day_title" msgid="4619489296444901622">"Week starts on"</string>
     <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"Week starts on"</string>
@@ -168,7 +168,7 @@
     <string name="search_history_cleared" msgid="1536707558435227567">"Search history cleared."</string>
     <string name="preferences_alerts_title" msgid="6636088008103904020">"Notifications"</string>
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"Vibrate"</string>
-    <string name="preferences_alerts_ringtone_title" msgid="7872809411438804447">"Choose ringtone"</string>
+    <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"Sound"</string>
     <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"Pop-up notification"</string>
     <string name="preferences_default_reminder_title" msgid="5188861433342733905">"Default reminder time"</string>
     <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"Default reminder time"</string>
@@ -179,12 +179,6 @@
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Show week number"</string>
     <string name="preferences_about_title" msgid="2810624892412097879">"About"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Build version"</string>
-  <string-array name="prefEntries_alerts_vibrateWhen">
-    <item msgid="2539376794936035639">"Always"</item>
-    <item msgid="8091719131860840185">"Only when silent"</item>
-    <item msgid="4552962311897985633">"Never"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="8995274609647451109">"Vibrate"</string>
     <string name="gadget_title" msgid="939918875331310945">"Calendar"</string>
   <plurals name="month_more_events">
     <item quantity="one" msgid="8971334808414201327">"+1"</item>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index caf63d90..cb0425a0 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -159,7 +159,7 @@
     <string name="menu_about_preferences" msgid="6124375438237674973">"Acerca de Calendar"</string>
     <string name="preferences_title" msgid="8045855493262131773">"Configuración"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"Configuración de vista de calendario"</string>
-    <string name="preferences_reminder_title" msgid="6940022527071973010">"Configuración de recordatorio"</string>
+    <string name="preferences_reminder_title" msgid="5199606534191180129">"Notificaciones y recordatorios"</string>
     <string name="preferences_hide_declined_title" msgid="1849295943669890034">"Ocultar eventos declinados"</string>
     <string name="preferences_week_start_day_title" msgid="4619489296444901622">"Primer día de la semana"</string>
     <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"Primer día de la semana"</string>
@@ -168,7 +168,7 @@
     <string name="search_history_cleared" msgid="1536707558435227567">"Se eliminó el historial de búsqueda."</string>
     <string name="preferences_alerts_title" msgid="6636088008103904020">"Notificaciones"</string>
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"Vibrar"</string>
-    <string name="preferences_alerts_ringtone_title" msgid="7872809411438804447">"Elegir un tono"</string>
+    <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"Sonido"</string>
     <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"Notificación emergente"</string>
     <string name="preferences_default_reminder_title" msgid="5188861433342733905">"Hora predet. de record."</string>
     <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"Hora predet. de record."</string>
@@ -179,12 +179,6 @@
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Mostrar número de semana"</string>
     <string name="preferences_about_title" msgid="2810624892412097879">"Acerca de"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Versión de compilación"</string>
-  <string-array name="prefEntries_alerts_vibrateWhen">
-    <item msgid="2539376794936035639">"Siempre"</item>
-    <item msgid="8091719131860840185">"Sólo cuando esté en silencio"</item>
-    <item msgid="4552962311897985633">"Nunca"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="8995274609647451109">"Vibrar"</string>
     <string name="gadget_title" msgid="939918875331310945">"Calendar"</string>
   <plurals name="month_more_events">
     <item quantity="one" msgid="8971334808414201327">"+1"</item>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 65eceff1..ac63780c 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -159,7 +159,7 @@
     <string name="menu_about_preferences" msgid="6124375438237674973">"Acerca de Calendario"</string>
     <string name="preferences_title" msgid="8045855493262131773">"Ajustes"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"Configuración de la vista de calendario"</string>
-    <string name="preferences_reminder_title" msgid="6940022527071973010">"Configuración de los recordatorios"</string>
+    <string name="preferences_reminder_title" msgid="5199606534191180129">"Notificaciones y recordatorios"</string>
     <string name="preferences_hide_declined_title" msgid="1849295943669890034">"Ocultar eventos rechaz."</string>
     <string name="preferences_week_start_day_title" msgid="4619489296444901622">"La semana empieza el"</string>
     <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"La semana empieza el"</string>
@@ -168,7 +168,7 @@
     <string name="search_history_cleared" msgid="1536707558435227567">"Se ha borrado el historial de búsqueda."</string>
     <string name="preferences_alerts_title" msgid="6636088008103904020">"Notificaciones"</string>
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"Vibrar"</string>
-    <string name="preferences_alerts_ringtone_title" msgid="7872809411438804447">"Seleccionar tono"</string>
+    <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"Sonido"</string>
     <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"Notificación emergente"</string>
     <string name="preferences_default_reminder_title" msgid="5188861433342733905">"Duración pred. del recordatorio"</string>
     <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"Duración pred. del recordatorio"</string>
@@ -179,12 +179,6 @@
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Mostrar número semana"</string>
     <string name="preferences_about_title" msgid="2810624892412097879">"Acerca de"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Versión de la compilación"</string>
-  <string-array name="prefEntries_alerts_vibrateWhen">
-    <item msgid="2539376794936035639">"Siempre"</item>
-    <item msgid="8091719131860840185">"Solo en modo silencio"</item>
-    <item msgid="4552962311897985633">"Nunca"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="8995274609647451109">"Vibración"</string>
     <string name="gadget_title" msgid="939918875331310945">"Calendario"</string>
   <plurals name="month_more_events">
     <item quantity="one" msgid="8971334808414201327">"+1"</item>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index a23fe2a0..280188e0 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -159,7 +159,7 @@
     <string name="menu_about_preferences" msgid="6124375438237674973">"Teave kalendri kohta"</string>
     <string name="preferences_title" msgid="8045855493262131773">"Seaded"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"Kalendrivaate seade"</string>
-    <string name="preferences_reminder_title" msgid="6940022527071973010">"Meeldetuletuse seaded"</string>
+    <string name="preferences_reminder_title" msgid="5199606534191180129">"Märguanded ja meeldetuletused"</string>
     <string name="preferences_hide_declined_title" msgid="1849295943669890034">"Peida tagasilükatud sündmused"</string>
     <string name="preferences_week_start_day_title" msgid="4619489296444901622">"Nädala algus:"</string>
     <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"Nädala algus:"</string>
@@ -168,7 +168,7 @@
     <string name="search_history_cleared" msgid="1536707558435227567">"Otsinguajalugu on kustutatud."</string>
     <string name="preferences_alerts_title" msgid="6636088008103904020">"Teatised"</string>
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"Vibreerimine"</string>
-    <string name="preferences_alerts_ringtone_title" msgid="7872809411438804447">"Helina valimine"</string>
+    <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"Heli"</string>
     <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"Hüpikteatis"</string>
     <string name="preferences_default_reminder_title" msgid="5188861433342733905">"Meeldetuletuse vaikeaeg"</string>
     <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"Vaikimisi meeldetuletuse aeg"</string>
@@ -179,12 +179,6 @@
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Nädala numbri kuvamine"</string>
     <string name="preferences_about_title" msgid="2810624892412097879">"Teave"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Järguversioon"</string>
-  <string-array name="prefEntries_alerts_vibrateWhen">
-    <item msgid="2539376794936035639">"Alati"</item>
-    <item msgid="8091719131860840185">"Ainult hääletus režiimis"</item>
-    <item msgid="4552962311897985633">"Mitte kunagi"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="8995274609647451109">"Vibreerimine"</string>
     <string name="gadget_title" msgid="939918875331310945">"Kalender"</string>
   <plurals name="month_more_events">
     <item quantity="one" msgid="8971334808414201327">"+1"</item>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index ffffc215..17cb22d5 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -159,7 +159,7 @@
     <string name="menu_about_preferences" msgid="6124375438237674973">"درباره تقویم"</string>
     <string name="preferences_title" msgid="8045855493262131773">"تنظیمات"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"تنظیم نمای تقویم"</string>
-    <string name="preferences_reminder_title" msgid="6940022527071973010">"تنظیمات یادآور"</string>
+    <string name="preferences_reminder_title" msgid="5199606534191180129">"اعلان‌ها و یادآورها"</string>
     <string name="preferences_hide_declined_title" msgid="1849295943669890034">"پنهان کردن رویدادهای رد شده"</string>
     <string name="preferences_week_start_day_title" msgid="4619489296444901622">"شروع هفته در"</string>
     <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"شروع هفته در"</string>
@@ -168,7 +168,7 @@
     <string name="search_history_cleared" msgid="1536707558435227567">"سابقه جستجو پاک شد."</string>
     <string name="preferences_alerts_title" msgid="6636088008103904020">"اعلان‌ها"</string>
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"لرزش"</string>
-    <string name="preferences_alerts_ringtone_title" msgid="7872809411438804447">"انتخاب آهنگ زنگ"</string>
+    <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"صدا"</string>
     <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"اعلان بازشو"</string>
     <string name="preferences_default_reminder_title" msgid="5188861433342733905">"زمان یادآور پیش‌فرض"</string>
     <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"زمان یادآور پیش‌فرض"</string>
@@ -179,12 +179,6 @@
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"شماره هفته نمایش"</string>
     <string name="preferences_about_title" msgid="2810624892412097879">"درباره"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"نسخه ساخت"</string>
-  <string-array name="prefEntries_alerts_vibrateWhen">
-    <item msgid="2539376794936035639">"همیشه"</item>
-    <item msgid="8091719131860840185">"فقط هنگام ساکت بودن"</item>
-    <item msgid="4552962311897985633">"هرگز"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="8995274609647451109">"لرزش"</string>
     <string name="gadget_title" msgid="939918875331310945">"تقویم"</string>
   <plurals name="month_more_events">
     <item quantity="one" msgid="8971334808414201327">"+1"</item>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 0699cd18..cfc2e3c7 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -159,7 +159,7 @@
     <string name="menu_about_preferences" msgid="6124375438237674973">"Tietoja kalenterista"</string>
     <string name="preferences_title" msgid="8045855493262131773">"Asetukset"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"Kalenterinäkymän asetus"</string>
-    <string name="preferences_reminder_title" msgid="6940022527071973010">"Muistutusten asetukset"</string>
+    <string name="preferences_reminder_title" msgid="5199606534191180129">"Ilmoitukset ja muistutukset"</string>
     <string name="preferences_hide_declined_title" msgid="1849295943669890034">"Piilota hylätyt tapahtumat"</string>
     <string name="preferences_week_start_day_title" msgid="4619489296444901622">"Viikko alkaa päivänä"</string>
     <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"Viikko alkaa päivänä"</string>
@@ -168,7 +168,7 @@
     <string name="search_history_cleared" msgid="1536707558435227567">"Hakuhistoria tyhjennetty."</string>
     <string name="preferences_alerts_title" msgid="6636088008103904020">"Ilmoitukset"</string>
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"Värinä"</string>
-    <string name="preferences_alerts_ringtone_title" msgid="7872809411438804447">"Valitse soittoääni"</string>
+    <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"Ääni"</string>
     <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"Ponnahdusikkunailmoitus"</string>
     <string name="preferences_default_reminder_title" msgid="5188861433342733905">"Muistutuksen oletusaika"</string>
     <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"Muistutuksen oletusaika"</string>
@@ -179,12 +179,6 @@
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Näytä viikon numero"</string>
     <string name="preferences_about_title" msgid="2810624892412097879">"Tietoja"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Ohjelmistoversio"</string>
-  <string-array name="prefEntries_alerts_vibrateWhen">
-    <item msgid="2539376794936035639">"Aina"</item>
-    <item msgid="8091719131860840185">"Vain äänettömässä tilassa"</item>
-    <item msgid="4552962311897985633">"Ei koskaan"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="8995274609647451109">"Värinä"</string>
     <string name="gadget_title" msgid="939918875331310945">"Kalenteri"</string>
   <plurals name="month_more_events">
     <item quantity="one" msgid="8971334808414201327">"+1"</item>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index ea6390f3..79e45297 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -159,7 +159,7 @@
     <string name="menu_about_preferences" msgid="6124375438237674973">"À propos de Google Agenda"</string>
     <string name="preferences_title" msgid="8045855493262131773">"Paramètres"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"Paramètres d\'affichage de l\'agenda"</string>
-    <string name="preferences_reminder_title" msgid="6940022527071973010">"Paramètres de rappel"</string>
+    <string name="preferences_reminder_title" msgid="5199606534191180129">"Notifications et rappels"</string>
     <string name="preferences_hide_declined_title" msgid="1849295943669890034">"Masquer évén. refusés"</string>
     <string name="preferences_week_start_day_title" msgid="4619489296444901622">"1er jour de la semaine :"</string>
     <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"1er jour de la semaine :"</string>
@@ -168,7 +168,7 @@
     <string name="search_history_cleared" msgid="1536707558435227567">"Historique des recherches effacé."</string>
     <string name="preferences_alerts_title" msgid="6636088008103904020">"Notifications"</string>
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"Vibreur"</string>
-    <string name="preferences_alerts_ringtone_title" msgid="7872809411438804447">"Sélectionner une sonnerie"</string>
+    <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"Sonnerie"</string>
     <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"Notification dans pop-up"</string>
     <string name="preferences_default_reminder_title" msgid="5188861433342733905">"Rappel par défaut"</string>
     <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"Rappel par défaut"</string>
@@ -179,12 +179,6 @@
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Afficher numéro semaine"</string>
     <string name="preferences_about_title" msgid="2810624892412097879">"À propos de"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Version"</string>
-  <string-array name="prefEntries_alerts_vibrateWhen">
-    <item msgid="2539376794936035639">"Toujours"</item>
-    <item msgid="8091719131860840185">"En mode silencieux"</item>
-    <item msgid="4552962311897985633">"Jamais"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="8995274609647451109">"Vibreur"</string>
     <string name="gadget_title" msgid="939918875331310945">"Agenda"</string>
   <plurals name="month_more_events">
     <item quantity="one" msgid="8971334808414201327">"+ 1"</item>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 74b997b8..ebda6cb1 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -159,7 +159,7 @@
     <string name="menu_about_preferences" msgid="6124375438237674973">"कैलेंडर के बारे में"</string>
     <string name="preferences_title" msgid="8045855493262131773">"सेटिंग"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"कैलेंडर दृश्य सेटिंग"</string>
-    <string name="preferences_reminder_title" msgid="6940022527071973010">"अनुस्मारक सेटिंग"</string>
+    <string name="preferences_reminder_title" msgid="5199606534191180129">"सूचनाएं और अनुस्मारक"</string>
     <string name="preferences_hide_declined_title" msgid="1849295943669890034">"अस्वीकृत ईवेंट छुपाएं"</string>
     <string name="preferences_week_start_day_title" msgid="4619489296444901622">"सप्ताह का प्रारंभ"</string>
     <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"सप्ताह का प्रारंभ"</string>
@@ -168,7 +168,7 @@
     <string name="search_history_cleared" msgid="1536707558435227567">"खोज इतिहास साफ़ किया गया."</string>
     <string name="preferences_alerts_title" msgid="6636088008103904020">"सूचनाएं"</string>
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"कंपन"</string>
-    <string name="preferences_alerts_ringtone_title" msgid="7872809411438804447">"रिंगटोन चुनें"</string>
+    <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"ध्वनि"</string>
     <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"पॉप-अप सूचना"</string>
     <string name="preferences_default_reminder_title" msgid="5188861433342733905">"डिफ़ॉल्ट अनुस्मारक समय"</string>
     <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"डिफ़ॉल्ट अनुस्मारक समय"</string>
@@ -179,12 +179,6 @@
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"सप्ताह संख्या दिखाएं"</string>
     <string name="preferences_about_title" msgid="2810624892412097879">"इसके बारे में"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"बिल्ड संस्करण"</string>
-  <string-array name="prefEntries_alerts_vibrateWhen">
-    <item msgid="2539376794936035639">"हमेशा"</item>
-    <item msgid="8091719131860840185">"केवल मौन होने पर"</item>
-    <item msgid="4552962311897985633">"कभी नहीं"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="8995274609647451109">"कंपन"</string>
     <string name="gadget_title" msgid="939918875331310945">"कैलेंडर"</string>
   <plurals name="month_more_events">
     <item quantity="one" msgid="8971334808414201327">"+1"</item>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index b2ebcebb..585d9b31 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -159,7 +159,7 @@
     <string name="menu_about_preferences" msgid="6124375438237674973">"O kalendaru"</string>
     <string name="preferences_title" msgid="8045855493262131773">"Postavke"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"Postavka prikazivanja kalendara"</string>
-    <string name="preferences_reminder_title" msgid="6940022527071973010">"Postavke podsjetnika"</string>
+    <string name="preferences_reminder_title" msgid="5199606534191180129">"Obavijesti i podsjetnici"</string>
     <string name="preferences_hide_declined_title" msgid="1849295943669890034">"Sakrij odbijene događaje"</string>
     <string name="preferences_week_start_day_title" msgid="4619489296444901622">"Tjedan počinje u"</string>
     <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"Tjedan počinje u"</string>
@@ -168,7 +168,7 @@
     <string name="search_history_cleared" msgid="1536707558435227567">"Povijest pretraživanja obrisana je."</string>
     <string name="preferences_alerts_title" msgid="6636088008103904020">"Obavijesti"</string>
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"Vibracija"</string>
-    <string name="preferences_alerts_ringtone_title" msgid="7872809411438804447">"Odaberite melodiju zvona"</string>
+    <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"Zvuk"</string>
     <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"Skočna obavijest"</string>
     <string name="preferences_default_reminder_title" msgid="5188861433342733905">"Zadano vrijeme podsjetnika"</string>
     <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"Zadano vrijeme podsjetnika"</string>
@@ -179,12 +179,6 @@
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Prikaži broj tjedna"</string>
     <string name="preferences_about_title" msgid="2810624892412097879">"O"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Međuverzija"</string>
-  <string-array name="prefEntries_alerts_vibrateWhen">
-    <item msgid="2539376794936035639">"Uvijek"</item>
-    <item msgid="8091719131860840185">"Samo kada je bešumno"</item>
-    <item msgid="4552962311897985633">"Nikad"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="8995274609647451109">"Vibracija"</string>
     <string name="gadget_title" msgid="939918875331310945">"Kalendar"</string>
   <plurals name="month_more_events">
     <item quantity="one" msgid="8971334808414201327">"+1"</item>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 42fdb3b8..e72b3386 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -159,7 +159,7 @@
     <string name="menu_about_preferences" msgid="6124375438237674973">"A Naptárról"</string>
     <string name="preferences_title" msgid="8045855493262131773">"Beállítások"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"A naptár megjelenésének beállítása"</string>
-    <string name="preferences_reminder_title" msgid="6940022527071973010">"Emlékeztetők beállításai"</string>
+    <string name="preferences_reminder_title" msgid="5199606534191180129">"Értesítések és emlékeztetők"</string>
     <string name="preferences_hide_declined_title" msgid="1849295943669890034">"Elutasított események elrejtése"</string>
     <string name="preferences_week_start_day_title" msgid="4619489296444901622">"A hét kezdőnapja"</string>
     <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"A hét kezdőnapja"</string>
@@ -168,7 +168,7 @@
     <string name="search_history_cleared" msgid="1536707558435227567">"A keresési előzmények törölve."</string>
     <string name="preferences_alerts_title" msgid="6636088008103904020">"Értesítések"</string>
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"Rezgés"</string>
-    <string name="preferences_alerts_ringtone_title" msgid="7872809411438804447">"Válasszon csengőhangot"</string>
+    <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"Hang"</string>
     <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"Előugró értesítés"</string>
     <string name="preferences_default_reminder_title" msgid="5188861433342733905">"Emlékeztető alapértelmezett ideje"</string>
     <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"Emlékeztető alapértelmezett ideje"</string>
@@ -179,12 +179,6 @@
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Hét számának megjelenítése"</string>
     <string name="preferences_about_title" msgid="2810624892412097879">"Névjegy"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Build verziószáma"</string>
-  <string-array name="prefEntries_alerts_vibrateWhen">
-    <item msgid="2539376794936035639">"Mindig"</item>
-    <item msgid="8091719131860840185">"Csak néma üzemmódban"</item>
-    <item msgid="4552962311897985633">"Soha"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="8995274609647451109">"Rezgés"</string>
     <string name="gadget_title" msgid="939918875331310945">"Naptár"</string>
   <plurals name="month_more_events">
     <item quantity="one" msgid="8971334808414201327">"+1"</item>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 684fa10f..2eb67028 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -159,7 +159,7 @@
     <string name="menu_about_preferences" msgid="6124375438237674973">"Tentang Kalender"</string>
     <string name="preferences_title" msgid="8045855493262131773">"Setelan"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"Setelan tampilan kalender"</string>
-    <string name="preferences_reminder_title" msgid="6940022527071973010">"Setelan pengingat"</string>
+    <string name="preferences_reminder_title" msgid="5199606534191180129">"Pemberitahuan &amp; pengingat"</string>
     <string name="preferences_hide_declined_title" msgid="1849295943669890034">"Sembunyikan acara yang ditolak"</string>
     <string name="preferences_week_start_day_title" msgid="4619489296444901622">"Minggu dimulai pada"</string>
     <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"Minggu dimulai pada"</string>
@@ -168,7 +168,7 @@
     <string name="search_history_cleared" msgid="1536707558435227567">"Riwayat penelusuran dihapus."</string>
     <string name="preferences_alerts_title" msgid="6636088008103904020">"Pemberitahuan"</string>
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"Getar"</string>
-    <string name="preferences_alerts_ringtone_title" msgid="7872809411438804447">"Pilih nada dering"</string>
+    <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"Suara"</string>
     <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"Pemberitahuan munculan"</string>
     <string name="preferences_default_reminder_title" msgid="5188861433342733905">"Waktu pengingat default"</string>
     <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"Waktu pengingat default"</string>
@@ -179,12 +179,6 @@
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Tampilkan angka minggu"</string>
     <string name="preferences_about_title" msgid="2810624892412097879">"Tentang"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Versi bentukan"</string>
-  <string-array name="prefEntries_alerts_vibrateWhen">
-    <item msgid="2539376794936035639">"Selalu"</item>
-    <item msgid="8091719131860840185">"Hanya saat senyap"</item>
-    <item msgid="4552962311897985633">"Tidak pernah"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="8995274609647451109">"Getar"</string>
     <string name="gadget_title" msgid="939918875331310945">"Kalender"</string>
   <plurals name="month_more_events">
     <item quantity="one" msgid="8971334808414201327">"+1"</item>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index c8920510..62c143eb 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -159,7 +159,7 @@
     <string name="menu_about_preferences" msgid="6124375438237674973">"Informazioni su Calendario"</string>
     <string name="preferences_title" msgid="8045855493262131773">"Impostazioni"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"Visualizzazione calendario"</string>
-    <string name="preferences_reminder_title" msgid="6940022527071973010">"Impostazioni promemoria"</string>
+    <string name="preferences_reminder_title" msgid="5199606534191180129">"Notifiche e promemoria"</string>
     <string name="preferences_hide_declined_title" msgid="1849295943669890034">"Nascondi eventi rifiutati"</string>
     <string name="preferences_week_start_day_title" msgid="4619489296444901622">"La settimana inizia da"</string>
     <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"La settimana inizia da"</string>
@@ -168,7 +168,7 @@
     <string name="search_history_cleared" msgid="1536707558435227567">"Cronologia delle ricerche cancellata."</string>
     <string name="preferences_alerts_title" msgid="6636088008103904020">"Notifiche"</string>
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"Vibrazione"</string>
-    <string name="preferences_alerts_ringtone_title" msgid="7872809411438804447">"Scegli suoneria"</string>
+    <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"Suono"</string>
     <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"Notifica popup"</string>
     <string name="preferences_default_reminder_title" msgid="5188861433342733905">"Promemoria predefinito"</string>
     <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"Promemoria predefinito"</string>
@@ -179,12 +179,6 @@
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Mostra numero settimana"</string>
     <string name="preferences_about_title" msgid="2810624892412097879">"Informazioni"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Versione build"</string>
-  <string-array name="prefEntries_alerts_vibrateWhen">
-    <item msgid="2539376794936035639">"Sempre"</item>
-    <item msgid="8091719131860840185">"Solo in modalità silenziosa"</item>
-    <item msgid="4552962311897985633">"Mai"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="8995274609647451109">"Vibrazione"</string>
     <string name="gadget_title" msgid="939918875331310945">"Calendario"</string>
   <plurals name="month_more_events">
     <item quantity="one" msgid="8971334808414201327">"+1"</item>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index cc50227e..f5ce1398 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -159,7 +159,7 @@
     <string name="menu_about_preferences" msgid="6124375438237674973">"מידע על \'יומן Google\'"</string>
     <string name="preferences_title" msgid="8045855493262131773">"הגדרות"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"הגדרות תצוגה של יומן"</string>
-    <string name="preferences_reminder_title" msgid="6940022527071973010">"הגדרות תזכורת"</string>
+    <string name="preferences_reminder_title" msgid="5199606534191180129">"התראות ותזכורות"</string>
     <string name="preferences_hide_declined_title" msgid="1849295943669890034">"הסתר אירועים שנדחו"</string>
     <string name="preferences_week_start_day_title" msgid="4619489296444901622">"השבוע מתחיל ביום"</string>
     <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"השבוע מתחיל ביום"</string>
@@ -168,7 +168,7 @@
     <string name="search_history_cleared" msgid="1536707558435227567">"היסטוריית החיפושים נוקתה."</string>
     <string name="preferences_alerts_title" msgid="6636088008103904020">"התראות"</string>
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"רטט"</string>
-    <string name="preferences_alerts_ringtone_title" msgid="7872809411438804447">"בחר רינגטון"</string>
+    <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"צליל"</string>
     <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"התראה קופצת"</string>
     <string name="preferences_default_reminder_title" msgid="5188861433342733905">"ברירת מחדל של מועד תזכורת"</string>
     <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"ברירת מחדל של מועד תזכורת"</string>
@@ -179,12 +179,6 @@
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"הצג מספר שבוע"</string>
     <string name="preferences_about_title" msgid="2810624892412097879">"מידע על"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"גרסת Build"</string>
-  <string-array name="prefEntries_alerts_vibrateWhen">
-    <item msgid="2539376794936035639">"תמיד"</item>
-    <item msgid="8091719131860840185">"במצב שקט בלבד"</item>
-    <item msgid="4552962311897985633">"אף פעם"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="8995274609647451109">"רטט"</string>
     <string name="gadget_title" msgid="939918875331310945">"יומן"</string>
   <plurals name="month_more_events">
     <item quantity="one" msgid="8971334808414201327">"+1"</item>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 01c1d5d8..4d639e5e 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -159,7 +159,7 @@
     <string name="menu_about_preferences" msgid="6124375438237674973">"カレンダーについて"</string>
     <string name="preferences_title" msgid="8045855493262131773">"設定"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"カレンダーの表示設定"</string>
-    <string name="preferences_reminder_title" msgid="6940022527071973010">"通知設定"</string>
+    <string name="preferences_reminder_title" msgid="5199606534191180129">"通知とリマインダ"</string>
     <string name="preferences_hide_declined_title" msgid="1849295943669890034">"辞退した予定を非表示"</string>
     <string name="preferences_week_start_day_title" msgid="4619489296444901622">"週の開始日"</string>
     <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"週の開始日"</string>
@@ -168,7 +168,7 @@
     <string name="search_history_cleared" msgid="1536707558435227567">"検索履歴を消去しました。"</string>
     <string name="preferences_alerts_title" msgid="6636088008103904020">"通知"</string>
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"バイブレーション"</string>
-    <string name="preferences_alerts_ringtone_title" msgid="7872809411438804447">"着信音の選択"</string>
+    <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"音声"</string>
     <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"ポップアップ通知"</string>
     <string name="preferences_default_reminder_title" msgid="5188861433342733905">"デフォルトの通知時間"</string>
     <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"リマインダー通知"</string>
@@ -179,12 +179,6 @@
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"第何週かを表示"</string>
     <string name="preferences_about_title" msgid="2810624892412097879">"概要"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"ビルドバージョン"</string>
-  <string-array name="prefEntries_alerts_vibrateWhen">
-    <item msgid="2539376794936035639">"常に使用"</item>
-    <item msgid="8091719131860840185">"マナーモード時のみ"</item>
-    <item msgid="4552962311897985633">"使用しない"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="8995274609647451109">"バイブレーション"</string>
     <string name="gadget_title" msgid="939918875331310945">"カレンダー"</string>
   <plurals name="month_more_events">
     <item quantity="one" msgid="8971334808414201327">"+1"</item>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index d461fd57..27b075d5 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -159,7 +159,7 @@
     <string name="menu_about_preferences" msgid="6124375438237674973">"캘린더 정보"</string>
     <string name="preferences_title" msgid="8045855493262131773">"설정"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"캘린더 보기 설정"</string>
-    <string name="preferences_reminder_title" msgid="6940022527071973010">"알림 설정"</string>
+    <string name="preferences_reminder_title" msgid="5199606534191180129">"알림"</string>
     <string name="preferences_hide_declined_title" msgid="1849295943669890034">"거부한 일정 숨기기"</string>
     <string name="preferences_week_start_day_title" msgid="4619489296444901622">"한 주의 시작"</string>
     <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"한 주의 시작"</string>
@@ -168,7 +168,7 @@
     <string name="search_history_cleared" msgid="1536707558435227567">"검색기록이 삭제되었습니다."</string>
     <string name="preferences_alerts_title" msgid="6636088008103904020">"알림"</string>
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"진동"</string>
-    <string name="preferences_alerts_ringtone_title" msgid="7872809411438804447">"벨소리 선택"</string>
+    <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"소리"</string>
     <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"팝업 알림"</string>
     <string name="preferences_default_reminder_title" msgid="5188861433342733905">"기본 알림 시간"</string>
     <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"기본 알림 시간"</string>
@@ -179,12 +179,6 @@
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"몇째 주인지 표시"</string>
     <string name="preferences_about_title" msgid="2810624892412097879">"정보"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"빌드 버전"</string>
-  <string-array name="prefEntries_alerts_vibrateWhen">
-    <item msgid="2539376794936035639">"항상"</item>
-    <item msgid="8091719131860840185">"무음 시에만"</item>
-    <item msgid="4552962311897985633">"사용 안함"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="8995274609647451109">"진동"</string>
     <string name="gadget_title" msgid="939918875331310945">"캘린더"</string>
   <plurals name="month_more_events">
     <item quantity="one" msgid="8971334808414201327">"+ 1개"</item>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 3da185bc..a90417f0 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -159,7 +159,7 @@
     <string name="menu_about_preferences" msgid="6124375438237674973">"Apie Kalendorių"</string>
     <string name="preferences_title" msgid="8045855493262131773">"Nustatymai"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"Kalendoriaus rodinio nustatymas"</string>
-    <string name="preferences_reminder_title" msgid="6940022527071973010">"Priminimo nustatymai"</string>
+    <string name="preferences_reminder_title" msgid="5199606534191180129">"Pranešimai ir priminimai"</string>
     <string name="preferences_hide_declined_title" msgid="1849295943669890034">"Slėpti atmestus įvykius"</string>
     <string name="preferences_week_start_day_title" msgid="4619489296444901622">"Savaitė prasideda"</string>
     <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"Savaitė prasideda"</string>
@@ -168,7 +168,7 @@
     <string name="search_history_cleared" msgid="1536707558435227567">"Paieškos istorija išvalyta."</string>
     <string name="preferences_alerts_title" msgid="6636088008103904020">"Pranešimai"</string>
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"Vibruoti"</string>
-    <string name="preferences_alerts_ringtone_title" msgid="7872809411438804447">"Pasirinkti skambėjimo toną"</string>
+    <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"Garsas"</string>
     <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"Iššokantysis pranešimas"</string>
     <string name="preferences_default_reminder_title" msgid="5188861433342733905">"Numatytasis priminimo laikas"</string>
     <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"Numatytasis priminimo laikas"</string>
@@ -179,12 +179,6 @@
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Rodyti savaitės numerį"</string>
     <string name="preferences_about_title" msgid="2810624892412097879">"Apie"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Versija"</string>
-  <string-array name="prefEntries_alerts_vibrateWhen">
-    <item msgid="2539376794936035639">"Visada"</item>
-    <item msgid="8091719131860840185">"Tik kai veikia tyliai"</item>
-    <item msgid="4552962311897985633">"Niekada"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="8995274609647451109">"Vibruoti"</string>
     <string name="gadget_title" msgid="939918875331310945">"Kalendorius"</string>
   <plurals name="month_more_events">
     <item quantity="one" msgid="8971334808414201327">"+1"</item>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index d89f860d..6ec24a28 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -159,7 +159,7 @@
     <string name="menu_about_preferences" msgid="6124375438237674973">"Par pakalpojumu Kalendārs"</string>
     <string name="preferences_title" msgid="8045855493262131773">"Iestatījumi"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"Kalendāra skatījuma iestatījums"</string>
-    <string name="preferences_reminder_title" msgid="6940022527071973010">"Atgādinājumu iestatījumi"</string>
+    <string name="preferences_reminder_title" msgid="5199606534191180129">"Paziņojumi un atgādinājumi"</string>
     <string name="preferences_hide_declined_title" msgid="1849295943669890034">"Slēpt noraidītos pasākumus"</string>
     <string name="preferences_week_start_day_title" msgid="4619489296444901622">"Nedēļas pirmā diena"</string>
     <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"Nedēļas pirmā diena"</string>
@@ -168,7 +168,7 @@
     <string name="search_history_cleared" msgid="1536707558435227567">"Meklēšanas vēsture ir notīrīta."</string>
     <string name="preferences_alerts_title" msgid="6636088008103904020">"Paziņojumi"</string>
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"Vibrozvans"</string>
-    <string name="preferences_alerts_ringtone_title" msgid="7872809411438804447">"Zvana signāla izvēle"</string>
+    <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"Skaņa"</string>
     <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"Uznirstošais paziņojums"</string>
     <string name="preferences_default_reminder_title" msgid="5188861433342733905">"Atgādinājuma noklusējuma laiks"</string>
     <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"Atgādinājuma noklusējuma laiks"</string>
@@ -179,12 +179,6 @@
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Rādīt nedēļas numuru"</string>
     <string name="preferences_about_title" msgid="2810624892412097879">"Par"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Būvējuma versija"</string>
-  <string-array name="prefEntries_alerts_vibrateWhen">
-    <item msgid="2539376794936035639">"Vienmēr"</item>
-    <item msgid="8091719131860840185">"Tikai klusuma režīmā"</item>
-    <item msgid="4552962311897985633">"Nekad"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="8995274609647451109">"Vibrozvans"</string>
     <string name="gadget_title" msgid="939918875331310945">"Kalendārs"</string>
   <plurals name="month_more_events">
     <item quantity="one" msgid="8971334808414201327">"+1"</item>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index b81c2bcf..e1d87223 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -159,7 +159,7 @@
     <string name="menu_about_preferences" msgid="6124375438237674973">"Mengenai Kalendar"</string>
     <string name="preferences_title" msgid="8045855493262131773">"Tetapan"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"Tetapan paparan kalendar"</string>
-    <string name="preferences_reminder_title" msgid="6940022527071973010">"Tetapan peringatan"</string>
+    <string name="preferences_reminder_title" msgid="5199606534191180129">"Pemberitahuan &amp; peringatan"</string>
     <string name="preferences_hide_declined_title" msgid="1849295943669890034">"Sembunyikan acara yang ditolak"</string>
     <string name="preferences_week_start_day_title" msgid="4619489296444901622">"Minggu bermula pada"</string>
     <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"Minggu bermula pada"</string>
@@ -168,7 +168,7 @@
     <string name="search_history_cleared" msgid="1536707558435227567">"Sejarah carian dipadam bersih."</string>
     <string name="preferences_alerts_title" msgid="6636088008103904020">"Pemberitahuan"</string>
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"Getar"</string>
-    <string name="preferences_alerts_ringtone_title" msgid="7872809411438804447">"Pilih nada dering"</string>
+    <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"Bunyi"</string>
     <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"Pemberitahuan pop timbul"</string>
     <string name="preferences_default_reminder_title" msgid="5188861433342733905">"Waktu peringatan lalai"</string>
     <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"Waktu peringatan lalai"</string>
@@ -179,12 +179,6 @@
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Tunjukkan nombor minggu"</string>
     <string name="preferences_about_title" msgid="2810624892412097879">"Mengenai"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Versi binaan"</string>
-  <string-array name="prefEntries_alerts_vibrateWhen">
-    <item msgid="2539376794936035639">"Sentiasa"</item>
-    <item msgid="8091719131860840185">"Apabila senyap sahaja"</item>
-    <item msgid="4552962311897985633">"Jangan sekali-kali"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="8995274609647451109">"Getar"</string>
     <string name="gadget_title" msgid="939918875331310945">"Kalendar"</string>
   <plurals name="month_more_events">
     <item quantity="one" msgid="8971334808414201327">"+1"</item>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 86d07366..7f72a19b 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -159,7 +159,7 @@
     <string name="menu_about_preferences" msgid="6124375438237674973">"Om Kalender"</string>
     <string name="preferences_title" msgid="8045855493262131773">"Innstillinger"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"Kalender visningsinnstilling"</string>
-    <string name="preferences_reminder_title" msgid="6940022527071973010">"Påminnelsesinnstillinger"</string>
+    <string name="preferences_reminder_title" msgid="5199606534191180129">"Varsler og påminnelser"</string>
     <string name="preferences_hide_declined_title" msgid="1849295943669890034">"Skjul avslåtte aktiviteter"</string>
     <string name="preferences_week_start_day_title" msgid="4619489296444901622">"Uke starter på"</string>
     <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"Uke starter på"</string>
@@ -168,7 +168,7 @@
     <string name="search_history_cleared" msgid="1536707558435227567">"Søkeloggen er tømt."</string>
     <string name="preferences_alerts_title" msgid="6636088008103904020">"Varsler"</string>
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"Vibrering"</string>
-    <string name="preferences_alerts_ringtone_title" msgid="7872809411438804447">"Velg ringetone"</string>
+    <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"Lyd"</string>
     <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"Forgrunnsvinduvarsel"</string>
     <string name="preferences_default_reminder_title" msgid="5188861433342733905">"Sett standard påminnelse"</string>
     <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"Standard påminnelsestid"</string>
@@ -179,12 +179,6 @@
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Vis ukenummer"</string>
     <string name="preferences_about_title" msgid="2810624892412097879">"Info"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Delversjon"</string>
-  <string-array name="prefEntries_alerts_vibrateWhen">
-    <item msgid="2539376794936035639">"Alltid"</item>
-    <item msgid="8091719131860840185">"Kun ved stille modus"</item>
-    <item msgid="4552962311897985633">"Aldri"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="8995274609647451109">"Vibrering"</string>
     <string name="gadget_title" msgid="939918875331310945">"Kalender"</string>
   <plurals name="month_more_events">
     <item quantity="one" msgid="8971334808414201327">"+ 1"</item>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 5654f907..9a01356e 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -134,7 +134,7 @@
     <string name="menu_about_preferences" msgid="6124375438237674973">"Over Agenda"</string>
     <string name="preferences_title" msgid="8045855493262131773">"Instellingen"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"Instelling agendaweergave"</string>
-    <string name="preferences_reminder_title" msgid="6940022527071973010">"Instellingen voor herinneringen"</string>
+    <string name="preferences_reminder_title" msgid="5199606534191180129">"Meldingen en herinneringen"</string>
     <string name="preferences_hide_declined_title" msgid="1849295943669890034">"Geweigerde afspraken verbergen"</string>
     <string name="preferences_week_start_day_title" msgid="4619489296444901622">"Week begint op"</string>
     <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"Week begint op"</string>
@@ -143,7 +143,7 @@
     <string name="search_history_cleared" msgid="1536707558435227567">"Zoekgeschiedenis gewist."</string>
     <string name="preferences_alerts_title" msgid="6636088008103904020">"Meldingen"</string>
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"Trillen"</string>
-    <string name="preferences_alerts_ringtone_title" msgid="7872809411438804447">"Beltoon kiezen"</string>
+    <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"Geluid"</string>
     <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"Pop-upmelding"</string>
     <string name="preferences_default_reminder_title" msgid="5188861433342733905">"Herinneringstijd"</string>
     <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"Herinneringstijd"</string>
@@ -153,7 +153,6 @@
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Weeknummer tonen"</string>
     <string name="preferences_about_title" msgid="2810624892412097879">"Over"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Build-versie"</string>
-    <string name="prefDialogTitle_vibrateWhen" msgid="8995274609647451109">"Trillen"</string>
     <string name="gadget_title" msgid="939918875331310945">"Agenda"</string>
     <string name="gadget_no_events" msgid="5209110911088302855">"Geen lopende agenda-afspraken"</string>
     <string name="copy_db" msgid="437691290566699292">"Database verzenden"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 229c5443..030dfcdf 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -159,7 +159,7 @@
     <string name="menu_about_preferences" msgid="6124375438237674973">"Kalendarz – informacje"</string>
     <string name="preferences_title" msgid="8045855493262131773">"Ustawienia"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"Widok kalendarza"</string>
-    <string name="preferences_reminder_title" msgid="6940022527071973010">"Ustawienia przypomnień"</string>
+    <string name="preferences_reminder_title" msgid="5199606534191180129">"Powiadomienia i przypomnienia"</string>
     <string name="preferences_hide_declined_title" msgid="1849295943669890034">"Ukryj odrzucone"</string>
     <string name="preferences_week_start_day_title" msgid="4619489296444901622">"Początek tygodnia to"</string>
     <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"Początek tygodnia to"</string>
@@ -168,7 +168,7 @@
     <string name="search_history_cleared" msgid="1536707558435227567">"Wyczyszczono historię wyszukiwania."</string>
     <string name="preferences_alerts_title" msgid="6636088008103904020">"Powiadomienia"</string>
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"Wibracje"</string>
-    <string name="preferences_alerts_ringtone_title" msgid="7872809411438804447">"Wybierz dzwonek"</string>
+    <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"Dźwięk"</string>
     <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"Wyświetl na ekranie"</string>
     <string name="preferences_default_reminder_title" msgid="5188861433342733905">"Domyślne przypomnienie"</string>
     <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"Domyślne przypomnienie"</string>
@@ -179,12 +179,6 @@
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Pokaż numer tygodnia"</string>
     <string name="preferences_about_title" msgid="2810624892412097879">"Informacje"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Wersja kompilacji"</string>
-  <string-array name="prefEntries_alerts_vibrateWhen">
-    <item msgid="2539376794936035639">"Zawsze"</item>
-    <item msgid="8091719131860840185">"Tylko po wyciszeniu"</item>
-    <item msgid="4552962311897985633">"Nigdy"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="8995274609647451109">"Wibracje"</string>
     <string name="gadget_title" msgid="939918875331310945">"Kalendarz"</string>
   <plurals name="month_more_events">
     <item quantity="one" msgid="8971334808414201327">"+1"</item>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 0c0b0217..9950d946 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -159,7 +159,7 @@
     <string name="menu_about_preferences" msgid="6124375438237674973">"Acerca do Calendário"</string>
     <string name="preferences_title" msgid="8045855493262131773">"Definições"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"Configuração de visualização do calendário"</string>
-    <string name="preferences_reminder_title" msgid="6940022527071973010">"Definições de lembrete"</string>
+    <string name="preferences_reminder_title" msgid="5199606534191180129">"Notificações e lembretes"</string>
     <string name="preferences_hide_declined_title" msgid="1849295943669890034">"Ocultar eventos recusados"</string>
     <string name="preferences_week_start_day_title" msgid="4619489296444901622">"A semana começa"</string>
     <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"A semana começa na"</string>
@@ -168,7 +168,7 @@
     <string name="search_history_cleared" msgid="1536707558435227567">"Histórico de pesquisas limpo."</string>
     <string name="preferences_alerts_title" msgid="6636088008103904020">"Notificações"</string>
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"Vibrar"</string>
-    <string name="preferences_alerts_ringtone_title" msgid="7872809411438804447">"Escolher toque"</string>
+    <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"Som"</string>
     <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"Notificação de pop-up"</string>
     <string name="preferences_default_reminder_title" msgid="5188861433342733905">"Hora predefinida do lembrete"</string>
     <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"Hora predefinida do lembrete"</string>
@@ -179,12 +179,6 @@
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Mostrar número da semana"</string>
     <string name="preferences_about_title" msgid="2810624892412097879">"Acerca de"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Versão da compilação"</string>
-  <string-array name="prefEntries_alerts_vibrateWhen">
-    <item msgid="2539376794936035639">"Sempre"</item>
-    <item msgid="8091719131860840185">"Apenas quando está em silêncio"</item>
-    <item msgid="4552962311897985633">"Nunca"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="8995274609647451109">"Vibrar"</string>
     <string name="gadget_title" msgid="939918875331310945">"Calendário"</string>
   <plurals name="month_more_events">
     <item quantity="one" msgid="8971334808414201327">"+1"</item>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index bf9fbaf7..3ad0c6a2 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -159,7 +159,7 @@
     <string name="menu_about_preferences" msgid="6124375438237674973">"Sobre a Agenda"</string>
     <string name="preferences_title" msgid="8045855493262131773">"Configurações"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"Configuração de visualização"</string>
-    <string name="preferences_reminder_title" msgid="6940022527071973010">"Configurações dos lembretes"</string>
+    <string name="preferences_reminder_title" msgid="5199606534191180129">"Notificações e lembretes"</string>
     <string name="preferences_hide_declined_title" msgid="1849295943669890034">"Ocultar recusados"</string>
     <string name="preferences_week_start_day_title" msgid="4619489296444901622">"A semana começa em"</string>
     <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"A semana começa em"</string>
@@ -168,7 +168,7 @@
     <string name="search_history_cleared" msgid="1536707558435227567">"Histórico de pesquisa apagado."</string>
     <string name="preferences_alerts_title" msgid="6636088008103904020">"Notificações"</string>
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"Vibrar"</string>
-    <string name="preferences_alerts_ringtone_title" msgid="7872809411438804447">"Escolher toque"</string>
+    <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"Som"</string>
     <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"Notificação pop-up"</string>
     <string name="preferences_default_reminder_title" msgid="5188861433342733905">"Tempo do lembrete"</string>
     <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"Momento padrão do lembrete"</string>
@@ -179,12 +179,6 @@
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Mostrar núm. da semana"</string>
     <string name="preferences_about_title" msgid="2810624892412097879">"Sobre"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Versão da compilação"</string>
-  <string-array name="prefEntries_alerts_vibrateWhen">
-    <item msgid="2539376794936035639">"Sempre"</item>
-    <item msgid="8091719131860840185">"Apenas quando estiver no silencioso"</item>
-    <item msgid="4552962311897985633">"Nunca"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="8995274609647451109">"Vibrar"</string>
     <string name="gadget_title" msgid="939918875331310945">"Agenda"</string>
   <plurals name="month_more_events">
     <item quantity="one" msgid="8971334808414201327">"+1"</item>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 469df7b8..2b9879dc 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -159,7 +159,7 @@
     <string name="menu_about_preferences" msgid="6124375438237674973">"Despre Calendar"</string>
     <string name="preferences_title" msgid="8045855493262131773">"Setări"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"Setarea afişării calendarului"</string>
-    <string name="preferences_reminder_title" msgid="6940022527071973010">"Setări mementouri"</string>
+    <string name="preferences_reminder_title" msgid="5199606534191180129">"Notificări și mementouri"</string>
     <string name="preferences_hide_declined_title" msgid="1849295943669890034">"Ascundeţi evenimentele refuzate"</string>
     <string name="preferences_week_start_day_title" msgid="4619489296444901622">"Săptămâna începe"</string>
     <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"Săptămâna începe"</string>
@@ -168,7 +168,7 @@
     <string name="search_history_cleared" msgid="1536707558435227567">"Istoricul căutărilor a fost şters."</string>
     <string name="preferences_alerts_title" msgid="6636088008103904020">"Notificări"</string>
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"Vibrare"</string>
-    <string name="preferences_alerts_ringtone_title" msgid="7872809411438804447">"Alegeţi un ton de sonerie"</string>
+    <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"Sunet"</string>
     <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"Notificare pop-up"</string>
     <string name="preferences_default_reminder_title" msgid="5188861433342733905">"Timp predefinit pentru memento"</string>
     <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"Timp predefinit pentru memento"</string>
@@ -179,12 +179,6 @@
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Afişaţi numărul săptămânii"</string>
     <string name="preferences_about_title" msgid="2810624892412097879">"Despre"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Versiunea"</string>
-  <string-array name="prefEntries_alerts_vibrateWhen">
-    <item msgid="2539376794936035639">"Întotdeauna"</item>
-    <item msgid="8091719131860840185">"Numai când profilul este Silenţios"</item>
-    <item msgid="4552962311897985633">"Niciodată"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="8995274609647451109">"Vibrare"</string>
     <string name="gadget_title" msgid="939918875331310945">"Calendar"</string>
   <plurals name="month_more_events">
     <item quantity="one" msgid="8971334808414201327">"+1"</item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 3c7341ec..9ace4221 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -159,7 +159,7 @@
     <string name="menu_about_preferences" msgid="6124375438237674973">"О календаре"</string>
     <string name="preferences_title" msgid="8045855493262131773">"Настройки"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"Мероприятия"</string>
-    <string name="preferences_reminder_title" msgid="6940022527071973010">"Настройки напоминаний"</string>
+    <string name="preferences_reminder_title" msgid="5199606534191180129">"Уведомления и напоминания"</string>
     <string name="preferences_hide_declined_title" msgid="1849295943669890034">"Скрыть отклоненные"</string>
     <string name="preferences_week_start_day_title" msgid="4619489296444901622">"Начало недели:"</string>
     <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"Начало недели:"</string>
@@ -168,7 +168,7 @@
     <string name="search_history_cleared" msgid="1536707558435227567">"История поиска удалена."</string>
     <string name="preferences_alerts_title" msgid="6636088008103904020">"Оповещения"</string>
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"Вибросигнал"</string>
-    <string name="preferences_alerts_ringtone_title" msgid="7872809411438804447">"Выбрать рингтон"</string>
+    <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"Рингтон"</string>
     <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"Всплывающее уведомление"</string>
     <string name="preferences_default_reminder_title" msgid="5188861433342733905">"Время напоминания"</string>
     <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"Напомнить"</string>
@@ -179,12 +179,6 @@
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Показать номер недели"</string>
     <string name="preferences_about_title" msgid="2810624892412097879">"О программе"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Версия сборки"</string>
-  <string-array name="prefEntries_alerts_vibrateWhen">
-    <item msgid="2539376794936035639">"Всегда"</item>
-    <item msgid="8091719131860840185">"Только в режиме без звука"</item>
-    <item msgid="4552962311897985633">"Никогда"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="8995274609647451109">"Вибросигнал"</string>
     <string name="gadget_title" msgid="939918875331310945">"Календарь"</string>
   <plurals name="month_more_events">
     <item quantity="one" msgid="8971334808414201327">" и еще 1"</item>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 2b8f11ba..6ba6362b 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -159,7 +159,7 @@
     <string name="menu_about_preferences" msgid="6124375438237674973">"O Kalendári"</string>
     <string name="preferences_title" msgid="8045855493262131773">"Nastavenia"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"Nastavenie zobrazenia kalendára"</string>
-    <string name="preferences_reminder_title" msgid="6940022527071973010">"Nastavenia pripomienok"</string>
+    <string name="preferences_reminder_title" msgid="5199606534191180129">"Upozornenia a pripomienky"</string>
     <string name="preferences_hide_declined_title" msgid="1849295943669890034">"Skryť odmietnuté udalosti"</string>
     <string name="preferences_week_start_day_title" msgid="4619489296444901622">"Začiatok týždňa"</string>
     <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"Začiatok týždňa"</string>
@@ -168,7 +168,7 @@
     <string name="search_history_cleared" msgid="1536707558435227567">"História vyhľadávania bola vymazaná."</string>
     <string name="preferences_alerts_title" msgid="6636088008103904020">"Upozornenia"</string>
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"Vibrovať"</string>
-    <string name="preferences_alerts_ringtone_title" msgid="7872809411438804447">"Zvoliť tón zvonenia"</string>
+    <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"Zvuk"</string>
     <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"Kontextové upozornenie"</string>
     <string name="preferences_default_reminder_title" msgid="5188861433342733905">"Predvolený čas pripomienky"</string>
     <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"Predvolený čas pripomienky"</string>
@@ -179,12 +179,6 @@
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Zobrazovať číslo týždňa"</string>
     <string name="preferences_about_title" msgid="2810624892412097879">"O službe"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Verzia zostavy"</string>
-  <string-array name="prefEntries_alerts_vibrateWhen">
-    <item msgid="2539376794936035639">"Vždy"</item>
-    <item msgid="8091719131860840185">"Iba v tichom režime"</item>
-    <item msgid="4552962311897985633">"Nikdy"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="8995274609647451109">"Vibrovať"</string>
     <string name="gadget_title" msgid="939918875331310945">"Kalendár"</string>
   <plurals name="month_more_events">
     <item quantity="one" msgid="8971334808414201327">"+1"</item>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 7cd164e7..e9f90535 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -159,7 +159,7 @@
     <string name="menu_about_preferences" msgid="6124375438237674973">"O Koledarju"</string>
     <string name="preferences_title" msgid="8045855493262131773">"Nastavitve"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"Nastavitev pogleda koledarja"</string>
-    <string name="preferences_reminder_title" msgid="6940022527071973010">"Nastavitve opomnikov"</string>
+    <string name="preferences_reminder_title" msgid="5199606534191180129">"Obvestila in opomniki"</string>
     <string name="preferences_hide_declined_title" msgid="1849295943669890034">"Skrij zavrnjene dogodke"</string>
     <string name="preferences_week_start_day_title" msgid="4619489296444901622">"Teden se začne v"</string>
     <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"Teden se začne v"</string>
@@ -168,7 +168,7 @@
     <string name="search_history_cleared" msgid="1536707558435227567">"Zgodovina iskanja je izbrisana."</string>
     <string name="preferences_alerts_title" msgid="6636088008103904020">"Obvestila"</string>
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"Vibriranje"</string>
-    <string name="preferences_alerts_ringtone_title" msgid="7872809411438804447">"Izberite melodijo zvonjenja"</string>
+    <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"Zvok"</string>
     <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"Pojavno obvestilo"</string>
     <string name="preferences_default_reminder_title" msgid="5188861433342733905">"Privzeti čas opomnika"</string>
     <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"Privzeti čas opomnika"</string>
@@ -179,12 +179,6 @@
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Pokaži številko tedna"</string>
     <string name="preferences_about_title" msgid="2810624892412097879">"O programu"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Delovna različica"</string>
-  <string-array name="prefEntries_alerts_vibrateWhen">
-    <item msgid="2539376794936035639">"Vedno"</item>
-    <item msgid="8091719131860840185">"Samo v tihem načinu"</item>
-    <item msgid="4552962311897985633">"Nikoli"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="8995274609647451109">"Vibriranje"</string>
     <string name="gadget_title" msgid="939918875331310945">"Koledar"</string>
   <plurals name="month_more_events">
     <item quantity="one" msgid="8971334808414201327">"+1"</item>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index a648ecf3..a95cff65 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -159,7 +159,7 @@
     <string name="menu_about_preferences" msgid="6124375438237674973">"О Календару"</string>
     <string name="preferences_title" msgid="8045855493262131773">"Подешавања"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"Подешавање приказа календара"</string>
-    <string name="preferences_reminder_title" msgid="6940022527071973010">"Подешавања подсетника"</string>
+    <string name="preferences_reminder_title" msgid="5199606534191180129">"Обавештења и подсетници"</string>
     <string name="preferences_hide_declined_title" msgid="1849295943669890034">"Сакриј одбијене догађаје"</string>
     <string name="preferences_week_start_day_title" msgid="4619489296444901622">"Недеља почиње дана"</string>
     <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"Недеља почиње дана"</string>
@@ -168,7 +168,7 @@
     <string name="search_history_cleared" msgid="1536707558435227567">"Историја претраге је обрисана."</string>
     <string name="preferences_alerts_title" msgid="6636088008103904020">"Обавештења"</string>
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"Вибрација"</string>
-    <string name="preferences_alerts_ringtone_title" msgid="7872809411438804447">"Избор мелодије звона"</string>
+    <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"Звук"</string>
     <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"Искачуће обавештење"</string>
     <string name="preferences_default_reminder_title" msgid="5188861433342733905">"Подразумевано време подсетника"</string>
     <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"Подразумевано време подсетника"</string>
@@ -179,12 +179,6 @@
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Прикажи број недеље"</string>
     <string name="preferences_about_title" msgid="2810624892412097879">"О"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Верзија апликације"</string>
-  <string-array name="prefEntries_alerts_vibrateWhen">
-    <item msgid="2539376794936035639">"Увек"</item>
-    <item msgid="8091719131860840185">"Само у нечујном режиму"</item>
-    <item msgid="4552962311897985633">"Никад"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="8995274609647451109">"Вибрација"</string>
     <string name="gadget_title" msgid="939918875331310945">"Календар"</string>
   <plurals name="month_more_events">
     <item quantity="one" msgid="8971334808414201327">"+1"</item>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 51cd5d5a..9f3a6ded 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -145,7 +145,7 @@
     <string name="yearly_plain" msgid="3652692085322162449">"Varje år"</string>
     <string name="monthly_on_day" msgid="5370155265278821156">"Varje månad (den <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
     <string name="yearly" msgid="8576208380302949002">"Varje år (den <xliff:g id="DATES">%s</xliff:g>)"</string>
-    <string name="custom" product="tablet" msgid="3806817351377723249">"Anpassad (går ej att anpassa på pekdatorn)"</string>
+    <string name="custom" product="tablet" msgid="3806817351377723249">"Anpassad (går ej att anpassa på surfplattan)"</string>
     <string name="custom" product="default" msgid="4137468716966004993">"Anpassad (går ej att anpassa i mobilen)"</string>
     <string name="modify_event" msgid="5982876409997142690">"Ändra bara den här händelsen"</string>
     <string name="modify_all" msgid="4421657265864209041">"Ändra alla händelser i serien"</string>
@@ -159,7 +159,7 @@
     <string name="menu_about_preferences" msgid="6124375438237674973">"Om Kalender"</string>
     <string name="preferences_title" msgid="8045855493262131773">"Inställningar"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"Inställning för kalendervy"</string>
-    <string name="preferences_reminder_title" msgid="6940022527071973010">"Inställningar för påminnelse"</string>
+    <string name="preferences_reminder_title" msgid="5199606534191180129">"Meddelanden och påminnelser"</string>
     <string name="preferences_hide_declined_title" msgid="1849295943669890034">"Dölj avböjda händelser"</string>
     <string name="preferences_week_start_day_title" msgid="4619489296444901622">"Veckan börjar med"</string>
     <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"Veckan börjar med"</string>
@@ -168,7 +168,7 @@
     <string name="search_history_cleared" msgid="1536707558435227567">"Sökhistoriken har rensats."</string>
     <string name="preferences_alerts_title" msgid="6636088008103904020">"Aviseringar"</string>
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"Vibrera"</string>
-    <string name="preferences_alerts_ringtone_title" msgid="7872809411438804447">"Välj ringsignal"</string>
+    <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"Ljud"</string>
     <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"Popup-meddelande"</string>
     <string name="preferences_default_reminder_title" msgid="5188861433342733905">"Standardtid för påminnelse"</string>
     <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"Standardtid för påminnelse"</string>
@@ -179,12 +179,6 @@
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Visa veckonummer"</string>
     <string name="preferences_about_title" msgid="2810624892412097879">"Om"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Programversion"</string>
-  <string-array name="prefEntries_alerts_vibrateWhen">
-    <item msgid="2539376794936035639">"Alltid"</item>
-    <item msgid="8091719131860840185">"Bara vid tyst"</item>
-    <item msgid="4552962311897985633">"Aldrig"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="8995274609647451109">"Vibrera"</string>
     <string name="gadget_title" msgid="939918875331310945">"Kalender"</string>
   <plurals name="month_more_events">
     <item quantity="one" msgid="8971334808414201327">"+ 1"</item>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 19fe5b2d..7dd4f751 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -145,8 +145,8 @@
     <string name="yearly_plain" msgid="3652692085322162449">"Kila mwaka"</string>
     <string name="monthly_on_day" msgid="5370155265278821156">"Kila mwezi (kwa siku ya <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
     <string name="yearly" msgid="8576208380302949002">"Kila mwaka (mnamo <xliff:g id="DATES">%s</xliff:g>)"</string>
-    <string name="custom" product="tablet" msgid="3806817351377723249">"Kaida (haiwezi kugeuzia kwa kompyuta ndogo)"</string>
-    <string name="custom" product="default" msgid="4137468716966004993">"Kaida (haiwezi kugeuzia kwa simu)"</string>
+    <string name="custom" product="tablet" msgid="3806817351377723249">"Maalum (haiwezi kugeuzia kukufaa kwenye kompyuta kibao)"</string>
+    <string name="custom" product="default" msgid="4137468716966004993">"Maalum (haiwezi kugeuzia kukufaa kwenye simu)"</string>
     <string name="modify_event" msgid="5982876409997142690">"Badilisha tukio hili pekee"</string>
     <string name="modify_all" msgid="4421657265864209041">"Badilisha matukio yote katika mfululizo"</string>
     <string name="modify_all_following" msgid="3017428541066390380">"Badilisha hili na matukio yote yajayo"</string>
@@ -159,7 +159,7 @@
     <string name="menu_about_preferences" msgid="6124375438237674973">"Kuhusu Kalenda"</string>
     <string name="preferences_title" msgid="8045855493262131773">"Mipangilio"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"Mipangilio ya mwonekano wa kalenda"</string>
-    <string name="preferences_reminder_title" msgid="6940022527071973010">"Mipangilio ya kikumbusho"</string>
+    <string name="preferences_reminder_title" msgid="5199606534191180129">"Arifa na vikumbusho"</string>
     <string name="preferences_hide_declined_title" msgid="1849295943669890034">"Ficha matukio yaliyokataliwa"</string>
     <string name="preferences_week_start_day_title" msgid="4619489296444901622">"Juma linaanza"</string>
     <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"Juma linaanza"</string>
@@ -168,7 +168,7 @@
     <string name="search_history_cleared" msgid="1536707558435227567">"Historia ya utafutaji imefutwa."</string>
     <string name="preferences_alerts_title" msgid="6636088008103904020">"Taarifa"</string>
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"Tikisika"</string>
-    <string name="preferences_alerts_ringtone_title" msgid="7872809411438804447">"Chagua toni ya mlio"</string>
+    <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"Sauti"</string>
     <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"Arifa ibukizi"</string>
     <string name="preferences_default_reminder_title" msgid="5188861433342733905">"Muda chaguo-msingi wa ukumbusho"</string>
     <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"Muda chaguo-msingi wa ukumbusho"</string>
@@ -179,12 +179,6 @@
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Onyesha nambari ya wiki"</string>
     <string name="preferences_about_title" msgid="2810624892412097879">"Kuhusu"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Toleo la muundo"</string>
-  <string-array name="prefEntries_alerts_vibrateWhen">
-    <item msgid="2539376794936035639">"Kila wakati"</item>
-    <item msgid="8091719131860840185">"Ikiwa kimya tu"</item>
-    <item msgid="4552962311897985633">"Katu"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="8995274609647451109">"Tikisika"</string>
     <string name="gadget_title" msgid="939918875331310945">"Kalenda"</string>
   <plurals name="month_more_events">
     <item quantity="one" msgid="8971334808414201327">"+1"</item>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 63b1a811..b4c06cc1 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -159,7 +159,7 @@
     <string name="menu_about_preferences" msgid="6124375438237674973">"เกี่ยวกับปฏิทิน"</string>
     <string name="preferences_title" msgid="8045855493262131773">"การตั้งค่า"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"การตั้งค่ามุมมองปฏิทิน"</string>
-    <string name="preferences_reminder_title" msgid="6940022527071973010">"การตั้งค่าการเตือนความจำ"</string>
+    <string name="preferences_reminder_title" msgid="5199606534191180129">"การแจ้งเตือน"</string>
     <string name="preferences_hide_declined_title" msgid="1849295943669890034">"ซ่อนกิจกรรมที่ปฏิเสธ"</string>
     <string name="preferences_week_start_day_title" msgid="4619489296444901622">"สัปดาห์เริ่มต้นวันที่"</string>
     <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"สัปดาห์เริ่มต้นวันที่"</string>
@@ -168,7 +168,7 @@
     <string name="search_history_cleared" msgid="1536707558435227567">"ล้างประวัติการค้นหาแล้ว"</string>
     <string name="preferences_alerts_title" msgid="6636088008103904020">"การแจ้งเตือน"</string>
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"สั่น"</string>
-    <string name="preferences_alerts_ringtone_title" msgid="7872809411438804447">"เลือกเสียงแจ้งเตือน"</string>
+    <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"เสียง"</string>
     <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"ป๊อปอัปแจ้งเตือน"</string>
     <string name="preferences_default_reminder_title" msgid="5188861433342733905">"เวลาการเตือนความจำเริ่มต้น"</string>
     <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"เวลาการเตือนความจำเริ่มต้น"</string>
@@ -179,12 +179,6 @@
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"แสดงหมายเลขสัปดาห์"</string>
     <string name="preferences_about_title" msgid="2810624892412097879">"เกี่ยวกับ"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"รุ่น"</string>
-  <string-array name="prefEntries_alerts_vibrateWhen">
-    <item msgid="2539376794936035639">"ทุกครั้ง"</item>
-    <item msgid="8091719131860840185">"เฉพาะเมื่อปิดเสียง"</item>
-    <item msgid="4552962311897985633">"ไม่ใช้"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="8995274609647451109">"สั่น"</string>
     <string name="gadget_title" msgid="939918875331310945">"ปฏิทิน"</string>
   <plurals name="month_more_events">
     <item quantity="one" msgid="8971334808414201327">"+1"</item>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index c4a57f10..e9544ed5 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -159,7 +159,7 @@
     <string name="menu_about_preferences" msgid="6124375438237674973">"Tungkol sa Calendar"</string>
     <string name="preferences_title" msgid="8045855493262131773">"Mga Setting"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"Setting ng pagtingin sa kalendaryo"</string>
-    <string name="preferences_reminder_title" msgid="6940022527071973010">"Mga setting ng paalala"</string>
+    <string name="preferences_reminder_title" msgid="5199606534191180129">"Mga notification at paalala"</string>
     <string name="preferences_hide_declined_title" msgid="1849295943669890034">"Itago ang mga tinanggihang kaganapan"</string>
     <string name="preferences_week_start_day_title" msgid="4619489296444901622">"Magsisimula ang linggo sa"</string>
     <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"Magsisimula ang linggo sa"</string>
@@ -168,7 +168,7 @@
     <string name="search_history_cleared" msgid="1536707558435227567">"Na-clear ang kasaysayan ng paghahanap."</string>
     <string name="preferences_alerts_title" msgid="6636088008103904020">"Mga Notification"</string>
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"I-vibrate"</string>
-    <string name="preferences_alerts_ringtone_title" msgid="7872809411438804447">"Pumili ng ringtone"</string>
+    <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"Tunog"</string>
     <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"Pop-up notification"</string>
     <string name="preferences_default_reminder_title" msgid="5188861433342733905">"Default na oras ng paalala"</string>
     <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"Default na oras ng paalala"</string>
@@ -179,12 +179,6 @@
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Ipakita ang numero ng linggo"</string>
     <string name="preferences_about_title" msgid="2810624892412097879">"Tungkol sa"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Bumuo ng bersyon"</string>
-  <string-array name="prefEntries_alerts_vibrateWhen">
-    <item msgid="2539376794936035639">"Palagi"</item>
-    <item msgid="8091719131860840185">"Kapag tahimik lang"</item>
-    <item msgid="4552962311897985633">"Hindi kailanman"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="8995274609647451109">"I-vibrate"</string>
     <string name="gadget_title" msgid="939918875331310945">"Kalendaryo"</string>
   <plurals name="month_more_events">
     <item quantity="one" msgid="8971334808414201327">"+1"</item>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 6ed9a289..7f1493bd 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -159,7 +159,7 @@
     <string name="menu_about_preferences" msgid="6124375438237674973">"Takvim hakkında"</string>
     <string name="preferences_title" msgid="8045855493262131773">"Ayarlar"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"Takvim görünümü ayarı"</string>
-    <string name="preferences_reminder_title" msgid="6940022527071973010">"Hatırlatıcı ayarları"</string>
+    <string name="preferences_reminder_title" msgid="5199606534191180129">"Bildirimler ve hatırlatıcılar"</string>
     <string name="preferences_hide_declined_title" msgid="1849295943669890034">"Reddedilmiş etkin. gizle"</string>
     <string name="preferences_week_start_day_title" msgid="4619489296444901622">"Haftanın ilk günü"</string>
     <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"Haftanın ilk günü"</string>
@@ -168,7 +168,7 @@
     <string name="search_history_cleared" msgid="1536707558435227567">"Arama geçmişi temizlendi."</string>
     <string name="preferences_alerts_title" msgid="6636088008103904020">"Bildirimler"</string>
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"Titreşim"</string>
-    <string name="preferences_alerts_ringtone_title" msgid="7872809411438804447">"Zil sesi seçin"</string>
+    <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"Ses"</string>
     <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"Pop-up bildirim"</string>
     <string name="preferences_default_reminder_title" msgid="5188861433342733905">"Varsayılan hatırlatıcı süresi"</string>
     <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"Varsayılan hatırlatıcı süresi"</string>
@@ -179,12 +179,6 @@
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Hafta sayısını göster"</string>
     <string name="preferences_about_title" msgid="2810624892412097879">"Hakkında"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Derleme sürümü"</string>
-  <string-array name="prefEntries_alerts_vibrateWhen">
-    <item msgid="2539376794936035639">"Her zaman"</item>
-    <item msgid="8091719131860840185">"Yalnızca sessizken"</item>
-    <item msgid="4552962311897985633">"Hiçbir zaman"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="8995274609647451109">"Titreşim"</string>
     <string name="gadget_title" msgid="939918875331310945">"Takvim"</string>
   <plurals name="month_more_events">
     <item quantity="one" msgid="8971334808414201327">"+1"</item>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 384df733..33cc3103 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -59,7 +59,7 @@
     <string name="event_edit" msgid="4006961928830064662">"Редаг. подію"</string>
     <string name="event_delete" msgid="2386667193277770442">"Видалити подію"</string>
     <string name="goto_today" msgid="9162136434410891230">"Сьогодні"</string>
-    <string name="menu_preferences" msgid="9120238479503233925">"Налаштув-ня"</string>
+    <string name="menu_preferences" msgid="9120238479503233925">"Налаштування"</string>
     <string name="menu_select_visible_calendars" msgid="735670432781741817">"Календарі"</string>
     <string name="search" msgid="550656004486017426">"Пошук"</string>
     <string name="hide_controls" msgid="830320505938520882">"Сховати елем. керув."</string>
@@ -72,7 +72,7 @@
     <string name="select_synced_calendars_title" msgid="7916084873075901448">"Календарі для синхронізації"</string>
     <string name="select_synced_calendars_button" msgid="8890542984949996251">"Календарі для синхронізації"</string>
     <string name="hint_what" msgid="709155115005044531">"Назва події"</string>
-    <string name="hint_where" msgid="4972598001033801974">"Місцезнаходж-ня"</string>
+    <string name="hint_where" msgid="4972598001033801974">"Місце проведення"</string>
     <string name="hint_description" msgid="1910143586169033232">"Опис"</string>
     <string name="hint_attendees" msgid="1650488163176888480">"Гості"</string>
     <string name="creating_event" msgid="7516249252554059980">"Подію створено."</string>
@@ -157,9 +157,9 @@
     <string name="change_response_title" msgid="7704714776070974984">"Змінити відповідь"</string>
     <string name="menu_general_preferences" msgid="2812705323334260708">"Загальні налаштування"</string>
     <string name="menu_about_preferences" msgid="6124375438237674973">"Про Календар"</string>
-    <string name="preferences_title" msgid="8045855493262131773">"Налаштув-ня"</string>
+    <string name="preferences_title" msgid="8045855493262131773">"Налаштування"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"Налаш. перегляду календ."</string>
-    <string name="preferences_reminder_title" msgid="6940022527071973010">"Налашт-ня нагадувань"</string>
+    <string name="preferences_reminder_title" msgid="5199606534191180129">"Сповіщення й нагадування"</string>
     <string name="preferences_hide_declined_title" msgid="1849295943669890034">"Сховати відхилені події"</string>
     <string name="preferences_week_start_day_title" msgid="4619489296444901622">"Початок тижня:"</string>
     <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"Початок тижня:"</string>
@@ -168,7 +168,7 @@
     <string name="search_history_cleared" msgid="1536707558435227567">"Історію пошуку очищено."</string>
     <string name="preferences_alerts_title" msgid="6636088008103904020">"Сповіщення"</string>
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"Вібросигнал"</string>
-    <string name="preferences_alerts_ringtone_title" msgid="7872809411438804447">"Вибрати сигнал дзвінка"</string>
+    <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"Звук"</string>
     <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"Спливаюче сповіщення"</string>
     <string name="preferences_default_reminder_title" msgid="5188861433342733905">"Час нагад. за умовч."</string>
     <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"Час нагад. за умовч."</string>
@@ -179,12 +179,6 @@
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Показувати номер тижня"</string>
     <string name="preferences_about_title" msgid="2810624892412097879">"Про"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Версія складання"</string>
-  <string-array name="prefEntries_alerts_vibrateWhen">
-    <item msgid="2539376794936035639">"Завжди"</item>
-    <item msgid="8091719131860840185">"Лише в беззвуч. реж."</item>
-    <item msgid="4552962311897985633">"Ніколи"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="8995274609647451109">"Вібросигнал"</string>
     <string name="gadget_title" msgid="939918875331310945">"Календар"</string>
   <plurals name="month_more_events">
     <item quantity="one" msgid="8971334808414201327">"+1"</item>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index b3bd3574..8480b2c0 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -159,7 +159,7 @@
     <string name="menu_about_preferences" msgid="6124375438237674973">"Giới thiệu về lịch"</string>
     <string name="preferences_title" msgid="8045855493262131773">"Cài đặt"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"Cài đặt chế độ xem lịch"</string>
-    <string name="preferences_reminder_title" msgid="6940022527071973010">"Cài đặt lời nhắc"</string>
+    <string name="preferences_reminder_title" msgid="5199606534191180129">"Thông báo và lời nhắc"</string>
     <string name="preferences_hide_declined_title" msgid="1849295943669890034">"Ẩn sự kiện bị từ chối"</string>
     <string name="preferences_week_start_day_title" msgid="4619489296444901622">"Tuần bắt đầu vào"</string>
     <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"Tuần bắt đầu vào"</string>
@@ -168,7 +168,7 @@
     <string name="search_history_cleared" msgid="1536707558435227567">"Đã xóa lịch sử tìm kiếm."</string>
     <string name="preferences_alerts_title" msgid="6636088008103904020">"Thông báo"</string>
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"Rung"</string>
-    <string name="preferences_alerts_ringtone_title" msgid="7872809411438804447">"Chọn nhạc chuông"</string>
+    <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"Âm thanh"</string>
     <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"Thông báo bật lên"</string>
     <string name="preferences_default_reminder_title" msgid="5188861433342733905">"Thời gian nhắc mặc định"</string>
     <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"Thời gian nhắc mặc định"</string>
@@ -179,12 +179,6 @@
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Hiển thị số tuần"</string>
     <string name="preferences_about_title" msgid="2810624892412097879">"Giới thiệu về"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Phiên bản đóng gói"</string>
-  <string-array name="prefEntries_alerts_vibrateWhen">
-    <item msgid="2539376794936035639">"Luôn luôn"</item>
-    <item msgid="8091719131860840185">"Chỉ khi ở chế độ im lặng"</item>
-    <item msgid="4552962311897985633">"Chưa bao giờ"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="8995274609647451109">"Rung"</string>
     <string name="gadget_title" msgid="939918875331310945">"Lịch"</string>
   <plurals name="month_more_events">
     <item quantity="one" msgid="8971334808414201327">"+1"</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 4e842adf..e84a510b 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -159,7 +159,7 @@
     <string name="menu_about_preferences" msgid="6124375438237674973">"关于日历"</string>
     <string name="preferences_title" msgid="8045855493262131773">"设置"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"日历视图设置"</string>
-    <string name="preferences_reminder_title" msgid="6940022527071973010">"提醒设置"</string>
+    <string name="preferences_reminder_title" msgid="5199606534191180129">"通知和提醒"</string>
     <string name="preferences_hide_declined_title" msgid="1849295943669890034">"隐藏已拒绝的活动"</string>
     <string name="preferences_week_start_day_title" msgid="4619489296444901622">"一周开始日"</string>
     <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"一周开始日"</string>
@@ -168,7 +168,7 @@
     <string name="search_history_cleared" msgid="1536707558435227567">"搜索记录已清除。"</string>
     <string name="preferences_alerts_title" msgid="6636088008103904020">"通知"</string>
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"振动"</string>
-    <string name="preferences_alerts_ringtone_title" msgid="7872809411438804447">"选择铃声"</string>
+    <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"提示音"</string>
     <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"弹出式通知"</string>
     <string name="preferences_default_reminder_title" msgid="5188861433342733905">"默认提醒时间"</string>
     <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"默认提醒时间"</string>
@@ -179,12 +179,6 @@
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"显示周数"</string>
     <string name="preferences_about_title" msgid="2810624892412097879">"关于"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"版本号"</string>
-  <string-array name="prefEntries_alerts_vibrateWhen">
-    <item msgid="2539376794936035639">"始终"</item>
-    <item msgid="8091719131860840185">"仅在静音时"</item>
-    <item msgid="4552962311897985633">"永不"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="8995274609647451109">"振动"</string>
     <string name="gadget_title" msgid="939918875331310945">"日历"</string>
   <plurals name="month_more_events">
     <item quantity="one" msgid="8971334808414201327">"+1"</item>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 253b65e6..3eac3f8c 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -159,7 +159,7 @@
     <string name="menu_about_preferences" msgid="6124375438237674973">"關於日曆"</string>
     <string name="preferences_title" msgid="8045855493262131773">"設定"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"日曆檢視設定"</string>
-    <string name="preferences_reminder_title" msgid="6940022527071973010">"提醒設定"</string>
+    <string name="preferences_reminder_title" msgid="5199606534191180129">"通知和提醒"</string>
     <string name="preferences_hide_declined_title" msgid="1849295943669890034">"隱藏已拒絕的活動"</string>
     <string name="preferences_week_start_day_title" msgid="4619489296444901622">"一週起始日"</string>
     <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"一週起始日"</string>
@@ -168,7 +168,7 @@
     <string name="search_history_cleared" msgid="1536707558435227567">"已清除搜尋記錄。"</string>
     <string name="preferences_alerts_title" msgid="6636088008103904020">"通知"</string>
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"震動"</string>
-    <string name="preferences_alerts_ringtone_title" msgid="7872809411438804447">"選擇鈴聲"</string>
+    <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"音效"</string>
     <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"彈出式通知"</string>
     <string name="preferences_default_reminder_title" msgid="5188861433342733905">"預設提醒時間"</string>
     <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"預設提醒時間"</string>
@@ -179,12 +179,6 @@
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"顯示週數"</string>
     <string name="preferences_about_title" msgid="2810624892412097879">"相關資訊"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"版本"</string>
-  <string-array name="prefEntries_alerts_vibrateWhen">
-    <item msgid="2539376794936035639">"一律"</item>
-    <item msgid="8091719131860840185">"靜音時才啟用"</item>
-    <item msgid="4552962311897985633">"永遠不要"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="8995274609647451109">"震動"</string>
     <string name="gadget_title" msgid="939918875331310945">"日曆"</string>
   <plurals name="month_more_events">
     <item quantity="one" msgid="8971334808414201327">"+1"</item>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 26a02fd3..f3136208 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -164,7 +164,7 @@
     <string name="menu_about_preferences" msgid="6124375438237674973">"Mayelana nekhalenda"</string>
     <string name="preferences_title" msgid="8045855493262131773">"Izilungiselelo"</string>
     <string name="preferences_general_title" msgid="2069075513760573117">"Ilungiselelo lokubuka ikhalenda"</string>
-    <string name="preferences_reminder_title" msgid="6940022527071973010">"Izilungiselelo Zesikhumbuzi"</string>
+    <string name="preferences_reminder_title" msgid="5199606534191180129">"Izaziso nezikhumbuzo"</string>
     <string name="preferences_hide_declined_title" msgid="1849295943669890034">"Fihla izenzakalo ezinqabelwe"</string>
     <string name="preferences_week_start_day_title" msgid="4619489296444901622">"Iviki liqala ngezi"</string>
     <string name="preferences_week_start_day_dialog" msgid="5181634128884089113">"Iviki liqala ngezi"</string>
@@ -173,7 +173,7 @@
     <string name="search_history_cleared" msgid="1536707558435227567">"Umlando wokusesha ususiwe."</string>
     <string name="preferences_alerts_title" msgid="6636088008103904020">"Izaziso"</string>
     <string name="preferences_alerts_vibrateWhen_title" msgid="8731372580674292759">"Dlidliza"</string>
-    <string name="preferences_alerts_ringtone_title" msgid="7872809411438804447">"Khetha ithoni yokukhala"</string>
+    <string name="preferences_alerts_ringtone_title" msgid="1849706055052358346">"Umsindo"</string>
     <string name="preferences_alerts_popup_title" msgid="6643468203670475296">"Isaziso esiqhamukayo"</string>
     <string name="preferences_default_reminder_title" msgid="5188861433342733905">"Isikhathi sesikhumbuzi esizenzakalelayo"</string>
     <string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"Isikhathi sesikhumbuzi esizenzakalelayo"</string>
@@ -184,12 +184,6 @@
     <string name="preferences_show_week_num_title" msgid="5280734329664503461">"Bonisa inombolo yeviki"</string>
     <string name="preferences_about_title" msgid="2810624892412097879">"Mayelana"</string>
     <string name="preferences_build_version" msgid="8242471883413502068">"Yakha inguqulo"</string>
-  <string-array name="prefEntries_alerts_vibrateWhen">
-    <item msgid="2539376794936035639">"Njalo"</item>
-    <item msgid="8091719131860840185">"Kuphela uma ithulile"</item>
-    <item msgid="4552962311897985633">"Akusoze"</item>
-  </string-array>
-    <string name="prefDialogTitle_vibrateWhen" msgid="8995274609647451109">"Dlidliza"</string>
     <string name="gadget_title" msgid="939918875331310945">"Ikhalenda"</string>
   <plurals name="month_more_events">
     <item quantity="one" msgid="8971334808414201327">"+1"</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7deeefaa..64fbfa50 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -466,7 +466,7 @@
     <string name="preferences_general_title">Calendar view setting</string>
     <!-- This is the title of a section in the Settings screen for settings
          related to reminders for calendar events -->
-    <string name="preferences_reminder_title">Reminder settings</string>
+    <string name="preferences_reminder_title">Notifications \u0026 reminders</string>
     <!-- Settings check box label to hide events that the user has declined to attend -->
     <string name="preferences_hide_declined_title">Hide declined events</string>
     <!-- Settings week start label to start week on specific day-->
@@ -485,8 +485,10 @@
     <string name="preferences_alerts_title">Notifications</string>
     <!-- Settings dialog label that specifies when the phone should vibrate -->
     <string name="preferences_alerts_vibrateWhen_title">Vibrate</string>
+    <!-- The old value for enabling vibration. used only for migrating -->
+    <string translatable="false" name="prefDefault_alerts_vibrate_true">always</string>
     <!-- Title of ringtone selector dialog -->
-    <string name="preferences_alerts_ringtone_title">Choose ringtone</string>
+    <string name="preferences_alerts_ringtone_title">Sound</string>
     <!-- Title of check box label to enable or disable pop-up notifications -->
     <string name="preferences_alerts_popup_title">Pop-up notification</string>
     <!-- List item label for setting the default number of reminder minutes -->
@@ -513,33 +515,6 @@
     <!-- Build version of the application -->
     <string name="preferences_build_version">Build version</string>
 
-    <!-- The vibrate notification modes -->
-    <string-array name="prefEntries_alerts_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_alerts_vibrateWhen">never</string>
-    <!-- The value to use then migrating from old versions for a true vibrate setting -->
-    <string translatable="false" name="prefDefault_alerts_vibrate_true">always</string>
-    <!-- The value to use then migrating from old versions for a false vibrate setting -->
-    <string translatable="false" name="prefDefault_alerts_vibrate_false">never</string>
-
-    <!-- The vibrateWhen values -->
-    <string-array translatable="false" name="prefValues_alerts_vibrateWhen">
-        <item>always</item>
-        <item>silent</item>
-        <item>never</item>
-    </string-array>
-
-    <!-- Dialog title for the Vibrate dialog -->
-    <string name="prefDialogTitle_vibrateWhen">Vibrate</string>
-
     <!-- Widget -->
     <skip/>
     <!-- Title for calendar gadget when displayed in list of all other gadgets -->
diff --git a/res/xml/general_preferences.xml b/res/xml/general_preferences.xml
index 0a2c14ce..674d0445 100644
--- a/res/xml/general_preferences.xml
+++ b/res/xml/general_preferences.xml
@@ -64,14 +64,11 @@
             android:ringtoneType="notification"
             android:defaultValue="content://settings/system/notification_sound" />
 
-        <ListPreference
+        <CheckBoxPreference
             android:layout="?android:attr/preferenceLayoutChild"
-            android:key="preferences_alerts_vibrateWhen"
+            android:key="preferences_alerts_vibrate"
             android:title="@string/preferences_alerts_vibrateWhen_title"
-            android:entries="@array/prefEntries_alerts_vibrateWhen"
-            android:entryValues="@array/prefValues_alerts_vibrateWhen"
-            android:defaultValue="@string/prefDefault_alerts_vibrateWhen"
-            android:dialogTitle="@string/prefDialogTitle_vibrateWhen" />
+            android:defaultValue="false" />
 
         <CheckBoxPreference
             android:layout="?android:attr/preferenceLayoutChild"
diff --git a/src/com/android/calendar/GeneralPreferences.java b/src/com/android/calendar/GeneralPreferences.java
index abaa2b66..d98d3e65 100644
--- a/src/com/android/calendar/GeneralPreferences.java
+++ b/src/com/android/calendar/GeneralPreferences.java
@@ -22,6 +22,9 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
+import android.media.Ringtone;
+import android.media.RingtoneManager;
+import android.net.Uri;
 import android.os.Bundle;
 import android.os.Vibrator;
 import android.preference.CheckBoxPreference;
@@ -59,7 +62,6 @@ public class GeneralPreferences extends PreferenceFragment implements
     public static final String KEY_ALERTS_CATEGORY = "preferences_alerts_category";
     public static final String KEY_ALERTS = "preferences_alerts";
     public static final String KEY_ALERTS_VIBRATE = "preferences_alerts_vibrate";
-    public static final String KEY_ALERTS_VIBRATE_WHEN = "preferences_alerts_vibrateWhen";
     public static final String KEY_ALERTS_RINGTONE = "preferences_alerts_ringtone";
     public static final String KEY_ALERTS_POPUP = "preferences_alerts_popup";
 
@@ -102,7 +104,7 @@ public class GeneralPreferences extends PreferenceFragment implements
     public static final boolean DEFAULT_SHOW_WEEK_NUM = false;
 
     CheckBoxPreference mAlert;
-    ListPreference mVibrateWhen;
+    CheckBoxPreference mVibrate;
     RingtonePreference mRingtone;
     CheckBoxPreference mPopup;
     CheckBoxPreference mUseHomeTZ;
@@ -141,17 +143,21 @@ public class GeneralPreferences extends PreferenceFragment implements
 
         final PreferenceScreen preferenceScreen = getPreferenceScreen();
         mAlert = (CheckBoxPreference) preferenceScreen.findPreference(KEY_ALERTS);
-        mVibrateWhen = (ListPreference) preferenceScreen.findPreference(KEY_ALERTS_VIBRATE_WHEN);
+        mVibrate = (CheckBoxPreference) preferenceScreen.findPreference(KEY_ALERTS_VIBRATE);
         Vibrator vibrator = (Vibrator) activity.getSystemService(Context.VIBRATOR_SERVICE);
         if (vibrator == null || !vibrator.hasVibrator()) {
             PreferenceCategory mAlertGroup = (PreferenceCategory) preferenceScreen
                     .findPreference(KEY_ALERTS_CATEGORY);
-            mAlertGroup.removePreference(mVibrateWhen);
-        } else {
-            mVibrateWhen.setSummary(mVibrateWhen.getEntry());
+            mAlertGroup.removePreference(mVibrate);
         }
 
         mRingtone = (RingtonePreference) preferenceScreen.findPreference(KEY_ALERTS_RINGTONE);
+        String ringToneUri = Utils.getSharedPreference(activity, KEY_ALERTS_RINGTONE, "");
+        if (!TextUtils.isEmpty(ringToneUri)) {
+            String ringtone = getRingtoneTitleFromUri(getActivity(), ringToneUri);
+            mRingtone.setSummary(ringtone == null ? "" : ringtone);
+        }
+
         mPopup = (CheckBoxPreference) preferenceScreen.findPreference(KEY_ALERTS_POPUP);
         mUseHomeTZ = (CheckBoxPreference) preferenceScreen.findPreference(KEY_HOME_TZ_ENABLED);
         mHideDeclined = (CheckBoxPreference) preferenceScreen.findPreference(KEY_HIDE_DECLINED);
@@ -181,8 +187,8 @@ public class GeneralPreferences extends PreferenceFragment implements
     }
 
     @Override
-    public void onResume() {
-        super.onResume();
+    public void onStart() {
+        super.onStart();
         getPreferenceScreen().getSharedPreferences()
                 .registerOnSharedPreferenceChangeListener(this);
         setPreferenceListeners(this);
@@ -199,16 +205,15 @@ public class GeneralPreferences extends PreferenceFragment implements
         mDefaultReminder.setOnPreferenceChangeListener(listener);
         mRingtone.setOnPreferenceChangeListener(listener);
         mHideDeclined.setOnPreferenceChangeListener(listener);
-        mVibrateWhen.setOnPreferenceChangeListener(listener);
-
+        mVibrate.setOnPreferenceChangeListener(listener);
     }
 
     @Override
-    public void onPause() {
-        super.onPause();
+    public void onStop() {
         getPreferenceScreen().getSharedPreferences()
                 .unregisterOnSharedPreferenceChangeListener(this);
         setPreferenceListeners(null);
+        super.onStop();
     }
 
     @Override
@@ -266,17 +271,32 @@ public class GeneralPreferences extends PreferenceFragment implements
             mDefaultReminder.setValue((String) newValue);
             mDefaultReminder.setSummary(mDefaultReminder.getEntry());
         } else if (preference == mRingtone) {
-            // TODO update this after b/3417832 is fixed
+            if (newValue instanceof String) {
+                String ringtone = getRingtoneTitleFromUri(getActivity(), (String) newValue);
+                mRingtone.setSummary(ringtone == null ? "" : ringtone);
+            }
+            return true;
+        } else if (preference == mVibrate) {
+            mVibrate.setChecked((Boolean) newValue);
             return true;
-        } else if (preference == mVibrateWhen) {
-            mVibrateWhen.setValue((String)newValue);
-            mVibrateWhen.setSummary(mVibrateWhen.getEntry());
         } else {
             return true;
         }
         return false;
     }
 
+    public String getRingtoneTitleFromUri(Context context, String uri) {
+        if (TextUtils.isEmpty(uri)) {
+            return null;
+        }
+
+        Ringtone ring = RingtoneManager.getRingtone(getActivity(), Uri.parse(uri));
+        if (ring != null) {
+            return ring.getTitle(context);
+        }
+        return null;
+    }
+
     /**
      * If necessary, upgrades previous versions of preferences to the current
      * set of keys and values.
@@ -284,13 +304,9 @@ public class GeneralPreferences extends PreferenceFragment implements
      */
     private void migrateOldPreferences(SharedPreferences prefs) {
         // If needed, migrate vibration setting from a previous version
-        if (!prefs.contains(KEY_ALERTS_VIBRATE_WHEN) &&
-                prefs.contains(KEY_ALERTS_VIBRATE)) {
-            int stringId = prefs.getBoolean(KEY_ALERTS_VIBRATE, false) ?
-                    R.string.prefDefault_alerts_vibrate_true :
-                    R.string.prefDefault_alerts_vibrate_false;
-            mVibrateWhen.setValue(getActivity().getString(stringId));
-        }
+
+        mVibrate.setChecked(Utils.getDefaultVibrate(getActivity(), prefs));
+
         // If needed, migrate the old alerts type settin
         if (!prefs.contains(KEY_ALERTS) && prefs.contains(KEY_ALERTS_TYPE)) {
             String type = prefs.getString(KEY_ALERTS_TYPE, ALERT_TYPE_STATUS_BAR);
@@ -319,13 +335,11 @@ public class GeneralPreferences extends PreferenceFragment implements
      */
     private void updateChildPreferences() {
         if (mAlert.isChecked()) {
-            mVibrateWhen.setEnabled(true);
+            mVibrate.setEnabled(true);
             mRingtone.setEnabled(true);
             mPopup.setEnabled(true);
         } else {
-            mVibrateWhen.setValue(
-                    getActivity().getString(R.string.prefDefault_alerts_vibrate_false));
-            mVibrateWhen.setEnabled(false);
+            mVibrate.setEnabled(false);
             mRingtone.setEnabled(false);
             mPopup.setEnabled(false);
         }
diff --git a/src/com/android/calendar/Utils.java b/src/com/android/calendar/Utils.java
index 3afcfd44..e21a8f32 100644
--- a/src/com/android/calendar/Utils.java
+++ b/src/com/android/calendar/Utils.java
@@ -116,6 +116,8 @@ public class Utils {
 
     public static final String KEY_QUICK_RESPONSES = "preferences_quick_responses";
 
+    public static final String KEY_ALERTS_VIBRATE_WHEN = "preferences_alerts_vibrateWhen";
+
     public static final String APPWIDGET_DATA_TYPE = "vnd.android.data/update";
 
     static final String MACHINE_GENERATED_ADDRESS = "calendar.google.com";
@@ -224,6 +226,26 @@ public class Utils {
         return mTZUtils.formatDateRange(context, startMillis, endMillis, flags);
     }
 
+    public static boolean getDefaultVibrate(Context context, SharedPreferences prefs) {
+        boolean vibrate;
+        if (prefs.contains(KEY_ALERTS_VIBRATE_WHEN)) {
+            // Migrate setting to new 4.2 behavior
+            //
+            // silent and never -> off
+            // always -> on
+            String vibrateWhen = prefs.getString(KEY_ALERTS_VIBRATE_WHEN, null);
+            vibrate = vibrateWhen != null && vibrateWhen.equals(context
+                    .getString(R.string.prefDefault_alerts_vibrate_true));
+            prefs.edit().remove(KEY_ALERTS_VIBRATE_WHEN).commit();
+            Log.d(TAG, "Migrating KEY_ALERTS_VIBRATE_WHEN(" + vibrateWhen
+                    + ") to KEY_ALERTS_VIBRATE = " + vibrate);
+        } else {
+            vibrate = prefs.getBoolean(GeneralPreferences.KEY_ALERTS_VIBRATE,
+                    false);
+        }
+        return vibrate;
+    }
+
     public static String[] getSharedPreference(Context context, String key, String[] defaultValue) {
         SharedPreferences prefs = GeneralPreferences.getSharedPreferences(context);
         Set<String> ss = prefs.getStringSet(key, null);
diff --git a/src/com/android/calendar/alerts/AlertService.java b/src/com/android/calendar/alerts/AlertService.java
index 17cdce82..eed0ebb3 100644
--- a/src/com/android/calendar/alerts/AlertService.java
+++ b/src/com/android/calendar/alerts/AlertService.java
@@ -26,7 +26,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.database.Cursor;
-import android.media.AudioManager;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
@@ -44,7 +43,6 @@ import android.text.format.Time;
 import android.util.Log;
 
 import com.android.calendar.GeneralPreferences;
-import com.android.calendar.R;
 import com.android.calendar.Utils;
 
 import java.util.ArrayList;
@@ -506,7 +504,6 @@ public class AlertService extends Service {
                 // Use app local storage to keep track of fired alerts to fix problem of multiple
                 // installed calendar apps potentially causing missed alarms.
                 boolean newAlertOverride = false;
-                String alertIdStr = Long.toString(alertId);
                 if (AlertUtils.BYPASS_DB && ((currentTime - alarmTime) / MINUTE_MS < 1)) {
                     // To avoid re-firing alerts, only fire if alarmTime is very recent.  Otherwise
                     // we can get refires for non-dismissed alerts after app installation, or if the
@@ -588,18 +585,6 @@ public class AlertService extends Service {
                 }
 
                 // TODO: Prefer accepted events in case of ties.
-                int newStatus;
-                switch (status) {
-                    case Attendees.ATTENDEE_STATUS_ACCEPTED:
-                        newStatus = 2;
-                        break;
-                    case Attendees.ATTENDEE_STATUS_TENTATIVE:
-                        newStatus = 1;
-                        break;
-                    default:
-                        newStatus = 0;
-                }
-
                 NotificationInfo newInfo = new NotificationInfo(eventName, location,
                         description, beginTime, endTime, eventId, allDay, newAlert);
 
@@ -834,40 +819,7 @@ public class AlertService extends Service {
 
         private boolean getDefaultVibrate() {
             if (defaultVibrate < 0) {
-                // Find out the circumstances under which to vibrate.
-                // Migrate from pre-Froyo boolean setting if necessary.
-                String vibrateWhen; // "always" or "silent" or "never"
-                if(prefs.contains(GeneralPreferences.KEY_ALERTS_VIBRATE_WHEN))
-                {
-                    // Look up Froyo setting
-                    vibrateWhen =
-                        prefs.getString(GeneralPreferences.KEY_ALERTS_VIBRATE_WHEN, null);
-                } else if(prefs.contains(GeneralPreferences.KEY_ALERTS_VIBRATE)) {
-                    // No Froyo setting. Migrate pre-Froyo setting to new Froyo-defined value.
-                    boolean vibrate =
-                        prefs.getBoolean(GeneralPreferences.KEY_ALERTS_VIBRATE, false);
-                    vibrateWhen = vibrate ?
-                        context.getString(R.string.prefDefault_alerts_vibrate_true) :
-                        context.getString(R.string.prefDefault_alerts_vibrate_false);
-                } else {
-                    // No setting. Use Froyo-defined default.
-                    vibrateWhen = context.getString(R.string.prefDefault_alerts_vibrateWhen);
-                }
-
-                if (vibrateWhen.equals("always")) {
-                    defaultVibrate = 1;
-                } else if (!vibrateWhen.equals("silent")) {
-                    defaultVibrate = 0;
-                } else {
-                    // Settings are to vibrate when silent.  Return true if it is now silent.
-                    AudioManager audioManager =
-                        (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-                    if (audioManager.getRingerMode() == AudioManager.RINGER_MODE_VIBRATE) {
-                        defaultVibrate = 1;
-                    } else {
-                        defaultVibrate = 0;
-                    }
-                }
+                defaultVibrate = Utils.getDefaultVibrate(context, prefs) ? 1 : 0;
             }
             return defaultVibrate == 1;
         }
diff --git a/tests/src/com/android/calendar/alerts/AlertServiceTest.java b/tests/src/com/android/calendar/alerts/AlertServiceTest.java
index ef472866..75a14b7b 100644
--- a/tests/src/com/android/calendar/alerts/AlertServiceTest.java
+++ b/tests/src/com/android/calendar/alerts/AlertServiceTest.java
@@ -47,8 +47,7 @@ public class AlertServiceTest extends AndroidTestCase {
 
     class MockSharedPreferences implements SharedPreferences {
 
-        /* "always", "silent", depends on ringer mode */
-        private String mVibrateWhen;
+        private Boolean mVibrate;
         private String mRingtone;
         private Boolean mPopup;
 
@@ -66,14 +65,14 @@ public class AlertServiceTest extends AndroidTestCase {
         }
 
         void init() {
-            mVibrateWhen = "always";
+            mVibrate = true;
             mRingtone = "/some/cool/ringtone";
             mPopup = true;
         }
 
         @Override
         public boolean contains(String key) {
-            if (GeneralPreferences.KEY_ALERTS_VIBRATE_WHEN.equals(key)) {
+            if (GeneralPreferences.KEY_ALERTS_VIBRATE.equals(key)) {
                 return true;
             }
             return false;
@@ -81,6 +80,17 @@ public class AlertServiceTest extends AndroidTestCase {
 
         @Override
         public boolean getBoolean(String key, boolean defValue) {
+            if (GeneralPreferences.KEY_ALERTS_VIBRATE.equals(key)) {
+                if (mVibrate == null) {
+                    Assert.fail(GeneralPreferences.KEY_ALERTS_VIBRATE
+                            + " fetched more than once.");
+                }
+                boolean val = mVibrate;
+                if (mStrict) {
+                    mVibrate = null;
+                }
+                return val;
+            }
             if (GeneralPreferences.KEY_ALERTS_POPUP.equals(key)) {
                 if (mPopup == null) {
                     Assert.fail(GeneralPreferences.KEY_ALERTS_POPUP + " fetched more than once.");
@@ -96,17 +106,6 @@ public class AlertServiceTest extends AndroidTestCase {
 
         @Override
         public String getString(String key, String defValue) {
-            if (GeneralPreferences.KEY_ALERTS_VIBRATE_WHEN.equals(key)) {
-                if (mVibrateWhen == null) {
-                    Assert.fail(GeneralPreferences.KEY_ALERTS_VIBRATE_WHEN
-                            + " fetched more than once.");
-                }
-                String val = mVibrateWhen;
-                if (mStrict) {
-                    mVibrateWhen = null;
-                }
-                return val;
-            }
             if (GeneralPreferences.KEY_ALERTS_RINGTONE.equals(key)) {
                 if (mRingtone == null) {
                     Assert.fail(GeneralPreferences.KEY_ALERTS_RINGTONE
@@ -377,6 +376,7 @@ public class AlertServiceTest extends AndroidTestCase {
             assertNull("Unexpected cancel for id " + id, mExpectedNotifications[id]);
         }
 
+        @Override
         public void notify(int id, NotificationWrapper nw) {
             assertTrue("id out of bound: " + id, 0 <= id);
             assertTrue("id out of bound: " + id, id < mExpectedNotifications.length);