Merge "Do not create incoming/disconnected calls on update." into klp-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6ecb7c5..fe71d4c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -507,6 +507,17 @@
                 android:launchMode="singleInstance"
                 android:theme="@style/Empty">
         </activity>
+        <activity android:name=".TextMessagePackageChooser"
+                android:label="@string/respond_via_sms_setting_title"
+                android:configChanges="orientation|screenSize|keyboardHidden"
+                android:theme="@style/Theme.Transparent">
+        </activity>
+
+        <activity android:name="HfaActivity"
+                android:excludeFromRecents="true"
+                android:launchMode="singleInstance"
+                android:theme="@style/Empty">
+        </activity>
 
         <receiver android:name="CallerInfoCacheUpdateReceiver">
             <intent-filter>
diff --git a/common/src/com/android/services/telephony/common/ICallCommandService.aidl b/common/src/com/android/services/telephony/common/ICallCommandService.aidl
index 5969575..660d8aa 100644
--- a/common/src/com/android/services/telephony/common/ICallCommandService.aidl
+++ b/common/src/com/android/services/telephony/common/ICallCommandService.aidl
@@ -40,6 +40,11 @@
     void disconnectCall(int callId);
 
     /**
+     * Separate a conference call.
+     */
+    void separateCall(int callId);
+
+    /**
      * Place call on hold.
      */
     void hold(int callId, boolean hold);
@@ -87,4 +92,8 @@
      * {@see AudioMode}
      */
     void setAudioMode(int mode);
+
+    void postDialCancel(int callId);
+
+    void postDialWaitContinue(int callId);
 }
diff --git a/common/src/com/android/services/telephony/common/ICallHandlerService.aidl b/common/src/com/android/services/telephony/common/ICallHandlerService.aidl
index 5eddb0e..4fbc8b8 100644
--- a/common/src/com/android/services/telephony/common/ICallHandlerService.aidl
+++ b/common/src/com/android/services/telephony/common/ICallHandlerService.aidl
@@ -67,4 +67,6 @@
      * Called when the system wants to bring the in-call UI into the foreground.
      */
     void bringToForeground();
+
+    void onPostDialWait(int callId, String remainingChars);
 }
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 5f3c9c1..8b1cb17 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -454,6 +454,10 @@
     <string name="network_message" msgid="4483886461245213802">"Netwerkboodskap"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Aktiveer jou foon"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"\'n Spesiale oproep moet gemaak word om jou foondiens te aktiveer. \n\nDruk \"Aktiveer\" en luister dan na die instruksies om jou foon te aktiveer."</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Slaan aktivering oor?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"As jy aktivering oorslaan, kan jy nie oproepe maak of aan mobiele datanetwerke koppel nie (hoewel jy aan Wi-Fi-netwerke kan koppel). Tot tyd en wyl jy jou foon aktiveer, word jy gevra om dit te aktiveer elke keer wat jy dit aanskakel."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Slaan oor"</string>
@@ -581,7 +585,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Redigeer vinnige antwoorde"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Vinnige antwoord"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Stel verstek program terug"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Boodskap gestuur na <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"een"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"twee"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 1a315a5..c4d2dba 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -450,6 +450,10 @@
     <string name="network_message" msgid="4483886461245213802">"የአውታረ መረብ መልዕክት"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"ስልክዎን ያግብሩ"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"የስልክዎን አገለግሎት ለማግበር ልዩ ጥሪ ያስፈልጋል።\n\n  \"አግብር\" ከተጫኑ በኋላ ስልክዎን ለማግበር የቀረቡትን መመሪያዎች ያዳምጡ።"</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"አግብር ይዝለል?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"ማግበር ካዘለሉ፣ ጥሪ ማድረግ ወይም ተንቀሳቃሽ ስልክ ውሂብ አውታረ መረብ(በWi-Fi አውታረ መረቦች ማያያዝ ቢችሉም እንኳን ) ማያያዝ አይችሉም። ስልክዎን እስኪያገብሩ ድረስ፣ ባበሩት ቁጥር እንዲያገብሩት ይጠየቃሉ።"</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"ዝለል"</string>
@@ -577,7 +581,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"ፈጣን ምላሾች አርትዕ"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"ፈጣን ምላሽ"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"ነባሪውን መተግበሪያ ዳግም አስጀምር"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"ለ <xliff:g id="PHONE_NUMBER">%s</xliff:g> የተላከ መልዕክት"</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"አንድ"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"ሁለት"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 38580a5..e403f1e 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -450,6 +450,10 @@
     <string name="network_message" msgid="4483886461245213802">"رسالة الشبكة"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"تنشيط الهاتف"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"يلزم إجراء اتصال خاص لتنشيط خدمة الهاتف. \n\nبعد الضغط على \"تنشيط\"، استمع إلى الإرشادات المقدمة لتنشيط هاتفك."</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"هل تريد تخطي التنشيط؟"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"إذا تخطيت التنشيط، فلن تتمكن من إجراء مكالمات أو الاتصال بشبكات بيانات الجوال (ومع ذلك، يمكنك الاتصال بشبكات Wi-Fi). إلى أن تنشط هاتفك، ستتم مطالبتك بتنشيطه في كل مرة تشغله فيها."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"تخطٍ"</string>
@@ -577,7 +581,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"تعديل الردود السريعة"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"رد سريع"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"إعادة تعيين التطبيق الافتراضي"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"تم إرسال الرسالة إلى <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"واحد"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"اثنان"</string>
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
index ea22a2c..015a27d 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az-rAZ/strings.xml
@@ -450,6 +450,10 @@
     <string name="network_message" msgid="4483886461245213802">"Şəbəkə mesajı"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Telefonunuzu aktivləşdirin"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Telefon xidmətinizi aktivləşdirmək üçün xüsusi zəngə ehtiyac var.\n\n\"Aktivləşdir\" düyməsini basandan sonra telefonunuzu aktivləşdirmək üçün təqdim olunan instruksiyaları dinləyin."</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Aktivasiyanı ötürək?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Aktivasiyanı ötürdüyünüz halda zəng edə və ya mobil data şəbəkəsinə birləşə bilməzsiniz (Wi-Fi şəbəkəsinə birləşə bilərsiniz). Telefonunuzu aktivləşdirənə kimi hər dəfə telefonunuzu yandırarkən Sizə onu aktivləşdirmək təklif olunacaq."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Ötürün"</string>
@@ -577,7 +581,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Tez cavablara düzəliş edin"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Tez cavab"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Defolt tətbiqləri sıfırla"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Mesaj <xliff:g id="PHONE_NUMBER">%s</xliff:g> nömrəsinə göndərildi."</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"bir"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"iki"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 430ea06..69e62ed 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -450,6 +450,10 @@
     <string name="network_message" msgid="4483886461245213802">"Паведамленне сеткі"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Актываваць тэлефон"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Каб актываваць абслугоўванне вашага тэлефона, трэба выканаць спецыяльны выклік. \n\nНацісніце \"Актываваць\" і слухайце інструкцыі, неабходныя для актывацыі тэлефона."</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Прапусціць актывацыю?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Калі прапусціць актывацыю, вы не зможаце здзяйсняць званкі або падлучэнні да мабільных сетак перадачы дадзеных (хаця вы зможаце падлучыцца да Wi-Fi). Кожны раз пры ўключэнні тэлефона вам будзе прапанавана актываваць яго."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Прапусціць"</string>
@@ -577,7 +581,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Рэдагаваць хуткія адказы"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Хуткі адказ"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Скінуць налады прыкладання"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Паведамленне адпраўлена на нумар <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"адзін"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"два"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 69799b0..0cfe315 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -450,6 +450,10 @@
     <string name="network_message" msgid="4483886461245213802">"Мрежово съобщение"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Активиране на вашия телефон"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"За активиране на телефонните услуги трябва да направите специално обаждане. \n\nСлед като натиснете „Активиране“, чуйте предоставените инструкции за тази цел."</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Да се пропусне ли активацията?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Ако пропуснете активирането, не може да осъществявате обаждания или свързване към мобилни мрежи с данни (възможно е свързване към мрежи с Wi-Fi). Докато не активирате телефона си, от вас ще се иска да го правите при всяко включване."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Пропускане"</string>
@@ -577,7 +581,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Редактиране на бързи отговори"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Бърз отговор"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Възст. на станд. настройки"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"До <xliff:g id="PHONE_NUMBER">%s</xliff:g> бе изпратено съобщение."</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"едно"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"две"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index a652cf8..00c3beb 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -104,7 +104,7 @@
     <string name="response_error" msgid="6674110501330139405">"Resposta inesperada de la xarxa."</string>
     <string name="exception_error" msgid="7027667130619518211">"Error de xarxa o de targeta SIM."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"La configuració dels números de marcatge fix de l\'aplicació Telèfon està activada. En conseqüència, algunes funcions relacionades amb les trucades no funcionen."</string>
-    <string name="radio_off_error" msgid="2304459933248513376">"Activa la ràdio abans de visualitzar aquesta configuració."</string>
+    <string name="radio_off_error" msgid="2304459933248513376">"Per veure aquesta configuració, has d\'activar el senyal mòbil."</string>
     <string name="close_dialog" msgid="2365884406356986917">"D\'acord"</string>
     <string name="enable" msgid="1059008390636773574">"Activa"</string>
     <string name="disable" msgid="7274240979164762320">"Desactiva"</string>
@@ -413,7 +413,7 @@
     <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"No es pot alliberar les trucades."</string>
     <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Trucada per Internet"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Trucada d\'emergència"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"S\'està activant la ràdio..."</string>
+    <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"S\'està activant el senyal mòbil..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Fora de l\'àrea de servei; s\'està tornant a provar..."</string>
     <string name="dial_emergency_error" msgid="7969515493359619960">"No s\'ha enviat la trucada. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> no és un número d\'emergència."</string>
     <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Trucada no enviada. Marca un número d\'emergència."</string>
@@ -450,6 +450,10 @@
     <string name="network_message" msgid="4483886461245213802">"Missatge de xarxa"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Activació del telèfon"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Cal fer una trucada especial per activar el servei del telèfon. \n\nDesprés de prémer \"Activa\", escolteu les instruccions proporcionades per activar el telèfon."</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Voleu ometre l\'activació?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Si ometeu l\'activació, no podreu fer trucades ni connectar-vos a xarxes de dades mòbils (tot i que podreu connectar-vos a xarxes Wi-fi). Fins que activeu el telèfon, se us demanarà que ho feu cada cop que l\'engegueu."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Omet"</string>
@@ -577,7 +581,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Edita les respostes ràpides"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Resposta ràpida"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Restableix aplic. predetermin."</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Missatge enviat a <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"un"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"dos"</string>
@@ -605,6 +610,6 @@
     <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="dial_pad_autocomplete" msgid="494525952035761075">"Compleció autom. del teclat"</string>
+    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Autocompletar amb teclat"</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 99b145b..61c8e6c 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -450,6 +450,10 @@
     <string name="network_message" msgid="4483886461245213802">"Zpráva sítě"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Aktivujte svůj telefon"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"K aktivaci telefonní služby je potřeba uskutečnit speciální hovor. \n\nStiskněte tlačítko Aktivovat a aktivujte telefon podle pokynů, které vám budou sděleny."</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Přeskočit aktivaci?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Pokud přeskočíte aktivaci, nemůžete volat ani se připojovat k mobilním datovým sítím (můžete se ale připojit k sítím Wi-Fi). Dokud svůj telefon neaktivujete, bude se zobrazovat výzva k aktivaci při každém zapnutí."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Přeskočit"</string>
@@ -577,7 +581,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Upravit rychlé odpovědi"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Rychlá odpověď"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Resetovat výchozí aplikaci"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Zpráva byla odeslána na číslo <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"jedna"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"dvě"</string>
@@ -605,6 +610,6 @@
     <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="dial_pad_autocomplete" msgid="494525952035761075">"Aut. doplň. pomocí číselníku"</string>
+    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Autom. doplňování číselníku"</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 1b47288..51416c6 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -456,6 +456,10 @@
     <string name="network_message" msgid="4483886461245213802">"Netværksbesked"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Aktivér din telefon"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Der skal foretages et særligt opkald for at aktivere din telefontjeneste. \n\n Lyt til instruktionerne, når du har trykket på “Aktivér” for at aktivere din telefon."</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Spring aktivering over?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Hvis du springer aktiveringen over, kan du ikke foretage opkald eller oprette forbindelse til mobildatanetværk (du kan dog godt oprette forbindelse til Wi-Fi-netværk). Du vil blive bedt om at aktivere din telefon, hver gang du tænder den, indtil du gør det."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Spring over"</string>
@@ -583,7 +587,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Rediger hurtige svar"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Hurtigt svar"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Nulstil standardapp"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Meddelelsen er sendt til <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"en"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"to"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 475c0ec..556e8d0 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -454,6 +454,10 @@
     <string name="network_message" msgid="4483886461245213802">"Netzwerknachricht"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Ihr Telefon aktivieren"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Zur Aktivierung Ihres Telefondienstes muss ein spezieller Anruf getätigt werden. \n\nWählen Sie \"Aktivieren\" und folgen Sie der Anleitung zur Aktivierung Ihres Telefons."</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Aktivierung überspringen?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Wenn Sie die Aktivierung überspringen, können Sie keine Anrufe tätigen oder sich mit mobilen Datennetzwerken verbinden (Sie können sich allerdings mit WLAN-Netzwerken verbinden). Bis Sie Ihr Telefon aktivieren, werden Sie bei jedem Einschalten zur Aktivierung aufgefordert."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Überspringen"</string>
