am fd12d3a6: Merge "Fix to prevent unnecessary mode changes in LTE network modes."

* commit 'fd12d3a6c72d56cdafc639402bf7e0ff9048c1b7':
  Fix to prevent unnecessary mode changes in LTE network modes.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7cec83d..b2d9733 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -107,7 +107,7 @@
         <activity android:name="EmergencyDialer"
             android:label="@string/emergencyDialerIconLabel"
             android:theme="@style/EmergencyDialerTheme"
-            android:screenOrientation="nosensor">
+            android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="com.android.phone.EmergencyDialer.DIAL" />
                 <category android:name="android.intent.category.DEFAULT" />
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index ef82556..5f5e09d 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -616,7 +616,8 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Wys af"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibreer"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibreer"</string>
-    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Luitoon"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Klank"</string>
+    <string name="default_notification_description" msgid="78174796906240970">"Verstek klank (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Altyd"</item>
     <item msgid="1595097872875714252">"Net wanneer stil"</item>
@@ -625,5 +626,5 @@
     <string name="ringtone_title" msgid="6374978286202084684">"Foon-luitoon"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibreer wanneer lui"</string>
     <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Belblad-raaktone"</string>
-    <string name="preference_category_ringtone" msgid="9007490591910078324">"Luitoon"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"Luitoon en vibreer"</string>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index f068ba4..67420d6 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -612,7 +612,8 @@
     <string name="description_target_decline" msgid="4789834364389731957">"አትቀበል"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"ንዘር"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"ንዘር"</string>
-    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"የደውል ቅላጼ"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"ድምፅ"</string>
+    <string name="default_notification_description" msgid="78174796906240970">"ነባሪ ድምጽ (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"ዘወትር"</item>
     <item msgid="1595097872875714252">"በፀጥታ ሲሆን ብቻ"</item>
@@ -621,5 +622,5 @@
     <string name="ringtone_title" msgid="6374978286202084684">"የስልክ ጥሪ ድምፅ"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"በሚደወልበት ጊዜ ንዘር"</string>
     <string name="dtmf_tone_enable_title" msgid="827601042915852989">"የመደወያ ሰሌዳ ድምፆች ዳስ"</string>
-    <string name="preference_category_ringtone" msgid="9007490591910078324">"የደውል ቅላጼ"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"የደወል ቅላጼ እና ንዘረት"</string>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index e04a955..a60869c 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -612,7 +612,8 @@
     <string name="description_target_decline" msgid="4789834364389731957">"رفض"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"الاهتزاز"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"الاهتزاز"</string>
-    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"نغمة الرنين"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"الصوت"</string>
+    <string name="default_notification_description" msgid="78174796906240970">"الصوت الافتراضي (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"دائمًا"</item>
     <item msgid="1595097872875714252">"فقط عندما يكون صامتًا"</item>
@@ -621,5 +622,5 @@
     <string name="ringtone_title" msgid="6374978286202084684">"نغمة رنين الهاتف"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"اهتزاز عند الرنين"</string>
     <string name="dtmf_tone_enable_title" msgid="827601042915852989">"نغمات لمس لوحة الطلب"</string>
-    <string name="preference_category_ringtone" msgid="9007490591910078324">"نغمة الرنين"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"نغمة الرنين والاهتزاز"</string>
 </resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 9cf2c0a..26a8fb1 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -612,7 +612,8 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Адхіліць"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Вібрацыя"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Вібрацыя"</string>
-    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Рынгтон"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Гук"</string>
+    <string name="default_notification_description" msgid="78174796906240970">"Гук па змаўчанні (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Заўсёды"</item>
     <item msgid="1595097872875714252">"Толькі ў бязгучным рэжыме"</item>
@@ -621,5 +622,5 @@
     <string name="ringtone_title" msgid="6374978286202084684">"Мелодыя тэлефона"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Вібрацыя падчас званка"</string>
     <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Набор гукаў сэнсарнай панэлі"</string>
-    <string name="preference_category_ringtone" msgid="9007490591910078324">"Рынгтон"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"Рынгтон і вiбрацыя"</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 79f37ae..ccb0823 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -612,7 +612,8 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Отхвърлям"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Вибриране"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Вибриране"</string>
-    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Мелодия"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Звук"</string>
+    <string name="default_notification_description" msgid="78174796906240970">"Стандартен звук (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Винаги"</item>
     <item msgid="1595097872875714252">"Само при тих режим"</item>
@@ -621,5 +622,5 @@
     <string name="ringtone_title" msgid="6374978286202084684">"Мелодия на телефона"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Вибриране при звънене"</string>
     <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Тонове при набиране"</string>
-    <string name="preference_category_ringtone" msgid="9007490591910078324">"Мелодия"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"Мелодия и вибриране"</string>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 6a9aa2d..3efad33 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -612,7 +612,8 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Rebutja"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibra"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibra"</string>
-    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"To"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"So"</string>
+    <string name="default_notification_description" msgid="78174796906240970">"So predeterminat (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Sempre"</item>
     <item msgid="1595097872875714252">"Només quan està en silenci"</item>
@@ -621,5 +622,5 @@
     <string name="ringtone_title" msgid="6374978286202084684">"To del telèfon"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibrar en sonar"</string>
     <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Sonar en marcar els números"</string>
-    <string name="preference_category_ringtone" msgid="9007490591910078324">"To"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"To i vibració"</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index af013e2..5a611a5 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -612,7 +612,8 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Odmítnout"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibrace"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrace"</string>
-    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Vyzvánění"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Zvuk"</string>
+    <string name="default_notification_description" msgid="78174796906240970">"Výchozí zvuk (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Vždy"</item>
     <item msgid="1595097872875714252">"Pouze v tichém režimu"</item>
@@ -621,5 +622,5 @@
     <string name="ringtone_title" msgid="6374978286202084684">"Vyzváněcí tón telefonu"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibrace při vyzvánění"</string>
     <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Tóny při dotyku číselníku"</string>
-    <string name="preference_category_ringtone" msgid="9007490591910078324">"Vyzvánění"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"Vyzvánění a vibrace"</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index ac2441b..e5ad41d 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -618,7 +618,8 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Afvis"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibration"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibration"</string>
-    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Ringetone"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Lyd"</string>
+    <string name="default_notification_description" msgid="78174796906240970">"Standardlyd (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Altid"</item>
     <item msgid="1595097872875714252">"Kun ved lydløs"</item>
@@ -627,5 +628,5 @@
     <string name="ringtone_title" msgid="6374978286202084684">"Ringetone for opkald"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibrer ved opringning"</string>
     <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Tastaturtoner"</string>
-    <string name="preference_category_ringtone" msgid="9007490591910078324">"Ringetone"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"Ringetone og vibration"</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 74e8596..7f14f70 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="tablet" msgid="8576272342240415145">"Mobile Daten"</string>
+    <string name="phoneAppLabel" product="tablet" msgid="8576272342240415145">"Mobilfunk"</string>
     <string name="phoneAppLabel" product="default" msgid="906161039445636857">"Telefon"</string>
     <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Notruf"</string>
     <string name="phoneIconLabel" msgid="2331230813161304895">"Telefon"</string>
@@ -140,7 +140,7 @@
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Die aktuellen Einstellungen der Weiterleitungsnummern konnten nicht abgerufen und gespeichert werden."\n"Möchten Sie trotzdem zum neuen Anbieter wechseln?"</string>
     <string name="no_change" msgid="3186040086622435212">"Es wurden keine Änderungen vorgenommen."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Mailbox-Dienst auswählen"</string>
-    <string name="voicemail_default" msgid="5902099213882352338">"Mein Netzbetreiber"</string>
+    <string name="voicemail_default" msgid="5902099213882352338">"Mein Mobilfunkanbieter"</string>
     <string name="mobile_networks" msgid="5540397602919106177">"Einstellungen für Mobilfunknetze"</string>
     <string name="label_available" msgid="1181658289009300430">"Verfügbare Netzwerke"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Suche läuft..."</string>
@@ -351,7 +351,7 @@
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Zugelassene Rufnummer wird gelöscht..."</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Zugelassene Rufnummer gelöscht"</string>
     <string name="pin2_invalid" msgid="5470854099230755944">"Die Anrufbegrenzung wurde nicht aktualisiert, weil Sie eine falsche PIN eingegeben haben."</string>
-    <string name="fdn_invalid_number" msgid="1494755047900009147">"Die Anrufbegrenzung wurde nicht aktualisiert, da die Nummer maximal 20 Ziffern enthalten darf."</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"Die Anrufbegrenzung wurde nicht aktualisiert, weil die Nummer maximal 20 Ziffern enthalten darf."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN wurde nicht aktualisiert. PIN2 war ungültig oder die Telefonnummer wurde abgelehnt."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"SIM-Karte wird ausgelesen..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Keine Kontakte auf SIM-Karte"</string>
@@ -616,7 +616,8 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Ablehnen"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibration"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibration"</string>
-    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Klingelton"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Töne"</string>
+    <string name="default_notification_description" msgid="78174796906240970">"Standardklingelton (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Immer"</item>
     <item msgid="1595097872875714252">"Nur im Lautlos-Modus"</item>
@@ -625,5 +626,5 @@
     <string name="ringtone_title" msgid="6374978286202084684">"Klingelton"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Beim Klingeln vibrieren"</string>
     <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Wähltastentöne"</string>
-    <string name="preference_category_ringtone" msgid="9007490591910078324">"Klingelton"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"Klingelton &amp; Vibration"</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 6bf050b..14cf537 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -612,7 +612,8 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Απόρριψη"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Δόνηση"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Δόνηση"</string>
-    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Ήχος κλήσης"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Ήχος"</string>
+    <string name="default_notification_description" msgid="78174796906240970">"Προεπιλεγμένος ήχος (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Πάντα"</item>
     <item msgid="1595097872875714252">"Μόνο στο αθόρυβο"</item>
@@ -621,5 +622,5 @@
     <string name="ringtone_title" msgid="6374978286202084684">"Ήχος κλήσης τηλεφώνου"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Δόνηση κατά το κουδούνισμα"</string>
     <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Ήχοι αφής πληκτρολογίου κλήσης"</string>
-    <string name="preference_category_ringtone" msgid="9007490591910078324">"Ήχος κλήσης"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"Ήχος κλήσης &amp; δόνηση"</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 27a116d..f3e9256 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -612,7 +612,8 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Decline"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibrate"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrate"</string>
-    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Ringtone"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Sound"</string>
+    <string name="default_notification_description" msgid="78174796906240970">"Default sound (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Always"</item>
     <item msgid="1595097872875714252">"Only when silent"</item>
@@ -621,5 +622,6 @@
     <string name="ringtone_title" msgid="6374978286202084684">"Phone ringtone"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibrate when ringing"</string>
     <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Dial pad touch tones"</string>
-    <string name="preference_category_ringtone" msgid="9007490591910078324">"Ringtone"</string>
+    <!-- no translation found for preference_category_ringtone (5197960752529332721) -->
+    <skip />
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 316e086..2e3827b 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -612,7 +612,8 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Rechazar"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibrar"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrar"</string>
-    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Tono de llamada"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Sonido"</string>
+    <string name="default_notification_description" msgid="78174796906240970">"Sonido predeterminado (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Siempre"</item>
     <item msgid="1595097872875714252">"Solo en modo silencioso"</item>
@@ -621,5 +622,5 @@
     <string name="ringtone_title" msgid="6374978286202084684">"Tono del dispositivo"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibrar al sonar"</string>
     <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Tonos táctiles del teclado de marcado"</string>
-    <string name="preference_category_ringtone" msgid="9007490591910078324">"Tono de llamada"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"Tono y vibración"</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 21fb011..be30b4d 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -616,7 +616,8 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Rechazar"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibrar"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrar"</string>
-    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Tono"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Sonido"</string>
+    <string name="default_notification_description" msgid="78174796906240970">"Sonido predeterminado (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Siempre"</item>
     <item msgid="1595097872875714252">"Solo en modo silencio"</item>
@@ -625,5 +626,5 @@
     <string name="ringtone_title" msgid="6374978286202084684">"Tono del teléfono"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibrar al sonar"</string>
     <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Sonar al marcar número"</string>
-    <string name="preference_category_ringtone" msgid="9007490591910078324">"Tono"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"Tono y vibración"</string>
 </resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 1755314..eed3155 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -612,7 +612,8 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Keeldumine"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibreerimine"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibreerimine"</string>
-    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Helin"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Heli"</string>
+    <string name="default_notification_description" msgid="78174796906240970">"Vaikeheli (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Alati"</item>
     <item msgid="1595097872875714252">"Ainult hääletus režiimis"</item>
@@ -621,5 +622,5 @@
     <string name="ringtone_title" msgid="6374978286202084684">"Telefonihelin"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibreerimine helina ajal"</string>
     <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Valimisklahvistiku puutetoonid"</string>
-    <string name="preference_category_ringtone" msgid="9007490591910078324">"Helin"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"Helin ja vibratsioon"</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 26da88e..23ed04b 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -141,7 +141,7 @@
     <string name="no_change" msgid="3186040086622435212">"تغییری انجام نشده است."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"انتخاب سرویس پست صوتی"</string>
     <string name="voicemail_default" msgid="5902099213882352338">"شرکت مخابراتی من"</string>
-    <string name="mobile_networks" msgid="5540397602919106177">"تنظیمات شبکه تلفن همراه"</string>
+    <string name="mobile_networks" msgid="5540397602919106177">"تنظیمات شبکهٔ تلفن همراه"</string>
     <string name="label_available" msgid="1181658289009300430">"شبکه‌های موجود"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"در حال جستجو…"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"شبکه‌ای یافت نشد."</string>
@@ -183,7 +183,7 @@
     <item msgid="5541716989029928208">"CDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"داده‌ها فعال شدند"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"فعال کردن دسترسی داده از طریق شبکه تلفن همراه"</string>
+    <string name="data_enable_summary" msgid="5022018967714633874">"فعال کردن دسترسی داده از طریق شبکهٔ تلفن همراه"</string>
     <string name="roaming" msgid="8871412572928323707">"رومینگ داده"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"اتصال به سرویس‌های داده هنگام رومینگ"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"اتصال به سرویس‌های داده هنگام رومینگ"</string>
@@ -201,7 +201,7 @@
     <string name="throttle_data_rate_reduced_subtext" msgid="7492763592720107737">"<xliff:g id="USED_0">%1$s</xliff:g> بیش از حداکثر مجاز"\n"نرخ داده به <xliff:g id="USED_1">%2$d</xliff:g> کیلو بیت در ثانیه کاهش یافت"</string>
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"<xliff:g id="USED_0">%1$d</xliff:g>٪ از دوره سپری شده"\n"دوره زمانی بعدی بعد از <xliff:g id="USED_1">%2$d</xliff:g> روز شروع می‌شود (<xliff:g id="USED_2">%3$s</xliff:g>)"</string>
     <string name="throttle_rate_subtext" msgid="2149102656120726855">"در صورت فراتر رفتن مصرف داده از حد مجاز، نرخ داده‌ها به <xliff:g id="USED">%1$d</xliff:g> کیلو بیت در ثانیه کاهش می‌یابد."</string>
-    <string name="throttle_help_subtext" msgid="5217706521499010816">"اطلاعات بیشتر درباره خط مشی استفاده از داده شبکه تلفن همراه شرکت مخابراتی شما"</string>
+    <string name="throttle_help_subtext" msgid="5217706521499010816">"اطلاعات بیشتر درباره خط مشی استفاده از داده شبکهٔ تلفن همراه شرکت مخابراتی شما"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"پیامک پخش سلولی"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"پیامک پخش سلولی"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"پیامک پخش سلولی فعال شد"</string>
@@ -414,7 +414,7 @@
     <string name="notification_missedCall_message" msgid="3049928912736917988">"پیام"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"برای برقراری یک تماس، ابتدا حالت هواپیما را خاموش کنید."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"در شبکه ثبت نشده است."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"شبکه تلفن همراه موجود نیست."</string>
+    <string name="incall_error_out_of_service" msgid="8587993036435080418">"شبکهٔ تلفن همراه موجود نیست."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"تماس ارسال نشد، هیچ شماره معتبری وارد نشده است."</string>
     <string name="incall_error_call_failed" msgid="4313552620858880999">"تماس ارسال نشد."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"شروع ترتیب MMI..."</string>
@@ -612,7 +612,8 @@
     <string name="description_target_decline" msgid="4789834364389731957">"عدم پذیرش"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"لرزش"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"لرزش"</string>
-    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"زنگ"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"صدا"</string>
+    <string name="default_notification_description" msgid="78174796906240970">"صدای پیش‌فرض (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"همیشه"</item>
     <item msgid="1595097872875714252">"فقط هنگام ساکت بودن"</item>
@@ -621,5 +622,5 @@
     <string name="ringtone_title" msgid="6374978286202084684">"آهنگ زنگ تلفن"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"ارتعاش هنگام زنگ زدن"</string>
     <string name="dtmf_tone_enable_title" msgid="827601042915852989">"صداهای پد لمسی شماره‌گیری"</string>
-    <string name="preference_category_ringtone" msgid="9007490591910078324">"صدای زنگ"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"آهنگ‌ زنگ و لرزش"</string>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index be763c4..91a18a6 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -616,7 +616,8 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Hylkää"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Värinä"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Värinä"</string>
-    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Soittoääni"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Ääni"</string>
+    <string name="default_notification_description" msgid="78174796906240970">"Oletusääni (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Aina"</item>
     <item msgid="1595097872875714252">"Vain äänettömässä tilassa"</item>
@@ -625,5 +626,5 @@
     <string name="ringtone_title" msgid="6374978286202084684">"Puhelimen soittoääni"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Värinä ja soittoääni"</string>
     <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Valintanäppäimien näppäinäänet"</string>
-    <string name="preference_category_ringtone" msgid="9007490591910078324">"Soittoääni"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"Soittoääni ja värinä"</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 4f96455..9ca44e4 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -612,7 +612,8 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Refuser"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibreur"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibreur"</string>
-    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Sonnerie"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Sonnerie"</string>
+    <string name="default_notification_description" msgid="78174796906240970">"Sonnerie par défaut (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Toujours"</item>
     <item msgid="1595097872875714252">"Uniquement en mode silencieux"</item>
@@ -621,5 +622,5 @@
     <string name="ringtone_title" msgid="6374978286202084684">"Sonnerie du téléphone"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Mode Vibreur lorsque le tél. sonne"</string>
     <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Numérotation sonore"</string>
-    <string name="preference_category_ringtone" msgid="9007490591910078324">"Sonnerie"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"Sonnerie et vibreur"</string>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 86de7d3..21bd837 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -612,7 +612,8 @@
     <string name="description_target_decline" msgid="4789834364389731957">"अस्वीकार करें"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"कंपन करें"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"कंपन करें"</string>
-    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"रिंगटोन"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"ध्वनि"</string>
+    <string name="default_notification_description" msgid="78174796906240970">"डिफ़ॉल्ट ध्वनि (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"हमेशा"</item>
     <item msgid="1595097872875714252">"केवल मौन होने पर"</item>
@@ -621,5 +622,5 @@
     <string name="ringtone_title" msgid="6374978286202084684">"फ़ोन रिंगटोन"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"रिंग आने पर कंपन करें"</string>
     <string name="dtmf_tone_enable_title" msgid="827601042915852989">"डायल पैड स्पर्श टोन"</string>
-    <string name="preference_category_ringtone" msgid="9007490591910078324">"रिंगटोन"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"रिंगटोन और कंपन"</string>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index e3f6d31..e6d9ef1 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -612,7 +612,8 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Odbij"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibracija"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibracija"</string>
-    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Melodija zvona"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Zvuk"</string>
+    <string name="default_notification_description" msgid="78174796906240970">"Zadani zvuk (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Uvijek"</item>
     <item msgid="1595097872875714252">"Samo ako je bešumno"</item>
@@ -621,5 +622,5 @@
     <string name="ringtone_title" msgid="6374978286202084684">"Melodija zvona telefona"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibrira dok zvoni"</string>
     <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Tonovi biranja"</string>
-    <string name="preference_category_ringtone" msgid="9007490591910078324">"Melodija zvona"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"Melodija zvona i vibracija"</string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 261dba2..f94a7e5 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -612,7 +612,8 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Elutasítás"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Rezgés"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Rezgés"</string>
-    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Csengőhang"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Hang"</string>
+    <string name="default_notification_description" msgid="78174796906240970">"Alapértelmezett hang (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Mindig"</item>
     <item msgid="1595097872875714252">"Csak néma üzemmódban"</item>
@@ -621,5 +622,5 @@
     <string name="ringtone_title" msgid="6374978286202084684">"Telefon csengőhangja"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Csengetéskor rezegjen"</string>
     <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Tárcsázó érintési hangjai"</string>
-    <string name="preference_category_ringtone" msgid="9007490591910078324">"Csengőhang"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"Csengőhang és rezgés"</string>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index b660a3e..afe30f5 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -68,7 +68,7 @@
     <string name="puk_unlocked" msgid="2284912838477558454">"Kartu SIM Anda tidak lagi dicekal. Ponsel Anda sedang dibuka kuncinya..."</string>
     <string name="label_ndp" msgid="780479633159517250">"PIN pembuka kunci jaringan SIM"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"Buka kunci"</string>
-    <string name="sim_ndp_dismiss_text" msgid="1604823375752456947">"Tolak"</string>
+    <string name="sim_ndp_dismiss_text" msgid="1604823375752456947">"Tutup"</string>
     <string name="requesting_unlock" msgid="6412629401033249351">"Meminta membuka jaringan..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"Permintaan buka kunci jaringan gagal."</string>
     <string name="unlock_success" msgid="6770085622238180152">"Jaringan berhasil dibuka."</string>
@@ -499,7 +499,7 @@
     <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"Keluar dari mode Panggilan Balik Darurat"</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"Ya"</string>
     <string name="alert_dialog_no" msgid="1476091437797628703">"Tidak"</string>
-    <string name="alert_dialog_dismiss" msgid="2491494287075907171">"Tolak"</string>
+    <string name="alert_dialog_dismiss" msgid="2491494287075907171">"Tutup"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"Layanan"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"Penyiapan"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Tidak disetel&gt;"</string>
@@ -612,7 +612,8 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Menolak"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Getar"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Getar"</string>
-    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Nada Dering"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Suara"</string>
+    <string name="default_notification_description" msgid="78174796906240970">"Suara default (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Selalu"</item>
     <item msgid="1595097872875714252">"Hanya saat senyap"</item>
@@ -621,5 +622,5 @@
     <string name="ringtone_title" msgid="6374978286202084684">"Nada dering ponsel"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Bergetar saat berdering"</string>
     <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Nada sentuh dial pad"</string>
-    <string name="preference_category_ringtone" msgid="9007490591910078324">"Nada dering"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"Nada dering &amp; Getar"</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 442aceb..9f464a4 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -616,7 +616,8 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Rifiuta"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibrazione"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrazione"</string>
-    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Suoneria"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Suono"</string>
+    <string name="default_notification_description" msgid="78174796906240970">"Suono predefinito (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Sempre"</item>
     <item msgid="1595097872875714252">"Solo in modalità Silenzioso"</item>
@@ -625,5 +626,5 @@
     <string name="ringtone_title" msgid="6374978286202084684">"Suoneria telefono"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibrazione quando squilla"</string>
     <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Toni tastierino numerico"</string>
-    <string name="preference_category_ringtone" msgid="9007490591910078324">"Suoneria"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"Suoneria e vibrazione"</string>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 193ebe6..0e430bb 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -612,7 +612,8 @@
     <string name="description_target_decline" msgid="4789834364389731957">"דחה"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"רטט"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"רטט"</string>
-    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"צלצול"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"צליל"</string>
+    <string name="default_notification_description" msgid="78174796906240970">"צליל ברירת מחדל (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"תמיד"</item>
     <item msgid="1595097872875714252">"במצב שקט בלבד"</item>
@@ -621,5 +622,5 @@
     <string name="ringtone_title" msgid="6374978286202084684">"רינגטון של טלפון"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"רטט בעת צלצול"</string>
     <string name="dtmf_tone_enable_title" msgid="827601042915852989">"צלילי מגע של לוח חיוג"</string>
-    <string name="preference_category_ringtone" msgid="9007490591910078324">"צלצול"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"רינגטון ורטט"</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index daf0844..657fc4f 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -612,7 +612,8 @@
     <string name="description_target_decline" msgid="4789834364389731957">"着信拒否"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"バイブレーション"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"バイブレーション"</string>
-    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"着信音"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"通知音"</string>
+    <string name="default_notification_description" msgid="78174796906240970">"デフォルトの通知音(<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"常時"</item>
     <item msgid="1595097872875714252">"マナーモード設定時のみ"</item>
@@ -621,5 +622,5 @@
     <string name="ringtone_title" msgid="6374978286202084684">"着信音"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"着信時のバイブレーション"</string>
     <string name="dtmf_tone_enable_title" msgid="827601042915852989">"ダイヤルパッドのタッチ操作音"</string>
-    <string name="preference_category_ringtone" msgid="9007490591910078324">"着信音"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"着信音とバイブレーション"</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 982b863..dc0c7bc 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -612,7 +612,8 @@
     <string name="description_target_decline" msgid="4789834364389731957">"거부"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"진동"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"진동"</string>
-    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"벨소리"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"알림음"</string>
+    <string name="default_notification_description" msgid="78174796906240970">"기본 알림음(<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"항상"</item>
     <item msgid="1595097872875714252">"무음 시에만"</item>
@@ -621,5 +622,5 @@
     <string name="ringtone_title" msgid="6374978286202084684">"전화 벨소리"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"전화 수신 시 진동"</string>
     <string name="dtmf_tone_enable_title" msgid="827601042915852989">"다이얼패드 터치음"</string>
-    <string name="preference_category_ringtone" msgid="9007490591910078324">"벨소리"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"벨소리 및 진동"</string>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index b4d8269..79978f0 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -612,7 +612,8 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Atmesti"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibruoti"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibruoti"</string>
-    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Skambėjimo tonas"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Garsas"</string>
+    <string name="default_notification_description" msgid="78174796906240970">"Numatytasis garsas (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Visada"</item>
     <item msgid="1595097872875714252">"Tik kai veikia tylos režimu"</item>
@@ -621,5 +622,5 @@
     <string name="ringtone_title" msgid="6374978286202084684">"Telefono skambėjimo tonas"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibruoti, kai skambina"</string>
     <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Numerio rinkimo lietimo tonas"</string>
-    <string name="preference_category_ringtone" msgid="9007490591910078324">"Skambėjimo tonas"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"Skambėjimo tonas ir vibracija"</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 9893974..8a44063 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -614,7 +614,8 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Noraidīt"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibrozvans"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrozvans"</string>
-    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Zvana signāls"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Signāls"</string>
+    <string name="default_notification_description" msgid="78174796906240970">"Noklusējuma signāls (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Vienmēr"</item>
     <item msgid="1595097872875714252">"Tikai klusuma režīmā"</item>
@@ -623,5 +624,5 @@
     <string name="ringtone_title" msgid="6374978286202084684">"Tālruņa zvana signāls"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibrēt zvanot"</string>
     <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Num. sast. tastatūras piesk. signāli"</string>
-    <string name="preference_category_ringtone" msgid="9007490591910078324">"Zvana signāls"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"Zvana signāls un vibrācija"</string>
 </resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 92536c2..1f6646b 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -612,7 +612,8 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Tolak"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Getar"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Getar"</string>
-    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Nada dering"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Bunyi"</string>
+    <string name="default_notification_description" msgid="78174796906240970">"Bunyi lalai (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Sentiasa"</item>
     <item msgid="1595097872875714252">"Apabila senyap sahaja"</item>
@@ -621,5 +622,5 @@
     <string name="ringtone_title" msgid="6374978286202084684">"Nada dering telefon"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Bergetar apabila berdering"</string>
     <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Nada sentuh pad dail"</string>
-    <string name="preference_category_ringtone" msgid="9007490591910078324">"Nada dering"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"Nada dering &amp; Bergetar"</string>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 4cd6ee4..e574e75 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -618,7 +618,8 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Avslå"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibrering"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrering"</string>
-    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Ringetone"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Lyd"</string>
+    <string name="default_notification_description" msgid="78174796906240970">"Standardlyd (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Alltid"</item>
     <item msgid="1595097872875714252">"Bare i stille modus"</item>
@@ -627,5 +628,5 @@
     <string name="ringtone_title" msgid="6374978286202084684">"Telefonringetone"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibrering når det ringer"</string>
     <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Tastetoner for tastatur"</string>
-    <string name="preference_category_ringtone" msgid="9007490591910078324">"Ringetone"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"Ringetone og vibrering"</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index efe72ba..71ebc81 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -612,7 +612,8 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Weigeren"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Trillen"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Trillen"</string>
-    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Beltoon"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Geluid"</string>
+    <string name="default_notification_description" msgid="78174796906240970">"Standaardgeluid (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Altijd"</item>
     <item msgid="1595097872875714252">"Alleen indien stil"</item>
@@ -621,5 +622,5 @@
     <string name="ringtone_title" msgid="6374978286202084684">"Beltoon telefoon"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Trillen bij bellen"</string>
     <string name="dtmf_tone_enable_title" msgid="827601042915852989">"DTMF-tonen kiestoetsen"</string>
-    <string name="preference_category_ringtone" msgid="9007490591910078324">"Beltoon"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"Beltoon en trillen"</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 15deb2e..c545412 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -612,7 +612,8 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Odrzuć"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Wibracje"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Wibracje"</string>
-    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Dzwonek"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Dźwięk"</string>
+    <string name="default_notification_description" msgid="78174796906240970">"Domyślny dźwięk (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Zawsze"</item>
     <item msgid="1595097872875714252">"Tylko po wyciszeniu"</item>
@@ -621,5 +622,5 @@
     <string name="ringtone_title" msgid="6374978286202084684">"Dzwonek telefonu"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Wibracje i dzwonek"</string>
     <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Dźwięki wybierania numeru"</string>
-    <string name="preference_category_ringtone" msgid="9007490591910078324">"Dzwonek"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"Dzwonek i wibracje"</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 34fdc61..1c24bf8 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -612,7 +612,8 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Recusar"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibrar"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrar"</string>
-    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Toque"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Som"</string>
+    <string name="default_notification_description" msgid="78174796906240970">"Som predefinido (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Sempre"</item>
     <item msgid="1595097872875714252">"Apenas quando está em silêncio"</item>
@@ -621,5 +622,5 @@
     <string name="ringtone_title" msgid="6374978286202084684">"Toque do telemóvel"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibrar ao tocar"</string>
     <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Sons dos toques no teclado de marcar"</string>
-    <string name="preference_category_ringtone" msgid="9007490591910078324">"Toque"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"Tocar e Vibrar"</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 177ba64..7614949 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -612,7 +612,8 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Recusar"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibrar"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrar"</string>
-    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Toque"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Som"</string>
+    <string name="default_notification_description" msgid="78174796906240970">"Som padrão (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Sempre"</item>
     <item msgid="1595097872875714252">"Apenas quando estiver no silencioso"</item>
@@ -621,5 +622,5 @@
     <string name="ringtone_title" msgid="6374978286202084684">"Toque do telefone"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibrar quando estiver tocando"</string>
     <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Tons de toque do teclado numérico"</string>
-    <string name="preference_category_ringtone" msgid="9007490591910078324">"Toque"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"Toque e vibração"</string>
 </resources>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