@@ -581,7 +585,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Kurzantworten bearbeiten"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Kurzantwort"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Standard-App zurücksetzen"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Nachricht an <xliff:g id="PHONE_NUMBER">%s</xliff:g> gesendet"</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"Eins"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"Zwei"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 12ebd6d..fccd8e9 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -450,6 +450,10 @@
     <string name="network_message" msgid="4483886461245213802">"Μήνυμα δικτύου"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Ενεργοποίηση του τηλεφώνου σας"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Πρέπει να γίνει ειδική κλήση για την ενεργοποίηση της υπηρεσίας του τηλεφώνου που διαθέτετε. \n\nΑφού πατήσετε την \"Ενεργοποίηση\", ακούστε τις οδηγίες που παρέχονται για να ενεργοποιήσετε το τηλέφωνό σας."</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Παράβλεψη ενεργοποίησης;"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Εάν παραλείψετε την ενεργοποίηση, δεν θα μπορείτε να πραγματοποιήσετε κλήσεις ή να συνδεθείτε σε δίκτυα δεδομένων κινητής τηλεφωνίας (αν και θα μπορείτε να συνδεθείτε σε δίκτυα Wi-Fi). Μέχρι να ενεργοποιήσετε το τηλέφωνό σας, θα σας ζητείται να το ενεργοποιήσετε κάθε φορά που θα το θέτετε σε λειτουργία."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Παράλειψη"</string>
@@ -577,7 +581,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Επεξεργασία γρήγορων απαντήσεων"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Γρήγορη απάντηση"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Επαναφορά προεπιλ. εφαρμογής"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Το μήνυμα εστάλη στο <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"ένα"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"δύο"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 8a0e02d..2e80121 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -450,6 +450,10 @@
     <string name="network_message" msgid="4483886461245213802">"Network message"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Activate your phone"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"A special call needs to be made to activate your phone service. \n\nAfter pressing “Activate”, listen to the instructions provided to activate your phone."</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Skip activation?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"If you skip activation, you can\'t place calls or connect to mobile data networks (though you can connect to Wi-Fi networks). Until you activate your phone, you are asked to activate it each time that you turn it on."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Skip"</string>
@@ -577,7 +581,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Edit quick responses"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Quick response"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Reset default app"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Message sent to <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"one"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"two"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 8a0e02d..2e80121 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -450,6 +450,10 @@
     <string name="network_message" msgid="4483886461245213802">"Network message"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Activate your phone"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"A special call needs to be made to activate your phone service. \n\nAfter pressing “Activate”, listen to the instructions provided to activate your phone."</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Skip activation?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"If you skip activation, you can\'t place calls or connect to mobile data networks (though you can connect to Wi-Fi networks). Until you activate your phone, you are asked to activate it each time that you turn it on."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Skip"</string>
@@ -577,7 +581,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Edit quick responses"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Quick response"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Reset default app"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Message sent to <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"one"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"two"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index a186f77..08111e5 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -450,6 +450,10 @@
     <string name="network_message" msgid="4483886461245213802">"Mensaje de red"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Activar tu teléfono"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Es necesario realizar una llamada especial para activar tu servicio de teléfono.\n\nLuego de presionar \"Activar\", escucha las instrucciones suministradas para activar tu teléfono."</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"¿Deseas omitir la activación?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Si omites la activación, no puedes colocar llamadas o conectarte con redes móviles de datos (a pesar de que te puedes conectar a redes de Wi-Fi). Hasta que actives tu teléfono, se te solicitará que lo actives cada vez que lo enciendas."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Omitir"</string>
@@ -577,7 +581,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Editar respuestas rápidas"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Respuesta rápida"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Restablecer aplic. predeterm."</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Mensaje enviado a <xliff:g id="PHONE_NUMBER">%s</xliff:g>"</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"uno"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"dos"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 9fc6185..6aeba0a 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -454,6 +454,10 @@
     <string name="network_message" msgid="4483886461245213802">"Mensaje de red"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Activar tu teléfono"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Es necesario realizar una llamada especial para activar el servicio telefónico. \n\nTras pulsar \"Activar\", escucha las instrucciones sobre cómo activar el teléfono."</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"¿Quieres omitir la activación?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Si omites la activación, no podrás realizar llamadas ni conectarte a las redes de datos móviles (aunque sí podrás conectarte a las redes Wi-Fi). Se te pedirá que actives el teléfono cada vez que lo enciendas hasta que realices la activación."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Omitir"</string>
@@ -581,7 +585,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Editar respuestas rápidas"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Respuestas rápidas"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Restablecer aplicación"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Mensaje enviado a <xliff:g id="PHONE_NUMBER">%s</xliff:g>"</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"uno"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"dos"</string>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 5afa46c..36e8ad8 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -450,6 +450,10 @@
     <string name="network_message" msgid="4483886461245213802">"Võrgusõnum"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Telefoni aktiveerimine"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Telefoniteenuse aktiveerimiseks peate valima konkreetse kõne. \n\nPärast käsu “Aktiveeri“ puudutamist kuulake telefoni aktiveerimise juhiseid."</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Jätan aktiveerimise vahele?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Aktiveerimise vahelejätmisel ei saa te kõnesid valida ega luua ühendust mobiilsete andmevõrkudega (kuid saate luua ühenduse WiFi-võrkudega). Telefoni aktiveerimisprotsessi ajal palutakse teil see aktiveerida iga kord, kui telefoni sisse lülitate."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Jäta vahele"</string>
@@ -577,7 +581,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Kiirvastuste muutmine"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Kiirvastus"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Lähtesta vaikerakendus"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Sõnum on saadetud numbrile <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"üks"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"kaks"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index a75ecd0..44944de 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -450,6 +450,10 @@
     <string name="network_message" msgid="4483886461245213802">"پیام شبکه"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"فعال کردن گوشی خود"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"برای فعال کردن سرویس گوشی خود، باید یک تماس ویژه برقرار کنید. \n\nبعد از فشردن \"فعال سازی\"، به دستورالعمل‌های ارائه شده جهت فعال کردن گوشی، گوش کنید."</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"از مرحله فعال سازی رد می‌شوید؟"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"در صورت رد شدن از مرحله فعال سازی، نمی‌توانید تماسی برقرار کنید یا به شبکه‌های داده‌ای تلفن همراه متصل شوید (با این وجود می‌توانید به شبکه‌های Wi-Fi متصل شوید). تا زمانی که گوشی خود را فعال نکنید، هر بار که تلفن را روشن می‌کنید از شما درخواست می‌شود آنرا فعال کنید."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"رد شدن"</string>
@@ -577,7 +581,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"ویرایش پاسخ‌های سریع"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"پاسخ سریع"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"بازنشانی برنامه‌ پیش‌فرض"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"پیام به <xliff:g id="PHONE_NUMBER">%s</xliff:g> ارسال شد."</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"یک"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"دو"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 8772f83..5c151a9 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -454,6 +454,10 @@
     <string name="network_message" msgid="4483886461245213802">"Verkkoviesti"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Aktivoi puhelin"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Sinun täytyy soittaa erityinen puhelu aktivoidaksesi puhelimesi palvelun. \n\nPaina Aktivoi ja aktivoi puhelimesi kuulemiesi ohjeiden avulla."</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Ohitetaanko aktivointi?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Jos ohitat aktivoinnin, et voi soittaa puheluita etkä muodostaa verkkoyhteyttä (voit tosin muodostaa yhteyden wifi-verkkoihin). Sinua pyydetään aktivoimaan puhelimesi aina kun käynnistät sen siihen saakka, että aktivoit sen."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Ohita"</string>
@@ -581,7 +585,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Muokkaa pikavastausta"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Pikavastaukset"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Palauta oletussovellus"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Viesti lähetetty numeroon <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"yksi"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"kaksi"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index ec13c38..7ccf062 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -454,6 +454,10 @@
     <string name="network_message" msgid="4483886461245213802">"Message réseau"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Activer votre téléphone"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Vous devez passer un appel spécial pour activer le service de téléphonie. \n\nAprès avoir appuyé sur \"Activer\", écoutez les instructions qui vous permettront d\'activer votre téléphone."</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Ignorer l\'activation?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Si vous poursuivez sans activer votre mobile, vous ne pourrez ni téléphoner, ni vous connecter à des réseaux de données mobiles. La connexion à un réseau Wi-Fi reste possible. Vous serez invité à effectuer l\'activation à chaque démarrage du téléphone."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Passer"</string>
@@ -581,7 +585,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Modif. rép. rapides"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Réponse rapide"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Rétablir application par défaut"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Message envoyé à <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"une"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"deux"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 338e3ee..3be5e3b 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -450,6 +450,10 @@
     <string name="network_message" msgid="4483886461245213802">"Message réseau"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Activer votre téléphone"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Vous devez passer un appel spécial pour activer le service de téléphonie. \n\nAprès avoir appuyé sur \"Activer\", écoutez les instructions qui vous permettront d\'activer votre téléphone."</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Ignorer l\'activation ?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Si vous poursuivez sans activer votre mobile, vous ne pourrez ni téléphoner, ni vous connecter à des réseaux de données mobiles. La connexion à un réseau Wi-Fi reste possible. Vous serez invité à effectuer l\'activation à chaque démarrage du téléphone."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Ignorer"</string>
@@ -577,7 +581,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Modifier les réponses rapides"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Réponse rapide"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Rétablir application par défaut"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Message envoyé à <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"un"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"deux"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 30e21e8..469d014 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -75,23 +75,23 @@
     <string name="sum_cw_disabled" msgid="3648693907300104575">"कॉल के दौरान, मुझे इनकमिंग कॉल की सूचना दें"</string>
     <string name="call_forwarding_settings" msgid="3378927671091537173">"कॉल अग्रेषण सेटिंग"</string>
     <string name="labelCF" msgid="2574386948026924737">"कॉल अग्रेषण"</string>
-    <string name="labelCFU" msgid="8147177368148660600">"हमेशा अग्रेषित करें"</string>
+    <string name="labelCFU" msgid="8147177368148660600">"हमेशा इसको भेजें"</string>
     <string name="messageCFU" msgid="3560082430662923687">"हमेशा इस नंबर का उपयोग करें"</string>
     <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"सभी कॉल अग्रेषित कर रहा है"</string>
     <string name="sum_cfu_enabled" msgid="2450052502198827927">"सभी कॉल <xliff:g id="PHONENUMBER">{0}</xliff:g> को अग्रेषित किए जा रहे हैं"</string>
     <string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"नंबर अनुपलब्ध है"</string>
     <string name="sum_cfu_disabled" msgid="3698472522160364904">"अक्षम की गई"</string>
-    <string name="labelCFB" msgid="218938523102207587">"व्यस्त होने पर अग्रेषित करें"</string>
+    <string name="labelCFB" msgid="218938523102207587">"व्यस्त होने पर इसको भेजें"</string>
     <string name="messageCFB" msgid="3711089705936187129">"व्यस्त रहते समय नंबर"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"<xliff:g id="PHONENUMBER">{0}</xliff:g> को अग्रेषित कर रहा है"</string>
     <string name="sum_cfb_disabled" msgid="227440009979537651">"अक्षम की गई"</string>
     <string name="disable_cfb_forbidden" msgid="3506984333877998061">"जब आपका फ़ोन व्यस्त हो, तो आपका ऑपरेटर कॉल अग्रेषण अक्षम करने का समर्थन नहीं करता."</string>
-    <string name="labelCFNRy" msgid="3646316323834351390">"अनुत्तरित होने पर अग्रेषित करें"</string>
+    <string name="labelCFNRy" msgid="3646316323834351390">"अनुत्तरित होने पर इसको भेजें"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"अनुत्तरित होने पर नंबर"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"<xliff:g id="PHONENUMBER">{0}</xliff:g> को अग्रेषित कर रहा है"</string>
     <string name="sum_cfnry_disabled" msgid="8422350929957344729">"अक्षम की गई"</string>
     <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"जब आपका फ़ोन उत्तर न दे, तो आपका ऑपरेटर कॉल अग्रेषण अक्षम करने का समर्थन नहीं करता."</string>
-    <string name="labelCFNRc" msgid="47183615370850000">"पहुंच योग्य न होने पर अग्रेषित करें"</string>
+    <string name="labelCFNRc" msgid="47183615370850000">"पहुंच योग्य न होने पर इसको भेजें"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"पहुंच योग्य न होने पर नंबर"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"<xliff:g id="PHONENUMBER">{0}</xliff:g> को अग्रेषित कर रहा है"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"अक्षम की गई"</string>
@@ -450,6 +450,10 @@
     <string name="network_message" msgid="4483886461245213802">"नेटवर्क संदेश"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"अपना फ़ोन सक्रिय करें"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"आपकी फ़ोन सेवा को सक्रिय करने के लिए एक विशेष कॉल करने की आवश्यकता है. \n\n\"सक्रिय करें\" दबाने के बाद, अपने फ़ोन को सक्रिय करने के लिए दिए जाने वाले निर्देश सुनें."</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"सक्रियण छोड़ें?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"यदि आप सक्रियण छोड़ देते हैं, तो आप कॉल नहीं कर सकते या मोबाइल डेटा नेटवर्क से कनेक्ट (हालांकि आप Wi-Fi नेटवर्क से कनेक्ट हो सकते हैं) नहीं हो सकते हैं. जब तक आप अपने फ़ोन को सक्रिय नहीं करते, आपको प्रत्येक बार उसे चालू करने पर उसे सक्रिय करने के लिए कहा जाएगा."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"छोड़ें"</string>
@@ -577,7 +581,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"त्वरित प्रतिसाद संपादित करें"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"त्वरित प्रतिसाद"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"डिफ़ॉल्ट एप्लिकेशन रीसेट करें"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"<xliff:g id="PHONE_NUMBER">%s</xliff:g> को संदेश भेजा गया."</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"एक"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"दो"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 93fb57a..0c2827e 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -450,6 +450,10 @@
     <string name="network_message" msgid="4483886461245213802">"Mrežna poruka"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Aktivirajte svoj telefon"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Poseban poziv upućen je za aktiviranje telefonske usluge. \n\nNakon što pritisnete “Aktiviraj”, poslušajte upute za aktiviranje telefona."</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Preskoči aktivaciju?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Ako preskočite aktivaciju, ne možete pozivati niti se povezivati na mobilne podatkovne mreže (premda se možete prijaviti na Wi-Fi mreže).Sve dok ne aktivirate telefon prikazivat će se upit za aktiviranje kod svakog prijavljivanja."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Preskoči"</string>
@@ -577,7 +581,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Uređivanje brzih odgovora"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Brzi odgovor"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Poništavanje zadane aplikacije"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Poruka poslana na broj <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"jedan"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"dva"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 1e7226e..06ee7f5 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -450,6 +450,10 @@
     <string name="network_message" msgid="4483886461245213802">"Hálózati üzenet"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Aktiválja telefonját"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"A telefonszolgáltatás aktiválásához egy speciális hívást kell indítania. \n\nAz \"Aktiválás\" megnyomása után kövesse az utasításokat."</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Kihagyja az aktiválást?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Ha kihagyja az aktiválást, nem indíthat hívásokat és nem kapcsolódhat mobil adathálózatokhoz (de csatlakozhat Wi-Fi hálózatokhoz). Amíg nem aktiválja telefonját, az minden egyes bekapcsoláskor felkéri Önt erre."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Átugrás"</string>
@@ -577,7 +581,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Gyors válaszok szerkesztése"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Gyors válasz"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Alapalkalmazás visszaállítása"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Üzenet elküldve ide: <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"egy"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"kettő"</string>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 01fb394..70d93ab 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -456,6 +456,10 @@
     <string name="network_message" msgid="4483886461245213802">"Ցանցային հաղորդագրություն"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Ակտիվացրեք ձեր հեռախոսը"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Հատուկ զանգ է հարկավոր կատարել՝ ձեր հեռախոսի ծառայությունն ակտիվացնելու համար: \n\n«Ակտիվացնել» կոճակը սեղմելուց հետո լսեք հրահանգները, որոնք տրվում են ձեր հեռախոսն ակտիվացնելու համար:"</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Բաց թողնե՞լ ակտիվացումը"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Եթե ​​դուք բաց թողնեք ակտիվացումը, դուք չեք կարող կատարել զանգեր կամ միանալ բջջային տվյալների ցանցերին (թեև դուք կարող եք միանալ Wi-Fi ցանցերին): Մինչև դուք չակտիվացնեեք ձեր հեռախոսը, ձեզ հարցվելու է ակտիվացնել յուրաքանչյուր անգամ, երբ դուք միացնեք այն:"</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Բաց թողնել"</string>
@@ -583,7 +587,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Խմբագրել արագ պատասխանները"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Արագ պատասխան"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Վերականգնել լռելյայն հավելվածը"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Հաղորդագրությունն ուղարկվել է <xliff:g id="PHONE_NUMBER">%s</xliff:g>-ին:"</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"մեկ"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"երկու"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 2c8e0e7..2f750a7 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -450,6 +450,10 @@
     <string name="network_message" msgid="4483886461245213802">"Pesan jaringan"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Aktifkan ponsel Anda"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Perlu dilakukan panggilan khusus untuk mengaktifkan layanan ponsel Anda. \n\nSetelah menekan “Aktifkan”, dengarkan instruksi yang diberikan untuk mengaktifkan ponsel."</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Lewati aktivasi?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Jika Anda mengabaikan aktivasi, Anda tidak dapat melakukan panggilan atau menyambung ke jaringan data seluler (walaupun dapat menyambung ke jaringan Wi-Fi). Sampai ponsel diaktifkan, Anda akan diminta mengaktifkannya setiap kali ponsel dihidupkan."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Lewati"</string>
@@ -577,7 +581,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Edit tanggapan cepat"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Tanggapan cepat"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Setel ulang aplikasi default"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Pesan dikirim ke <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"satu"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"dua"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 5cf59af..a3ad5cc 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -454,6 +454,10 @@
     <string name="network_message" msgid="4483886461245213802">"Messaggio di rete"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Attiva il telefono"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"È necessario effettuare una chiamata speciale per attivare il servizio telefonico. \n\nDopo avere premuto \"Attiva\", ascolta le istruzioni fornite per attivare il telefono."</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Saltare l\'attivazione?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Se salti l\'attivazione, non potrai effettuare chiamate o connetterti a reti di dati mobili (ma potrai connetterti a reti Wi-Fi). Finché non attiverai il telefono, ti verrà chiesto di attivarlo ogni volta che lo accendi."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Ignora"</string>
@@ -581,7 +585,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Modifica risposte rapide"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Risposta rapida"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Reimposta app predefinita"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Messaggio inviato a <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"uno"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"due"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index b62f060..018bd92 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -450,6 +450,10 @@
     <string name="network_message" msgid="4483886461245213802">"הודעת רשת"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"הפעל את הטלפון"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"יש לבצע שיחה מיוחדת כדי להפעיל את השירות לטלפון. \n\nלאחר הלחיצה על \'הפעל\', הקשב להוראות להפעלת הטלפון."</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"לדלג על ההפעלה?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"אם תדלג על ההפעלה, לא תוכל להתקשר או להתחבר לרשתות נתונים לנייד (אך תוכל להתחבר לרשתות Wi-Fi). עד שתפעיל את הטלפון, תתבקש להפעיל אותו בכל פעם שתדליק אותו."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"דלג"</string>
@@ -577,7 +581,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"ערוך תגובות מהירות"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"תגובה מהירה"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"אפס את היישום המוגדר כברירת מחדל"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"הודעה נשלחה אל <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"אחת"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"שתיים"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 2b09e71..ef26bf5 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -450,6 +450,10 @@
     <string name="network_message" msgid="4483886461245213802">"ネットワークメッセージ"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"携帯電話を有効にする"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"通話サービスを有効にするには特別な通話が必要です。\n\n[有効にする]を押してから、流れてくる音声に従って電話を有効にしてください。"</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"スキップして有効にしない"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"スキップして有効にしない場合、通話やモバイルデータネットワークの接続ができません(Wi-Fiネットワークには接続できます)。携帯を有効にするまでは、電源を入れるたびに有効にするかどうかを尋ねるメッセージが表示されます。"</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"スキップ"</string>
@@ -577,7 +581,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"クイック返信の編集"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"クイック返信"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"デフォルトのアプリをリセット"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"<xliff:g id="PHONE_NUMBER">%s</xliff:g>にメッセージを送信しました。"</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"1"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"2"</string>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 88f1ccd..d1da77a 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -450,6 +450,10 @@
     <string name="network_message" msgid="4483886461245213802">"ქსელის შეტყობინება"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"თქვენი ტელეფონის აქტივაცია"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"თქვენი ტელეფონის სერვისის გასააქტიურებლად აუცილებელია საგანგებო ზარის განხორციელება. \n\nტექსტზე „აქტივაცია“ დაჭერის შემდეგ, მოუსმინეთ ინსტრუქციებს თქვენი ტელეფონის აქტივაციისათვის."</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"გსურთ აქტივაციის გამოტოვება?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"თუ აქტივაციას გამოტოვებთ, ზარების განხორციელებას ან მობილური ინტერნეტის გამოყენებას ვერ შეძლებთ (თუმცა, შესაძლებელია Wi-Fi ქსელებთან დაკავშირება). სანამ ტელეფონს გაააქტიურებდეთ, მოგეთხოვებათ გაააქტიუროთ ის, სანამ ჩართავდეთ."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"გამოტოვება"</string>
@@ -577,7 +581,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"სწრაფი პასუხის რედაქტირება"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"სწრაფი პასუხი"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"ნაგულისხმევი აპის ისევ დაყენება"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"შეტყობინება გაიგზავნა <xliff:g id="PHONE_NUMBER">%s</xliff:g>-თან."</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"ერთ"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"ორი"</string>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 78ccf32..a520979 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -450,6 +450,10 @@
     <string name="network_message" msgid="4483886461245213802">"សារ​បណ្ដាញ"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"បាន​ធ្វើ​ឲ្យ​ទូរស័ព្ទ​របស់​អ្នក​សកម្ម"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"ការ​ហៅ​ពិសេស​ចាំបាច់​ធ្វើ​ឲ្យ​សេវា​ទូរស័ព្ទ​របស់​អ្នក​សកម្ម។ \n\n បន្ទាប់​ពី​ចុច​ “ធ្វើ​ឲ្យ​សកម្ម”  ស្ដាប់​សេចក្ដី​ណែនាំ​ដែល​បាន​ផ្ដល់​​ដើម្បី​ធ្វើ​ឲ្យ​ទូរស័ព្ទ​របស់​អ្នក​សកម្ម។"</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"រំលង​ការ​ធ្វើ​ឲ្យ​សកម្ម​?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"ប្រសិនបើ​អ្នក​រំលង​ការ​ធ្វើ​ឲ្យ​សកម្ម អ្នក​មិន​អាច​កំណត់​ការ​ហៅ ឬ​តភ្ជាប់​បណ្ដាញ​​ទិន្នន័យ​ឧបករណ៍​​ចល័ត​បាន​ទេ (អ្នក​អាច​តភ្ជាប់​តាម​បណ្ដាញ​​វ៉ាយហ្វាយ )។ លុះត្រាតែ​​​អ្នកធ្វើ​ឲ្យ​ទូរស័ព្ទ​របស់​អ្នក​សកម្ម អ្នក​ត្រូវ​បាន​ស្នើ​ធ្វើ​ឲ្យ​វា​សកម្ម​នៅ​ពេល​ដែល​អ្នក​បិទ​វា។"</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"រំលង"</string>
@@ -577,7 +581,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"កែ​ការ​ឆ្លើយតប​រហ័ស"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"ឆ្លើយតប​រហ័ស"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"កំណត់​កម្មវិធី​លំនាំដើម​ឡើងវិញ"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"បាន​ផ្ញើ​សារ​ទៅ <xliff:g id="PHONE_NUMBER">%s</xliff:g> ។"</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"មួយ"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"ពីរ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 7bd62bd..a50d971 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -450,6 +450,10 @@
     <string name="network_message" msgid="4483886461245213802">"네트워크 메시지"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"전화 활성화"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"전화 서비스를 활성화하려면 특수 통화를 해야 합니다. \n\n\'활성화\'를 누른 다음 지시사항을 듣고 전화를 활성화하세요."</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"활성화를 건너뛰시겠습니까?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"활성화를 건너뛰면 Wi-Fi 네트워크에는 연결할 수 있지만 전화를 걸거나 모바일 데이터 네트워크에 연결할 수 없습니다. 휴대전화를 활성화할 때까지 휴대전화를 켤 때마다 활성화하라는 메시지가 표시됩니다."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"건너뛰기"</string>
@@ -577,7 +581,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"빠른 응답 수정"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"빠른 응답"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"기본 앱 재설정"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"<xliff:g id="PHONE_NUMBER">%s</xliff:g>(으)로 메시지를 보냈습니다."</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"1"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"2"</string>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index e26af3b..5428d12 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -450,6 +450,10 @@
     <string name="network_message" msgid="4483886461245213802">"ຂໍ້ຄວາມເຄືອຂ່າຍ"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"ເປີດນຳໃຊ້ໂທລະສັບຂອງທ່ານ"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"ຕ້ອງໃຊ້ການໂທພິເສດ ເພື່ອເປີດນຳໃຊ້ບໍລິການໂທລະສັບຂອງທ່ານ. \n\nຫຼັງຈາກກົດປຸ່ມ “ເປີດນຳໃຊ້” ແລ້ວ, ໃຫ້ຟັງຄຳແນະນຳທີ່ລະບຸເພື່ອເປີດນຳໃຊ້ໂທລະສັບຂອງທ່ານ."</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"ຂ້າມການເປີດນຳໃຊ້?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"ຫາກທ່ານຂ້າມການເປີດນຳໃຊ້, ທ່ານຈະບໍ່ສາມາດໂທອອກ ຫຼືເຊື່ອມຕໍ່ເຄືອຂ່າຍຂໍ້ມູນມືຖືໄດ້ (ເຖິງແມ່ນວ່າ ທ່ານຈະສາມາດເຊື່ອມຕໍ່ຫາເຄືອຂ່າຍ Wi-Fi). ທ່ານຈະຖືກຖາມໃຫ້ເປີດນຳໃຊ້ທຸກຄັ້ງທີ່ທ່ານເປີດເຄື່ອງ, ຈົນກວ່າທ່ານຈະສຳເລັດຂັ້ນຕອນ ການເປີດນຳໃຊ້ໂທລະສັບຂອງທ່ານ."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"ຂ້າມ"</string>