deleted file mode 100644
index 31002f9..0000000
--- a/res/values-rm/strings.xml
+++ /dev/null
@@ -1,813 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for phoneAppLabel (8576272342240415145) -->
-    <skip />
-    <!-- no translation found for phoneAppLabel (906161039445636857) -->
-    <skip />
-    <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Cloms d\'urgenza"</string>
-    <string name="phoneIconLabel" msgid="2331230813161304895">"Telefon"</string>
-    <string name="fdnListLabel" msgid="8630418672279521003">"Glista da numers autorisads"</string>
-    <string name="unknown" msgid="6878797917991465859">"Nunenconuschent"</string>
-    <string name="private_num" msgid="6713286113000232309">"Numer privat"</string>
-    <string name="payphone" msgid="1931775086311769314">"Cabina da telefon"</string>
-    <string name="onHold" msgid="9035493194749959955">"Spetgant"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"Lingia occupada"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"Rait occupada"</string>
-    <!-- no translation found for callFailed_timedOut (7590961703135543346) -->
-    <skip />
-    <!-- no translation found for callFailed_server_unreachable (2133506577423869729) -->
-    <skip />
-    <!-- no translation found for callFailed_number_unreachable (7632566442515734778) -->
-    <skip />
-    <!-- no translation found for callFailed_invalid_credentials (8226835346196775378) -->
-    <skip />
-    <!-- no translation found for callFailed_out_of_network (8740943329772180507) -->
-    <skip />
-    <!-- no translation found for callFailed_server_error (5717915213586193217) -->
-    <skip />
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"Nagin signal"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Surpassà la limita ACM"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"Signal radio deactivà"</string>
-    <!-- no translation found for callFailed_simError (4476360200030635828) -->
-    <skip />
-    <string name="callFailed_outOfService" msgid="4825791466557236225">"Territori senza rait"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"Ils cloms sortints èn limitads pervia da la limitaziun da cloms (FDN)."</string>
-    <!-- no translation found for callFailed_cb_enabled (3686963693629739680) -->
-    <skip />
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Tut ils cloms èn limitads entras ina controlla d\'access."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Ils cloms d\'urgenza èn limitads d\'ina controlla d\'access."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Ils cloms normals èn limitads entras la controlla d\'access."</string>
-    <!-- no translation found for callFailed_unobtainable_number (4736290912891155067) -->
-    <skip />
-    <string name="confCall" msgid="1904840547188336828">"Conferenza da telefon"</string>
-    <string name="call_lost" msgid="317670617901479594">"Il clom è ì a perder."</string>
-    <string name="ok" msgid="3811371167865772377">"OK"</string>
-    <string name="mmiStarted" msgid="6347869857061147003">"Il code IHM è vegnì lantschà."</string>
-    <string name="ussdRunning" msgid="485588686340541690">"Execuziun dal code USSD..."</string>
-    <string name="mmiCancelled" msgid="2771923949751842276">"Annullà Code IHM"</string>
-    <string name="cancel" msgid="5044513931633602634">"Interrumper"</string>
-    <!-- no translation found for manageConferenceLabel (4691922394301969053) -->
-    <skip />
-    <!-- no translation found for audio_mode_speaker (27649582100085266) -->
-    <skip />
-    <!-- no translation found for audio_mode_earpiece (4156527186373869107) -->
-    <skip />
-    <!-- no translation found for audio_mode_wired_headset (1465350758489175975) -->
-    <skip />
-    <!-- no translation found for audio_mode_bluetooth (3047641300848211128) -->
-    <skip />
-    <string name="wait_prompt_str" msgid="7601815427707856238">"Trametter ils tuns suandants?"\n</string>
-    <!-- no translation found for pause_prompt_str (1789964702154314806) -->
-    <skip />
-    <string name="send_button" msgid="4106860097497818751">"Trametter"</string>
-    <string name="pause_prompt_yes" msgid="3564467212025151797">"Gea"</string>
-    <string name="pause_prompt_no" msgid="6686238803236884877">"Na"</string>
-    <!-- no translation found for wild_prompt_str (5543521676355533577) -->
-    <skip />
-    <string name="no_vm_number" msgid="4164780423805688336">"Numer da mailbox mancant"</string>
-    <string name="no_vm_number_msg" msgid="1300729501030053828">"Sin la carta SIM n\'è nagin numer da mailbox memorisà."</string>
-    <string name="add_vm_number_str" msgid="4676479471644687453">"Agiuntar in numer"</string>
-    <string name="puk_unlocked" msgid="2284912838477558454">"Vossa carta SIM è vegnida debloccada. Voss telefonin vegn debloccà..."</string>
-    <string name="label_ndp" msgid="780479633159517250">"Code PIN da debloccaziun da la rait SIM"</string>
-    <string name="sim_ndp_unlock_text" msgid="683628237760543009">"Debloccar"</string>
-    <string name="sim_ndp_dismiss_text" msgid="1604823375752456947">"Serrar"</string>
-    <string name="requesting_unlock" msgid="6412629401033249351">"Dumandar la debloccaziun da la rait..."</string>
-    <string name="unlock_failed" msgid="6490531697031504225">"Betg reussì da dumandar la debloccaziun da la rait."</string>
-    <string name="unlock_success" msgid="6770085622238180152">"Reussì da debloccar la rait."</string>
-    <string name="labelGSMMore" msgid="5930842194056092106">"Parameters da clom GSM"</string>
-    <string name="labelCDMAMore" msgid="1630676740428229339">"Parameters da clom CDMA"</string>
-    <string name="apn_settings" msgid="9043423184895642077">"Nums da puncts d\'access"</string>
-    <string name="settings_label" msgid="3876743539816984008">"Parameters da la rait"</string>
-    <string name="voicemail" msgid="8693759337917898954">"Mailbox"</string>
-    <string name="voicemail_abbreviated" msgid="2215592488517217448">"MV:"</string>
-    <string name="networks" msgid="8873030692174541976">"Gestiunari da la rait"</string>
-    <string name="call_settings" msgid="6112441768261754562">"Parameters da clom"</string>
-    <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Auters parameters"</string>
-    <string name="sum_gsm_call_settings" msgid="4076647190996778012">"Auters parameters da clom mo GSM"</string>
-    <string name="additional_cdma_call_settings" msgid="8628958775721886909">"Auters parameters da clom CDMA"</string>
-    <string name="sum_cdma_call_settings" msgid="284753265979035549">"Auters parameters da clom mo CDMA"</string>
-    <string name="labelNwService" msgid="4699970172021870983">"Parameters dal servetsch da rait"</string>
-    <string name="labelCallerId" msgid="3888899447379069198">"ID dal clamader"</string>
-    <!-- no translation found for sum_loading_settings (1826692909391168620) -->
-    <skip />
-    <string name="sum_hide_caller_id" msgid="1071407020290873782">"Numer zuppentà per ils cloms sortints"</string>
-    <string name="sum_show_caller_id" msgid="6768534125447290401">"Numer mussà per ils cloms sortints"</string>
-    <string name="sum_default_caller_id" msgid="1954518825510901365">"Utilisar ils parameters da standard dal gestiunari per mussar mes numer cun cloms sortints"</string>
-    <string name="labelCW" msgid="6120513814915920200">"Avis da clom"</string>
-    <string name="sum_cw_enabled" msgid="8083061901633671397">"M\'avisar en cas da cloms entrants durant che jau telefonesch"</string>
-    <string name="sum_cw_disabled" msgid="3648693907300104575">"M\'avisar en cas da cloms entrants durant che jau telefonesch"</string>
-    <string name="call_forwarding_settings" msgid="3378927671091537173">"Parameters da renviament da clom"</string>
-    <string name="labelCF" msgid="2574386948026924737">"Renviament da clom"</string>
-    <string name="labelCFU" msgid="8147177368148660600">"Adina renviar"</string>
-    <string name="messageCFU" msgid="3560082430662923687">"Adina utilisar quest numer"</string>
-    <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"Renviar tut ils cloms"</string>
-    <!-- no translation found for sum_cfu_enabled (2450052502198827927) -->
-    <skip />
-    <string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"Numer betg disponibel"</string>
-    <string name="sum_cfu_disabled" msgid="3698472522160364904">"Deactivà"</string>
-    <string name="labelCFB" msgid="218938523102207587">"Renviar sche occupà"</string>
-    <string name="messageCFB" msgid="3711089705936187129">"Numer da renviament sche la lingia è occupada"</string>
-    <!-- no translation found for sum_cfb_enabled (5984198104833116690) -->
-    <skip />
-    <string name="sum_cfb_disabled" msgid="227440009979537651">"Deactivà"</string>
-    <!-- no translation found for disable_cfb_forbidden (3506984333877998061) -->
-    <skip />
-    <string name="labelCFNRy" msgid="3646316323834351390">"Renviar sche betg respundì"</string>
-    <string name="messageCFNRy" msgid="672317899884380374">"Numer da renviament sche Vus na respundais betg"</string>
-    <!-- no translation found for sum_cfnry_enabled (6955775691317662910) -->
-    <skip />
-    <string name="sum_cfnry_disabled" msgid="8422350929957344729">"Deactivà"</string>
-    <!-- no translation found for disable_cfnry_forbidden (4308233959150658058) -->
-    <skip />
-    <!-- no translation found for labelCFNRc (47183615370850000) -->
-    <skip />
-    <string name="messageCFNRc" msgid="6380695421020295119">"Numer da renviament sche betg accessibel"</string>
-    <!-- no translation found for sum_cfnrc_enabled (7010898346095497421) -->
-    <skip />
-    <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Deactivà"</string>
-    <!-- no translation found for disable_cfnrc_forbidden (5646361343094064333) -->
-    <skip />
-    <string name="updating_title" msgid="6146755386174019046">"Parameters da clom"</string>
-    <string name="error_updating_title" msgid="7970259216988931777">"Errur dals parameters da clom"</string>
-    <string name="reading_settings" msgid="1920291699287055284">"Leger ils parameters..."</string>
-    <string name="updating_settings" msgid="8171225533884883252">"Actualisar ils parameters..."</string>
-    <string name="reverting_settings" msgid="4752151682666912828">"Reinizialisar ils parameters..."</string>
-    <string name="response_error" msgid="6674110501330139405">"Resposta nunspetgada da la rait"</string>
-    <string name="exception_error" msgid="7027667130619518211">"Errur da rait u da la carta SIM."</string>
-    <!-- no translation found for fdn_check_failure (18200614306525434) -->
-    <skip />
-    <!-- no translation found for radio_off_error (2304459933248513376) -->
-    <skip />
-    <string name="close_dialog" msgid="2365884406356986917">"OK"</string>
-    <string name="enable" msgid="1059008390636773574">"Activar"</string>
-    <string name="disable" msgid="7274240979164762320">"Deactivar"</string>
-    <string name="change_num" msgid="239476305819844391">"Actualisaziun"</string>
-  <string-array name="clir_display_values">
-    <item msgid="5560134294467334594">"Rait predefinida"</item>
-    <item msgid="7876195870037833661">"Zuppentar il numer"</item>
-    <item msgid="1108394741608734023">"Mussar il numer"</item>
-  </string-array>
-    <string name="vm_changed" msgid="380744030726254139">"Midà il numer da la mailbox."</string>
-    <!-- no translation found for vm_change_failed (3352934863246208918) -->
-    <skip />
-    <!-- no translation found for fw_change_failed (5298103228470214665) -->
-    <skip />
-    <!-- no translation found for fw_get_in_vm_failed (8862896836093833973) -->
-    <skip />
-    <string name="no_change" msgid="3186040086622435212">"Naginas modificaziuns n\'èn vegnidas fatgas."</string>
-    <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Tscherner in servetsch da mailbox"</string>
-    <string name="voicemail_default" msgid="5902099213882352338">"Mes gestiunari da la rait"</string>
-    <string name="mobile_networks" msgid="5540397602919106177">"Parameters da la rait mobila"</string>
-    <string name="label_available" msgid="1181658289009300430">"Raits disponiblas"</string>
-    <string name="load_networks_progress" msgid="5230707536168902952">"Tschertga en process…"</string>
-    <string name="empty_networks_list" msgid="4249426905018815316">"Chattà nagina rait."</string>
-    <string name="search_networks" msgid="1601136049300882441">"Tschertgar las raits"</string>
-    <string name="network_query_error" msgid="6828516148953325006">"Errur cun tschertgar raits."</string>
-    <string name="register_on_network" msgid="9055203954040805084">"Registrar en <xliff:g id="NETWORK">%s</xliff:g>…"</string>
-    <!-- no translation found for not_allowed (5613353860205691579) -->
-    <skip />
-    <!-- no translation found for connect_later (2308119155752343975) -->
-    <skip />
-    <string name="registration_done" msgid="495135664535876612">"Registrà en la rait."</string>
-    <!-- no translation found for sum_carrier_select (3494252551249882718) -->
-    <skip />
-    <string name="sum_search_networks" msgid="2921092249873272715">"Tschertgar tut las raits disponiblas"</string>
-    <!-- no translation found for select_automatically (5628402124471810174) -->
-    <skip />
-    <!-- no translation found for sum_select_automatically (5614890115123292400) -->
-    <skip />
-    <!-- no translation found for register_automatically (6017849844573519637) -->
-    <skip />
-    <string name="preferred_network_mode_title" msgid="8873246565334559308">"Modus da rait"</string>
-    <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Midar il modus da funcziunament da la rait"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Modus da rait preferida"</string>
-    <!-- no translation found for preferred_network_mode_wcdma_perf_summary (8521677230113533809) -->
-    <skip />
-    <!-- no translation found for preferred_network_mode_gsm_only_summary (3352445413437453511) -->
-    <skip />
-    <!-- no translation found for preferred_network_mode_wcdma_only_summary (2836897236221063413) -->
-    <skip />
-    <!-- no translation found for preferred_network_mode_gsm_wcdma_summary (3161255745326408587) -->
-    <skip />
-    <!-- no translation found for preferred_network_mode_cdma_summary (3175690187294334241) -->
-    <skip />
-    <!-- no translation found for preferred_network_mode_cdma_evdo_summary (8332063064712726618) -->
-    <skip />
-    <!-- no translation found for preferred_network_mode_cdma_only_summary (1309770926198634150) -->
-    <skip />
-    <!-- no translation found for preferred_network_mode_evdo_only_summary (8472220691721269155) -->
-    <skip />
-    <!-- no translation found for preferred_network_mode_lte_cdma_summary (3722647806454528426) -->
-    <skip />
-    <!-- no translation found for preferred_network_mode_choices:0 (5543794538185064048) -->
-    <!-- no translation found for preferred_network_mode_choices:3 (648505122852496166) -->
-    <!-- no translation found for preferred_network_mode_choices:4 (7148247646407324800) -->
-    <!-- no translation found for preferred_network_mode_choices:7 (8508331239546115206) -->
-    <!-- no translation found for preferred_network_mode_choices_lte:0 (7002474529872452266) -->
-    <!-- no translation found for preferred_network_mode_choices_lte:1 (5541716989029928208) -->
-    <string name="data_enabled" msgid="5972538663568715366">"Datas activadas"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"Activar l\'access a las datas sur la rait mobila"</string>
-    <string name="roaming" msgid="8871412572928323707">"Roaming da datas"</string>
-    <string name="roaming_enable" msgid="7331106985174381987">"Connectar als servetschs da datas en cas da roaming"</string>
-    <string name="roaming_disable" msgid="1843417228755568110">"Connectar als servetschs da datas cun roaming"</string>
-    <!-- no translation found for roaming_reenable_message (8913735676127858115) -->
-    <skip />
-    <string name="roaming_warning" msgid="7820963598559553967">"Permetter il roaming da datas? Las tariffas da roaming pon esser considerablas!"</string>
-    <string name="gsm_umts_options" msgid="6538311689850981686">"Opziuns GSM/UMTS"</string>
-    <string name="cdma_options" msgid="4016822858172249884">"Opziuns CDMA"</string>
-    <string name="throttle_data_usage" msgid="3715677828160555808">"Utilisaziun da datas"</string>
-    <string name="throttle_current_usage" msgid="8762280193043815361">"Datas utilisadas en la perioda actuala"</string>
-    <string name="throttle_time_frame" msgid="1915198770363734685">"Perioda d\'utilisaziun da datas"</string>
-    <string name="throttle_rate" msgid="4710388992676803508">"Reglas davart la sveltezza da transmissiun da datas"</string>
-    <string name="throttle_help" msgid="243651091785169900">"Ulteriuras infurmaziuns"</string>
-    <string name="throttle_status_subtext" msgid="1657318943142085170">"<xliff:g id="USED_0">%1$s</xliff:g> (<xliff:g id="USED_1">%2$d</xliff:g>٪) da l\'interval maximal da <xliff:g id="USED_2">%3$s</xliff:g>."\n"Il proxim interval cumenza en <xliff:g id="USED_3">%4$d</xliff:g> dis (<xliff:g id="USED_4">%5$s</xliff:g>)."</string>
-    <string name="throttle_data_usage_subtext" msgid="6029276011123694701">"<xliff:g id="USED_0">%1$s</xliff:g> da <xliff:g id="USED_2">%3$s</xliff:g> - (<xliff:g id="USED_1">%2$d</xliff:g> ٪) dal maximum per perioda"</string>
-    <string name="throttle_data_rate_reduced_subtext" msgid="7492763592720107737">"Surpassà il maximum da <xliff:g id="USED_0">%1$s</xliff:g>"\n"La sveltezza da transmissiun da datas è vegnida reducida a <xliff:g id="USED_1">%2$d</xliff:g> kbit/s"</string>
-    <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"<xliff:g id="USED_0">%1$d</xliff:g>٪ dal ciclus èn passads."\n"La proxima perioda cumenza en <xliff:g id="USED_1">%2$d</xliff:g> dis (<xliff:g id="USED_2">%3$s</xliff:g>)."</string>
-    <string name="throttle_rate_subtext" msgid="2149102656120726855">"Reducì la sveltezza da transfer da datas a <xliff:g id="USED">%1$d</xliff:g> kbit/s sche la limita d\'utilisaziun da datas è surpassada."</string>
-    <string name="throttle_help_subtext" msgid="5217706521499010816">"Ulteriuras infurmaziuns davart las reglas da Voss gestiunari da la rait mobila concernent l\'utilisaziun da datas en sia rait."</string>
-    <string name="cell_broadcast_sms" msgid="5584192824053625842">"SMS Cell Broadcast"</string>
-    <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"SMS Cell Broadcast"</string>
-    <string name="cell_bc_sms_enable" msgid="6441688565738921084">"SMS Cell Broadcast activà"</string>
-    <string name="cell_bc_sms_disable" msgid="3398365088309408749">"SMS Cell Broadcast deactivà"</string>
-    <string name="cb_sms_settings" msgid="651715019785107312">"Parameters da SMS Cell Broadcast"</string>
-    <string name="enable_disable_emergency_broadcast" msgid="2157014609041245335">"Broadcast d\'urgenza"</string>
-    <string name="emergency_broadcast_enable" msgid="2645980025414010211">"Broadcast d\'urgenza activà"</string>
-    <string name="emergency_broadcast_disable" msgid="3665199821267569426">"Broadcast d\'urgenza deactivà"</string>
-    <string name="enable_disable_administrative" msgid="6501582322182059412">"Administraziun"</string>
-    <string name="administrative_enable" msgid="1750086122962032235">"Administraziun activada"</string>
-    <string name="administrative_disable" msgid="8433273857248698539">"Administraziun deactivada"</string>
-    <string name="enable_disable_maintenance" msgid="1819693083025106678">"Mantegniment"</string>
-    <string name="maintenance_enable" msgid="8566636458770971189">"Mantegniment activà"</string>
-    <string name="maintenance_disable" msgid="7340189100885066077">"Mantegniment deactivà"</string>
-    <string name="general_news_settings" msgid="4968779723948432978">"Novitads generalas"</string>
-    <string name="bf_news_settings" msgid="3935593091894685267">"Economia e finanzas"</string>
-    <string name="sports_news_settings" msgid="7649399631270052835">"Novitads da sport"</string>
-    <string name="entertainment_news_settings" msgid="5051153952959405035">"Cultura e divertiment"</string>
-    <string name="enable_disable_local" msgid="7890281063123416120">"Local"</string>
-    <string name="local_enable" msgid="6370463247609136359">"Novitads localas activadas"</string>
-    <string name="local_disable" msgid="4405691986943795798">"Novitads localas deactivadas"</string>
-    <string name="enable_disable_regional" msgid="4905652414535565872">"Regiunals"</string>
-    <string name="regional_enable" msgid="4434680415437834759">"Novitads regiunalas activadas"</string>
-    <string name="regional_disable" msgid="5359325527213850077">"Novitads regiunalas deactivadas"</string>
-    <string name="enable_disable_national" msgid="236278090206880734">"Naziunal"</string>
-    <string name="national_enable" msgid="1172443648912246952">"Novitads naziunalas activadas"</string>
-    <string name="national_disable" msgid="326018148178601166">"Novitads naziunalas deactivadas"</string>
-    <string name="enable_disable_international" msgid="7535348799604565592">"Internaziunal"</string>
-    <string name="international_enable" msgid="5855356769925044927">"Novitads internaziunalas activadas"</string>
-    <string name="international_disable" msgid="2850648591041088931">"Novitads internaziunalas deactivadas"</string>
-    <string name="list_language_title" msgid="2841683501919760043">"Lingua"</string>
-    <string name="list_language_summary" msgid="8109546531071241601">"Tscherni la lingua da novitads"</string>
-  <string-array name="list_language_entries">
-    <item msgid="6137851079727305485">"Englais"</item>
-    <item msgid="1151988412809572526">"Franzos"</item>
-    <item msgid="577840534704312665">"Spagnol"</item>
-    <item msgid="8385712091143148180">"Giapunais"</item>
-    <item msgid="1858401628368130638">"Corean"</item>
-    <item msgid="1933212028684529632">"Chinais"</item>
-    <item msgid="1908428006803639064">"Ebraic"</item>
-  </string-array>
-  <string-array name="list_language_values">
-    <item msgid="1804908636436467150">"1"</item>
-    <item msgid="289708030346890334">"2"</item>
-    <item msgid="1121469729692402684">"3"</item>
-    <item msgid="2614093115912897722">"4"</item>
-    <item msgid="2411164639857960614">"5"</item>
-    <item msgid="5884448729274543324">"6"</item>
-    <item msgid="5511864807618312598">"7"</item>
-  </string-array>
-    <string name="list_language_dtitle" msgid="5442908726538951934">"Linguas"</string>
-    <string name="enable_disable_local_weather" msgid="986967454867219114">"Meteo local"</string>
-    <string name="local_weather_enable" msgid="6199315114382448922">"Meteo local activà"</string>
-    <string name="local_weather_disable" msgid="2510158089142626480">"Meteo local deactivà"</string>
-    <string name="enable_disable_atr" msgid="8339572391278872343">"Infurmaziuns davart il traffic local"</string>
-    <string name="atr_enable" msgid="5541757457789181799">"Infurmaziuns davart il traffic local activadas"</string>
-    <string name="atr_disable" msgid="7085558154727596455">"Infurmaziuns davart il traffic local deactivadas"</string>
-    <string name="enable_disable_lafs" msgid="668189073721277199">"Uraris da sgols dad eroports locals"</string>
-    <string name="lafs_enable" msgid="2791978667205137052">"Uraris da sgols dad eroports locals activads"</string>
-    <string name="lafs_disable" msgid="2391212397725495350">"Uraris da sgols dad eroports locals deactivads"</string>
-    <string name="enable_disable_restaurants" msgid="6240381945336814024">"Ustarias"</string>
-    <string name="restaurants_enable" msgid="5137657479469118847">"Ustarias activadas"</string>
-    <string name="restaurants_disable" msgid="3678480270938424092">"Ustarias deactivadas"</string>
-    <string name="enable_disable_lodgings" msgid="1822029172658551202">"Alloschis"</string>
-    <string name="lodgings_enable" msgid="3230042508992850322">"Alloschis activads"</string>
-    <string name="lodgings_disable" msgid="3387879742320682391">"Alloschis deactivads"</string>
-    <string name="enable_disable_retail_directory" msgid="1357809784475660303">"Register da las firmas"</string>
-    <string name="retail_directory_enable" msgid="3280626290436111496">"Register da las firmas activà"</string>
-    <string name="retail_directory_disable" msgid="6479739816662879027">"Register da las firmas deactivà"</string>
-    <string name="enable_disable_advertisements" msgid="5999495926176182128">"Reclamas"</string>
-    <string name="advertisements_enable" msgid="2050305021264683786">"Reclama activada"</string>
-    <string name="advertisements_disable" msgid="8350985908788707935">"Reclamas deactivadas"</string>
-    <string name="enable_disable_stock_quotes" msgid="6397810445293533603">"Curs da la bursa"</string>
-    <string name="stock_quotes_enable" msgid="4384802470887170543">"Curs da la bursa activads"</string>
-    <string name="stock_quotes_disable" msgid="4781450084565594998">"Curs da la bursa activads"</string>
-    <string name="enable_disable_eo" msgid="4863043263443942494">"Offertas da plazzas da lavur libras"</string>
-    <string name="eo_enable" msgid="8623559062015685813">"Offertas da plazzas da lavur libras activadas"</string>
-    <string name="eo_disable" msgid="3863812478090907609">"Offertas da plazzas da lavur libras deactivadas"</string>
-    <!-- no translation found for enable_disable_mhh (908214593528968522) -->
-    <skip />
-    <!-- no translation found for mhh_enable (5544500632306446815) -->
-    <skip />
-    <!-- no translation found for mhh_disable (8998210550117117437) -->
-    <skip />
-    <string name="enable_disable_technology_news" msgid="3517184627114999149">"Tecnologias"</string>
-    <string name="technology_news_enable" msgid="7995209394210455181">"Novitads da tecnologia activadas"</string>
-    <string name="technology_news_disable" msgid="5483490380561851946">"Novitads da tecnologia deactivadas"</string>
-    <string name="enable_disable_multi_category" msgid="626771003122899280">"Multicategorias"</string>
-    <string name="multi_category_enable" msgid="1179299804641721768">"Multicategorias activadas"</string>
-    <string name="multi_category_disable" msgid="880104702904139505">"Multicategorias deactivadas"</string>
-    <string name="prefer_2g" msgid="8442550937280449639">"Mo utilisar las raits 2G"</string>
-    <string name="prefer_2g_summary" msgid="1976491403210690759">"Spargna l\'accu"</string>
-    <string name="cdma_system_select_title" msgid="5757657769327732833">"Tscherner il sistem"</string>
-    <!-- no translation found for cdma_system_select_summary (60460043745797517) -->
-    <skip />
-    <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Tscherna da sistem"</string>
-  <string-array name="cdma_system_select_choices">
-    <item msgid="176474317493999285">"Mo raits domesticas"</item>
-    <item msgid="1205664026446156265">"Automaticamain"</item>
-  </string-array>
-    <!-- no translation found for cdma_subscription_title (1162564010076763284) -->
-    <skip />
-    <string name="cdma_subscription_summary" msgid="2530890766115781140">"Midar tranter las cartas RUIM/SIM e NV"</string>
-    <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"abunament"</string>
-  <string-array name="cdma_subscription_choices">
-    <item msgid="2258014151300708431">"RUIM/SIM"</item>
-    <item msgid="5127722015571873880">"NV"</item>
-  </string-array>
-  <string-array name="cdma_subscription_values">
-    <item msgid="7494167883478914080">"0"</item>
-    <item msgid="6043847456049107742">"1"</item>
-  </string-array>
-    <!-- no translation found for cdma_activate_device (3793805892364814518) -->
-    <skip />
-    <!-- no translation found for cdma_lte_data_service (4255018217292548962) -->
-    <skip />
-    <string name="fdn" msgid="7878832555095183202">"Numers autorisads"</string>
-    <string name="manage_fdn_list" msgid="8777755791892122369">"Glista da numers autorisads"</string>
-    <string name="fdn_activation" msgid="2156479741307463576">"Activaziun da numers autorisads"</string>
-    <string name="fdn_enabled" msgid="5238109009915521240">"La limitaziun da cloms è activada."</string>
-    <string name="fdn_disabled" msgid="4700049736675368279">"La limitaziun da cloms è deactivada"</string>
-    <string name="enable_fdn" msgid="3740191529180493851">"Activar limitaziun da cloms (FDN)"</string>
-    <string name="disable_fdn" msgid="7944020890722540616">"Deactivar numers autorisads"</string>
-    <string name="change_pin2" msgid="2153563695382176676">"Midar il code PIN2"</string>
-    <string name="enable_fdn_ok" msgid="7215588870329688132">"Deactivar numers autorisads"</string>
-    <string name="disable_fdn_ok" msgid="5727046928930740173">"Activar"</string>
-    <string name="sum_fdn" msgid="1959399454900272878">"Administrar la glista dals numers autorisads"</string>
-    <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Modifitgar il code PIN per l\'access a numers autorisads"</string>
-    <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Administrar la glista da numers da telefon"</string>
-    <!-- no translation found for voice_privacy (3776841382844614716) -->
-    <skip />
-    <string name="voice_privacy_summary" msgid="3159383389833516214">"Activar il modus da protecziun da datas optimada"</string>
-    <string name="tty_mode_option_title" msgid="9033098925144434669">"Modus TTY"</string>
-    <string name="tty_mode_option_summary" msgid="1073835131534808732">"Definir il modus TTY"</string>
-    <!-- no translation found for auto_retry_mode_title (4073265511427813322) -->
-    <skip />
-    <!-- no translation found for auto_retry_mode_summary (4973886004067532288) -->
-    <skip />
-    <string name="menu_add" msgid="1882023737425114762">"Agiuntar in contact"</string>
-    <string name="menu_edit" msgid="7143003705504672374">"Modifitgar il contact"</string>
-    <string name="menu_delete" msgid="3977150783449642851">"Stizzar il contact"</string>
-    <!-- no translation found for get_pin2 (8204677063922225311) -->
-    <skip />
-    <string name="name" msgid="7329028332786872378">"Num"</string>
-    <string name="number" msgid="7905950798349903858">"Numer"</string>
-    <string name="save" msgid="4094274636321939086">"Memorisar"</string>
-    <string name="add_fdn_contact" msgid="2481915899633353976">"Agiuntar in numer autorisà"</string>
-    <string name="adding_fdn_contact" msgid="7627379633721940991">"Agiuntar in numer autorisà..."</string>
-    <string name="fdn_contact_added" msgid="7458335758501736665">"Agiuntà in numer autorisà."</string>
-    <string name="edit_fdn_contact" msgid="7976936035587081480">"Modifitgar il numer autorisà"</string>
-    <string name="updating_fdn_contact" msgid="8370929876849803600">"Actualisaziun dal numer autorisà..."</string>
-    <string name="fdn_contact_updated" msgid="5497828782609005017">"Actualisà il numer autorisà"</string>
-    <string name="delete_fdn_contact" msgid="6668958073074151717">"Stizzar in numer autorisà"</string>
-    <string name="deleting_fdn_contact" msgid="5669163206349319969">"Stizzar il numer autorisà..."</string>
-    <string name="fdn_contact_deleted" msgid="7154162327112259569">"Stizzà il numer autorisà."</string>
-    <!-- no translation found for pin2_invalid (5470854099230755944) -->
-    <skip />
-    <!-- no translation found for fdn_invalid_number (1494755047900009147) -->
-    <skip />
-    <!-- no translation found for pin2_or_fdn_invalid (6025144083384701197) -->
-    <skip />
-    <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Leger da la carta SIM..."</string>
-    <string name="simContacts_empty" msgid="5270660846489561932">"Nagins contacts sin Vossa carta SIM."</string>
-    <string name="simContacts_title" msgid="1861472842524839921">"Selecziunar contacts per importar"</string>
-    <!-- no translation found for simContacts_airplaneMode (1846161429087789936) -->
-    <skip />
-    <string name="enable_pin" msgid="5422767284133234860">"Activar/deactivar il code PIN da la carta SIM"</string>
-    <string name="change_pin" msgid="9174186126330785343">"Midar il PIN da la carta SIM"</string>
-    <string name="enter_pin_text" msgid="8532615714751931951">"Code PIN da la carta SIM:"</string>
-    <string name="oldPinLabel" msgid="5287773661246368314">"PIN vegl"</string>
-    <string name="newPinLabel" msgid="207488227285336897">"Nov code PIN"</string>
-    <string name="confirmPinLabel" msgid="257597715098070206">"Confermar il nov code PIN"</string>
-    <!-- no translation found for badPin (8955102849303984935) -->
-    <skip />
-    <!-- no translation found for mismatchPin (5923253370683071889) -->
-    <skip />
-    <string name="invalidPin" msgid="5981171102258684792">"Endatai in code PIN che consista da 4 fin a 8 cifras."</string>
-    <string name="disable_sim_pin" msgid="3992926931620188855">"Deactivar il code PIN da la carta SIM"</string>
-    <string name="enable_sim_pin" msgid="5803702443844458831">"Activar il code PIN da la carta SIM"</string>
-    <string name="enable_in_progress" msgid="3695303775100109650">"Spetgar..."</string>
-    <!-- no translation found for enable_pin_ok (9166061915030865848) -->
-    <skip />
-    <!-- no translation found for disable_pin_ok (5596999379593924850) -->
-    <skip />
-    <!-- no translation found for pin_failed (2298841192582192277) -->
-    <skip />
-    <!-- no translation found for pin_changed (4365538014588501049) -->
-    <skip />
-    <string name="puk_requested" msgid="3898394204193202803">"Il pled-clav è nuncorrect, la carta SIM è bloccada! Il PUK2 è necessari."</string>
-    <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
-    <string name="oldPin2Label" msgid="8559146795026261502">"Vegl PIN2"</string>
-    <string name="newPin2Label" msgid="4573956902204349054">"Nov code PIN2"</string>
-    <string name="confirmPin2Label" msgid="8100319484454787708">"Confermar il nov code PIN2"</string>
-    <!-- no translation found for badPuk2 (4851734468010000418) -->
-    <skip />
-    <!-- no translation found for badPin2 (1041576234483629991) -->
-    <skip />
-    <!-- no translation found for mismatchPin2 (523029155918113440) -->
-    <skip />
-    <string name="invalidPin2" msgid="8237110107480395938">"Endatai in code PIN2 che cuntegna 4 fin 8 cifras."</string>
-    <string name="invalidPuk2" msgid="1290977391033057871">"Endatai ina clav PUK2 dad 8 cifras."</string>
-    <!-- no translation found for pin2_changed (1639666438836544393) -->
-    <skip />
-    <string name="label_puk2_code" msgid="302845876240219560">"Endatai il code PUK2"</string>
-    <!-- no translation found for fdn_enable_puk2_requested (4262894949634885773) -->
-    <skip />
-    <!-- no translation found for puk2_requested (8909278021238716877) -->
-    <skip />
-    <string name="doneButton" msgid="2859593360997984240">"Finì"</string>
-    <string name="caller_manage_header" msgid="3231519674734638786">"Conferenza da telefon <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Numer da la mailbox"</string>
-    <string name="card_title_dialing" msgid="5769417478498348054">"Telefonar..."</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"Nova emprova"</string>
-    <string name="card_title_conf_call" msgid="1162980346189744501">"Conferenza da telefon"</string>
-    <string name="card_title_incoming_call" msgid="7364539451234646909">"Clom entrant"</string>
-    <string name="card_title_call_ended" msgid="5544730338889702298">"Finì il telefon"</string>
-    <string name="card_title_on_hold" msgid="821463117892339942">"Clom spetgant"</string>
-    <string name="card_title_hanging_up" msgid="3999101620995182450">"Pender si"</string>
-    <string name="card_title_in_call" msgid="6346543933068225205">"Clom"</string>
-    <!-- no translation found for card_title_my_phone_number (112428362494434191) -->
-    <skip />
-    <!-- no translation found for notification_dialing (2107666444937350731) -->
-    <skip />
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Clom manchentà"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Cloms manchentads"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> cloms manchentads"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"Clom manchentà da <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <!-- no translation found for notification_ongoing_call (7068688957273482989) -->
-    <skip />
-    <string name="notification_on_hold" msgid="3480694969511790465">"Spetgant"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Clom entrant"</string>
-    <string name="notification_voicemail_title" msgid="8933468752045550523">"Nov messadi vocal"</string>
-    <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Novs messadis vocals (<xliff:g id="COUNT">%d</xliff:g>)"</string>
-    <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Cumponer <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Numer da mailbox nunenconuschent"</string>
-    <string name="notification_network_selection_title" msgid="4224455487793492772">"nagin servetsch"</string>
-    <string name="notification_network_selection_text" msgid="2607085729661923269">"La rait tschernida (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) n\'è betg disponibla"</string>
-    <!-- no translation found for notification_action_end_call (6069460915123531620) -->
-    <skip />
-    <!-- no translation found for notification_missedCall_call_back (2684890353590890187) -->
-    <skip />
-    <!-- no translation found for notification_missedCall_message (3049928912736917988) -->
-    <skip />
-    <string name="incall_error_power_off" msgid="6550191216405193368">"Deactivai l\'emprim il modus d\'aviun per pudair telefonar."</string>
-    <string name="incall_error_emergency_only" msgid="4678640422710818317">"Betg registrà en la rait."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"Rait mobila betg disponibla."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Betg telefonà. Il numer cumponì n\'è betg valid."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"Il clom n\'è betg vegnì exequì."</string>
-    <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Iniziar la sequenza MMI..."</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Quest servetsch na vegn betg sustegnì."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Impussibel da midar tranter cloms."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Impussibel da separar il clom."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Impussibel da renviar il clom."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Impussibel da lantschar ina conferenza da telefon."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Impussibel da refusar il clom."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Impussibel da render disponibel il(s) clom(s)."</string>
-    <!-- no translation found for incall_call_type_label_sip (2310958283037924371) -->
-    <skip />
-    <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Clom d\'urgenza"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Activaziun dal signal radio..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Territori senza rait, empruvar anc ina giada..."</string>
-    <!-- no translation found for dial_emergency_error (7969515493359619960) -->
-    <skip />
-    <!-- no translation found for dial_emergency_empty_error (5556166819619323893) -->
-    <skip />
-    <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Utilisai la tastatura per cumponer il numer"</string>
-    <string name="onscreenHoldText" msgid="2285258239691145872">"Far spetgar"</string>
-    <string name="onscreenEndCallText" msgid="4403855834875398585">"Serrar"</string>
-    <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Tastatura"</string>
-    <string name="onscreenMuteText" msgid="5011369181754261374">"Nagin tun"</string>
-    <string name="onscreenAddCallText" msgid="5140385634712287403">"Agiuntar in clom"</string>
-    <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Fusiunar ils cloms"</string>
-    <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Stgamiar"</string>
-    <string name="onscreenManageCallsText" msgid="5473231160123254154">"Administrar ils cloms"</string>
-    <!-- no translation found for onscreenManageConferenceText (6485935856534311346) -->
-    <skip />
-    <!-- no translation found for onscreenAudioText (1710087112800041743) -->
-    <skip />
-    <string name="importSimEntry" msgid="6614358325359736031">"Importar"</string>
-    <string name="importAllSimEntries" msgid="1503181169636198673">"Importar tuts"</string>
-    <string name="importingSimContacts" msgid="7374056215462575769">"Importar contacts SIM"</string>
-    <string name="importToFDNfromContacts" msgid="2130620207013368580">"Importar ord contacts"</string>
-    <string name="hac_mode_title" msgid="8740268574688743289">"Agids auditivs"</string>
-    <string name="hac_mode_summary" msgid="6833851160514929341">"Activar la cumpatibilitad dal servetsch d\'agid auditiv"</string>
-  <string-array name="tty_mode_entries">
-    <item msgid="512950011423868021">"Modus TTY deactivà"</item>
-    <item msgid="3971695875449640648">"TTY cumplet"</item>
-    <item msgid="1937509904407445684">"TTY HCO"</item>
-    <item msgid="5644925873488772224">"TTY VCO"</item>
-  </string-array>
-    <!-- no translation found for dtmf_tones_title (5163153771291340803) -->
-    <skip />
-    <string name="dtmf_tones_summary" msgid="3351820372864020331">"Definir la durada dals tuns DTMF"</string>
-  <string-array name="dtmf_tone_entries">
-    <item msgid="899650777817315681">"Normal"</item>
-    <item msgid="2883365539347850535">"Lungs"</item>
-  </string-array>
-    <!-- no translation found for network_message (4483886461245213802) -->
-    <skip />
-    <string name="ota_title_activate" msgid="8616918561356194398">"Activar Voss telefonin"</string>
-    <string name="ota_touch_activate" msgid="6553212803262586244">"Vus stuais far in clom spezial per activar il servetsch da telefon. "\n\n"Smatgai sin «Activar» e tadlai las instrucziuns che As permettan dad activar Voss telefonin."</string>
-    <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Sursiglir l\'activaziun?"</string>
-    <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Sche Vus cuntinuais senza activar Voss telefonin na pudais Vus ni telefonar, ni As connectar ad ina rait da datas mobilas. La connexiun ad ina rait WLAN resta dentant pussaivla. Vus vegnis dumandads dad activar il telefonin mintga giada cura che Vus al mettais en funcziun."</string>
-    <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Sursiglir"</string>
-    <string name="ota_activate" msgid="1368528132525626264">"Activar"</string>
-    <!-- no translation found for ota_title_activate_success (6570240212263372046) -->
-    <skip />
-    <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"Problem cun l\'activaziun"</string>
-    <string name="ota_listen" msgid="162923839877584937">"Suandai las instrucziuns a bucca enfin che Vus udis che l\'activaziun è cumpletta."</string>
-    <string name="ota_speaker" msgid="6904589278542719647">"Autpledader"</string>
-    <!-- no translation found for ota_progress (3420314892609254729) -->
-    <skip />
-    <!-- no translation found for ota_failure (4311299546379674378) -->
-    <skip />
-    <string name="ota_successful" msgid="1880780692887077407">"Voss telefonin è ussa activà. Il servetsch vegn activà entaifer las proximas 15 minutas."</string>
-    <!-- no translation found for ota_unsuccessful (8072141612635635357) -->
-    <skip />
-    <string name="ota_spc_failure" msgid="3909983542575030796">"MEMIA BLERAS ERRURS SPC"</string>
-    <string name="ota_call_end" msgid="4537279738134612388">"Enavos"</string>
-    <string name="ota_try_again" msgid="7685477206465902290">"Reempruvar"</string>
-    <string name="ota_next" msgid="3904945374358235910">"Vinavant"</string>
-    <string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmExitDialog"</string>
-    <string name="phone_entered_ecm_text" msgid="6266424252578731203">"Modus da clom enavos d\'urgenza è activà"</string>
-    <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Modus da clom enavos d\'urgenza"</string>
-    <string name="phone_in_ecm_call_notification_text" msgid="4611608947314729773">"Connexiun da datas deactivada"</string>
-  <plurals name="phone_in_ecm_notification_time">
-    <item quantity="one" msgid="4866221796252472622">"Nagina connexiun da datas durant <xliff:g id="COUNT">%s</xliff:g> minuta"</item>
-    <item quantity="other" msgid="3122217344579273583">"Nagina connexiun da datas durant <xliff:g id="COUNT">%s</xliff:g> minutas"</item>
-  </plurals>
-    <!-- no translation found for alert_dialog_exit_ecm:one (8060210887681426682) -->
-    <!-- no translation found for alert_dialog_exit_ecm:other (8617116564023933114) -->
-    <!-- no translation found for alert_dialog_not_avaialble_in_ecm:one (2585506997024726599) -->
-    <!-- no translation found for alert_dialog_not_avaialble_in_ecm:other (6115622137771382224) -->
-    <!-- no translation found for alert_dialog_in_ecm_call (1886723687211887104) -->
-    <skip />
-    <!-- no translation found for progress_dialog_exiting_ecm (4835734101617817074) -->
-    <skip />
-    <string name="alert_dialog_yes" msgid="6674268047820703974">"Gea"</string>
-    <string name="alert_dialog_no" msgid="1476091437797628703">"Na"</string>
-    <string name="alert_dialog_dismiss" msgid="2491494287075907171">"Serrar"</string>
-    <!-- no translation found for voicemail_provider (5135942703327136909) -->
-    <skip />
-    <!-- no translation found for voicemail_settings (72448049107749316) -->
-    <skip />
-    <!-- no translation found for voicemail_number_not_set (6724904736891087856) -->
-    <skip />
-    <string name="other_settings" msgid="3672912580359716394">"Auters parameters da clom"</string>
-    <!-- no translation found for calling_via_template (4839419581866928142) -->
-    <skip />
-    <string name="contactPhoto" msgid="4713193418046639466">"foto dal contact"</string>
-    <string name="goPrivate" msgid="865837794424530980">"modus privat"</string>
-    <string name="selectContact" msgid="781975788478987237">"tscherner in contact"</string>
-    <string name="sip_settings" msgid="6699045718560859691">"Parameters da clom internet"</string>
-    <!-- no translation found for sip_accounts (2097054001288457163) -->
-    <skip />
-    <!-- no translation found for sip_accounts_title (1212889069281054570) -->
-    <skip />
-    <string name="sip_receive_calls" msgid="5635685570889971559">"Retschaiver cloms entrants"</string>
-    <!-- no translation found for sip_receive_calls_summary (8403613238633679184) -->
-    <skip />
-    <!-- no translation found for sip_call_options_title (27433718808839672) -->
-    <skip />
-    <!-- no translation found for sip_call_options_wifi_only_title (145572394529090811) -->
-    <skip />
-    <!-- no translation found for sip_call_options_entry_1 (6556668894178520760) -->
-    <skip />
-    <!-- no translation found for sip_call_options_entry_2 (6789764029719494361) -->
-    <skip />
-    <!-- no translation found for sip_call_options_entry_3 (7474809001402649185) -->
-    <skip />
-    <!-- no translation found for sip_call_options_wifi_only_entry_1 (7423523864471650069) -->
-    <skip />
-    <!-- no translation found for pick_outgoing_call_phone_type (5622916534828338675) -->
-    <skip />
-    <!-- no translation found for pick_outgoing_sip_phone (7012322118236208875) -->
-    <skip />
-    <!-- no translation found for remember_my_choice (7058059586169290705) -->
-    <skip />
-    <!-- no translation found for reset_my_choice_hint (5523030209803567922) -->
-    <skip />
-    <!-- no translation found for pstn_phone (8782554491484326429) -->
-    <skip />
-    <!-- no translation found for internet_phone (1147922660195095810) -->
-    <skip />
-    <!-- no translation found for no_sip_account_found_title (6266249392379373628) -->
-    <skip />
-    <!-- no translation found for no_sip_account_found (724325811961769997) -->
-    <skip />
-    <!-- no translation found for sip_menu_add (8757508498518881500) -->
-    <skip />
-    <!-- no translation found for add_sip_account (5904858426290097611) -->
-    <skip />
-    <!-- no translation found for remove_sip_account (7645900420385682570) -->
-    <skip />
-    <string name="sip_account_list" msgid="5480058210652194306">"Contos SIP"</string>
-    <!-- no translation found for saving_account (52903398217017954) -->
-    <skip />
-    <!-- no translation found for removing_account (7183999896088628100) -->
-    <skip />
-    <string name="sip_menu_save" msgid="5842531129356014943">"Memorisar"</string>
-    <string name="sip_menu_discard" msgid="524075892158789701">"Annullar"</string>
-    <!-- no translation found for alert_dialog_close (7759635137627626235) -->
-    <skip />
-    <string name="alert_dialog_ok" msgid="3580379406983564080">"OK"</string>
-    <!-- no translation found for close_profile (6886968271423155284) -->
-    <skip />
-    <!-- no translation found for primary_account_summary_with (1633960536212343187) -->
-    <skip />
-    <!-- no translation found for registration_status_checking_status (3381868307694056727) -->
-    <skip />
-    <!-- no translation found for registration_status_registering (4288401139400232968) -->
-    <skip />
-    <!-- no translation found for registration_status_still_trying (3185581992666091911) -->
-    <skip />
-    <!-- no translation found for registration_status_not_receiving (4185572774980557758) -->
-    <skip />
-    <!-- no translation found for registration_status_no_data (4901476962360656611) -->
-    <skip />
-    <!-- no translation found for registration_status_no_wifi_data (4038976374713018067) -->
-    <skip />
-    <!-- no translation found for registration_status_not_running (4824867184446232131) -->
-    <skip />
-    <!-- no translation found for registration_status_done (884630717456439280) -->
-    <skip />
-    <!-- no translation found for registration_status_failed_try_later (5214474354451220581) -->
-    <skip />
-    <!-- no translation found for registration_status_invalid_credentials (4908446367559341757) -->
-    <skip />
-    <!-- no translation found for registration_status_server_unreachable (5733421582468991276) -->
-    <skip />
-    <!-- no translation found for third_party_account_summary (2532526738862533028) -->
-    <skip />
-    <!-- no translation found for sip_edit_title (489288416435014385) -->
-    <skip />
-    <!-- no translation found for sip_edit_new_title (3659149255856520385) -->
-    <skip />
-    <!-- no translation found for domain_address_title (9071787581316160480) -->
-    <skip />
-    <string name="username_title" msgid="2479375923477682328">"Num d\'utilisader"</string>
-    <string name="password_title" msgid="3323555249068171531">"Pled-clav"</string>
-    <string name="display_name_title" msgid="2459768196312249937">"Num mussà"</string>
-    <!-- no translation found for proxy_address_title (4828301345351614273) -->
-    <skip />
-    <!-- no translation found for port_title (5952939408078626657) -->
-    <skip />
-    <!-- no translation found for transport_title (8253139511847746640) -->
-    <skip />
-    <string name="send_keepalive_title" msgid="7533342573918645113">"Trametter keep-alive"</string>
-    <!-- no translation found for set_primary_title (5351892327447571451) -->
-    <skip />
-    <!-- no translation found for set_primary_summary (2219064654523258577) -->
-    <skip />
-    <!-- no translation found for advanced_settings (8350631795335495338) -->
-    <skip />
-    <!-- no translation found for auth_username_title (851473016307947120) -->
-    <skip />
-    <!-- no translation found for auth_username_summary (6782012405225938629) -->
-    <skip />
-    <!-- no translation found for default_preference_summary (868766740121667450) -->
-    <skip />
-    <!-- no translation found for display_name_summary (8636377460518225523) -->
-    <skip />
-    <!-- no translation found for optional_summary (1464058793789832411) -->
-    <skip />
-    <!-- no translation found for advanced_settings_show (4668880308290857597) -->
-    <skip />
-    <!-- no translation found for advanced_settings_hide (217398292824758079) -->
-    <skip />
-    <!-- no translation found for empty_alert (6839103946505432390) -->
-    <skip />
-    <!-- no translation found for not_a_valid_port (4796149266434630292) -->
-    <skip />
-    <!-- no translation found for no_internet_available_title (3327109242858406165) -->
-    <skip />
-    <!-- no translation found for no_wifi_available_title (747881033089378758) -->
-    <skip />
-    <!-- no translation found for no_internet_available (7877142631803238549) -->
-    <skip />
-    <!-- no translation found for no_wifi_available (1225073547318465713) -->
-    <skip />
-    <!-- no translation found for no_voip (8901474054537199865) -->
-    <skip />
-    <!-- no translation found for sip_system_decide (368030746310423471) -->
-    <skip />
-    <!-- no translation found for sip_always_send_keepalive (8192080724632877132) -->
-    <skip />
-    <!-- no translation found for not_voice_capable (2739898841461577811) -->
-    <skip />
-    <!-- no translation found for respond_via_sms_canned_response_1 (2461606462788380215) -->
-    <skip />
-    <!-- no translation found for respond_via_sms_canned_response_2 (4074450431532859214) -->
-    <skip />
-    <!-- no translation found for respond_via_sms_canned_response_3 (3496079065723960450) -->
-    <skip />
-    <!-- no translation found for respond_via_sms_canned_response_4 (1698989243040062190) -->
-    <skip />
-    <!-- no translation found for respond_via_sms_custom_message (6648174777301028017) -->
-    <skip />
-    <!-- no translation found for respond_via_sms_setting_title (3754000371039709383) -->
-    <skip />
-    <!-- no translation found for respond_via_sms_setting_title_2 (6104662227299493906) -->
-    <skip />
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
-    <!-- no translation found for respond_via_sms_edittext_dialog_title (20379890418289778) -->
-    <skip />
-    <!-- no translation found for respond_via_sms_confirmation_format (7229149977515784269) -->
-    <skip />
-    <!-- no translation found for description_image_button_one (5502718871331943463) -->
-    <skip />
-    <!-- no translation found for description_image_button_two (4903738528222924522) -->
-    <skip />
-    <!-- no translation found for description_image_button_three (5570985408463782329) -->
-    <skip />
-    <!-- no translation found for description_image_button_four (1697520001239289074) -->
-    <skip />
-    <!-- no translation found for description_image_button_five (3450276493026943454) -->
-    <skip />
-    <!-- no translation found for description_image_button_six (2070376172268675300) -->
-    <skip />
-    <!-- no translation found for description_image_button_seven (1757351311199993371) -->
-    <skip />
-    <!-- no translation found for description_image_button_eight (4734693919020613227) -->
-    <skip />
-    <!-- no translation found for description_image_button_nine (5568534122590597040) -->
-    <skip />
-    <!-- no translation found for description_image_button_star (1976280813017254462) -->
-    <skip />
-    <!-- no translation found for description_image_button_zero (4211255756866893605) -->
-    <skip />
-    <!-- no translation found for description_image_button_pound (1716041284529917866) -->
-    <skip />
-    <!-- no translation found for description_dial_button (7459705245418435351) -->
-    <skip />
-    <!-- no translation found for description_delete_button (4015842181592283903) -->
-    <skip />
-    <!-- no translation found for accessibility_speakerphone_enabled (1988512040421036359) -->
-    <skip />
-    <!-- no translation found for accessibility_call_muted (2776111226185342220) -->
-    <skip />
-    <!-- no translation found for description_target_answer (7205604197797472471) -->
-    <skip />
-    <!-- no translation found for description_target_send_sms (2098326025587950144) -->
-    <skip />
-    <!-- no translation found for description_target_decline (4789834364389731957) -->
-    <skip />
-    <!-- no translation found for voicemail_notification_vibrate_when_title (8361970092063604886) -->
-    <!-- no translation found for voicemail_notification_vibrate_when_title (8731372580674292759) -->
-    <skip />
-    <!-- no translation found for voicemail_notification_vibarte_when_dialog_title (5739583146522136440) -->
-    <!-- no translation found for voicemail_notification_vibarte_when_dialog_title (8995274609647451109) -->
-    <skip />
-    <!-- no translation found for voicemail_notification_ringtone_title (2512535133814478358) -->
-    <skip />
-    <!-- no translation found for voicemail_notification_vibrate_when_entries:0 (468237575962916558) -->
-    <!-- no translation found for voicemail_notification_vibrate_when_entries:0 (2539376794936035639) -->
-    <!-- no translation found for voicemail_notification_vibrate_when_entries:1 (1595097872875714252) -->
-    <!-- no translation found for voicemail_notification_vibrate_when_entries:1 (8091719131860840185) -->
-    <!-- no translation found for voicemail_notification_vibrate_when_entries:2 (1458182414036878616) -->
-    <!-- no translation found for voicemail_notification_vibrate_when_entries:2 (4552962311897985633) -->
-    <!-- no translation found for ringtone_title (6374978286202084684) -->
-    <!-- no translation found for ringtone_title (5379026328015343686) -->
-    <skip />
-    <!-- no translation found for vibrate_on_ring_title (9197564612065258960) -->
-    <skip />
-    <!-- no translation found for dtmf_tone_enable_title (827601042915852989) -->
-    <skip />
-    <!-- no translation found for preference_category_ringtone (9007490591910078324) -->
-    <skip />
-</resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 3611653..56c78d1 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -612,7 +612,8 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Refuzaţi"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibraţii"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibraţii"</string>
-    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Ton de apel"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Sunet"</string>
+    <string name="default_notification_description" msgid="78174796906240970">"Sunet prestabilit (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Întotdeauna"</item>
     <item msgid="1595097872875714252">"Numai când profilul este Silenţios"</item>