@@ -577,7 +581,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"ແກ້ໄຂຂໍ້ຄວາມຕອບກັບດ່ວນ"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"ຕອບກັບດ່ວນ"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"ຄືນຄ່າແອັບຯເລີ່ມຕົ້ນ"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"ສົ່ງຂໍ້ຄວາມຫາ <xliff:g id="PHONE_NUMBER">%s</xliff:g> ແລ້ວ."</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"ນຶ່ງ"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"ສອງ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 8fd66c2..092d811 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -450,6 +450,10 @@
     <string name="network_message" msgid="4483886461245213802">"Tinklo pranešimas"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Aktyvinkite savo telefoną"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Kad suaktyvintumėte telefono paslaugą, reikia atlikti specialų skambutį. \n\nPaspaudę „Aktyvinti“ klausykite pateikiamų telefono aktyvinimo instrukcijų."</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Praleisti aktyvinimą?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Jei praleisite aktyvinimą, negalėsite skambinti ar prisijungti prie mobilių duomenų tinklų (nors ir galite prisijungti prie „Wi-Fi“ tinklų). Iki tol, kol suaktyvinsite telefoną, aktyvinkite jį kaskart jį įjungdami."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Praleisti"</string>
@@ -577,7 +581,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Redaguoti greitus atsakus"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Greitas atsakas"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Nustat. iš naujo numat. prog."</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Pranešimas išsiųstas numeriu <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"vienas"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"du"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index edc40b6..3c93d2e 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -452,6 +452,10 @@
     <string name="network_message" msgid="4483886461245213802">"Tīkla ziņojums"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Tālruņa aktivizēšana"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Lai aktivizētu tālruņa pakalpojumu, ir jāveic īpašs zvans. \n\nNospiediet uz Aktivizēt un pēc tam klausieties tālruņa aktivizēšanas norādījumus."</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Vai izlaist aktivizāciju?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Ja tiks izlaista aktivizācija, nevarēs veikt zvanus vai izveidot savienojumu ar mobilajiem datu tīkliem (taču varēs izveidot savienojumu ar Wi-Fi tīkliem). Ikreiz ieslēdzot tālruni, tiks prasīts to aktivizēt (līdz brīdim, kad tas tiks aktivizēts)."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Izlaist"</string>
@@ -579,7 +583,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Ātro atbilžu rediģēšana"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Ātrā atbilde"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Atiestatīt noklus. lietotni"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Ziņojums nosūt. uz šādu tālr. nr.: <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"viens"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"divi"</string>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index fc5db2b..fa0c84f 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -450,6 +450,10 @@
     <string name="network_message" msgid="4483886461245213802">"Сүлжээний зурвас"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Утсаа идэвхжүүлнэ үү"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Таны утасны үйлчилгээ идэвхжүүлэхийн тулд тусгай дуудлага хийх шаардлагатай. \n\n“Идэвхжүүлэх” гэснийг дарсны дараа өгч байгаа зааврыг сонсон утсаа идэвхжүүлнэ үү."</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Идэвхжүүлэхийг алгасах уу?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Хэрэв та идэвхжүүлэхийг алгасвал дуудлага хийх буюу мобайль дата сүлжээнд холбогдох (хэдийгээр Wi-Fi сүлжээнд холбогдож болох ч) боломжгүй болно. Таныг утсаа идэвхжүүлэх хүртэл утсаа асаах бүрт идэвхжүүлэхийг хүсэх болно."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Алгасах"</string>
@@ -577,7 +581,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Шуурхай хариунуудыг засах"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Шуурхай хариу"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Үндсэн апп-г сэргээх"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Зурвасыг <xliff:g id="PHONE_NUMBER">%s</xliff:g> руу илгээв."</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"нэг"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"хоёр"</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index dd0ce3d..51f70ef 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -450,6 +450,10 @@
     <string name="network_message" msgid="4483886461245213802">"Mesej rangkaian"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Aktifkan telefon anda"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Panggilan khas perlu dibuat untuk mengaktifkan perkhidmatan telefon anda. \n\nSelepas menekan “Aktifkan”, dengar arahan yang diberi untuk mengaktifkan telefon anda."</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Langkau pengaktifan?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Jika anda melangkau pengaktifan, anda tidak boleh membuat panggilan atau bersambung ke rangkaian data mudah alih (walaupun anda boleh bersambung ke rangkaian Wi-Fi). Sehingga anda mengaktifkan telefon anda, anda akan diminta untuk mengaktifkannya setiap kali anda menghidupkannya."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Langkau"</string>
@@ -577,7 +581,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Edit respons pantas"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Respons pantas"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Tetapkan semula apl lalai"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Mesej dihantar ke <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"satu"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"dua"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 8c7fd9c..e14a9fe 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -456,6 +456,10 @@
     <string name="network_message" msgid="4483886461245213802">"Nettverksmelding"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Aktiver telefonen din"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Det må foretas en spesifikk oppringning for at telefontjenesten skal aktiveres. \n\nTrykk «Aktiver», og lytt deretter til instruksjonene for å aktivere telefonen."</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Hopp over aktivering?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Hvis du hopper over aktiveringen, kan du ikke foreta anrop eller koble til mobildatanettverk (du kan imidlertid koble til trådløse nettverk). Du blir bedt om å aktivere hver gang du slår på telefonen, inntil aktivering er fullført."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Hopp over"</string>
@@ -583,7 +587,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Rediger hurtigsvar"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Hurtigsvar"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Tilbakestill standardappen"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Melding er sendt til <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"en"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"to"</string>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index 345fbf9..fac38a9 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -450,6 +450,10 @@
     <string name="network_message" msgid="4483886461245213802">"नेटवर्क सन्देश"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"तपाईंको फोन सक्रिय गर्नुहोस्"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"विशेष कललाई तपाईंको फोन सेवा सक्रिय गर्न जरुरी हुन्छ। \n \n \"सक्रिय\" थिचेर तपाईंको फोन  सक्रिय गर्न दिएका निर्देशनहरू सुन्नुहोस्।"</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"सक्रिया गर्ने काम छोड्ने हो?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"यदि तपाईं सक्रियता छोड्नुहुन्छ भने तपाईं कल वा मोबाइल डेटा नेटवर्क (तपाईं वाइ-फाइ नेटवर्क जडान गर्न सक्नु हुन्छ) बाट जडान गर्न सक्नु हुन्छ। तपाईंले आफ्नो फोनलाई सक्रिय गर्ने बेलासम्म तपाईं यसलाई हरेक पटक खोल्ने गर्नुहोस्।"</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"छोड्नुहोस्"</string>
@@ -577,7 +581,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"द्रुत प्रतिक्रियाहरू सम्पादन गर्नुहोस्"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"द्रुत प्रतिक्रिया"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"पूर्वनिर्धारित अनुप्रयोग पुनःसेट गर्नुहोस्"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"<xliff:g id="PHONE_NUMBER">%s</xliff:g> लाई सन्देश पठाइयो।"</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"एक"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"दुई"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index e741088..255c4b6 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -450,6 +450,10 @@
     <string name="network_message" msgid="4483886461245213802">"Netwerkbericht"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Uw telefoon activeren"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"U moet een speciale oproep uitvoeren om uw telefoonservice te activeren. \n\nNadat u op \'Activeren\' heeft gedrukt, luistert u naar de instructies om uw telefoon te activeren."</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Activering overslaan?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Als u de activering overslaat, kunt u niet bellen of verbinding maken met mobiele gegevensnetwerken (u kunt wel verbinding maken met wifi-netwerken). Tot u de telefoon activeert, wordt u gevraagd deze te activeren telkens wanneer u de telefoon inschakelt."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Overslaan"</string>
@@ -577,7 +581,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Snelle reacties bewerken"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Snelle reactie"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Standaardapp opnieuw instellen"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Bericht verzonden naar <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"één"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"twee"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 7b97d7a..4ad9448 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -450,6 +450,10 @@
     <string name="network_message" msgid="4483886461245213802">"Komunikat sieciowy"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Aktywuj telefon"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Aby aktywować usługę telekomunikacyjną, należy wykonać połączenie specjalne. \n\nPo naciśnięciu przycisku „Aktywuj” posłuchaj dostępnych instrukcji, aby aktywować telefon."</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Pominąć aktywację?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Jeśli pominiesz aktywację, nie będzie można wykonywać połączeń ani łączyć się z komórkowymi sieciami transmisji danych (łączenie się z sieciami Wi-Fi będzie jednak możliwe). Do momentu dokonania aktywacji odpowiedni monit będzie wyświetlany po każdym włączeniu telefonu."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Pomiń"</string>
@@ -577,7 +581,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Edytuj szybkie odpowiedzi"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Szybka odpowiedź"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Resetuj domyślną aplikację"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Wiadomość wysłano na numer <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"jeden"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"dwa"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index c8ee8f0..86fe999 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -450,6 +450,10 @@
     <string name="network_message" msgid="4483886461245213802">"Mensagem de rede"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Activar o seu telefone"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"É necessário efectuar uma chamada especial para activar o seu serviço telefónico. \n\nDepois de premir “Activar”, ouça as instruções fornecidas para activar o telefone."</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Ignorar activação?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Se ignorar a activação, não poderá fazer chamadas nem estabelecer ligação a redes móveis de dados (apesar de poder estabelecer ligação a redes Wi-Fi). Enquanto não activar o telefone, ser-lhe-á solicitada activação sempre que ligar o telefone."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Ignorar"</string>
@@ -577,7 +581,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Editar respostas rápidas"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Resposta rápida"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Repor aplicação predefinida"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Mensagem enviada para <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"um"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"dois"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 2951ea5..c10005c 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -450,6 +450,10 @@
     <string name="network_message" msgid="4483886461245213802">"Mensagem de rede"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Ativar o seu telefone"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Uma chamada especial precisa ser feita para ativar o serviço do seu telefone. \n\nDepois de pressionar “Ativar”, ouça as instruções fornecidas para ativar o seu telefone."</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Ignorar ativação?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Se você ignorar a ativação, não poderá fazer chamadas ou se conectar a redes móveis de dados (embora possa se conectar a redes Wi-Fi). Até que o seu telefone seja ativado, você receberá solicitações de ativação sempre que o ligar."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Ignorar"</string>
@@ -568,16 +572,17 @@
     <string name="sip_system_decide" msgid="368030746310423471">"Automático"</string>
     <string name="sip_always_send_keepalive" msgid="8192080724632877132">"Sempre enviar"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Chamada de voz não compatível"</string>
-    <string name="respond_via_sms_canned_response_1" msgid="2461606462788380215">"Não posso falar agora. Me manda um SMS, por favor?"</string>
+    <string name="respond_via_sms_canned_response_1" msgid="2461606462788380215">"Não posso falar agora. Manda um SMS, por favor?"</string>
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Já te ligo de volta."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Eu te ligo mais tarde."</string>
-    <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Não posso falar agora. Me liga depois, por favor?"</string>
+    <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Não posso falar agora. Liga depois, por favor?"</string>
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Escreva sua resposta..."</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Respostas rápidas"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Editar respostas rápidas"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Resposta rápida"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Redefinir aplicativo padrão"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Mensagem enviada para <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"um"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"dois"</string>
@@ -604,7 +609,7 @@
     <string name="default_notification_description" msgid="78174796906240970">"Som padrão (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
     <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="dtmf_tone_enable_title" msgid="827601042915852989">"Tons de toque teclado numérico"</string>
     <string name="dial_pad_autocomplete" msgid="494525952035761075">"Autopreenchimento do teclado"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Toque e vibração"</string>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 5101e73..10fd579 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -450,6 +450,10 @@
     <string name="network_message" msgid="4483886461245213802">"Mesaj de reţea"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Activaţi-vă telefonul"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Pentru a vă activa serviciul de telefonie, trebuie să efectuaţi un apel special. \n\nDupă ce apăsaţi „Activaţi”, ascultaţi instrucţiunile furnizate pentru a vă activa telefonul."</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Omiteţi activarea?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Dacă omiteţi activarea, nu puteţi efectua apeluri şi nici nu vă puteţi conecta la o reţea de date mobilă (deşi vă puteţi conecta la reţele Wi-Fi). Până veţi activa telefonul, vi se va solicita să-l activaţi de fiecare dată când îl porniţi."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Omiteţi"</string>
@@ -577,7 +581,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Editaţi răspunsurile rapide"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Răspuns rapid"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Resetați aplic. prestabilită"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Mesajul a fost trimis la <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"unu"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"doi"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 1070838..00e74fc 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -452,6 +452,10 @@
     <string name="network_message" msgid="4483886461245213802">"Сообщение сети"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Активировать телефон"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Необходим специальный звонок для активации службы телефона. \n\nПосле нажатия кнопки \"Активировать\" прослушайте инструкции по активации телефона."</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Пропустить активацию?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Если вы пропустите активацию, вы не сможете совершать вызовы и подключаться к мобильным сетям передачи данных (хотя вы сможете подключаться к сетям Wi-Fi). Пока вы не активируете свой телефон, запрос активации будет отображаться при каждом его включении."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Пропустить"</string>
@@ -579,7 +583,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Быстрые ответы"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Быстрый ответ"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Сбросить стандартные настройки"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Сообщение отправлено на номер <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"один"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"два"</string>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index 4b5415f..9967695 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -450,6 +450,10 @@
     <string name="network_message" msgid="4483886461245213802">"ජාල පණිවිඩය"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"ඔබගේ දුරකථනය සක්‍රිය කරන්න"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"ඔබගේ දුරකථන සේවාව සක්‍රිය කිරීමට විශේෂ ඇමතුමක් ලබා ගත යුතුවේ. \n\n“සක්‍රිය කරන්න” එබීමෙන් පසු, ඔබගේ දුරකථනය සක්‍රිය කිරීමට ලබා දෙන උපදෙස් පිළිපදින්න."</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"සක්‍රිය කිරීම මග හරින්නද?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"ඔබ සක්‍රිය කිරීම මඟ හරියේ නම්, ඔබට ඇමතුම් ගැනීම හෝ ජංගම දත්ත ජාල වෙත සම්බන්ධ වීමට නොහැක (ඔබට Wi-Fi ජාල වෙත සම්බන්ධ විය හැකි වුවද). ඔබ දුරකථනය සක්‍රිය කරන තෙක්, ඔබ එය ආරම්භ කරන සෑම විටම සක්‍රිය කිරීමට අසනු ඇත."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"මඟ හරින්න"</string>
@@ -577,7 +581,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"ක්ෂණික ප්‍රතිචාර සංස්කරණය කරන්න"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"ක්ෂණික ප්‍රතිචාරය"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"සුපුරුදු යෙදුම යළි සකසන්න"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"<xliff:g id="PHONE_NUMBER">%s</xliff:g> හට පණිවිඩය යවන්න."</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"එක"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"දෙක"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 6f22387..80a7e30 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -450,6 +450,10 @@
     <string name="network_message" msgid="4483886461245213802">"Informácia siete"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Aktivujte svoj telefón"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Telefónnu službu je potrebné aktivovať uskutočnením mimoriadneho hovoru. \n\nStlačte tlačidlo Aktivovať a aktivujte telefón podľa poskytnutých pokynov."</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Preskočiť aktiváciu?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Ak preskočíte aktiváciu, nemôžete volať ani sa pripájať k mobilným dátovým sieťam (môžete sa ale pripojiť k sieťam Wi-Fi). Ak svoj telefón neaktivujete, bude sa pri každom zapnutí zobrazovať výzva na aktiváciu."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Preskočiť"</string>
@@ -577,7 +581,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Upraviť rýchle odpovede"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Rýchla odpoveď"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Obnoviť predvolenú aplikáciu"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Správa bola odoslaná na číslo <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"jeden"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"dva"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index d8b1dd8..560d129 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -450,6 +450,10 @@
     <string name="network_message" msgid="4483886461245213802">"Sporočilo omrežja"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Aktivirajte telefon"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Izvesti morate poseben klic, da aktivirate telefonsko storitev. \n\nPo pritisku »Aktiviranje« poslušajte navodila za aktiviranje telefona."</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Želite preskočiti aktiviranje?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Če preskočite aktiviranje, ne morete klicati oziroma vzpostaviti stika z mobilnimi podatkovnimi omrežji (lahko pa se povežete v brezžična omrežja). Dokler telefona ne aktivirate, boste k aktiviranju pozvani ob vsakem vklopu telefona."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Preskoči"</string>
@@ -577,7 +581,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Urejanje hitrih odgovorov"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Hiter odgovor"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Ponastavi privzeto aplikacijo"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"SMS poslan na številko <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"ena"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"dve"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 9ffa564..aeb97bb 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -450,6 +450,10 @@
     <string name="network_message" msgid="4483886461245213802">"Мрежна порука"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Активирајте телефон"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Потребно је да упутите посебан позив да бисте активирали услугу свој телефона. \n\nНакон што притиснете дугме „Активирај“, слушајте дата упутства да бисте да бисте активирали свој телефон."</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Желите ли да прескочите активацију?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Ако прескочите активацију, не можете да упућујете позиве или да се повезујете са мрежама за мобилни пренос података (иако можете да се повежете са Wi-Fi мрежама). Све док не активирате свој телефон, бићете упитани да то учините сваки пут када га укључите."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Прескочи"</string>
@@ -577,7 +581,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Измена брзих одговора"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Брзи одговор"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Ресетуј подразумев. апликацију"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Порука је послата на број <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"један"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"два"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index c8d4073..e9bd672 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -456,6 +456,10 @@
     <string name="network_message" msgid="4483886461245213802">"Nätverksmeddelande"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Aktivera telefonen"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Du måste ringa ett särskilt samtal för att aktivera telefontjänsten. \n\n Tryck på \"Aktivera\" och lyssna på instruktionerna om hur du aktiverar telefonen."</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Vill du hoppa över aktiveringen?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Om du hoppar över aktiveringen kan du inte ringa samtal eller ansluta till mobila datanätverk (men du kan ansluta till Wi-Fi-nätverk). Du kommer att påminnas om att aktivera telefonen varje gång du sätter på den, tills du har aktiverat den."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Hoppa över"</string>
@@ -583,7 +587,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Redigera snabbsvar"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Snabbsvar"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Återställ standardappen"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Meddelandet har skickats till <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"ett"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"två"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 8a3390a..1ee8824 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -450,6 +450,10 @@
     <string name="network_message" msgid="4483886461245213802">"Ujumbe wa mtandao"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Wezesha simu yako"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Simu maalum inahitaji kupigwa ili kuamilisha huduma ya simu yako. \n\n Baada ya kubonyeza \"Amilisha\", sikiliza maagizo yaliyotolewa ili kuamilisha simu yako."</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Ruka uwezeshaji?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Kama utaruka kuwezesha, hauwezi kupiga simu au kuunganisha kwa mitandao ya data ya simu (ingawaje unaweza kuunganisha kwa mitandao-hewa). Hadi uiwezeshe simu yako, utaulizwa uiwezeshe kila utakapoiwasha."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Ruka"</string>
@@ -577,7 +581,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Hariri majibu ya haraka"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Majibu ya haraka"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Weka upya programu chaguo-msingi"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Ujumbe uliotumwa kwa <xliff:g id="PHONE_NUMBER">%s</xliff:g> ."</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"moja"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"mbili"</string>
@@ -605,6 +610,6 @@
     <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">"Toa sauti vitufe vya kupiga vinapoguswa"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Jaza kitufe cha kupiga kiotomatiki"</string>
+    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Jaza nambari kiotomatiki"</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 1e36d26..367a240 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -450,6 +450,10 @@
     <string name="network_message" msgid="4483886461245213802">"ข้อความจากเครือข่าย"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"เปิดการใช้งานโทรศัพท์ของคุณ"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"ต้องทำการโทรพิเศษเพื่อเปิดใช้บริการโทรศัพท์ของคุณ \n\nหลังจากกด “เปิดการใช้งาน” ให้ฟังคำแนะนำเพื่อเปิดใช้บริการโทรศัพท์ของคุณ"</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"ข้ามการเปิดใช้งานหรือไม่"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"หากคุณข้ามการเปิดใช้งาน คุณจะโทรออกหรือเชื่อมต่อเครือข่ายข้อมูลมือถือไม่ได้ (แม้จะเชื่อมต่อเครือข่าย WiFi ได้ก็ตาม) และระบบจะขอให้คุณเปิดใช้งานทุกครั้งที่คุณเปิดเครื่องจนกว่าคุณจะเปิดใช้งานโทรศัพท์"</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"ข้าม"</string>
@@ -577,7 +581,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"แก้ไขคำตอบด่วน"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"คำตอบด่วน"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"รีเซ็ตแอปพลิเคชันเริ่มต้น"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"ส่งข้อความไปยัง <xliff:g id="PHONE_NUMBER">%s</xliff:g> แล้ว"</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"หนึ่ง"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"สอง"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index e2197c1..844a6e0 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -450,6 +450,10 @@
     <string name="network_message" msgid="4483886461245213802">"Mensahe ng network"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"I-activate ang iyong telepono"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Kailangang maisagawa ang isang espesyal na tawag upang i-activate ang iyong serbisyo ng telepono. \n\nPagkatapos pindutin ang “I-activate”, makinig sa mga ibinigay na tagubilin upang i-activate ang iyong telepono."</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Laktawan ang pag-activate?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Kung lalaktawan mo ang pag-activate, hindi ka makakagawa ng mga tawag o makakakonekta sa mga mobile data network (ngunit makakakonekta ka sa mga Wi-Fi network). Hanggang sa i-activate mo ang iyong telepono, hihilingin sa iyong i-activate ito sa bawat pagkakataon na i-on mo ito."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Laktawan"</string>
@@ -577,7 +581,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"I-edit ang mga mabilisang tugon"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Mabilisang tugon"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"I-reset ang default na app"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Naipadala ang mensahe sa <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"isa"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"dalawa"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index c235786..836ff69 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -450,6 +450,10 @@
     <string name="network_message" msgid="4483886461245213802">"Ağ mesajı"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Telefonunuzu aktive edin"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Telefon hizmetinizin aktive edilmesi için özel bir çağrı yapılması gerekiyor. \n\n“Aktive Et”e bastıktan sonra, telefonunuzun aktive edilmesi için sağlanan talimatları dinleyin."</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Etkinleştirme atlansın mı?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Etkinleştirmeyi atlarsanız, arama yapamaz veya mobil veri ağlarına bağlanamazsınız (yine de Kablosuz ağlara bağlanabilirsiniz). Telefonunuzu etkinleştirinceye kadar, telefonu her açışınızda ürünü etkinleştirip etkinleştirmeyeceğiniz sorulur."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Atla"</string>
@@ -577,7 +581,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Hızlı yanıtları düzenle"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Hızlı yanıt"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Varsayılan uygulamayı sıfırla"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Mesaj, <xliff:g id="PHONE_NUMBER">%s</xliff:g> numaralı telefona gönderildi."</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"bir"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"iki"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index f8c3ae3..da58606 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -450,6 +450,10 @@
     <string name="network_message" msgid="4483886461245213802">"Повідомлення мережі"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Активуйте свій телефон"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Щоб активувати службу вашого тел., треба зробити спеціальний дзвінок. \n\nНатиснувши \"Активувати\", прослухайте інструкції, надані для активації телефону."</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Пропуст. активацію?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Якщо ви пропустите активацію, то не зможете розміщ. виклик чи підключ. до даних моб. мереж (хоча можете підключ. до мереж Wi-Fi). Вас проситимуть активувати тел. щоразу, коли ви його вмикаєте, поки це не викон."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Пропуст."</string>
@@ -577,7 +581,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Редагувати швидкі відповіді"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Швидка відповідь"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Скинути програму за умовчанням"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Повідомлення надіслано на номер <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"один"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"два"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 06141b9..a3ee0d8 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -450,6 +450,10 @@
     <string name="network_message" msgid="4483886461245213802">"Thông báo của mạng"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Kích hoạt điện thoại của bạn"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Bạn cần phải thực hiện cuộc gọi đặc biệt để kích hoạt dịch vụ điện thoại của mình. \n\nSau khi nhấn “Kích hoạt”, nghe hướng dẫn được cung cấp để kích hoạt điện thoại của bạn."</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Bỏ qua kích hoạt?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Nếu bạn bỏ qua kích hoạt, bạn không thể thực hiện cuộc gọi hoặc kết nối với mạng dữ liệu dành cho điện thoại di động (mặc dù bạn có thể kết nối với mạng Wi-Fi). Cho tới khi bạn kích hoạt điện thoại của mình, bạn được yêu cầu kích hoạt điện thoại mỗi lần bạn bật điện thoại."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Bỏ qua"</string>
@@ -577,7 +581,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Chỉnh sửa trả lời nhanh"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Trả lời nhanh"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Đặt lại ứng dụng mặc định"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Đã gửi tin nhắn tới <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"một"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"hai"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 336c444..35410a0 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -450,6 +450,10 @@
     <string name="network_message" msgid="4483886461245213802">"网络讯息"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"激活您的手机"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"需要拨打特别号码才能激活您的手机服务。\n\n在按下“激活”后,按照语音提示激活您的手机。"</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"略过激活步骤?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"如果您略过激活步骤,就无法拨打电话或连接到移动数据网络(不过您可以连接到 WLAN 网络)。如果您不激活手机,每次开机时都会收到激活提示。"</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"跳过"</string>
@@ -577,7 +581,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"修改快速回复"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"快速回复"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"重置默认应用"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"讯息已发送至 <xliff:g id="PHONE_NUMBER">%s</xliff:g>。"</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"一"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"二"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 46efb25..5fd33f7 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -456,6 +456,10 @@
     <string name="network_message" msgid="4483886461245213802">"網絡訊息"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"啟用您的手機"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"如要啟用手機服務,您必須撥打一個特別電話。\n\n按「啟用」 後,請聽取手機啟用說明。"</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"是否略過啟用?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"如果略過啟用程序,那麼您就無法撥打電話或是連上行動數據網絡 (雖然可連上 Wi-Fi 網絡)。除非您已啟用手機,否則每次開機時,系統都會要求您啟用手機。"</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"略過"</string>
@@ -583,7 +587,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"編輯快速回應"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"快速回應"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"重設預設應用程式"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"訊息已傳送至 <xliff:g id="PHONE_NUMBER">%s</xliff:g>。"</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"一"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"二"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 03ab025..d808e4a 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -456,6 +456,10 @@
     <string name="network_message" msgid="4483886461245213802">"網路訊息"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"啟用您的手機"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"如要啟用手機服務,您必須撥打一通特殊電話。\n\n按下 [啟用] 後,請聽取手機啟用說明。"</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"是否略過啟用?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"如果您不啟用手機,就無法打電話或連線至行動服務資料網路 (透過這個資料網路,可連線至 Wi-Fi 網路)。每次一開機,系統就會詢問您是否要啟用手機,直到您啟用為止。"</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"略過"</string>