@@ -621,5 +622,5 @@
     <string name="ringtone_title" msgid="6374978286202084684">"Ton de sonerie telefon"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibrează când sună"</string>
     <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Tonuri la ating. tastaturii pt. apelare"</string>
-    <string name="preference_category_ringtone" msgid="9007490591910078324">"Ton de apel"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"Ton de sonerie și vibrare"</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index ef165ee..efd2ed7 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -614,7 +614,8 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Отклонить"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Вибросигнал"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Вибросигнал"</string>
-    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Рингтон"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Звук"</string>
+    <string name="default_notification_description" msgid="78174796906240970">"По умолчанию (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Всегда"</item>
     <item msgid="1595097872875714252">"Только в тихом режиме"</item>
@@ -623,5 +624,5 @@
     <string name="ringtone_title" msgid="6374978286202084684">"Рингтон"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Вибросигнал и рингтон"</string>
     <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Звук клавиш"</string>
-    <string name="preference_category_ringtone" msgid="9007490591910078324">"Рингтон"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"Рингтон и вибросигнал"</string>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 080a0b3..8f4863b 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -612,7 +612,8 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Odmietnuť"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibrovať"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrovať"</string>
-    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Tón zvonenia"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Zvuk"</string>
+    <string name="default_notification_description" msgid="78174796906240970">"Predvolený zvuk (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Vždy"</item>
     <item msgid="1595097872875714252">"Iba v tichom režime"</item>