@@ -583,7 +587,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"編輯快速回應"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"快速回應"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"重設預設應用程式"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"訊息已傳送至 <xliff:g id="PHONE_NUMBER">%s</xliff:g>。"</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"1"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"2"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index bb2d5a1..d3699cb 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -454,6 +454,10 @@
     <string name="network_message" msgid="4483886461245213802">"Umlayezo Wenethiwekhi"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Yenza ifoni yakho isebenze"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Ikholi ekhethekile kumele yenziwe ukuze wenze isevisi yefoni yakho isebenze.\n\nEmva kokucindezela \"Yenza kusebenze\", lalela iziqondiso ezinikeziwe ukwenza ifoni yakho isebenze."</string>
+    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
+    <skip />
+    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
+    <skip />
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Yeqa ukwenza kusebenze?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Uma weqa ukwenza kusebenze, awukwazi ukwenza amakholi noma xhuma kumanethiwekhi edatha yefoni (nakuba ungakwazi ukuxhuma kumanethiwekhi e-Wi-Fi). Kuze kube yilapho wenza ifoni yakho isebenze, ucelwa ukuba wenze isebenze"</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Yeqa"</string>
@@ -581,7 +585,8 @@
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Hlela izimpendulo ezisheshayo"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Izimpendulo ezisheshayo"</string>
-    <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Setha kabusha uhlelo lokusebenza lokuzenzakalelayo"</string>
+    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
+    <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Umlayezo othunyelwe ku <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
     <string name="description_image_button_one" msgid="5502718871331943463">"kunye"</string>
     <string name="description_image_button_two" msgid="4903738528222924522">"okubili"</string>
diff --git a/res/values/config.xml b/res/values/config.xml
index 2d3317c..adc54ee 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -125,4 +125,7 @@
 
     <!-- Class name for the default in-call UI Service [DO NOT TRANSLATE] -->
     <string name="incall_ui_default_class" translatable="false">com.android.incallui.CallHandlerService</string>
+
+    <!-- CDMA activation goes through HFA [DO NOT TRANSLATE] -->
+    <bool name="config_use_hfa_for_provisioning" translatable="false">false</bool>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1e5122e..f102cb7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -935,7 +935,10 @@
     <!-- Message displayed on the OTA activation screen. -->
     <string name="ota_touch_activate">A special call needs to be made to activate your phone service.
     \n\nAfter pressing \u201CActivate\u201D, listen to the instructions provided to activate your phone.</string>
-
+    <!-- Title shown during Hands Free Activation -->
+    <string name="ota_hfa_activation_title">Activating...</string>
+    <!-- Message shown during the hands free activation screen of the setup wizard. -->
+    <string name="ota_hfa_activation_dialog_message">The phone is activating your mobile data service.\n\nThis can take up to 5 minutes.</string>
     <!-- Title of skip activation dialog -->
     <string name="ota_skip_activation_dialog_title">Skip activation\?</string>
     <!-- Message displayed in skip activation dialog  -->
@@ -1266,7 +1269,7 @@
     <string name="respond_via_sms_edittext_dialog_title">Quick response</string>
     <!-- Menu option in  "Respond via SMS" that allows user to reset the default
          activity used to handle "Respond via SMS" [CHAR LIMIT=30] -->
-    <string name="respond_via_sms_menu_reset_default_activity">Reset default app</string>
+    <string name="respond_via_sms_menu_reset_default_activity">Restore defaults</string>
 
     <!-- "Respond via SMS": Confirmation message shown after sending
          a text response. [CHAR LIMIT=40] -->
@@ -1441,4 +1444,8 @@
          related settings.
          [CHAR LIMIT=30] -->
     <string name="preference_category_ringtone">Ringtone &amp; Vibrate</string>
+
+    <!-- String resource for the font-family to use for the call setting activity's title
+         Do not translate. -->
+    <string name="call_settings_title_font_family">sans-serif-light</string>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 65419a9..c91f69b 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -228,6 +228,8 @@
     <style name="DialtactsActionBarStyle"
            parent="@android:style/Widget.Holo.Light.ActionBar">
         <item name="android:background">@color/phone_settings_actionbar_color</item>
+        <!-- Empty icon -->
+        <item name="android:icon">@android:color/transparent</item>
     </style>
 
     <style name="SimImportTheme"
@@ -271,4 +273,13 @@
     <style name="SecondaryCallInfoSecondaryCallStatus">
         <item name="android:layout_gravity">top|right</item>
     </style>
+
+    <style name="Theme.Transparent" parent="android:Theme">
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:backgroundDimEnabled">false</item>
+    </style>
 </resources>
diff --git a/src/com/android/phone/BluetoothManager.java b/src/com/android/phone/BluetoothManager.java
index dd38632..c2b4f7d 100644
--- a/src/com/android/phone/BluetoothManager.java
+++ b/src/com/android/phone/BluetoothManager.java
@@ -27,8 +27,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.os.Handler;
-import android.os.Message;
 import android.os.SystemClock;
 import android.os.SystemProperties;
 import android.util.Log;
@@ -36,7 +34,6 @@
 import com.android.internal.telephony.CallManager;
 import com.android.services.telephony.common.Call;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -419,6 +416,11 @@
         updateBluetoothIndication();
     }
 
+    @Override
+    public void onPostDialWait(int callId, String chars) {
+        // no-op
+    }
+
     private void log(String msg) {
         Log.d(LOG_TAG, msg);
     }
diff --git a/src/com/android/phone/CallCommandService.java b/src/com/android/phone/CallCommandService.java
index 72273ee..90297d8 100644
--- a/src/com/android/phone/CallCommandService.java
+++ b/src/com/android/phone/CallCommandService.java
@@ -80,14 +80,13 @@
             CallResult result = mCallModeler.getCallWithId(callId);
             if (result != null) {
                 final String number = result.getConnection().getAddress();
+
                 Log.v(TAG, "Hanging up");
                 PhoneUtils.hangupRingingCall(result.getConnection().getCall());
+
                 if (rejectWithMessage) {
-                    if (message != null) {
-                        mRejectWithTextMessageManager.rejectCallWithMessage(number, message);
-                    } else {
-                        mRejectWithTextMessageManager.rejectCallWithNewMessage(number);
-                    }
+                    mRejectWithTextMessageManager.rejectCallWithMessage(
+                            result.getConnection().getCall(), message);
                 }
             }
         } catch (Exception e) {
@@ -105,9 +104,10 @@
                 int state = result.getCall().getState();
                 if (Call.State.ACTIVE == state ||
                         Call.State.ONHOLD == state ||
-                        Call.State.DIALING == state ||
-                        Call.State.CONFERENCED == state) {
+                        Call.State.DIALING == state) {
                     result.getConnection().getCall().hangup();
+                } else if (Call.State.CONFERENCED == state) {
+                    result.getConnection().hangup();
                 }
             }
         } catch (Exception e) {
@@ -116,6 +116,23 @@
     }
 
     @Override
+    public void separateCall(int callId) {
+        try {
+            CallResult result = mCallModeler.getCallWithId(callId);
+            if (DBG) Log.d(TAG, "disconnectCall " + result.getCall());
+
+            if (result != null) {
+                int state = result.getCall().getState();
+                if (Call.State.CONFERENCED == state) {
+                    result.getConnection().separate();
+                }
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "Error trying to separate call.", e);
+        }
+    }
+
+    @Override
     public void hold(int callId, boolean hold) {
         try {
             CallResult result = mCallModeler.getCallWithId(callId);
@@ -220,4 +237,20 @@
             Log.e(TAG, "Error setting the audio mode.", e);
         }
     }
+
+    @Override
+    public void postDialCancel(int callId) throws RemoteException {
+        final CallResult result = mCallModeler.getCallWithId(callId);
+        if (result != null) {
+            result.getConnection().cancelPostDial();
+        }
+    }
+
+    @Override
+    public void postDialWaitContinue(int callId) throws RemoteException {
+        final CallResult result = mCallModeler.getCallWithId(callId);
+        if (result != null) {
+            result.getConnection().proceedAfterWaitChar();
+        }
+    }
 }
diff --git a/src/com/android/phone/CallFeaturesSetting.java b/src/com/android/phone/CallFeaturesSetting.java
index c185931..e28e3d2 100644
--- a/src/com/android/phone/CallFeaturesSetting.java
+++ b/src/com/android/phone/CallFeaturesSetting.java
@@ -54,7 +54,10 @@
 import android.provider.Settings;
 import android.provider.Settings.SettingNotFoundException;
 import android.telephony.PhoneNumberUtils;
+import android.text.Spannable;
+import android.text.SpannableString;
 import android.text.TextUtils;
+import android.text.style.TypefaceSpan;
 import android.util.Log;
 import android.view.MenuItem;
 import android.view.WindowManager;
@@ -1653,7 +1656,14 @@
         ActionBar actionBar = getActionBar();
         if (actionBar != null) {
             // android.R.id.home will be triggered in onOptionsItemSelected()
+            actionBar.setDisplayShowHomeEnabled(true);
             actionBar.setDisplayHomeAsUpEnabled(true);
+            actionBar.setDisplayShowTitleEnabled(true);
+
+            final SpannableString s = new SpannableString(getString(R.string.call_settings));
+            s.setSpan(new TypefaceSpan(getString(R.string.call_settings_title_font_family)), 0,
+                    s.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+            actionBar.setTitle(s);
         }
     }
 
@@ -2170,11 +2180,7 @@
     public boolean onOptionsItemSelected(MenuItem item) {
         final int itemId = item.getItemId();
         if (itemId == android.R.id.home) {  // See ActionBar#setDisplayHomeAsUpEnabled()
-            Intent intent = new Intent();
-            intent.setClassName(UP_ACTIVITY_PACKAGE, UP_ACTIVITY_CLASS);
-            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-            startActivity(intent);
-            finish();
+            onBackPressed();
             return true;
         }
         return super.onOptionsItemSelected(item);
diff --git a/src/com/android/phone/CallHandlerServiceProxy.java b/src/com/android/phone/CallHandlerServiceProxy.java
index adf54c2..82c56a5 100644
--- a/src/com/android/phone/CallHandlerServiceProxy.java
+++ b/src/com/android/phone/CallHandlerServiceProxy.java
@@ -192,6 +192,26 @@
         }
     }
 
+
+    @Override
+    public void onPostDialWait(int callId, String remainingChars) {
+        try {
+            synchronized (mServiceAndQueueLock) {
+                if (mCallHandlerServiceGuarded == null) {
+                    if (DBG) {
+                        Log.d(TAG, "CallHandlerService not conneccted. Skipping "
+                                + "onPostDialWait().");
+                    }
+                    return;
+                }
+            }
+
+            mCallHandlerServiceGuarded.onPostDialWait(callId, remainingChars);
+        } catch (Exception e) {
+            Log.e(TAG, "Remote exception handling onUpdate", e);
+        }
+    }
+
     @Override
     public void onAudioModeChange(int newMode, boolean muted) {
         try {
diff --git a/src/com/android/phone/CallModeler.java b/src/com/android/phone/CallModeler.java
index d8c11d6..8848f73 100644
--- a/src/com/android/phone/CallModeler.java
+++ b/src/com/android/phone/CallModeler.java
@@ -16,7 +16,6 @@
 
 package com.android.phone;
 
-import android.content.Context;
 import android.os.AsyncResult;
 import android.os.Handler;
 import android.os.Message;
@@ -114,6 +113,9 @@
             case CallStateMonitor.PHONE_STATE_CHANGED:
                 onPhoneStateChanged((AsyncResult) msg.obj);
                 break;
+            case CallStateMonitor.PHONE_ON_DIAL_CHARS:
+                onPostDialChars((AsyncResult) msg.obj, (char) msg.arg1);
+                break;
             default:
                 break;
         }
@@ -192,6 +194,41 @@
         return false;
     }
 
+
+    /**
+     * Handles the POST_ON_DIAL_CHARS message from the Phone (see our call to
+     * mPhone.setOnPostDialCharacter() above.)
+     *
+     * TODO: NEED TO TEST THIS SEQUENCE now that we no longer handle "dialable" key events here in
+     * the InCallScreen: we do directly to the Dialer UI instead.  Similarly, we may now need to go
+     * directly to the Dialer to handle POST_ON_DIAL_CHARS too.
+     */
+    private void onPostDialChars(AsyncResult r, char ch) {
+        final Connection c = (Connection) r.result;
+
+        if (c != null) {
+            final Connection.PostDialState state = (Connection.PostDialState) r.userObj;
+
+            switch (state) {
+                // TODO(klp): add other post dial related functions
+                case WAIT:
+                    final Call call = getCallFromMap(mCallMap, c, false);
+                    if (call == null) {
+                        Log.i(TAG, "Call no longer exists. Skipping onPostDialWait().");
+                    } else {
+                        for (Listener mListener : mListeners) {
+                            mListener.onPostDialWait(call.getCallId(),
+                                    c.getRemainingPostDialString());
+                        }
+                    }
+                    break;
+
+                default:
+                    break;
+            }
+        }
+    }
+
     private void onNewRingingConnection(AsyncResult r) {
         Log.i(TAG, "onNewRingingConnection");
         final Connection conn = (Connection) r.result;
@@ -453,7 +490,7 @@
                     }
                 }
             }