@@ -621,5 +622,5 @@
     <string name="ringtone_title" msgid="6374978286202084684">"Tón zvonenia telefónu"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibrovať pri zvonení"</string>
     <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Zvuky pri dotyku na číselnú klávesnicu"</string>
-    <string name="preference_category_ringtone" msgid="9007490591910078324">"Tón zvonenia"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"Vyzváňací tón a vibrovanie"</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 057993d..9d80328 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -612,7 +612,8 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Zavrni"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibriraj"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibriraj"</string>
-    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Melodija zvonjenja"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Zvok"</string>
+    <string name="default_notification_description" msgid="78174796906240970">"Privzeti zvok (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Vedno"</item>
     <item msgid="1595097872875714252">"Samo v tihem načinu"</item>
@@ -621,5 +622,5 @@
     <string name="ringtone_title" msgid="6374978286202084684">"Ton zvonjenja telefona"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibriranje ob zvonjenju"</string>
     <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Zvok številčnice"</string>
-    <string name="preference_category_ringtone" msgid="9007490591910078324">"Ton zvonjenja"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"Zvonjenje in vibriranje"</string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 6c47923..5e82a3f 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -612,7 +612,8 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Одбиј"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Вибрација"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Вибрација"</string>
-    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Мелодија звона"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Звук"</string>
+    <string name="default_notification_description" msgid="78174796906240970">"Подразумевани звук (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Увек"</item>
     <item msgid="1595097872875714252">"Само у нечујном режиму"</item>
@@ -621,5 +622,5 @@
     <string name="ringtone_title" msgid="6374978286202084684">"Мелодија звона телефона"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Вибрирај када звони"</string>
     <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Тонови при додиру нумеричке тастатуре"</string>
-    <string name="preference_category_ringtone" msgid="9007490591910078324">"Мелодија звона"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"Мелодија звона и вибрација"</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index e8366a4..5fe1f39 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -618,7 +618,8 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Avvisa"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibrera"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrera"</string>
-    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Ringsignal"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Ljud"</string>
+    <string name="default_notification_description" msgid="78174796906240970">"Standardsignal (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Alltid"</item>
     <item msgid="1595097872875714252">"Bara i tyst läge"</item>
@@ -627,5 +628,5 @@
     <string name="ringtone_title" msgid="6374978286202084684">"Ringsignal"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Mobilen vibrerar när det ringer"</string>
     <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Knappljud"</string>
-    <string name="preference_category_ringtone" msgid="9007490591910078324">"Ringsignal"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"Ringsignal och vibrera"</string>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index f38b2a0..88d01ca 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -606,13 +606,14 @@
     <string name="description_dial_button" msgid="7459705245418435351">"piga simu"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"nafasi ya nyuma"</string>
     <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Spika za simu zimewezeshwa"</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Simu imenyamazishwa"</string>
+    <string name="accessibility_call_muted" msgid="2776111226185342220">"Simu imezimwa."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Jibu"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Tuma SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Kataa"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Mtetemo"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Mtetemo"</string>
-    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Mlio wa simu"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Sauti"</string>
+    <string name="default_notification_description" msgid="78174796906240970">"Sauti chaguo-msingi (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Daima"</item>
     <item msgid="1595097872875714252">"Ikiwa kimya tu"</item>
@@ -621,5 +622,5 @@
     <string name="ringtone_title" msgid="6374978286202084684">"Mlio wa simu"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Tetema wakati wa kuita"</string>
     <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Toni za mguso wa pedi ya kupiga"</string>
-    <string name="preference_category_ringtone" msgid="9007490591910078324">"Mlio wa simu"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"Malio wa simu na Mtetemo"</string>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 78f593d..44534ee 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -612,7 +612,8 @@
     <string name="description_target_decline" msgid="4789834364389731957">"ปฏิเสธ"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"สั่น"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"สั่น"</string>
-    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"เสียงเรียกเข้า"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"เสียง"</string>
+    <string name="default_notification_description" msgid="78174796906240970">"เสียงเริ่มต้น (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"เปิดใช้งานเสมอ"</item>
     <item msgid="1595097872875714252">"เฉพาะเมื่อปิดเสียง"</item>
@@ -621,5 +622,5 @@
     <string name="ringtone_title" msgid="6374978286202084684">"เสียงเรียกเข้าโทรศัพท์"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"สั่นเมื่อมีสายเข้า"</string>
     <string name="dtmf_tone_enable_title" msgid="827601042915852989">"เสียงแตะแป้นหมายเลข"</string>
-    <string name="preference_category_ringtone" msgid="9007490591910078324">"เสียงเรียกเข้า"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"เสียงเรียกเข้าและสั่น"</string>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index eaa1968..adcf741 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -612,7 +612,8 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Tanggihan"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Mag-vibrate"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Mag-vibrate"</string>
-    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Ringtone"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Tunog"</string>
+    <string name="default_notification_description" msgid="78174796906240970">"Default na tunog (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Palagi"</item>
     <item msgid="1595097872875714252">"Kapag lamang walang tunog"</item>
@@ -621,5 +622,5 @@
     <string name="ringtone_title" msgid="6374978286202084684">"Ringtone ng telepono"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"I-vibrate kapag nagri-ring"</string>
     <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Mga tone ng pagpindot sa dial pad"</string>
-    <string name="preference_category_ringtone" msgid="9007490591910078324">"Ringtone"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"Ringtone at Pag-vibrate"</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 7f014a8..1dd4a89 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -612,7 +612,8 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Reddet"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Titreşim"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Titreşim"</string>
-    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Zil sesi"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Ses"</string>
+    <string name="default_notification_description" msgid="78174796906240970">"Varsayılan ses (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Her zaman"</item>
     <item msgid="1595097872875714252">"Yalnızca sessizken"</item>
@@ -621,5 +622,5 @@
     <string name="ringtone_title" msgid="6374978286202084684">"Telefon zil sesi"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Çalarken titret"</string>
     <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Tuşlara basınca ses çıksın"</string>
-    <string name="preference_category_ringtone" msgid="9007490591910078324">"Zil sesi"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"Zil Sesi ve Titreşim"</string>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 068ba9e..aedf4fd 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -72,28 +72,28 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"Запитув. розблок. мережі..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"Не здійсн. запит розблокування мережі"</string>
     <string name="unlock_success" msgid="6770085622238180152">"Мережу успішно розблоковано."</string>
-    <string name="labelGSMMore" msgid="5930842194056092106">"Налашт. виклику GSM"</string>
+    <string name="labelGSMMore" msgid="5930842194056092106">"Налаштування викликів GSM"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Налашт. викл. в CDMA"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Назва точки доступу"</string>
     <string name="settings_label" msgid="3876743539816984008">"Налашт-ння мережі"</string>
     <string name="voicemail" msgid="8693759337917898954">"Голос. пошта"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"ГП:"</string>
     <string name="networks" msgid="8873030692174541976">"Оператори мережі"</string>
-    <string name="call_settings" msgid="6112441768261754562">"Налашт. виклику"</string>
-    <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Додаткові налашт-ння"</string>
+    <string name="call_settings" msgid="6112441768261754562">"Виклики"</string>
+    <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Додаткові налаштування"</string>
     <string name="sum_gsm_call_settings" msgid="4076647190996778012">"Лише додаткові налаштування GSM"</string>
-    <string name="additional_cdma_call_settings" msgid="8628958775721886909">"Додат. налашт-ння виклику в CDMA"</string>
-    <string name="sum_cdma_call_settings" msgid="284753265979035549">"Лише додат. налашт-ння виклику в CDMA"</string>
+    <string name="additional_cdma_call_settings" msgid="8628958775721886909">"Додаткові налаштування для викликів CDMA"</string>
+    <string name="sum_cdma_call_settings" msgid="284753265979035549">"Додаткові налаштування лише для викликів CDMA"</string>
     <string name="labelNwService" msgid="4699970172021870983">"Налашт-ня мережевої служби"</string>
-    <string name="labelCallerId" msgid="3888899447379069198">"Ідент. абон."</string>
+    <string name="labelCallerId" msgid="3888899447379069198">"Номер абонента"</string>
     <string name="sum_loading_settings" msgid="1826692909391168620">"Завантаження налаштувань…"</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"Номер приховано у вихідних дзвінках"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Номер відображ. у вихідних дзвінках"</string>
-    <string name="sum_default_caller_id" msgid="1954518825510901365">"Викор. налашт. оператора за умовч. для показу мого номеру у вих. дзвінк."</string>
-    <string name="labelCW" msgid="6120513814915920200">"Парал. виклик"</string>
+    <string name="sum_default_caller_id" msgid="1954518825510901365">"Використ. налаштув. оператора для показу мого номера для вихідних дзвінків"</string>
+    <string name="labelCW" msgid="6120513814915920200">"Паралельний виклик"</string>
     <string name="sum_cw_enabled" msgid="8083061901633671397">"Під час дзвінка сповіщати про вхідні дзвінки"</string>
     <string name="sum_cw_disabled" msgid="3648693907300104575">"Під час дзвінка сповіщати про вхідні дзвінки"</string>
-    <string name="call_forwarding_settings" msgid="3378927671091537173">"Налашт-ня переадрес. виклику"</string>
+    <string name="call_forwarding_settings" msgid="3378927671091537173">"Налаштування переадресації виклику"</string>
     <string name="labelCF" msgid="2574386948026924737">"Переадрес. виклику"</string>
     <string name="labelCFU" msgid="8147177368148660600">"Завжди пересилати"</string>
     <string name="messageCFU" msgid="3560082430662923687">"Завжди викор. цей номер"</string>
@@ -116,9 +116,9 @@
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Пересилання на <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Вимкнено"</string>
     <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Ваш оператор не підтримує вимкнення переадресації викликів, коли телефон недосяжний."</string>
-    <string name="updating_title" msgid="6146755386174019046">"Налашт. виклику"</string>
-    <string name="error_updating_title" msgid="7970259216988931777">"Помилка налашт. виклику"</string>
-    <string name="reading_settings" msgid="1920291699287055284">"Налашт-ння читання…"</string>
+    <string name="updating_title" msgid="6146755386174019046">"Налаштування викликів"</string>
+    <string name="error_updating_title" msgid="7970259216988931777">"Помилка налаштування викликів"</string>
+    <string name="reading_settings" msgid="1920291699287055284">"Читання налаштувань…"</string>
     <string name="updating_settings" msgid="8171225533884883252">"Оновлення налаштувань…"</string>
     <string name="reverting_settings" msgid="4752151682666912828">"Відновл. налашт-нь…"</string>
     <string name="response_error" msgid="6674110501330139405">"Неочікувана відповідь від мережі"</string>
@@ -130,7 +130,7 @@
     <string name="disable" msgid="7274240979164762320">"Вимкнути"</string>
     <string name="change_num" msgid="239476305819844391">"Оновити"</string>
   <string-array name="clir_display_values">
-    <item msgid="5560134294467334594">"Мережа за умовч."</item>
+    <item msgid="5560134294467334594">"Налаштування мережі за умовчанням"</item>
     <item msgid="7876195870037833661">"Сховати номер"</item>
     <item msgid="1108394741608734023">"Показ. номер"</item>
   </string-array>
@@ -141,7 +141,7 @@
     <string name="no_change" msgid="3186040086622435212">"Не здійсн. жодних змін."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Вибер. службу голос. пошти"</string>
     <string name="voicemail_default" msgid="5902099213882352338">"Мій оператор"</string>
-    <string name="mobile_networks" msgid="5540397602919106177">"Налатш-ння мобільної мережі"</string>
+    <string name="mobile_networks" msgid="5540397602919106177">"Налаштування мобільної мережі"</string>
     <string name="label_available" msgid="1181658289009300430">"Доступні мережі"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Пошук…"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Не знайд. жодних мереж."</string>
@@ -182,8 +182,8 @@
     <item msgid="7002474529872452266">"LTE/CDMA"</item>
     <item msgid="5541716989029928208">"CDMA"</item>
   </string-array>
-    <string name="data_enabled" msgid="5972538663568715366">"Дані увімкнено"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"Увімкн. перед. даних у мобільній мережі"</string>
+    <string name="data_enabled" msgid="5972538663568715366">"Передавання даних"</string>
+    <string name="data_enable_summary" msgid="5022018967714633874">"Дозволити передавання даних через мобільну мережу"</string>
     <string name="roaming" msgid="8871412572928323707">"Роумінг даних"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Підключ. до служб даних під час роумінгу"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Підключ. до служб даних під час роумінгу"</string>
@@ -289,8 +289,8 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"Мультикатегорія"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"Мультикатегорію увімкн."</string>
     <string name="multi_category_disable" msgid="880104702904139505">"Мультикатегорію вимкнено"</string>
-    <string name="prefer_2g" msgid="8442550937280449639">"Викор. лише мережі 2G"</string>
-    <string name="prefer_2g_summary" msgid="1976491403210690759">"Економ. батарею"</string>
+    <string name="prefer_2g" msgid="8442550937280449639">"Лише мережі 2G"</string>
+    <string name="prefer_2g_summary" msgid="1976491403210690759">"Використовувати мережі 2G для економії батареї"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Вибір системи"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"Змінити режим CDMA-роумінгу"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Вибір системи"</string>
@@ -503,7 +503,7 @@
     <string name="voicemail_provider" msgid="5135942703327136909">"Служба"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"Налаштування"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Не встановлено&gt;"</string>
-    <string name="other_settings" msgid="3672912580359716394">"Інші налашт-ння виклику"</string>
+    <string name="other_settings" msgid="3672912580359716394">"Інші налаштування виклику"</string>
     <string name="calling_via_template" msgid="4839419581866928142">"Виклик здійснюється за допомогою <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"фото контакта"</string>
     <string name="goPrivate" msgid="865837794424530980">"конфіденц."</string>
@@ -612,7 +612,8 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Відхилити"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Вібросигнал"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Вібросигнал"</string>
-    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Сигнал дзвінка"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Звук"</string>
+    <string name="default_notification_description" msgid="78174796906240970">"Звук за умовчанням (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Завжди"</item>
     <item msgid="1595097872875714252">"Лише в беззвучному режимі"</item>
@@ -621,5 +622,5 @@
     <string name="ringtone_title" msgid="6374978286202084684">"Сигнал дзвінка телефону"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Вібрувати під час дзвінка"</string>
     <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Звук клавіш"</string>
-    <string name="preference_category_ringtone" msgid="9007490591910078324">"Мелодія"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"Сигнал дзвінка та вібросигнал"</string>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 348819c..1ba7904 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -612,7 +612,8 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Từ chối"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Rung"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Rung"</string>
-    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Nhạc chuông"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Âm thanh"</string>
+    <string name="default_notification_description" msgid="78174796906240970">"Âm thanh mặc định (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Luôn luôn"</item>
     <item msgid="1595097872875714252">"Chỉ khi ở chế độ im lặng"</item>
@@ -621,5 +622,5 @@
     <string name="ringtone_title" msgid="6374978286202084684">"Nhạc chuông điện thoại"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Rung khi đổ chuông"</string>
     <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Âm chạm bàn phím số"</string>
-    <string name="preference_category_ringtone" msgid="9007490591910078324">"Nhạc chuông"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"Nhạc chuông và rung"</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 1d3aafa..5823d22 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -612,7 +612,8 @@
     <string name="description_target_decline" msgid="4789834364389731957">"拒绝"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"振动"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"振动"</string>
-    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"铃声"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"提示音"</string>
+    <string name="default_notification_description" msgid="78174796906240970">"默认提示音 (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"始终"</item>
     <item msgid="1595097872875714252">"仅在静音时"</item>
@@ -621,5 +622,5 @@
     <string name="ringtone_title" msgid="6374978286202084684">"手机铃声"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"响铃时振动"</string>
     <string name="dtmf_tone_enable_title" msgid="827601042915852989">"拨号键盘触摸音效"</string>
-    <string name="preference_category_ringtone" msgid="9007490591910078324">"铃声"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"铃声和振动"</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index f17a251..5b51e47 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -618,7 +618,8 @@
     <string name="description_target_decline" msgid="4789834364389731957">"拒絕"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"震動"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"震動"</string>
-    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"鈴聲"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"音效"</string>
+    <string name="default_notification_description" msgid="78174796906240970">"預設音效 (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"一律啟用"</item>
     <item msgid="1595097872875714252">"僅在靜音時啟用"</item>
@@ -627,5 +628,5 @@
     <string name="ringtone_title" msgid="6374978286202084684">"手機鈴聲"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"鈴響時震動"</string>
     <string name="dtmf_tone_enable_title" msgid="827601042915852989">"撥號鍵盤觸控音效"</string>
-    <string name="preference_category_ringtone" msgid="9007490591910078324">"鈴聲"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"鈴聲與震動"</string>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index d2db86f..c090be3 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -616,7 +616,8 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Nqaba"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Dlidliza"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Dlidliza"</string>
-    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Ithoni yokukhala"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Umsindo"</string>
+    <string name="default_notification_description" msgid="78174796906240970">"Umsindo ozenzakalelayo (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Njalo"</item>
     <item msgid="1595097872875714252">"Kuphela uma ithulile"</item>