-            changed |= oldSet.equals(call.getChildCallIds());
+            changed |= !oldSet.equals(call.getChildCallIds());
         }
 
         /**
@@ -697,6 +734,7 @@
         void onDisconnect(Call call);
         void onIncoming(Call call);
         void onUpdate(List<Call> calls);
+        void onPostDialWait(int callId, String remainingChars);
     }
 
     /**
diff --git a/src/com/android/phone/CallStateMonitor.java b/src/com/android/phone/CallStateMonitor.java
index 6152277..3e9ff5d 100644
--- a/src/com/android/phone/CallStateMonitor.java
+++ b/src/com/android/phone/CallStateMonitor.java
@@ -56,6 +56,7 @@
     public static final int PHONE_ENHANCED_VP_OFF = 10;
     public static final int PHONE_RINGBACK_TONE = 11;
     public static final int PHONE_RESEND_MUTE = 12;
+    public static final int PHONE_ON_DIAL_CHARS = 13;
 
     // Other events from call manager
     public static final int EVENT_OTA_PROVISION_CHANGE = 20;
@@ -88,6 +89,7 @@
         callManager.registerForInCallVoicePrivacyOff(this, PHONE_ENHANCED_VP_OFF, null);
         callManager.registerForRingbackTone(this, PHONE_RINGBACK_TONE, null);
         callManager.registerForResendIncallMute(this, PHONE_RESEND_MUTE, null);
+        callManager.registerForPostDialCharacter(this, PHONE_ON_DIAL_CHARS, null);
     }
 
     public void addListener(Handler handler) {
@@ -131,6 +133,7 @@
         callManager.unregisterForResendIncallMute(this);
         callManager.unregisterForInCallVoicePrivacyOn(this);
         callManager.unregisterForInCallVoicePrivacyOff(this);
+        callManager.unregisterForPostDialCharacter(this);
 
         registerForNotifications();
     }
diff --git a/src/com/android/phone/DTMFTonePlayer.java b/src/com/android/phone/DTMFTonePlayer.java
index d3ed53e..0acd114 100644
--- a/src/com/android/phone/DTMFTonePlayer.java
+++ b/src/com/android/phone/DTMFTonePlayer.java
@@ -31,8 +31,6 @@
 import com.android.internal.telephony.PhoneConstants;
 import com.android.services.telephony.common.Call;
 
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -125,6 +123,11 @@
         checkCallState();
     }
 
+    @Override
+    public void onPostDialWait(int callId, String chars) {
+        // no-op
+    }
+
     /**
      * Allocates some resources we keep around during a "dialer session".
      *
diff --git a/src/com/android/phone/HfaActivity.java b/src/com/android/phone/HfaActivity.java
new file mode 100644
index 0000000..3bc047d
--- /dev/null
+++ b/src/com/android/phone/HfaActivity.java
@@ -0,0 +1,275 @@
+/*
+ * Copyright (C) 2013 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.
+ */
+
+package com.android.phone;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.PendingIntent;
+import android.app.PendingIntent.CanceledException;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.AsyncResult;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.telephony.ServiceState;
+import android.util.Log;
+
+import com.android.internal.telephony.CallManager;
+import com.android.internal.telephony.Phone;
+import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
+
+/**
+ * Starts and displays status for Hands Free Activation (HFA).
+ *
+ * This class operates with Hands Free Activation apps.
+ * It starts by broadcasting the intent com.android.action.START_HFA.
+ * An HFA app will pick that up and start the HFA process.
+ * If it fails it return ERROR_HFA Intent and upon success returns COMPLETE_HFA.
+ *
+ * If successful, we bounce the radio so that the service picks up the new number. This is also
+ * necessary for the setup wizard to pick up the successful activation so that it can continue
+ * past the welcome screen. Once the radio is back on we send back the pendingIntent to setup
+ * wizard and destroy the activity.
+ *
+ * If there is an error, we do not bounce the radio but still send the pending intent back to
+ * the wizard (with a failure code).
+ *
+ * The user has an option to skip activation. If that happens, we go back to the setup
+ * wizard.
+ *
+ * TODO(klp): We need system-only permissions for the HFA intents.
+ * TODO(klp): Should be full screen activity instead of dialogs.
+ * TODO(klp): Currently display the error code instead of the error string resource.
+ * TODO(klp): Need to check the system to ensure someone is listening for the intent
+ *            before we send it.  Should there be a timeout?  5 minutes?
+ */
+public class HfaActivity extends Activity {
+    private static final String TAG = HfaActivity.class.getSimpleName();
+
+    private static final boolean VERBOSE = Log.isLoggable(TAG, Log.VERBOSE);
+
+    private static final String ACTION_START = "com.android.action.START_HFA";
+    private static final String ACTION_ERROR = "com.android.action.ERROR_HFA";
+    private static final String ACTION_CANCEL = "com.android.action.CANCEL_HFA";
+    private static final String ACTION_COMPLETE = "com.android.action.COMPLETE_HFA";
+
+    private static final int SERVICE_STATE_CHANGED = 1;
+
+    public static final int OTASP_UNKNOWN = 0;
+    public static final int OTASP_USER_SKIPPED = 1;
+    public static final int OTASP_SUCCESS = 2;
+    public static final int OTASP_FAILURE = 3;
+
+    public static final int NOT_WAITING = 0;
+    public static final int WAITING_FOR_RADIO_OFF = 1;
+    public static final int WAITING_FOR_RADIO_ON = 2;
+
+    private int mPhoneMonitorState = NOT_WAITING;
+    private boolean mCanSkip;
+    private AlertDialog mDialog;
+    private BroadcastReceiver mReceiver;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        if (VERBOSE) Log.v(TAG, "onCreate");
+
+        startHfaIntentReceiver();
+        startProvisioning();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+
+        if (VERBOSE) Log.v(TAG, "onDestroy");
+
+        if (mDialog != null && mDialog.isShowing()) {
+            mDialog.dismiss();
+            mDialog = null;
+        }
+
+        if (mReceiver != null) {
+            unregisterReceiver(mReceiver);
+            mReceiver = null;
+        }
+    }
+
+    private void startProvisioning() {
+        buildAndShowDialog();
+
+        sendHfaCommand(ACTION_START);
+    }
+
+    private void buildAndShowDialog() {
+        mCanSkip = true;
+
+        mDialog = new AlertDialog.Builder(this)
+                .setTitle(R.string.ota_hfa_activation_title)
+                .setMessage(R.string.ota_hfa_activation_dialog_message)
+                .setPositiveButton(R.string.ota_skip_activation_dialog_skip_label,
+                        new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface di, int which) {
+                                if (mCanSkip) {
+                                    sendHfaCommand(ACTION_CANCEL);
+                                    sendResponseToSetupWizard(OTASP_USER_SKIPPED);
+                                }
+                            }})
+                /*.setOnCancelListener(new DialogInterface.OnCancelListener() {
+                    @Override
+                    public void onCancel(DialogInterface di) {
+                        sendResponseToSetupWizard(OTASP_USER_SKIPPED);
+                    }})*/
+                .create();
+
+        if (VERBOSE) Log.v(TAG, "showing dialog");
+        mDialog.show();
+    }
+
+    private void sendHfaCommand(String action) {
+        if (VERBOSE) Log.v(TAG, "Sending command: " + action);
+        sendBroadcast(new Intent(action));
+    }
+
+    private void onHfaError(String errorMsg) {
+        mDialog.dismiss();
+
+        AlertDialog errorDialog = new AlertDialog.Builder(this)
+            .setMessage(errorMsg)
+            .setPositiveButton(R.string.ota_skip_activation_dialog_skip_label,
+                    new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface di, int which) {
+                            di.dismiss();
+                            sendResponseToSetupWizard(OTASP_USER_SKIPPED);
+                        }
+                    })
+            .setNegativeButton(R.string.ota_try_again,
+                    new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface di, int which) {
+                            di.dismiss();
+                            startProvisioning();
+                        }
+                    })
+            .create();
+
+        errorDialog.show();
+    }
+
+    private void onHfaSuccess() {
+        // User can no longer skip after success.
+        mCanSkip = false;
+
+        // We need to restart the modem upon successful activation
+        // so that it can acquire a number and ensure setupwizard will
+        // know about this success through phone state changes.
+
+        bounceRadio();
+    }
+
+    private void bounceRadio() {
+        final Phone phone = PhoneGlobals.getInstance().getPhone();
+        phone.registerForServiceStateChanged(mHandler, SERVICE_STATE_CHANGED, null);
+
+        mPhoneMonitorState = WAITING_FOR_RADIO_OFF;
+        phone.setRadioPower(false);
+        onServiceStateChange(phone.getServiceState());
+    }
+
+    private void onServiceStateChange(ServiceState state) {
+        final boolean radioIsOff = state.getVoiceRegState() == ServiceState.STATE_POWER_OFF;
+        final Phone phone = PhoneGlobals.getInstance().getPhone();
+
+        if (VERBOSE) Log.v(TAG, "Radio is off: " + radioIsOff);
+
+        if (mPhoneMonitorState == WAITING_FOR_RADIO_OFF) {
+            if (radioIsOff) {
+                mPhoneMonitorState = WAITING_FOR_RADIO_ON;
+                phone.setRadioPower(true);
+            }
+        } else if (mPhoneMonitorState == WAITING_FOR_RADIO_ON) {
+            if (!radioIsOff) {
+                mPhoneMonitorState = NOT_WAITING;
+                phone.unregisterForServiceStateChanged(mHandler);
+
+                // We have successfully bounced the radio.
+                // Time to go back to the setup wizard.
+                sendResponseToSetupWizard(OTASP_SUCCESS);
+            }
+        }
+    }
+
+    private void sendResponseToSetupWizard(int responseCode) {
+        final PendingIntent otaResponseIntent = getIntent().getParcelableExtra(
+                OtaUtils.EXTRA_OTASP_RESULT_CODE_PENDING_INTENT);
+
+        final Intent extraStuff = new Intent();
+        extraStuff.putExtra(OtaUtils.EXTRA_OTASP_RESULT_CODE, responseCode);
+
+        try {
+            if (VERBOSE) Log.v(TAG, "Sending OTASP confirmation with result code: " + responseCode);
+            otaResponseIntent.send(this, 0 /* resultCode (not used) */, extraStuff);
+        } catch (CanceledException e) {
+            Log.e(TAG, "Pending Intent canceled");
+        }
+
+        finish();
+    }
+
+    public void startHfaIntentReceiver() {
+        final IntentFilter filter = new IntentFilter(ACTION_COMPLETE);
+        filter.addAction(ACTION_ERROR);
+
+        mReceiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                final String action = intent.getAction();
+                if (action.equals(ACTION_ERROR)) {
+                    onHfaError(intent.getStringExtra("errorCode"));
+                } else if (action.equals(ACTION_COMPLETE)) {
+                    if (VERBOSE) Log.v(TAG, "Hfa Successful");
+                    onHfaSuccess();
+                }
+            }
+        };
+
+        registerReceiver(mReceiver, filter);
+    }
+
+    private Handler mHandler = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+            switch (msg.what) {
+                case SERVICE_STATE_CHANGED:
+                    ServiceState state = (ServiceState) ((AsyncResult) msg.obj).result;
+                    onServiceStateChange(state);
+                    break;
+                default:
+                    break;
+            }
+        }
+    };
+
+}
diff --git a/src/com/android/phone/InCallScreenShowActivation.java b/src/com/android/phone/InCallScreenShowActivation.java
index 243b437..15abb11 100644
--- a/src/com/android/phone/InCallScreenShowActivation.java
+++ b/src/com/android/phone/InCallScreenShowActivation.java
@@ -67,6 +67,14 @@
 
         if (intent.getAction().equals(OtaUtils.ACTION_PERFORM_CDMA_PROVISIONING)) {
 
+            boolean usesHfa = getResources().getBoolean(R.bool.config_use_hfa_for_provisioning);
+            if (usesHfa) {
+                Log.d(LOG_TAG, "Starting Hfa from ACTION_PERFORM_CDMA_PROVISIONING");
+                startHfa();
+                finish();
+                return;
+            }
+
             // On voice-capable devices, we perform CDMA provisioning in
             // "interactive" mode by directly launching the InCallScreen.
             // boolean interactiveMode = PhoneGlobals.sVoiceCapable;
@@ -137,4 +145,21 @@
 
         finish();
     }
+
+
+    /**
+     * Starts the HFA provisioning process by bringing up the HFA Activity.
+     */
+    private void startHfa() {
+        final Intent intent = new Intent(this, HfaActivity.class);
+
+        final PendingIntent otaResponseIntent = getIntent().getParcelableExtra(
+                OtaUtils.EXTRA_OTASP_RESULT_CODE_PENDING_INTENT);
+
+        intent.putExtra(OtaUtils.EXTRA_OTASP_RESULT_CODE_PENDING_INTENT, otaResponseIntent);
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
+
+        Log.v(LOG_TAG, "Starting hfa activation activity");
+        startActivity(intent);
+    }
 }
diff --git a/src/com/android/phone/PhoneGlobals.java b/src/com/android/phone/PhoneGlobals.java
index dc7d64b..45ffd33 100644
--- a/src/com/android/phone/PhoneGlobals.java
+++ b/src/com/android/phone/PhoneGlobals.java
@@ -1034,16 +1034,12 @@
         //
         boolean isRinging = (state == PhoneConstants.State.RINGING);
         boolean isDialing = (phone.getForegroundCall().getState() == Call.State.DIALING);
-        boolean showingQuickResponseDialog = (mInCallScreen != null) &&
-                mInCallScreen.isQuickResponseDialogShowing();
         boolean showingDisconnectedConnection =
                 PhoneUtils.hasDisconnectedConnections(phone) && isShowingCallScreen;
-        boolean keepScreenOn = isRinging || isDialing ||
-                (showingDisconnectedConnection && !showingQuickResponseDialog);
+        boolean keepScreenOn = isRinging || isDialing || showingDisconnectedConnection;
         if (DBG) Log.d(LOG_TAG, "updateWakeState: keepScreenOn = " + keepScreenOn
                        + " (isRinging " + isRinging
                        + ", isDialing " + isDialing
-                       + ", showingQuickResponse " + showingQuickResponseDialog
                        + ", showingDisc " + showingDisconnectedConnection + ")");
         // keepScreenOn == true means we'll hold a full wake lock:
         requestWakeState(keepScreenOn ? WakeState.FULL : WakeState.SLEEP);
@@ -1592,4 +1588,5 @@
             mBluetoothPhone = null;
         }
     };
+
 }
diff --git a/src/com/android/phone/RejectWithTextMessageManager.java b/src/com/android/phone/RejectWithTextMessageManager.java
index b03211a..fda8f78 100644
--- a/src/com/android/phone/RejectWithTextMessageManager.java
+++ b/src/com/android/phone/RejectWithTextMessageManager.java
@@ -73,7 +73,11 @@
     /** SharedPreferences file name for our persistent settings. */
     private static final String SHARED_PREFERENCES_NAME = "respond_via_sms_prefs";
 
-    // Preference keys for the 4 "canned responses"; see RespondViaSmsManager$Settings.
+    private Intent mIntent;
+
+    private ArrayList<ComponentName> mComponentsWithPermission = new ArrayList<ComponentName>();
+
+            // Preference keys for the 4 "canned responses"; see RespondViaSmsManager$Settings.
     // Since (for now at least) the number of messages is fixed at 4, and since
     // SharedPreferences can't deal with arrays anyway, just store the messages
     // as 4 separate strings.
@@ -82,20 +86,11 @@
     private static final String KEY_CANNED_RESPONSE_PREF_2 = "canned_response_pref_2";
     private static final String KEY_CANNED_RESPONSE_PREF_3 = "canned_response_pref_3";
     private static final String KEY_CANNED_RESPONSE_PREF_4 = "canned_response_pref_4";
-    private static final String KEY_PREFERRED_PACKAGE = "preferred_package_pref";
-    private static final String KEY_INSTANT_TEXT_DEFAULT_COMPONENT = "instant_text_def_component";
+    /* package */ static final String KEY_INSTANT_TEXT_DEFAULT_COMPONENT =
+            "instant_text_def_component";
 
-    /**
-     * Brings up the standard SMS compose UI.
-     */
-    private void launchSmsCompose(String phoneNumber) {
-        if (DBG) log("launchSmsCompose: number " + phoneNumber);
-
-        final Intent intent = getInstantTextIntent(phoneNumber, null, getSmsService());
-
-        if (DBG) log("- Launching SMS compose UI: " + intent);
-        PhoneGlobals.getInstance().startService(intent);
-    }
+    /* package */ static final String TAG_ALL_SMS_SERVICES = "com.android.phone.AvailablePackages";
+    /* package */ static final String TAG_SEND_SMS = "com.android.phone.MessageIntent";
 
     /**
      * Read the (customizable) canned responses from SharedPreferences,
@@ -130,28 +125,10 @@
         return responses;
     }
 
-    /**
-     * Sends a text message without any interaction from the user.
-     */
-    private void sendText(String phoneNumber, String message, ComponentName component) {
-        if (DBG) log("sendText: number "
-                      + phoneNumber + ", message '" + message + "'");
-
-        PhoneGlobals.getInstance().startService(getInstantTextIntent(phoneNumber, message,
-                component));
-    }
-
-    private void sendTextAndExit(String phoneNumber, String message, ComponentName component,
-            boolean setDefaultComponent) {
+    private void sendTextAndExit() {
         // Send the selected message immediately with no user interaction.
-        sendText(phoneNumber, message, component);
-
-        if (setDefaultComponent) {
-            final SharedPreferences prefs = PhoneGlobals.getInstance().getSharedPreferences(
-                    SHARED_PREFERENCES_NAME, Context.MODE_PRIVATE);
-            prefs.edit()
-                    .putString(KEY_INSTANT_TEXT_DEFAULT_COMPONENT, component.flattenToString())
-                    .apply();
+        if (mIntent.getComponent() != null) {
+            PhoneGlobals.getInstance().startService(mIntent);
         }
 
         // ...and show a brief confirmation to the user (since
@@ -231,11 +208,7 @@
         return intent;
     }
 
-    public void rejectCallWithNewMessage(String number) {
-        launchSmsCompose(number);
-    }
-
-    private ComponentName getSmsService() {
+    private boolean getSmsService() {
         if (DBG) log("sendTextToDefaultActivity()...");
         final PackageManager packageManager = PhoneGlobals.getInstance().getPackageManager();
 
@@ -257,7 +230,8 @@
 
             if (serviceInfo != null &&
                     PERMISSION_SEND_RESPOND_VIA_MESSAGE.equals(serviceInfo.permission)) {
-                return componentName;
+                mIntent.setComponent(componentName);
+                return true;
             } else {
                 SharedPreferences.Editor editor = prefs.edit();
                 editor.remove(KEY_INSTANT_TEXT_DEFAULT_COMPONENT);
@@ -265,29 +239,38 @@
             }
         }
 
-        final ArrayList<ComponentName> componentsWithPermission =
-            getPackagesWithInstantTextPermission();
+        mComponentsWithPermission = getPackagesWithInstantTextPermission();
 
-        final int size = componentsWithPermission.size();
+        final int size = mComponentsWithPermission.size();
         if (size == 0) {
             Log.e(TAG, "No appropriate package receiving the Intent. Don't send anything");
-            return null;
+            return false;
         } else if (size == 1) {
-            return componentsWithPermission.get(0);
+            mIntent.setComponent(mComponentsWithPermission.get(0));
+            return true;
         } else {
             Log.v(TAG, "Choosing from one of the apps");
             // TODO(klp): Add an app picker.
-            return componentsWithPermission.get(0);
+            final Intent intent = new Intent(Intent.ACTION_VIEW, null);
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK |
+                    Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS |
+                    Intent.FLAG_ACTIVITY_NO_ANIMATION  |
+                    Intent.FLAG_ACTIVITY_NO_HISTORY |
+                    Intent.FLAG_FROM_BACKGROUND);
+            intent.setClass(PhoneGlobals.getInstance(), TextMessagePackageChooser.class);
+            intent.putExtra(TAG_ALL_SMS_SERVICES, mComponentsWithPermission);
+            intent.putExtra(TAG_SEND_SMS, mIntent);
+            PhoneGlobals.getInstance().startActivity(intent);
+            return false;
+            // return componentsWithPermission.get(0);
         }
     }
 
-
-    public void rejectCallWithMessage(final String number, String message) {
-        final ComponentName componentName = getSmsService();
-
-        if (componentName != null) {
-            sendTextAndExit(number, message, componentName,
-                    false);
+    public void rejectCallWithMessage(Call call, String message) {
+        mComponentsWithPermission.clear();
+        mIntent = getInstantTextIntent(call.getLatestConnection().getAddress(), message, null);
+        if (getSmsService())  {
+            sendTextAndExit();
         }
     }
 
diff --git a/src/com/android/phone/TextMessagePackageChooser.java b/src/com/android/phone/TextMessagePackageChooser.java
new file mode 100644
index 0000000..ae638cb
--- /dev/null
+++ b/src/com/android/phone/TextMessagePackageChooser.java
@@ -0,0 +1,218 @@
+/*
+
+ * Copyright (C) 2013 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.
+ */
+
+package com.android.phone;
+
+import android.app.Activity;
+import android.app.ActivityManager;
+import android.app.AlertDialog;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TextMessagePackageChooser extends Activity {
+    private static final String TAG = TextMessagePackageChooser.class.getSimpleName();
+
+    /** SharedPreferences file name for our persistent settings. */
+    private static final String SHARED_PREFERENCES_NAME = "respond_via_sms_prefs";
+
+    private int mIconSize = -1;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        final ArrayList<ComponentName> components = getIntent().getParcelableArrayListExtra(
+                RejectWithTextMessageManager.TAG_ALL_SMS_SERVICES);
+        BaseAdapter adapter = new PackageSelectionAdapter(this, components);
+
+        PackageClickListener clickListener = new PackageClickListener(components);
+
+        final CharSequence title = getResources().getText(
+                com.android.internal.R.string.whichApplication);
+        LayoutInflater inflater =
+                (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+
+        final View view = inflater.inflate(com.android.internal.R.layout.always_use_checkbox,
+                null);
+        final CheckBox alwaysUse = (CheckBox) view.findViewById(
+                com.android.internal.R.id.alwaysUse);
+        alwaysUse.setText(com.android.internal.R.string.alwaysUse);
+        alwaysUse.setOnCheckedChangeListener(clickListener);
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(this)
+                .setTitle(title)
+                .setCancelable(true)
+                .setOnCancelListener(new RespondViaSmsCancelListener())
+                .setAdapter(adapter, clickListener)
+                .setView(view);
+                       
+        builder.create().show();
+    }
+    
+    private class PackageSelectionAdapter extends BaseAdapter {
+        private final LayoutInflater mInflater;
+        private final List<ComponentName> mComponents;
+
+        public PackageSelectionAdapter(Context context, List<ComponentName> components) {
+            mInflater = (LayoutInflater)context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+            mComponents = components;
+        }
+
+        @Override
+        public int getCount() {
+            return mComponents.size();
+        }
+
+        @Override
+        public Object getItem(int position) {
+            return mComponents.get(position);
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return position;
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            if (convertView == null) {
+                convertView = mInflater.inflate(
+                        com.android.internal.R.layout.activity_chooser_view_list_item, parent,
+                        false);
+            }
+
+            final ComponentName component = mComponents.get(position);
+            final String packageName = component.getPackageName();
+            final PackageManager packageManager = getPackageManager();
+
+            // Set the application label
+            final TextView text = (TextView) convertView.findViewById(
+                    com.android.internal.R.id.title);
+
+            text.setText("");
+            try {
+                final ApplicationInfo appInfo = packageManager.getApplicationInfo(packageName, 0);
+                final CharSequence label = packageManager.getApplicationLabel(appInfo);
+                if (label != null) {
+                    text.setText(label);
+                }
+            } catch (PackageManager.NameNotFoundException e) {
+                Log.w(TAG, "Failed to load app label because package was not found.");
+            }
+
+            // Set the application icon
+            final ImageView icon = (ImageView) convertView.findViewById(android.R.id.icon);
+            Drawable drawable = null;
+            try {
+                drawable = getPackageManager().getApplicationIcon(packageName);
+            } catch (PackageManager.NameNotFoundException e) {
+                Log.w(TAG, "Failed to load icon because it wasn't found.");
+            }
+            if (drawable == null) {
+                drawable = getPackageManager().getDefaultActivityIcon();
+            }
+            icon.setImageDrawable(drawable);
+            ViewGroup.LayoutParams lp = (ViewGroup.LayoutParams) icon.getLayoutParams();
+            lp.width = lp.height = getIconSize();
+
+            return convertView;
+        }
+
+    }
+
+    private class PackageClickListener implements DialogInterface.OnClickListener,
+            CompoundButton.OnCheckedChangeListener {
+        final private List<ComponentName> mComponents;
+        private boolean mMakeDefault = false;
+
+        public PackageClickListener(List<ComponentName> components) {
+            mComponents = components;
+        }
+
+        @Override
+        public void onClick(DialogInterface dialog, int which) {
+            final ComponentName component = mComponents.get(which);
+
+            if (mMakeDefault) {
+                final SharedPreferences prefs = PhoneGlobals.getInstance().getSharedPreferences(
+                        SHARED_PREFERENCES_NAME, Context.MODE_PRIVATE);
+                prefs.edit().putString(
+                        RejectWithTextMessageManager.KEY_INSTANT_TEXT_DEFAULT_COMPONENT,
+                        component.flattenToString()).apply();
+            }
+
+            final Intent messageIntent = (Intent) getIntent().getParcelableExtra(
+                    RejectWithTextMessageManager.TAG_SEND_SMS);
+            if (messageIntent != null) {
+                messageIntent.setComponent(component);
+                PhoneGlobals.getInstance().startService(messageIntent);
+            }
+            finish();
+        }
+
+        @Override
+        public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+            Log.i(TAG, "mMakeDefault : " + isChecked);
+            mMakeDefault = isChecked;
+        }
+    }
+
+    /**
+     * OnCancelListener for the "Respond via SMS" popup.
+     */
+    public class RespondViaSmsCancelListener implements DialogInterface.OnCancelListener {
+        public RespondViaSmsCancelListener() {
+        }
+
+        /**
+         * Handles the user canceling the popup, either by touching
+         * outside the popup or by pressing Back.
+         */
+        @Override
+        public void onCancel(DialogInterface dialog) {
+            finish();
+        }
+    }
+
+    private int getIconSize() {
+      if (mIconSize < 0) {
+          final ActivityManager am =
+              (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE);
+          mIconSize = am.getLauncherLargeIconSize();
+      }
+
+      return mIconSize;
+    }
+}