@@ -625,5 +626,5 @@
     <string name="ringtone_title" msgid="6374978286202084684">"Ithoni yokukhala kocingo"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Dlidlizisa uma ikhala"</string>
     <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Amathoni okuthinta iphedi yokudayela"</string>
-    <string name="preference_category_ringtone" msgid="9007490591910078324">"Ithoni yokukhala"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"Ithoni yokukhala nokudlidliza"</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 701c7e5..6a9de65 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1057,7 +1057,10 @@
 
     <!-- For incoming calls, this is a string we can get from a CDMA network instead of
          the actual phone number, to indicate there's no number present.  DO NOT TRANSLATE. -->
-    <string name="absent_num" translatable="false">ABSENT NUMBER</string>
+    <string-array name="absent_num" translatable="false">
+        <item>ABSENT NUMBER</item>
+        <item>ABSENTNUMBER</item>
+    </string-array>
 
     <!-- Preference for Voicemail service provider under "Voicemail" settings.
          [CHAR LIMIT=40] -->
@@ -1434,8 +1437,16 @@
     <!-- Dialog title for the vibration settings for voice mail notifications [CHAR LIMIT=40]-->
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="8995274609647451109">Vibrate</string>
 
-    <!-- Voicemail ringtone title [CHAR LIMIT=40] -->
-    <string name="voicemail_notification_ringtone_title">Ringtone</string>
+    <!-- Voicemail ringtone title. The user clicks on this preference to select
+         which sound to play when a voicemail notification is received.
+         [CHAR LIMIT=40] -->
+    <string name="voicemail_notification_ringtone_title">Sound</string>
+
+    <!--  The string used to describe a notification if it is the default one in the system. For
+          example, if the user selects the default notification, it will appear as something like
+          Default sound(Capella) in the notification summary.
+          [CHAR LIMIT=40] -->
+    <string name="default_notification_description">Default sound (<xliff:g id="default_sound_title">%1$s</xliff:g>)</string>
 
     <!-- The vibrate notification modes for voicemail notifications -->
     <string-array name="voicemail_notification_vibrate_when_entries">
@@ -1469,7 +1480,8 @@
          [CHAR LIMIT=40] -->
     <string name="dtmf_tone_enable_title">Dial pad touch tones</string>
 
-    <!-- Title for the category "ringtone", which is shown above ringote settings
+    <!-- Title for the category "ringtone", which is shown above ringtone and vibration
+         related settings.
          [CHAR LIMIT=40] -->
-    <string name="preference_category_ringtone">Ringtone</string>
+    <string name="preference_category_ringtone">Ringtone &amp; Vibrate</string>
 </resources>
diff --git a/res/xml/call_feature_setting.xml b/res/xml/call_feature_setting.xml
index 780fdee..36fd6b9 100644
--- a/res/xml/call_feature_setting.xml
+++ b/res/xml/call_feature_setting.xml
@@ -81,15 +81,11 @@
           android:persistent="true"
           android:ringtoneType="notification"
           android:defaultValue="content://settings/system/notification_sound" />
-
-      <ListPreference
-          android:key="button_voicemail_notification_vibrate_when_key"
+      <CheckBoxPreference
+          android:key="button_voicemail_notification_vibrate_key"
           android:title="@string/voicemail_notification_vibrate_when_title"
           android:persistent="true"
-          android:entries="@array/voicemail_notification_vibrate_when_entries"
-          android:entryValues="@array/voicemail_notification_vibrate_when_values"
-          android:defaultValue="@string/voicemail_notification_vibrate_when_default"
-          android:dialogTitle="@string/voicemail_notification_vibarte_when_dialog_title" />
+          />
   </PreferenceScreen>
 
   <CheckBoxPreference
diff --git a/src/com/android/phone/CallFeaturesSetting.java b/src/com/android/phone/CallFeaturesSetting.java
index ee1233d..ffed7b3 100644
--- a/src/com/android/phone/CallFeaturesSetting.java
+++ b/src/com/android/phone/CallFeaturesSetting.java
@@ -46,6 +46,7 @@
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceGroup;
+import android.preference.PreferenceManager;
 import android.preference.PreferenceScreen;
 import android.provider.ContactsContract.CommonDataKinds;
 import android.provider.MediaStore;
@@ -157,6 +158,11 @@
     private static final String BUTTON_VOICEMAIL_KEY = "button_voicemail_key";
     private static final String BUTTON_VOICEMAIL_PROVIDER_KEY = "button_voicemail_provider_key";
     private static final String BUTTON_VOICEMAIL_SETTING_KEY = "button_voicemail_setting_key";
+    // New preference key for voicemail notification vibration
+    /* package */ static final String BUTTON_VOICEMAIL_NOTIFICATION_VIBRATE_KEY =
+            "button_voicemail_notification_vibrate_key";
+    // Old preference key for voicemail notification vibration. Used for migration to the new
+    // preference key only.
     /* package */ static final String BUTTON_VOICEMAIL_NOTIFICATION_VIBRATE_WHEN_KEY =
             "button_voicemail_notification_vibrate_when_key";
     /* package */ static final String BUTTON_VOICEMAIL_NOTIFICATION_RINGTONE_KEY =
@@ -192,6 +198,7 @@
     private static final int EVENT_FORWARDING_GET_COMPLETED = 502;
 
     private static final int MSG_UPDATE_RINGTONE_SUMMARY = 1;
+    private static final int MSG_UPDATE_VOICEMAIL_RINGTONE_SUMMARY = 2;
 
     // preferred TTY mode
     // Phone.TTY_MODE_xxx
@@ -236,6 +243,10 @@
     private static final int MSG_VM_OK = 600;
     private static final int MSG_VM_NOCHANGE = 700;
 
+    // voicemail notification vibration string constants
+    private static final String VOICEMAIL_VIBRATION_ALWAYS = "always";
+    private static final String VOICEMAIL_VIBRATION_NEVER = "never";
+
     private EditPhoneNumberPreference mSubMenuVoicemailSettings;
 
     private Runnable mRingtoneLookupRunnable;
@@ -243,9 +254,12 @@
         @Override
         public void handleMessage(Message msg) {
             switch (msg.what) {
-            case MSG_UPDATE_RINGTONE_SUMMARY:
-                mRingtonePreference.setSummary((CharSequence) msg.obj);
-                break;
+                case MSG_UPDATE_RINGTONE_SUMMARY:
+                    mRingtonePreference.setSummary((CharSequence) msg.obj);
+                    break;
+                case MSG_UPDATE_VOICEMAIL_RINGTONE_SUMMARY:
+                    mVoicemailNotificationRingtone.setSummary((CharSequence) msg.obj);
+                    break;
             }
         }
     };
@@ -261,7 +275,8 @@
     private ListPreference mButtonSipCallOptions;
     private ListPreference mVoicemailProviders;
     private PreferenceScreen mVoicemailSettings;
-    private ListPreference mVoicemailNotificationVibrateWhen;
+    private Preference mVoicemailNotificationRingtone;
+    private CheckBoxPreference mVoicemailNotificationVibrate;
     private SipSharedPreferences mSipSharedPreferences;
 
     private class VoiceMailProvider {
@@ -574,10 +589,6 @@
                 mChangingVMorFwdDueToProviderChange = true;
                 saveVoiceMailAndForwardingNumber(newProviderKey, newProviderSettings);
             }
-        } else if (preference == mVoicemailNotificationVibrateWhen) {
-            mVoicemailNotificationVibrateWhen.setValue((String) objValue);
-            mVoicemailNotificationVibrateWhen.setSummary(
-                    mVoicemailNotificationVibrateWhen.getEntry());
         } else if (preference == mButtonSipCallOptions) {
             handleSipCallOptionsChange(objValue);
         }
@@ -1509,10 +1520,10 @@
         if (mVoicemailProviders != null) {
             mVoicemailProviders.setOnPreferenceChangeListener(this);
             mVoicemailSettings = (PreferenceScreen)findPreference(BUTTON_VOICEMAIL_SETTING_KEY);
-            mVoicemailNotificationVibrateWhen =
-                    (ListPreference) findPreference(BUTTON_VOICEMAIL_NOTIFICATION_VIBRATE_WHEN_KEY);
-            mVoicemailNotificationVibrateWhen.setOnPreferenceChangeListener(this);
-
+            mVoicemailNotificationRingtone =
+                    findPreference(BUTTON_VOICEMAIL_NOTIFICATION_RINGTONE_KEY);
+            mVoicemailNotificationVibrate =
+                    (CheckBoxPreference) findPreference(BUTTON_VOICEMAIL_NOTIFICATION_VIBRATE_KEY);
             initVoiceMailProviders();
         }
 
@@ -1626,6 +1637,10 @@
                     updateRingtoneName(RingtoneManager.TYPE_RINGTONE, mRingtonePreference,
                             MSG_UPDATE_RINGTONE_SUMMARY);
                 }
+                if (mVoicemailNotificationRingtone != null) {
+                    updateRingtoneName(RingtoneManager.TYPE_NOTIFICATION,
+                            mVoicemailNotificationRingtone, MSG_UPDATE_VOICEMAIL_RINGTONE_SUMMARY);
+                }
             }
         };
 
@@ -1643,7 +1658,32 @@
      */
     private void updateRingtoneName(int type, Preference preference, int msg) {
         if (preference == null) return;
-        Uri ringtoneUri = RingtoneManager.getActualDefaultRingtoneUri(this, type);
+        final Uri ringtoneUri;
+        boolean defaultRingtone = false;
+        if (type == RingtoneManager.TYPE_RINGTONE) {
+            // For ringtones, we can just lookup the system default because changing the settings
+            // in Call Settings changes the system default.
+            ringtoneUri = RingtoneManager.getActualDefaultRingtoneUri(this, type);
+        } else {
+            final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(
+                    mPhone.getContext());
+            // for voicemail notifications, we use the value saved in Phone's shared preferences.
+            String uriString = prefs.getString(preference.getKey(), null);
+            if (TextUtils.isEmpty(uriString)) {
+                // silent ringtone
+                ringtoneUri = null;
+            } else {
+                if (uriString.equals(Settings.System.DEFAULT_NOTIFICATION_URI.toString())) {
+                    // If it turns out that the voicemail notification is set to the system
+                    // default notification, we retrieve the actual URI to prevent it from showing
+                    // up as "Unknown Ringtone".
+                    defaultRingtone = true;
+                    ringtoneUri = RingtoneManager.getActualDefaultRingtoneUri(this, type);
+                } else {
+                    ringtoneUri = Uri.parse(uriString);
+                }
+            }
+        }
         CharSequence summary = getString(com.android.internal.R.string.ringtone_unknown);
         // Is it a silent ringtone?
         if (ringtoneUri == null) {
@@ -1663,6 +1703,10 @@
                 // Unknown title for the ringtone
             }
         }
+        if (defaultRingtone) {
+            summary = mPhone.getContext().getString(
+                    R.string.default_notification_description, summary);
+        }
         mRingtoneLookupComplete.sendMessage(mRingtoneLookupComplete.obtainMessage(msg, summary));
     }
 
@@ -1744,9 +1788,35 @@
             updatePreferredTtyModeSummary(settingsTtyMode);
         }
 
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(
+                mPhone.getContext());
+        if (migrateVoicemailVibrationSettingsIfNeeded(prefs)) {
+            mVoicemailNotificationVibrate.setChecked(prefs.getBoolean(
+                    BUTTON_VOICEMAIL_NOTIFICATION_VIBRATE_KEY, false));
+        }
+
         lookupRingtoneName();
     }
 
+    // Migrate settings from BUTTON_VOICEMAIL_NOTIFICATION_VIBRATE_WHEN_KEY to
+    // BUTTON_VOICEMAIL_NOTIFICATION_VIBRATE_KEY, if the latter does not exist.
+    // Returns true if migration was performed.
+    public static boolean migrateVoicemailVibrationSettingsIfNeeded(SharedPreferences prefs) {
+        if (!prefs.contains(BUTTON_VOICEMAIL_NOTIFICATION_VIBRATE_KEY)) {
+            String vibrateWhen = prefs.getString(
+                    BUTTON_VOICEMAIL_NOTIFICATION_VIBRATE_WHEN_KEY, VOICEMAIL_VIBRATION_NEVER);
+            // If vibrateWhen is always, then voicemailVibrate should be True.
+            // otherwise if vibrateWhen is "only in silent mode", or "never", then
+            // voicemailVibrate = False.
+            boolean voicemailVibrate = vibrateWhen.equals(VOICEMAIL_VIBRATION_ALWAYS);
+            final SharedPreferences.Editor editor = prefs.edit();
+            editor.putBoolean(BUTTON_VOICEMAIL_NOTIFICATION_VIBRATE_KEY, voicemailVibrate);
+            editor.commit();
+            return true;
+        }
+        return false;
+    }
+
     /**
      * Obtain the setting for "vibrate when ringing" setting.
      *
@@ -1852,8 +1922,7 @@
             mVoicemailSettings.setEnabled(false);
             mVoicemailSettings.setIntent(null);
 
-            mVoicemailNotificationVibrateWhen.setEnabled(false);
-            mVoicemailNotificationVibrateWhen.setSummary("");
+            mVoicemailNotificationVibrate.setEnabled(false);
         } else {
             if (DBG) {
                 log("updateVMPreferenceWidget: provider for the key \"" + key + "\".."
@@ -1865,9 +1934,7 @@
             mVoicemailSettings.setEnabled(true);
             mVoicemailSettings.setIntent(provider.intent);
 
-            mVoicemailNotificationVibrateWhen.setEnabled(true);
-            mVoicemailNotificationVibrateWhen.setSummary(
-                    mVoicemailNotificationVibrateWhen.getEntry());
+            mVoicemailNotificationVibrate.setEnabled(true);
         }
     }
 
diff --git a/src/com/android/phone/DTMFTwelveKeyDialer.java b/src/com/android/phone/DTMFTwelveKeyDialer.java
index 0f198f2..826d66c 100644
--- a/src/com/android/phone/DTMFTwelveKeyDialer.java
+++ b/src/com/android/phone/DTMFTwelveKeyDialer.java
@@ -58,6 +58,7 @@
     // events
     private static final int PHONE_DISCONNECT = 100;
     private static final int DTMF_SEND_CNF = 101;
+    private static final int DTMF_STOP = 102;
 
     /** Accessibility manager instance used to check touch exploration state. */
     private final AccessibilityManager mAccessibilityManager;
@@ -361,6 +362,10 @@
                     // handle burst dtmf confirmation
                     handleBurstDtmfConfirmation();
                     break;
+                case DTMF_STOP:
+                    if (DBG) log("dtmf stop received");
+                    stopTone();
+                    break;
             }
         }
     };
@@ -681,7 +686,7 @@
             final int id = v.getId();
             // Checking the press state prevents double activation.
             if (!v.isPressed() && mDisplayMap.containsKey(id)) {
-                processDtmf(mDisplayMap.get(id), true /* forceShortTone */);
+                processDtmf(mDisplayMap.get(id), true /* timedShortTone */);
             }
         }
     }
@@ -842,7 +847,7 @@
      * DTMF tone (or short tone if requested), and appending the digit to the
      * EditText field that displays the DTMF digits sent so far.
      */
-    private final void processDtmf(char c, boolean forceShortTone) {
+    private final void processDtmf(char c, boolean timedShortTone) {
         // if it is a valid key, then update the display and send the dtmf tone.
         if (PhoneNumberUtils.is12Key(c)) {
             if (DBG) log("updating display and sending dtmf tone for '" + c + "'");
@@ -864,7 +869,7 @@
             // Play the tone if it exists.
             if (mToneMap.containsKey(c)) {
                 // begin tone playback.
-                startTone(c, forceShortTone);
+                startTone(c, timedShortTone);
             }
         } else if (DBG) {
             log("ignoring dtmf request for '" + c + "'");
@@ -935,7 +940,7 @@
     /**
      * Plays the local tone based the phone type.
      */
-    public void startTone(char c, boolean forceShortTone) {
+    public void startTone(char c, boolean timedShortTone) {
         // Only play the tone if it exists.
         if (!mToneMap.containsKey(c)) {
             return;
@@ -949,31 +954,37 @@
         Phone phone = mCM.getFgPhone();
         mShortTone = PhoneUtils.useShortDtmfTones(phone, phone.getContext());
 
+        // Before we go ahead and start a tone, we need to make sure that any pending
+        // stop-tone message is processed.
+        if (mHandler.hasMessages(DTMF_STOP)) {
+            mHandler.removeMessages(DTMF_STOP);
+            stopTone();
+        }
+
         if (DBG) log("startDtmfTone()...");
 
         // For Short DTMF we need to play the local tone for fixed duration
-        if (forceShortTone || mShortTone) {
+        if (mShortTone) {
             sendShortDtmfToNetwork(c);
         } else {
             // Pass as a char to be sent to network
             if (DBG) log("send long dtmf for " + c);
             mCM.startDtmf(c);
+
+            // If it is a timed tone, queue up the stop command in DTMF_DURATION_MS.
+            if (timedShortTone) {
+                mHandler.sendMessageDelayed(mHandler.obtainMessage(DTMF_STOP), DTMF_DURATION_MS);
+            }
         }
-        startLocalToneIfNeeded(c, forceShortTone);
+        startLocalToneIfNeeded(c);
     }
 
-    /**
-     * Plays the local tone based the phone type.
-     */
-    public void startLocalToneIfNeeded(char c) {
-        startLocalToneIfNeeded(c, false);
-    }
 
     /**
      * Plays the local tone based the phone type, optionally forcing a short
      * tone.
      */
-    private void startLocalToneIfNeeded(char c, boolean forceShortTone) {
+    public void startLocalToneIfNeeded(char c) {
         // if local tone playback is enabled, start it.
         // Only play the tone if it exists.
         if (!mToneMap.containsKey(c)) {
@@ -986,7 +997,7 @@
                 } else {
                     if (DBG) log("starting local tone " + c);
                     int toneDuration = -1;
-                    if (forceShortTone || mShortTone) {
+                    if (mShortTone) {
                         toneDuration = DTMF_DURATION_MS;
                     }
                     mToneGenerator.startTone(mToneMap.get(c), toneDuration);
@@ -1028,7 +1039,6 @@
      */
     public void stopLocalToneIfNeeded() {
         if (!mShortTone) {
-            if (DBG) log("stopping remote tone.");
             // if local tone playback is enabled, stop it.
             if (DBG) log("trying to stop local tone...");
             if (mLocalToneEnabled) {
diff --git a/src/com/android/phone/NotificationMgr.java b/src/com/android/phone/NotificationMgr.java
index 044418c..42dcdb6 100644
--- a/src/com/android/phone/NotificationMgr.java
+++ b/src/com/android/phone/NotificationMgr.java
@@ -1277,17 +1277,12 @@
                     .setSound(ringtoneUri);
             Notification notification = builder.getNotification();
 
-            String vibrateWhen = prefs.getString(
-                    CallFeaturesSetting.BUTTON_VOICEMAIL_NOTIFICATION_VIBRATE_WHEN_KEY, "never");
-            boolean vibrateAlways = vibrateWhen.equals("always");
-            boolean vibrateSilent = vibrateWhen.equals("silent");
-            AudioManager audioManager =
-                    (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
-            boolean nowSilent = audioManager.getRingerMode() == AudioManager.RINGER_MODE_VIBRATE;
-            if (vibrateAlways || (vibrateSilent && nowSilent)) {
+            CallFeaturesSetting.migrateVoicemailVibrationSettingsIfNeeded(prefs);
+            final boolean vibrate = prefs.getBoolean(
+                    CallFeaturesSetting.BUTTON_VOICEMAIL_NOTIFICATION_VIBRATE_KEY, false);
+            if (vibrate) {
                 notification.defaults |= Notification.DEFAULT_VIBRATE;
             }
-
             notification.flags |= Notification.FLAG_NO_CLEAR;
             configureLedNotification(notification);
             mNotificationManager.notify(VOICEMAIL_NOTIFICATION, notification);
diff --git a/src/com/android/phone/PhoneUtils.java b/src/com/android/phone/PhoneUtils.java
index 0d98907..58a5ba9 100644
--- a/src/com/android/phone/PhoneUtils.java
+++ b/src/com/android/phone/PhoneUtils.java
@@ -21,11 +21,9 @@
 import android.app.ProgressDialog;
 import android.bluetooth.IBluetoothHeadsetPhone;
 import android.content.ActivityNotFoundException;
-import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.ServiceConnection;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
@@ -34,13 +32,10 @@
 import android.net.Uri;
 import android.net.sip.SipManager;
 import android.os.AsyncResult;
-import android.os.AsyncTask;
 import android.os.Handler;
-import android.os.IBinder;
 import android.os.Message;
 import android.os.RemoteException;
 import android.os.SystemProperties;
-import android.provider.ContactsContract;
 import android.provider.Settings;
 import android.telephony.PhoneNumberUtils;
 import android.text.TextUtils;
@@ -58,7 +53,6 @@
 import com.android.internal.telephony.CallerInfo;
 import com.android.internal.telephony.CallerInfoAsyncQuery;
 import com.android.internal.telephony.Connection;
-import com.android.internal.telephony.IExtendedNetworkService;
 import com.android.internal.telephony.MmiCode;
 import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.PhoneConstants;
@@ -68,6 +62,7 @@
 import com.android.internal.telephony.sip.SipPhone;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;
@@ -116,11 +111,6 @@
     /** Define for not a special CNAP string */
     private static final int CNAP_SPECIAL_CASE_NO = -1;
 
-    // Extended network service interface instance
-    private static IExtendedNetworkService mNwService = null;
-    // used to cancel MMI command after 15 seconds timeout for NWService requirement
-    private static Message mMmiTimeoutCbMsg = null;
-
     /** Noise suppression status as selected by user */
     private static boolean sIsNoiseSuppressionEnabled = true;
 
@@ -200,19 +190,6 @@
         }
     }
 
-
-    private static ServiceConnection ExtendedNetworkServiceConnection = new ServiceConnection() {
-        public void onServiceConnected(ComponentName name, IBinder iBinder) {
-            if (DBG) log("Extended NW onServiceConnected");
-            mNwService = IExtendedNetworkService.Stub.asInterface(iBinder);
-        }
-
-        public void onServiceDisconnected(ComponentName arg0) {
-            if (DBG) log("Extended NW onServiceDisconnected");
-            mNwService = null;
-        }
-    };
-
     /**
      * Register the ConnectionHandler with the phone, to receive connection events
      */
@@ -223,11 +200,6 @@
 
         // pass over cm as user.obj
         cm.registerForPreciseCallStateChanged(mConnectionHandler, PHONE_STATE_CHANGED, cm);
-        // Extended NW service
-        Intent intent = new Intent("com.android.ussd.IExtendedNetworkService");
-        cm.getDefaultPhone().getContext().bindService(intent,
-                ExtendedNetworkServiceConnection, Context.BIND_AUTO_CREATE);
-        if (DBG) log("Extended NW bindService IExtendedNetworkService");
 
     }
 
@@ -244,29 +216,29 @@
      * @see #answerAndEndHolding(CallManager, Call)
      * @see #answerAndEndActive(CallManager, Call)
      */
-    /* package */ static boolean answerCall(Call ringing) {
-        log("answerCall(" + ringing + ")...");
+    /* package */ static boolean answerCall(Call ringingCall) {
+        log("answerCall(" + ringingCall + ")...");
         final PhoneGlobals app = PhoneGlobals.getInstance();
+        final CallNotifier notifier = app.notifier;
 
         // If the ringer is currently ringing and/or vibrating, stop it
         // right now (before actually answering the call.)
-        app.getRinger().stopRing();
+        notifier.silenceRinger();
 
-        final Phone phone = ringing.getPhone();
+        final Phone phone = ringingCall.getPhone();
         final boolean phoneIsCdma = (phone.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA);
         boolean answered = false;
         IBluetoothHeadsetPhone btPhone = null;
 
         if (phoneIsCdma) {
             // Stop any signalInfo tone being played when a Call waiting gets answered
-            if (ringing.getState() == Call.State.WAITING) {
-                final CallNotifier notifier = app.notifier;
+            if (ringingCall.getState() == Call.State.WAITING) {
                 notifier.stopSignalInfoTone();
             }
         }
 
-        if (ringing != null && ringing.isRinging()) {
-            if (DBG) log("answerCall: call state = " + ringing.getState());
+        if (ringingCall != null && ringingCall.isRinging()) {
+            if (DBG) log("answerCall: call state = " + ringingCall.getState());
             try {
                 if (phoneIsCdma) {
                     if (app.cdmaPhoneCallState.getCurrentCallState()
@@ -299,10 +271,10 @@
                   }
                 }
 
-                final boolean isRealIncomingCall = isRealIncomingCall(ringing.getState());
+                final boolean isRealIncomingCall = isRealIncomingCall(ringingCall.getState());
 
                 //if (DBG) log("sPhone.acceptCall");
-                app.mCM.acceptCall(ringing);
+                app.mCM.acceptCall(ringingCall);
                 answered = true;
 
                 // Always reset to "unmuted" for a freshly-answered call
@@ -672,15 +644,6 @@
             if (phoneType == PhoneConstants.PHONE_TYPE_GSM && gatewayUri == null) {
                 if (DBG) log("dialed MMI code: " + number);
                 status = CALL_STATUS_DIALED_MMI;
-                // Set dialed MMI command to service
-                if (mNwService != null) {
-                    try {
-                        mNwService.setMmiString(number);
-                        if (DBG) log("Extended NW bindService setUssdString (" + number + ")");
-                    } catch (RemoteException e) {
-                        mNwService = null;
-                    }
-                }
             } else {
                 status = CALL_STATUS_FAILED;
             }
@@ -947,36 +910,6 @@
         //
         // Anything that is NOT a USSD request is a normal MMI request,
         // which will bring up a toast (desribed above).
-        // Optional code for Extended USSD running prompt
-        if (mNwService != null) {
-            if (DBG) log("running USSD code, displaying indeterminate progress.");
-            // create the indeterminate progress dialog and display it.
-            ProgressDialog pd = new ProgressDialog(context);
-            CharSequence textmsg = "";
-            try {
-                textmsg = mNwService.getMmiRunningText();
-
-            } catch (RemoteException e) {
-                mNwService = null;
-                textmsg = context.getText(R.string.ussdRunning);
-            }
-            if (DBG) log("Extended NW displayMMIInitiate (" + textmsg + ")");
-            pd.setMessage(textmsg);
-            pd.setCancelable(false);
-            pd.setIndeterminate(true);
-            pd.getWindow().addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND
-                    | WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
-            pd.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG);
-            pd.show();
-            // trigger a 15 seconds timeout to clear this progress dialog
-            mMmiTimeoutCbMsg = buttonCallbackMessage;
-            try {
-                mMmiTimeoutCbMsg.getTarget().sendMessageDelayed(buttonCallbackMessage, 15000);
-            } catch(NullPointerException e) {
-                mMmiTimeoutCbMsg = null;
-            }
-            return pd;
-        }
 
         boolean isCancelable = (mmiCode != null) && mmiCode.isCancelable();
 
@@ -1020,16 +953,6 @@
         MmiCode.State state = mmiCode.getState();
 
         if (DBG) log("displayMMIComplete: state=" + state);
-        // Clear timeout trigger message
-        if(mMmiTimeoutCbMsg != null) {
-            try{
-                mMmiTimeoutCbMsg.getTarget().removeMessages(mMmiTimeoutCbMsg.what);
-                if (DBG) log("Extended NW displayMMIComplete removeMsg");
-            } catch (NullPointerException e) {
-            }
-            mMmiTimeoutCbMsg = null;
-        }
-
 
         switch (state) {
             case PENDING:
@@ -1098,14 +1021,6 @@
             if (state != MmiCode.State.PENDING) {
                 if (DBG) log("MMI code has finished running.");
 
-                // Replace response message with Extended Mmi wording
-                if (mNwService != null) {
-                    try {
-                        text = mNwService.getUserMessage(text);
-                    } catch (RemoteException e) {
-                        mNwService = null;
-                    }
-                }
                 if (DBG) log("Extended NW displayMMIInitiate (" + text + ")");
                 if (text == null || text.length() == 0)
                     return;
@@ -1241,18 +1156,6 @@
                 canceled = true;
             }
         }
-
-        //clear timeout message and pre-set MMI command
-        if (mNwService != null) {
-            try {
-                mNwService.clearMmiString();
-            } catch (RemoteException e) {
-                mNwService = null;
-            }
-        }
-        if (mMmiTimeoutCbMsg != null) {
-            mMmiTimeoutCbMsg = null;
-        }
         return canceled;
     }
 
@@ -2357,7 +2260,9 @@
         // "ABSENT NUMBER" is a possible value we could get from the network as the
         // phone number, so if this happens, change it to "Unknown" in the CallerInfo
         // and fix the presentation to be the same.
-        if (number.equals(context.getString(R.string.absent_num))
+        final String[] absentNumberValues =
+                context.getResources().getStringArray(R.array.absent_num);
+        if (Arrays.asList(absentNumberValues).contains(number)
                 && presentation == PhoneConstants.PRESENTATION_ALLOWED) {
             number = context.getString(R.string.unknown);
             ci.numberPresentation = PhoneConstants.PRESENTATION_UNKNOWN;
diff --git a/src/com/android/phone/SmallerHitTargetTouchListener.java b/src/com/android/phone/SmallerHitTargetTouchListener.java
index 74f46f7..8e1bf16 100644
--- a/src/com/android/phone/SmallerHitTargetTouchListener.java
+++ b/src/com/android/phone/SmallerHitTargetTouchListener.java
@@ -16,6 +16,7 @@
 
 package com.android.phone;
 
+import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 
@@ -25,41 +26,20 @@
  * We do this for a few specific buttons which are vulnerable to
  * "false touches" because either (1) they're near the edge of the
  * screen and might be unintentionally touched while holding the
- * device in your hand, or (2) they're in the upper corners and might
+ * device in your hand, (2) they're in the upper corners and might
  * be touched by the user's ear before the prox sensor has a chance to
- * kick in.
- *
- * TODO (new ICS layout): not sure which buttons need this yet.
- * For now, use it only with the "End call" button (which extends all
- * the way to the edges of the screen).  But we can consider doing
- * this for "Dialpad" and/or "Add call" if those turn out to be a
- * problem too.
+ * kick in, or (3) they are close to other buttons.
  */
 public class SmallerHitTargetTouchListener implements View.OnTouchListener {
-    /**
-     * Width of the allowable "hit target" as a percentage of
-     * the total width of this button.
-     */
-    private static final int HIT_TARGET_PERCENT_X = 50;
+    private static final String TAG = "SmallerHitTargetTouchListener";
 
     /**
-     * Height of the allowable "hit target" as a percentage of
-     * the total height of this button.
-     *
-     * This is larger than HIT_TARGET_PERCENT_X because some of
-     * the onscreen buttons are wide but not very tall and we don't
-     * want to make the vertical hit target *too* small.
+     * Edge dimensions where a touch does not register an action (in DIP).
      */
-    private static final int HIT_TARGET_PERCENT_Y = 80;
-
-    // Size (percentage-wise) of the "edge" area that's *not* touch-sensitive.
-    private static final int X_EDGE = (100 - HIT_TARGET_PERCENT_X) / 2;
-    private static final int Y_EDGE = (100 - HIT_TARGET_PERCENT_Y) / 2;
-    // Min/max values (percentage-wise) of the touch-sensitive hit target.
-    private static final int X_HIT_MIN = X_EDGE;
-    private static final int X_HIT_MAX = 100 - X_EDGE;
-    private static final int Y_HIT_MIN = Y_EDGE;
-    private static final int Y_HIT_MAX = 100 - Y_EDGE;
+    private static final int HIT_TARGET_EDGE_IGNORE_DP_X = 30;
+    private static final int HIT_TARGET_EDGE_IGNORE_DP_Y = 10;
+    private static final int HIT_TARGET_MIN_SIZE_DP_X = HIT_TARGET_EDGE_IGNORE_DP_X * 3;
+    private static final int HIT_TARGET_MIN_SIZE_DP_Y = HIT_TARGET_EDGE_IGNORE_DP_Y * 3;
 
     // True if the most recent DOWN event was a "hit".
     boolean mDownEventHit;
@@ -81,25 +61,37 @@
             // Note that event.getX() and event.getY() are already
             // translated into the View's coordinates.  (In other words,
             // "0,0" is a touch on the upper-left-most corner of the view.)
-            int touchX = (int) event.getX();
-            int touchY = (int) event.getY();
+            final int touchX = (int) event.getX();
+            final int touchY = (int) event.getY();
 
-            int viewWidth = v.getWidth();
-            int viewHeight = v.getHeight();
+            final int viewWidth = v.getWidth();
+            final int viewHeight = v.getHeight();
 
-            // Touch location as a percentage of the total button width or height.
-            int touchXPercent = (int) ((float) (touchX * 100) / (float) viewWidth);
-            int touchYPercent = (int) ((float) (touchY * 100) / (float) viewHeight);
-            // if (DBG) log("- percentage:  x = " + touchXPercent + ",  y = " + touchYPercent);
+            final float pixelDensity = v.getResources().getDisplayMetrics().density;
+            final int targetMinSizeX = (int) (HIT_TARGET_MIN_SIZE_DP_X * pixelDensity);
+            final int targetMinSizeY = (int) (HIT_TARGET_MIN_SIZE_DP_Y * pixelDensity);
 
-            // TODO: user research: add event logging here of the actual
-            // hit location (and button ID), and enable it for dogfooders
-            // for a few days.  That'll give us a good idea of how close
-            // to the center of the button(s) most touch events are, to
-            // help us fine-tune the HIT_TARGET_PERCENT_* constants.
+            int edgeIgnoreX = (int) (HIT_TARGET_EDGE_IGNORE_DP_X * pixelDensity);
+            int edgeIgnoreY = (int) (HIT_TARGET_EDGE_IGNORE_DP_Y * pixelDensity);
 
-            if (touchXPercent < X_HIT_MIN || touchXPercent > X_HIT_MAX
-                    || touchYPercent < Y_HIT_MIN || touchYPercent > Y_HIT_MAX) {
+            // If we are dealing with smaller buttons where the dead zone defined by
+            // HIT_TARGET_EDGE_IGNORE_DP_[X|Y] is too large.
+            if (viewWidth < targetMinSizeX || viewHeight < targetMinSizeY) {
+                // This really should not happen given our two use cases (as of this writing)
+                // in the call edge button and secondary calling card. However, we leave
+                // this is as a precautionary measure.
+                Log.w(TAG, "onTouch: view is too small for SmallerHitTargetTouchListener");
+                edgeIgnoreX = 0;
+                edgeIgnoreY = 0;
+            }
+
+            final int minTouchX = edgeIgnoreX;
+            final int maxTouchX = viewWidth - edgeIgnoreX;
+            final int minTouchY = edgeIgnoreY;
+            final int maxTouchY = viewHeight - edgeIgnoreY;
+
+            if (touchX < minTouchX || touchX > maxTouchX ||
+                    touchY < minTouchY || touchY > maxTouchY) {
                 // Missed!
                 // if (DBG) log("  -> MISSED!");
                 mDownEventHit = false;
@@ -120,4 +112,4 @@
             return !mDownEventHit;
         }
     }
-}
\ No newline at end of file
+}