diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 43a1f5e..1fcfd23 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -71,7 +71,7 @@
              URL with the schemes "tel", "sip", and "voicemail". It also handles URLs linked to
              contacts provider entries. Any data not fitting the schema described is ignored. -->
         <activity android:name="CallActivity"
-                android:theme="@android:style/Theme.NoDisplay"
+                android:theme="@style/Theme.Telecomm.Transparent"
                 android:permission="android.permission.CALL_PHONE"
                 android:excludeFromRecents="true">
             <!-- CALL action intent filters for the various ways of initiating an outgoing call. -->
@@ -202,12 +202,19 @@
 
         <activity android:name=".PhoneAccountPreferencesActivity"
                   android:label="@string/phone_account_preferences_title"
-                  android:configChanges="orientation|screenSize|keyboardHidden">
-                  android:exported="true" >
+                  android:configChanges="orientation|screenSize|keyboardHidden"
+                  android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
         </activity>
 
+        <activity android:name=".ErrorDialogActivity"
+                android:configChanges="orientation|screenSize|keyboardHidden"
+                android:excludeFromRecents="true"
+                android:launchMode="singleInstance"
+                android:theme="@style/Theme.Telecomm.Transparent">
+        </activity>
+
     </application>
 </manifest>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index a6a63d0..158c252 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -36,9 +36,10 @@
     <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>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Boodskap gestuur na <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"Foonrekeningvoorkeure"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Foonrekeninginstellings"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"Verstek uitgaande rekening"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"Wi-Fi-oproeprekening"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"Vra elke keer"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Moenie Wi-Fi vir oproepe gebruik nie"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Hierdie gebruiker word nie toegelaat om nienood-foonoproepe te maak nie"</string>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 42edeae..53a608c 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -36,9 +36,10 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"ፈጣን ምላሽ"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"ነባሪውን መተግበሪያ ዳግም አስጀምር"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"ለ <xliff:g id="PHONE_NUMBER">%s</xliff:g> የተላከ መልዕክት"</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"የስልክ መለያ ምርጫዎች"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"የስልክ መለያ ቅንብሮች"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"ነባር ወጪ መለያ"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"የWi-Fi መደወያ መለያ"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"ሁልጊዜ ጊዜ ጠይቅ"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"የWi-Fi ጥሪ አይጠቀሙ"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"ይህ ተጠቃሚ የአስቸኳይ አደጋ ያልሆኑ ስልክ ጥሪዎችን እንዲያደርጉ አልተፈቀደላቸውም"</string>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index bdfb35d..0943943 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -36,9 +36,10 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"رد سريع"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"إعادة تعيين التطبيق الافتراضي"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"تم إرسال الرسالة إلى <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"تفضيلات حساب الهاتف"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"إعدادات حساب الهاتف"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"الحساب الافتراضي للصادر"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"‏حساب الاتصال عبر Wi-Fi"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"الطلب في كل مرة"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"‏عدم استخدام الاتصال عبر Wi-Fi"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"هذا المستخدم غير مسموح له بإجراء مكالمات هاتفية بخلاف مكالمات الطوارئ"</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index a0b2e8a..b9ffa44 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -36,9 +36,10 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Бърз отговор"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Възст. на станд. настройки"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"До <xliff:g id="PHONE_NUMBER">%s</xliff:g> бе изпратено съобщение."</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"Предпочитания за профилите на телефона"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Настройки на профила за телефона"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"Стандартен профил за изходящи обаждания"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"Профил за обаждане през Wi-Fi"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"Извеждане на запитване всеки път"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Без използване на обаждане през Wi-Fi"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"На този потребител е разрешено да провежда само спешни обаждания"</string>
 </resources>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index 53cc918..9fc3317 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -36,9 +36,10 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"দ্রুত প্রতিক্রিয়া"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"ডিফল্ট অ্যাপ্লিকেশন পুনরায় সেট করুন"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"<xliff:g id="PHONE_NUMBER">%s</xliff:g> এ বার্তা পাঠানো হয়েছে৷"</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"ফোন অ্যাকাউন্ট অগ্রাভিরুচি"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"ফোন অ্যাকাউন্ট সেটিংস"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"আউটগোয়িং ডিফল্ট অ্যাকাউন্ট"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"Wi-Fi এর মাধ্যমে কল করার অ্যাকাউন্ট"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"প্রতিবার জিজ্ঞাসা করুন"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Wi-Fi কলিং ব্যবহার করবেন না"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"জরুরী নয় এমন ফোন কল করার জন্য ব্যবহারকারী অনুমতি পাননি"</string>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index c91a313..9f9fdbf 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -36,9 +36,10 @@
     <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>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Missatge enviat a <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"Preferències del compte del telèfon"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Configuració del compte del telèfon"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"Compte de sortida predeterminat"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"Compte per a les trucades mitjançant Wi-Fi"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"Pregunta sempre"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"No facis servir les trucades mitjançant Wi-Fi"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Aquest usuari no pot fer trucades que no siguin d\'emergència."</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 4d24e04..ee20fc4 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -36,9 +36,10 @@
     <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>
     <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="phone_account_preferences_title" msgid="3932310998135189661">"Nastavení účtu telefonu"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Nastavení telefonního účtu"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"Výchozí odchozí účet"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"Účet k volání pomocí Wi-Fi"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"Vždy se dotázat"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Nepoužívat volání pomocí Wi-Fi"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Uživatel smí uskutečňovat pouze tísňová volání."</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 764337e..7179b2f 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -36,9 +36,10 @@
     <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>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Meddelelsen er sendt til <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"Kontoindstillinger for telefon"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Kontoindstillinger for telefon"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"Standardkonto for udgående"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"Konto til Wi-Fi-opkald"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"Spørg hver gang"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Brug ikke Wi-Fi-opkald"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Denne bruger har kun tilladelse til at foretage nødopkald"</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 7e02890..92ef8a6 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -36,9 +36,10 @@
     <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>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Nachricht an <xliff:g id="PHONE_NUMBER">%s</xliff:g> gesendet"</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"Einstellungen des Telefonkontos"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Telefonkontoeinstellungen"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"Standardkonto für ausgehende Anrufe"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"Konto für WLAN-Anrufe"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"Jedes Mal fragen"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Keine WLAN-Anrufe nutzen"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Dieser Nutzer darf abgesehen von Notrufen keine Anrufe tätigen."</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index db77deb..0072977 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -36,9 +36,10 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Γρήγορη απάντηση"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Επαναφορά προεπιλ. εφαρμογής"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Το μήνυμα εστάλη στο <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"Προτιμήσεις λογαριασμού τηλεφώνου"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Ρυθμίσεις λογαριασμού τηλεφώνου"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"Προεπιλεγμένος εξερχόμενος λογαριασμός"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"Λογαριασμός κλήσης μέσω Wi-Fi"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"Ερώτηση κάθε φορά"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Να μη χρησιμοποιείται η κλήση μέσω Wi-Fi"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Δεν επιτρέπεται σε αυτόν το χρήστη να πραγματοποιεί τηλεφωνικές κλήσεις οι οποίες δεν είναι εκτάκτου ανάγκης"</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index a48768c..a4f625b 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -36,9 +36,10 @@
     <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>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Message sent to <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"Phone account preferences"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Phone account settings"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"Default outgoing account"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"Wi-Fi calling account"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"Ask every time"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Do not use Wi-Fi calling"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"This user is not allowed to make non-emergency phone calls"</string>
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index a48768c..a4f625b 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -36,9 +36,10 @@
     <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>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Message sent to <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"Phone account preferences"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Phone account settings"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"Default outgoing account"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"Wi-Fi calling account"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"Ask every time"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Do not use Wi-Fi calling"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"This user is not allowed to make non-emergency phone calls"</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index f4f2926..2c4f49c 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -36,9 +36,10 @@
     <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>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Mensaje enviado a <xliff:g id="PHONE_NUMBER">%s</xliff:g>"</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"Preferencias de la cuenta de teléfono"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Configuración de cuenta telefónica"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"Cuenta saliente predeterminada"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"Cuenta para llamadas por Wi-Fi"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"Preguntar siempre"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"No utilizar llamadas por Wi-Fi"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Este usuario solo tiene permisos para hacer llamadas de emergencia."</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index fa6243d..67440a3 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -36,9 +36,10 @@
     <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>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Mensaje enviado a <xliff:g id="PHONE_NUMBER">%s</xliff:g>"</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"Preferencias de la cuenta del teléfono"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Ajustes de cuenta del teléfono"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"Cuenta predeterminada para hacer llamadas"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"Cuenta para llamadas Wi-Fi"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"Preguntar siempre"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"No usar llamadas Wi-Fi"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Este usuario solo puede realizar llamadas de emergencia"</string>
 </resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 14611ec..06736fd 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -36,9 +36,10 @@
     <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>
     <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="phone_account_preferences_title" msgid="3932310998135189661">"Telefonikonto eelistused"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Telefoni konto seaded"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"Väljuvate kõnede vaikekonto"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"WiFi-kõnede konto"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"Küsi iga kord"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Ära kasuta WiFi-kõnesid"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"See kasutaja võib teha ainult hädaabikõnesid"</string>
 </resources>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index 8d60f66..b194e6e 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -36,9 +36,10 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Erantzun bizkorra"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Berrezarri aplik. lehenetsia"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Mezua bidali da <xliff:g id="PHONE_NUMBER">%s</xliff:g> zenbakira."</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"Telefonoko kontuaren hobespenak"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Telefonoaren kontuaren ezarpenak"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"Irteerako kontu lehenetsia"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"Wi-Fi bidezko deiak egiteko kontua"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"Galdetu beti"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Ez erabili Wi-Fi bidezko deiak"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Erabiltzaile honek ez du larrialdietakoak ez diren telefono-deiak egiteko baimenik"</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index f59039e..ccbf993 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -36,9 +36,10 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"پاسخ سریع"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"بازنشانی برنامه‌ پیش‌فرض"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"پیام به <xliff:g id="PHONE_NUMBER">%s</xliff:g> ارسال شد."</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"تنظیمات برگزیده حساب تلفن"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"تنظیمات حساب تلفن"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"حساب خروجی پیش‌فرض"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"‏حساب برقراری تماس تلفنی با Wi-Fi"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"هر بار پرسیده شود"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"‏از تماس تلفنی با Wi-Fi استفاده نشود"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"این کاربر اجازه برقراری تماس‌های تلفنی غیر اضطراری ندارد."</string>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 5282486..b7344f9 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -36,9 +36,10 @@
     <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>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Viesti lähetetty numeroon <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"Puhelintilin asetukset"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Puhelintilin asetukset"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"Lähtevien puheluiden oletustili"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"Wi-Fi-puhelutili"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"Kysy aina"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Älä käytä puheluihin Wi-Fiä"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Tämä käyttäjä saa soittaa vain hätäpuheluita"</string>
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index e08dad9..f0b2319 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -36,9 +36,10 @@
     <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>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Message envoyé à <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"Préférences du compte de téléphone"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Paramètres du compte de téléphone"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"Compte sortant par défaut"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"Compte pour les appels Wi-Fi"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"Toujours demander"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Ne pas utiliser les appels par Wi-Fi"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Cet utilisateur n\'est pas autorisé à faire des appels téléphoniques non urgents"</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 1efe6e5..f58d6cb 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -36,9 +36,10 @@
     <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>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Message envoyé à <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"Préférences du compte de téléphone"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Paramètres de compte du téléphone"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"Compte par défaut pour appels sortants"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"Compte pour les appels Wi-Fi"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"Toujours demander"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Ne pas utiliser les appels Wi-Fi"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Cet utilisateur n\'est autorisé à effectuer que des appels d\'urgence."</string>
 </resources>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index 468fe02..f75da28 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -36,9 +36,10 @@
     <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">"Restablecer aplicación predet."</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Mensaxe enviada ao <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"Preferencias da conta do teléfono"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Configuración da conta do teléfono"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"Conta saínte predeterminada"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"Conta de chamadas wifi"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"Preguntar sempre"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Non utilizar as chamadas wifi"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Este usuario non ten permiso para facer chamadas telefónicas que non sexan de emerxencia"</string>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 457db21..5d71149 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -36,9 +36,10 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"त्वरित प्रतिसाद"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"डिफ़ॉल्ट ऐप्स  रीसेट करें"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"<xliff:g id="PHONE_NUMBER">%s</xliff:g> को संदेश भेजा गया."</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"फ़ोन खाता संबंधी प्राथमिकताएं"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"फ़ोन खाता सेटिंग"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"डिफ़ॉल्ट आउटगोइंग खाता"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"Wi-Fi कॉलिंग खाता"</string>
+    <string name="sim_call_manager_account" msgid="2559930293628077755">"वाई-फ़ाई  कॉलिंग खाता"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"हर बार पूछें"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Wi-Fi कॉलिंग का उपयोग न करें"</string>
+    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"वाई-फ़ाई  कॉलिंग का उपयोग न करें"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"इस उपयोगकर्ता को गैर-आपातकालीन फ़ोन कॉल करने की अनुमति नहीं है"</string>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index a9f4eeb..9aec86a 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -36,9 +36,10 @@
     <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>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Poruka poslana na broj <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"Postavke telefonskog računa"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Postavke telefonskog računa"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"Zadani odlazni račun"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"Račun za Wi-Fi pozive"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"Pitaj svaki put"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Ne upotrebljavaj Wi-Fi pozive"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Ovaj korisnik smije uspostavljati samo hitne pozive"</string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index b28720e..5291f45 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -36,9 +36,10 @@
     <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>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Üzenet elküldve ide: <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"Telefonáláshoz használt fiók beállításai"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Telefonos fiókbeállítások"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"Alapértelmezett kimenő fiók"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"A Wi-Fi-híváshoz használt fiók"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"Mindig rákérdez"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Ne használja a Wi-Fi-hívást"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Ez a felhasználó csak vészhelyzeti telefonhívásokat kezdeményezhet"</string>
 </resources>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 4d751be..9113650 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -36,9 +36,10 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Արագ պատասխան"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Վերականգնել լռելյայն հավելվածը"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Հաղորդագրությունն ուղարկվել է <xliff:g id="PHONE_NUMBER">%s</xliff:g>-ին:"</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"Հեռախոսային հաշվի նախապատվություններ"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Հեռախոսի հաշիվների կարգավորումներ"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"Կանխադրված ելքային հաշիվը"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"Wi-Fi զանգերի հաշիվ"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"Հարցնել ամեն անգամ"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Չօգտագործել Wi-Fi զանգերը"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Այս օգտվողին չի թույլատրվում կատարել ոչ արտակարգ զանգեր"</string>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 0c1eb75..45a3ec4 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -36,9 +36,10 @@
     <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>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Pesan dikirim ke <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"Preferensi akun telepon"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Setelan akun ponsel"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"Akun keluar default"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"Akun panggilan Wi-Fi"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"Tanyakan setiap kali"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Jangan gunakan panggilan Wi-Fi"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Pengguna ini tidak diizinkan untuk membuat panggilan telepon non-darurat"</string>
 </resources>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index ac7bd5e..8c37bd3 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -36,9 +36,10 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Snarsvar"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Endurstilla sjálfgefið forrit"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Skilaboð send til <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"Stillingar símareiknings"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Reikningsstillingar síma"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"Sjálfgefinn sendingarreikningur"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"Reikningur Wi-Fi símtala"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"Spyrja í hvert skipti"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Ekki nota Wi-Fi símtöl"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Þessi notandi hefur ekki leyfi til að hringja símtöl önnur en neyðarsímtöl"</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index cf287f2..450f17d 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -36,9 +36,10 @@
     <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>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Messaggio inviato a <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"Preferenze dell\'account telefonico"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Impostazioni account telefono"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"Account di uscita predefinito"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"Account per chiamate Wi-Fi"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"Chiedi ogni volta"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Non utilizzare chiamate Wi-Fi"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Questo utente non è autorizzato a fare telefonate diverse da quelle di emergenza"</string>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 17e31de..13ebe2f 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -36,9 +36,10 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"תגובה מהירה"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"אפס את האפליקציה המוגדר כברירת מחדל"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"הודעה נשלחה אל <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"העדפות חשבון טלפון"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"הגדרות חשבון טלפון"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"חשבון לשיחות יוצאות המשמש כברירת מחדל"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"‏חשבון לשיחות ב-Wi-Fi"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"שאל בכל פעם"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"‏אל תשתמש בשיחות ב-Wi-Fi"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"משתמש זה אינו רשאי לבצע שיחות טלפון שאינן שיחות חירום"</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 57f9e35..4e8f2ef 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -36,9 +36,10 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"クイック返信"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"デフォルトのアプリをリセット"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"<xliff:g id="PHONE_NUMBER">%s</xliff:g>にメッセージを送信しました。"</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"携帯端末アカウントの設定"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"携帯端末アカウントの設定"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"デフォルトの送信アカウント"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"Wi-Fi発信アカウント"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"その都度確認"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Wi-Fi発信を使用しない"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"このユーザーは緊急通報以外の通話は発信できません"</string>
 </resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index bd409e8..a5b7315 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -36,9 +36,10 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"სწრაფი პასუხი"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"ნაგულისხმევი აპის ისევ დაყენება"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"შეტყობინება გაიგზავნა <xliff:g id="PHONE_NUMBER">%s</xliff:g>-თან."</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"ტელეფონის ანგარიშის პარამეტრები"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"ტელეფონის ანგარიშის პარამეტრები"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"ნაგულისხმევი გამავალი ანგარიში"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"ანგარიში Wi-Fi დარეკვისთვის"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"მკითხე ყოველ ჯერზე"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Wi-Fi დარეკვა არ გამოიყენო"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"ამ მომხმარებელს არ აქვს უფლება, განახორციელოს არასაგანგებო სატელეფონო ზარები."</string>
 </resources>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index 41b642c..921c40c 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -36,9 +36,10 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Жылдам жауап"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Бастапқы қолдб-ға қайта реттеу"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Хабар <xliff:g id="PHONE_NUMBER">%s</xliff:g> нөміріне жіберілді."</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"Телефон есептік жазбасының параметрлері"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Телефон есептік жазбасының параметрлері"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"Әдепкі шығыс есептік жазба"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"Wi-Fi қоңыраулар есептік жазбасы"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"Әр қоңырау үшін сұрау"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Wi-Fi қоңырауларын пайдаланбау"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Бұл пайдаланушыға жедел емес қоңырауларды шалуға рұқсат етілмеген"</string>
 </resources>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index b6667b1..9d4c9e9 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -36,9 +36,10 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"ឆ្លើយតប​រហ័ស"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"កំណត់​កម្មវិធី​លំនាំដើម​ឡើងវិញ"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"បាន​ផ្ញើ​សារ​ទៅ <xliff:g id="PHONE_NUMBER">%s</xliff:g> ។"</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"ចំណូល​ចិត្ត​គណនី​ទូរស័ព្ទ"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"ការកំណត់​គណនី​ទូរស័ព្ទ"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"គណនី​ចេញ​លំនាំដើម"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"គណនី​ហៅ​តាម​វ៉ាយហ្វាយ"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"សួរ​ជានិច្ច"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"កុំ​ប្រើ​ការ​ហៅ​តាម​វ៉ាយហ្វាយ"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"អ្នក​ប្រើ​ម្នាក់​នេះ​មិន​ត្រូវ​បាន​អនុញ្ញាត​ឲ្យ​បង្កើត​កា​រ​ហៅ​ទូរស័ព្ទ​ពេល​មិន​អាសន្ន"</string>
 </resources>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 1cdeda6..5109406 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -36,9 +36,10 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"ತ್ವರಿತ ಪ್ರತಿಕ್ರಿಯೆ"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"ಡೀಫಾಲ್ಟ್ ಅಪ್ಲಿಕೇಶನ್ ಮರುಹೊಂದಿಸಿ"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"<xliff:g id="PHONE_NUMBER">%s</xliff:g> ಗೆ ಸಂದೇಶ ಕಳುಹಿಸಲಾಗಿದೆ."</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"ಫೋನ್ ಖಾತೆ ಪ್ರಾಶಸ್ತ್ಯಗಳು"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"ಫೋನ್ ಖಾತೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"ಡೀಫಾಲ್ಟ್ ಹೊರಹೋಗುವ ಖಾತೆ"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"Wi-Fi ಕರೆ ಮಾಡುವ ಖಾತೆ"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"ಪ್ರತಿ ಬಾರಿ ಕೇಳಿ"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Wi-Fi ಕರೆ ಮಾಡುವಿಕೆಯನ್ನು ಬಳಸಬೇಡಿ"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"ತುರ್ತುಸ್ಥಿತಿಯಲ್ಲದ ಫೋನ್‌ ಕರೆಗಳನ್ನು ಮಾಡಲು ಈ ಬಳಕೆದಾರರನ್ನು ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ"</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 405229a..3061ca6 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -36,9 +36,10 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"빠른 응답"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"기본 앱 재설정"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"<xliff:g id="PHONE_NUMBER">%s</xliff:g>(으)로 메시지를 보냈습니다."</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"휴대전화 계정 환경설정"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"전화 계정 설정"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"기본 발신 계정"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"Wi-Fi 통화 계정"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"항상 확인"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Wi-Fi 통화 사용 안함"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"일반 전화를 걸 수 없는 사용자입니다."</string>
 </resources>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index dcdcbcd..064a0d1 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -45,9 +45,10 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Тез жооп"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Абалкы колдонмону өзгөртүү"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"<xliff:g id="PHONE_NUMBER">%s</xliff:g> номуруна билдирүү жөнөтүлдү."</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"Телефон каттоо эсебинин жеке жөндөөлөрү"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Телефондун каттоо эсебинин жөндөөлөрү"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"Демейки чыгуучу каттоо эсеби"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"Wi-Fi чалуу үчүн каттоо эсеби"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"Чалган сайын сурасын"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Wi-Fi чалуу колдонулбасын"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Бул колдонуучу шашылыш эмес чалууларды аткара албайт"</string>
 </resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 1be6fd1..ef91c84 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -36,9 +36,10 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"ຕອບກັບດ່ວນ"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"ຄືນຄ່າແອັບຯເລີ່ມຕົ້ນ"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"ສົ່ງຂໍ້ຄວາມຫາ <xliff:g id="PHONE_NUMBER">%s</xliff:g> ແລ້ວ."</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"ການ​ຕັ້ງ​ຄ່າ​ບັນ​ຊີ​ໂທ​ລະ​ສັບ"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"​ການ​ຕັ້ງ​ຄ່າ​ບັນ​ຊີ​ໂທ​ລະ​ສັບ"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"​ບັນ​ຊີ​​ສົ່ງ​ອອກ​ເລີ່ມ​ຕົ້ນ"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"ບັນຊີ​ການ​ໂທ​ດ້ວຍ Wi-Fi"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"​ຖາມ​ທຸກ​ເທື່ອ"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"ບໍ່​ໃຊ້ການ​ໂທ​ດ້ວຍ Wi-Fi"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"ຜູ່​ໃຊ້​ນີ້ບໍ່​ໄດ້​ຮັບ​ອະ​ນຸ​ຍາດ​ໃຫ້​ໂທ​ສຸກ​ເສີນ​ໄດ້"</string>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 8f2162b..8772dcf 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -36,9 +36,10 @@
     <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>
     <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="phone_account_preferences_title" msgid="3932310998135189661">"Telefono paskyros nuostatos"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Telefono paskyros nustatymai"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"Numatytoji išsiunčiamoji paskyra"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"„Wi-Fi“ skambinimo paskyra"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"Klausti kaskart"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Nenaudoti „Wi-Fi“ skambinimo"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Šiam naudotojui leidžiama vykdyti tik skambučius pagalbos numeriais"</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 079eaf4..e0f37aa 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -36,9 +36,10 @@
     <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>
     <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="phone_account_preferences_title" msgid="3932310998135189661">"Tālruņa konta preferences"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Tālruņa konta iestatījumi"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"Noklusējuma izejošais konts"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"Wi-Fi zvanu konts"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"Jautāt katru reizi"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Neizmantot Wi-Fi zvanus"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Šim lietotājam nav atļauts veikt ārkārtas tālruņa zvanus."</string>
 </resources>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index 862f258..52df23f 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -36,9 +36,10 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Брз одговор"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Ресетирај стандардна апликација"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Порака е испратена на <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"Претпочитани вредности за телефонска сметка"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Поставки на телефонска сметка"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"Стандардна излезна сметка"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"Сметка за повикување преку Wi-Fi"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"Секогаш прашај"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Не користи повикување преку Wi-Fi"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Корисникот нема дозвола да прави телефонски повици ако не е итно"</string>
 </resources>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index 7fc8c3a..3e8d420 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -36,9 +36,10 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"ദ്രുത പ്രതികരണം"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"സ്ഥിര അപ്ലിക്കേഷൻ പുനഃസജ്ജമാക്കുക"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"<xliff:g id="PHONE_NUMBER">%s</xliff:g> എന്നതിലേക്ക് സന്ദേശമയച്ചു."</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"ഫോൺ അക്കൗണ്ട് മുൻഗണനകൾ"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"ഫോൺ അക്കൗണ്ട് ക്രമീകരണങ്ങൾ"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"സ്ഥിര ഔട്ട്ഗോയിംഗ് അക്കൗണ്ട്"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"Wi-Fi കോൾ ചെയ്യൽ അക്കൗണ്ട്"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"ഓരോ തവണയും ചോദിക്കുക"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Wi-Fi കോൾ ചെയ്യൽ ഉപയോഗിക്കരുത്"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"അത്യാവശ്യമല്ലാത്ത ഫോൺ കോളുകൾ ചെയ്യാൻ ഈ ഉപയോക്താവിനെ അനുവദിക്കുന്നില്ല"</string>
 </resources>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 6b251fd..18fc55e 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -36,9 +36,10 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Шуурхай хариу"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Үндсэн апп-г сэргээх"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Зурвасыг <xliff:g id="PHONE_NUMBER">%s</xliff:g> руу илгээв."</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"Утасны акаунтын тохируулга"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Утасны акаунтын тохиргоо"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"Үндсэн илгээх акаунт"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"Wi-Fi дуудлагын акаунт"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"Тухай бүрт асуух"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Wi-Fi дуудлага бүү ашиглана уу"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Энэ хэрэглэгч нь яаралтай бус утасны дуудлага хийх эрхгүй"</string>
 </resources>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index 27ecdca..c04c823 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -36,9 +36,10 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"द्रुत प्रतिसाद"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"डीफॉल्ट अ‍ॅप रीसेट करा"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"संदेश <xliff:g id="PHONE_NUMBER">%s</xliff:g> वर पाठविला."</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"फोन खाते प्राधान्ये"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"फोन खाते सेटिंग्ज"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"डीफॉल्ट केले जाणारे खाते"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"Wi-Fi कॉल करण्याचे खाते"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"प्रत्येक वेळी विचारा"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Wi-Fi कॉल करणे वापरू नका"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"या वापरकर्त्यास आणीबाणी-नसलेले फोन कॉल करण्‍याची अनुमती नाही"</string>
 </resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index c1fd590..a3c49cc 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -36,9 +36,10 @@
     <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>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Mesej dihantar ke <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"Pilihan akaun telefon"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Tetapan akaun telefon"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"Akaun keluar lalai"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"Akaun panggilan Wi-Fi"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"Tanya setiap kali"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Jangan gunakan panggilan Wi-Fi"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Pengguna ini tidak dibenarkan membuat panggilan telefon bukan kecemasan"</string>
 </resources>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index cda9091..3742912 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -36,9 +36,10 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"အမြန်တုံ့ပြန်ချက်"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"ပုံသေ အပ်ပလီကေးရှင်းအား ပြန်ပြောင်းရန်"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"<xliff:g id="PHONE_NUMBER">%s</xliff:g> ထံ စာတိုပို့လိုက်ပါပြီ"</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"ဖုန်း အကောင့် ဦးစားပေးချက်များ"</string>
-    <string name="default_outgoing_account_title" msgid="8261079649574578970">"ပုံသေ အထွက် အကောင့်"</string>
-    <string name="sim_call_manager_account" msgid="2559930293628077755">"ကြိုးမဲ့ ခေါ်ဆိုမှု အကောင့်"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"ဖုန်း အကောင့် ဆက်တင်များ"</string>
+    <string name="default_outgoing_account_title" msgid="8261079649574578970">"ပုံသေ အထွက် အကောင့်"</string>
+    <string name="sim_call_manager_account" msgid="2559930293628077755">"ကြိုးမဲ့ ခေါ်ဆိုမှု အကောင့်"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"အကြိမ်တိုင်းမှာ မေးရန်"</string>
-    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"ကြိုးမဲ့ ခေါ်ဆိုမှုကို မသုံးပါနှင့်"</string>
+    <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"ကြိုးမဲ့ ခေါ်ဆိုမှုကို မသုံးပါနှင့်"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"ဒီအသုံးပြုသူအား အရေးပေါ် မဟုတ်သည့် ဖုန်း ခေါ်ဆိုမှုများ လုပ်ခွင့် မပြုပါ"</string>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index fe3e23d..17e6c8f 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -36,9 +36,10 @@
     <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>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Melding er sendt til <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"Innstillinger for telefonkonto"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Kontoinnstillinger for telefonen"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"Standard utgående konto"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"Wi-Fi-samtalekonto"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"Spør hver gang"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Ikke bruk Wi-Fi-anrop"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Denne brukeren har bare tillatelse til å ringe nødnumre"</string>
 </resources>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index bfebcc6..0fe8775 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -36,9 +36,10 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"द्रुत प्रतिक्रिया"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"पूर्वनिर्धारित अनुप्रयोग पुनःसेट गर्नुहोस्"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"<xliff:g id="PHONE_NUMBER">%s</xliff:g> लाई सन्देश पठाइयो।"</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"फोन खाता प्राथमिकताहरू"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"फोन खाता सेटिङहरू"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"बहिर्गमन पूर्वनिर्धारित खाता"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"वाइफाइ कल गर्ने खाता"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"प्रत्येक चोटि सोध्नुहोस्"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"वाइफाइ कल प्रयोग नगर्नुहोस्"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"यो प्रयोगकर्तालाई गैर-आकस्मिक फोन कल गर्न अनुमति छैन"</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index ead002d..d1d579b 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -36,9 +36,10 @@
     <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>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Bericht verzonden naar <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"Voorkeuren voor telefoonaccount"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Accountinstellingen voor telefoon"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"Standaard uitgaand account"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"Account voor wifi-oproepen"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"Altijd vragen"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Bellen via wifi niet gebruiken"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Het is deze gebruiker niet toegestaan niet-noodoproepen te plaatsen"</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index fe08215..6cacaca 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -36,9 +36,10 @@
     <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>
     <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="phone_account_preferences_title" msgid="3932310998135189661">"Ustawienia konta telefonu"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Ustawienia konta telefonu"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"Domyślne konto wychodzące"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"Konto do połączeń telefonicznych przez Wi-Fi"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"Zawsze pytaj"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Nie używaj połączeń Wi-Fi"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Ten użytkownik nie ma uprawnień do połączeń innych niż alarmowe"</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 1b36003..a2151ad 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -36,9 +36,10 @@
     <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>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Mensagem enviada para <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"Preferências da conta do telemóvel"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Definições da conta do telemóvel"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"Conta de envio predefinida"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"Conta de chamadas de Wi-Fi"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"Perguntar sempre"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Não utilizar chamadas de Wi-Fi"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Este utilizador não está autorizado a fazer chamadas telefónicas que não sejam de emergência"</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index f13e3d9..4f21e13 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -36,9 +36,10 @@
     <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>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Mensagem enviada para <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"Preferências da conta do smartphone"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Configurações da conta do smartphone"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"Conta de envio padrão"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"Conta de chamadas por Wi-Fi"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"Perguntar sempre"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Não usar chamadas por Wi-Fi"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Este usuário não tem permissão para fazer chamadas não emergenciais pelo smartphone"</string>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 9266806..9b338ca 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -36,9 +36,10 @@
     <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>
     <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="phone_account_preferences_title" msgid="3932310998135189661">"Preferințe pentru contul telefonic"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Setările contului de pe telefon"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"Cont predefinit pentru apeluri efectuate"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"Cont pentru apelare Wi-Fi"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"Întreabă de fiecare dată"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Nu utilizați apelurile Wi-Fi"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Acest utilizator nu are permisiunea de a efectua apeluri telefonice către alte numere în afară de cele de urgență"</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 2bf9cd7..8c7095d 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -36,9 +36,10 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Быстрый ответ"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Сбросить стандартные настройки"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Сообщение отправлено на номер <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"Настройки телефона"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Настройки аккаунта телефона"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"Аккаунт по умолчанию для исходящих звонков"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"Аккаунт для звонков по Wi-Fi"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"Всегда спрашивать"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Не использовать Wi-Fi для звонков"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Этот пользователь может звонить только в службы экстренной помощи"</string>
 </resources>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index 0f465b9..91f9f29 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -36,9 +36,10 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"ක්ෂණික ප්‍රතිචාරය"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"සුපුරුදු යෙදුම යළි සකසන්න"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"<xliff:g id="PHONE_NUMBER">%s</xliff:g> හට පණිවිඩය යවන්න."</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"දුරකථනය ගිණුමේ මනාප"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"දුරකථන ගිණුම සැකසීම"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"සුපුරුදු එළියට යෑමේ ගිණුම"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"Wi-Fi ඇමතුම් ගැනීමේ ගිණුම"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"සෑම වේලාවේම අසන්න"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Wi-Fi ඇමතුම භාවිතා කරන්න එපා"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"හදිසි-නැති දුරකථන ඇමතුම් සිදුකිරීමට මෙම පරිශීලකයාට අවසර නොමැත"</string>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 81b45e9..a9eae5f 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -36,9 +36,10 @@
     <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>
     <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="phone_account_preferences_title" msgid="3932310998135189661">"Predvoľby účtu telefónu"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Nastavenia telefónneho účtu"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"Predvolený odchádzajúci účet"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"Účet volania prostredníctvom siete Wi-Fi"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"Vždy sa opýtať"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Nepoužívať volanie prostredníctvom siete Wi-Fi"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Tento používateľ smie uskutočňovať iba tiesňové hovory."</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 8a67036..2456650 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -36,9 +36,10 @@
     <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>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"SMS poslan na številko <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"Nastavitve telefonskih računov"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Nastavitve računa telefona"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"Privzeti račun za odhodne klice"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"Račun za klicanje prek povezave Wi-Fi"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"Vedno vprašaj"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Ne uporabljaj klicanja prek povezave Wi-Fi"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Temu uporabniku ni dovoljeno telefoniranje, razen klicev v sili"</string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index b173c3d..873b85e 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -36,9 +36,10 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Брзи одговор"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Ресетуј подразумев. апликацију"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Порука је послата на број <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"Подешавања налога телефона"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Подешавања налога на телефону"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"Подразумевани одлазни налог"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"Налог за Wi-Fi позивање"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"Питај сваки пут"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Не користи Wi-Fi позивање"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Овом кориснику није дозвољено да упућује телефонске позиве који нису хитни"</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index d71a6f5..683411d 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -36,9 +36,10 @@
     <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>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Meddelandet har skickats till <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"Kontoinställningar för telefon"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Kontoinställningar för mobil"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"Standardkonto för utgående samtal"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"Konto för Wi-Fi-samtal"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"Fråga varje gång"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Använd inte Wi-Fi-samtal"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Denna användare har inte tillåtelse att ringa icke-akuta samtal"</string>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 8ff0752..18b09cd 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -36,9 +36,10 @@
     <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>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Ujumbe uliotumwa kwa <xliff:g id="PHONE_NUMBER">%s</xliff:g> ."</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"Mapendeleo ya akaunti ya simu"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Mipangilio ya akaunti ya simu"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"Akaunti chaguo-msingi ya simu zinazotoka"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"Akaunti ya kupiga simu ya Wi-Fi"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"Uliza kila wakati"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Usitumie upigaji simu wa Wi-Fi"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Mtumiaji huyu haruhusiwi kupiga simu zisizo za dharura"</string>
 </resources>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index bfa5faa..5c50ffb 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -36,9 +36,10 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"விரைவு பதில்"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"இயல்பு பயன்பாட்டை மீட்டமை"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"<xliff:g id="PHONE_NUMBER">%s</xliff:g> க்குச் செய்தி அனுப்பப்பட்டது."</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"ஃபோன் கணக்கு விருப்பத்தேர்வுகள்"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"ஃபோன் கணக்கு அமைப்புகள்"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"அழைப்பிற்கான இயல்புநிலை கணக்கு"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"வைஃபை அழைப்பிற்கான கணக்கு"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"ஒவ்வொரு முறையும் கேள்"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"வைஃபை அழைப்பைப் பயன்படுத்தாதே"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"அவசரமற்ற ஃபோன் அழைப்புகளைச் செய்ய இவருக்கு அனுமதியில்லை"</string>
 </resources>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index f3dc46e..627ed4a 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -36,9 +36,10 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"శీఘ్ర ప్రతిస్పందన"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"డిఫాల్ట్ అనువర్తనాన్ని రీసెట్ చేయి"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"<xliff:g id="PHONE_NUMBER">%s</xliff:g>కు సందేశం పంపబడింది."</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"ఫోన్ ఖాతా ప్రాధాన్యతలు"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"ఫోన్ ఖాతా సెట్టింగ్‌లు"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"డిఫాల్ట్ అవుట్‌గోయింగ్ ఖాతా"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"Wi-Fi కాలింగ్ ఖాతా"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"ప్రతిసారి అడుగు"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Wi-Fi కాలింగ్‌ను ఉపయోగించవద్దు"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"ఈ వినియోగదారుకి అత్యవసరం కాని ఫోన్ కాల్‌లు చేయడానికి అనుమతి లేదు"</string>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index b480bf4..a610398 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -36,9 +36,10 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"คำตอบด่วน"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"รีเซ็ตแอปพลิเคชันเริ่มต้น"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"ส่งข้อความไปยัง <xliff:g id="PHONE_NUMBER">%s</xliff:g> แล้ว"</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"ค่ากำหนดบัญชีโทรศัพท์"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"การตั้งค่าบัญชีโทรศัพท์"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"บัญชีขาออกเริ่มต้น"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"บัญชีสำหรับการโทรผ่าน Wi-Fi"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"ถามทุกครั้ง"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"ไม่ใช้การโทรผ่าน Wi-Fi"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"ไม่อนุญาตให้ผู้ใช้รายนี้ดำเนินการโทรที่ไม่ฉุกเฉิน"</string>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 122c09c..c90db8b 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -36,9 +36,10 @@
     <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>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Naipadala ang mensahe sa <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"Mga kagustuhan sa account sa telepono"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Mga setting ng account ng telepono"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"Default na papalabas na account"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"Account sa pagtawag sa pamamagitan ng Wi-Fi"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"Magtanong palagi"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Huwag gumamit ng pagtawag sa pamamagitan ng Wi-Fi"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Hindi pinapahintulutan ang user na ito na gumawa ng mga hindi pang-emergency na tawag sa telepono"</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 3865daf..1d32d9b 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -36,9 +36,10 @@
     <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>
     <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="phone_account_preferences_title" msgid="3932310998135189661">"Telefon hesabı tercihleri"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Telefon hesabı ayarları"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"Varsayılan giden hesabı"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"Kablosuz çağrı hesabı"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"Her zaman sor"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Kablosuz çağrıyı kullanma"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Bu kullanıcının acil olmayan telefon çağrıları yapmasına izin verilmiyor"</string>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 4188190..a027a9f 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -36,9 +36,10 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Швидка відповідь"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Скинути програму за умовчанням"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Повідомлення надіслано на номер <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"Налаштування облікового запису телефона"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Налаштування облікового запису на телефоні"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"Вихідний обліковий запис за умовчанням"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"Обліковий запис для дзвінків через Wi-Fi"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"Запитувати щоразу"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Не використовувати дзвінки через Wi-Fi"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Цьому користувачу не дозволено здійснювати звичайні телефонні дзвінки"</string>
 </resources>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index ced59eb..16b8bac 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -36,9 +36,10 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"فوری جواب"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"ڈیفالٹ ایپ دوبارہ ترتیب دیں"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"پیغام <xliff:g id="PHONE_NUMBER">%s</xliff:g> کو بھیج دیا گیا۔"</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"فون اکاؤنٹ کی ترجیحات"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"فون اکاؤنٹ کی ترتیبات"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"ڈیفالٹ آؤٹ گوئنگ اکاؤنٹ"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"‏Wi-Fi کالنگ اکاؤنٹ"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"ہر بار پوچھیں"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"‏Wi-Fi کالنگ کا استعمال نہ کریں"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"اس صارف کو غیر ہنگامی فون کالیں کرنے کی اجازت نہیں ہے"</string>
 </resources>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 6db3d57..6d259b3 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -36,9 +36,10 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Tezkor javob"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"Standart ilovani tiklash"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Xabar <xliff:g id="PHONE_NUMBER">%s</xliff:g>ga jo‘natildi."</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"Telefon hisobi sozlamalari"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Telefon hisobi sozlamalari"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"Chiquvchi qo‘ng‘iroqlar uchun birlamchi hisob"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"Wi-Fi qo‘ng‘iroqlar uchun hisob"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"Har safar so‘ralsin"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Wi-Fi qo‘ng‘iroqlardan foydalanilmasin"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Ushbu foydalanuvchiga favqulodda qo‘ng‘iroqlardan boshqa telefon qo‘ng‘iroqlarini amalga oshirish uchun ruxsat berilmagan"</string>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 8035788..d53148e 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -36,9 +36,10 @@
     <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>
     <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="phone_account_preferences_title" msgid="3932310998135189661">"Tùy chọn tài khoản điện thoại"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Cài đặt tài khoản điện thoại"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"Tài khoản gọi mặc định"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"Tài khoản gọi qua Wi-Fi"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"Luôn hỏi"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Không sử dụng tính năng gọi qua Wi-Fi"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Người dùng này không được phép thực hiện cuộc gọi điện thoại không khẩn cấp"</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index ea9c2e1..4a5ad27 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -36,9 +36,10 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"快速回复"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"重置默认应用"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"讯息已发送至 <xliff:g id="PHONE_NUMBER">%s</xliff:g>。"</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"电话帐户偏好设置"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"电话帐户设置"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"默认拨出帐户"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"WLAN通话帐户"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"每次都询问"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"不使用WLAN通话功能"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"此用户无权拨打非紧急呼救电话"</string>
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 0ad50a1..26516e4 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -36,9 +36,10 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"快速回應"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"重設預設應用程式"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"訊息已傳送至 <xliff:g id="PHONE_NUMBER">%s</xliff:g>。"</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"電話帳戶偏好設定"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"手機帳戶設定"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"預設輸出帳戶"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"Wi-Fi 通話帳戶"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"每次都詢問"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"不要使用 Wi-Fi 通話功能"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"這位使用者只可撥打緊急電話"</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index bad1511..33dd66f 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -36,9 +36,10 @@
     <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"快速回應"</string>
     <string name="respond_via_sms_menu_reset_default_activity" msgid="1461742052902053466">"重設預設應用程式"</string>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"訊息已傳送至 <xliff:g id="PHONE_NUMBER">%s</xliff:g>。"</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"電話帳戶偏好設定"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"手機帳戶設定"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"預設撥號帳戶"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"Wi-Fi 通話帳戶"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"每次都詢問"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"不使用 Wi-Fi 通話功能"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"這位使用者只能撥打緊急電話"</string>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index adc7f0e..087e92c 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -36,9 +36,10 @@
     <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>
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Umlayezo othunyelwe ku <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>
-    <string name="phone_account_preferences_title" msgid="3932310998135189661">"Izintandokazi ze-akhawunti yefoni"</string>
+    <string name="phone_account_preferences_title" msgid="5042332049625236956">"Izilungiselelo ze-akhawunti yefoni"</string>
     <string name="default_outgoing_account_title" msgid="8261079649574578970">"I-akhawunti yokuphuma ezenzakalelayo"</string>
     <string name="sim_call_manager_account" msgid="2559930293628077755">"I-akhawunti yokushaya ye-Wi-Fi"</string>
     <string name="account_ask_every_time" msgid="944077828070287407">"Buza ngaso sonke isikhathi"</string>
     <string name="do_not_use_sim_call_manager" msgid="5519252524007323694">"Ungasebenzisi ukushaya nge-Wi-Fi"</string>
+    <string name="outgoing_call_not_allowed" msgid="1434784869685645427">"Lo msebenzisi akavunyelwe ukwenza amakholi wefoni okungewona wesimo esiphuthumayo"</string>
 </resources>
diff --git a/res/values/config.xml b/res/values/config.xml
index 6c6f215..39923d4 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -43,4 +43,8 @@
          if this package has not registered any accounts, then it will be ignored.
          [DO NOT TRANSLATE] -->
     <string name="default_connection_manager_component" translatable="false"></string>
+
+    <!-- Flag indicating that wi-fi calling through a connection manager is supported.
+         [DO NOT TRANSLATE] -->
+    <bool name="connection_manager_enabled" translatable="false">true</bool>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8f4a2e8..d50d830 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -95,6 +95,17 @@
          due to a user restriction -->
     <string name="outgoing_call_not_allowed">This user is not allowed to make non-emergency phone calls</string>
 
+    <!-- Call failure message displayed in an error dialog used to indicate that a phone number was not provided -->
+    <string name="outgoing_call_error_no_phone_number_supplied">Call not sent, no valid number entered.</string>
+
+    <!-- missing voicemail number -->
+    <!-- Title of the "Missing voicemail number" dialog -->
+    <string name="no_vm_number">Missing voicemail number</string>
+    <!-- Body text of the "Missing voicemail number" dialog -->
+    <string name="no_vm_number_msg">No voicemail number is stored on the SIM card.</string>
+    <!-- Button label on the "Missing voicemail number" dialog -->
+    <string name="add_vm_number_str">Add number</string>
+
     <!-- DO NOT TRANSLATE. Label for test Subscription 0. -->
     <string name="test_account_0_label">Q Mobile</string>
     <!-- DO NOT TRANSLATE. Label for test Subscription 1. -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
new file mode 100644
index 0000000..6b6c1bb
--- /dev/null
+++ b/res/values/styles.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <style name="Theme.Telecomm.Transparent" parent="@android:style/Theme.Material.Light">
+        <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">true</item>
+        <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
+    </style>
+</resources>
diff --git a/src/com/android/telecomm/Call.java b/src/com/android/telecomm/Call.java
index 4fa39e8..dc3fa07 100644
--- a/src/com/android/telecomm/Call.java
+++ b/src/com/android/telecomm/Call.java
@@ -616,7 +616,9 @@
     }
 
     @Override
-    public void handleCreateConnectionSuccess(ParcelableConnection connection) {
+    public void handleCreateConnectionSuccess(
+            CallIdMapper idMapper,
+            ParcelableConnection connection) {
         Log.v(this, "handleCreateConnectionSuccessful %s", connection);
         mCreateConnectionProcessor = null;
         setTargetPhoneAccount(connection.getPhoneAccount());
@@ -630,6 +632,11 @@
         setAudioModeIsVoip(connection.getAudioModeIsVoip());
         setStatusHints(connection.getStatusHints());
 
+        mConferenceableCalls.clear();
+        for (String id : connection.getConferenceableConnectionIds()) {
+            mConferenceableCalls.add(idMapper.getCall(id));
+        }
+
         if (mIsIncoming) {
             // We do not handle incoming calls immediately when they are verified by the connection
             // service. We allow the caller-info-query code to execute first so that we can read the
diff --git a/src/com/android/telecomm/CallActivity.java b/src/com/android/telecomm/CallActivity.java
index 89b89e6..0d36c8a 100644
--- a/src/com/android/telecomm/CallActivity.java
+++ b/src/com/android/telecomm/CallActivity.java
@@ -26,6 +26,7 @@
 import android.os.UserManager;
 import android.telecomm.PhoneAccountHandle;
 import android.telecomm.TelecommManager;
+import android.telephony.DisconnectCause;
 import android.telephony.PhoneNumberUtils;
 import android.text.TextUtils;
 import android.widget.Toast;
@@ -47,6 +48,7 @@
  * non-emergency numbers just like it did pre-L.
  */
 public class CallActivity extends Activity {
+
     private CallsManager mCallsManager = CallsManager.getInstance();
     private boolean mIsVoiceCapable;
 
@@ -149,7 +151,12 @@
 
         NewOutgoingCallIntentBroadcaster broadcaster = new NewOutgoingCallIntentBroadcaster(
                 mCallsManager, call, intent, isDefaultDialer());
-        final boolean success = broadcaster.processIntent();
+        final int result = broadcaster.processIntent();
+        final boolean success = result == DisconnectCause.NOT_DISCONNECTED;
+
+        if (!success && call != null) {
+            disconnectCallAndShowErrorDialog(call, result);
+        }
         setResult(success ? RESULT_OK : RESULT_CANCELED);
     }
 
@@ -206,4 +213,23 @@
         return getApplicationContext().getResources().getBoolean(
                 com.android.internal.R.bool.config_voice_capable);
     }
+
+    private void disconnectCallAndShowErrorDialog(Call call, int errorCode) {
+        call.disconnect();
+        final Intent errorIntent = new Intent(this, ErrorDialogActivity.class);
+        int errorMessageId = -1;
+        switch (errorCode) {
+            case DisconnectCause.INVALID_NUMBER:
+                errorMessageId = R.string.outgoing_call_error_no_phone_number_supplied;
+                break;
+            case DisconnectCause.VOICEMAIL_NUMBER_MISSING:
+                errorIntent.putExtra(ErrorDialogActivity.SHOW_MISSING_VOICEMAIL_NO_DIALOG_EXTRA,
+                        true);
+                break;
+        }
+        if (errorMessageId != -1) {
+            errorIntent.putExtra(ErrorDialogActivity.ERROR_MESSAGE_ID_EXTRA, errorMessageId);
+        }
+        startActivity(errorIntent);
+    }
 }
diff --git a/src/com/android/telecomm/ConnectionServiceWrapper.java b/src/com/android/telecomm/ConnectionServiceWrapper.java
index 52180e9..33f472f 100644
--- a/src/com/android/telecomm/ConnectionServiceWrapper.java
+++ b/src/com/android/telecomm/ConnectionServiceWrapper.java
@@ -899,7 +899,8 @@
         } else {
             // Successful connection
             if (mPendingResponses.containsKey(callId)) {
-                mPendingResponses.remove(callId).handleCreateConnectionSuccess(connection);
+                mPendingResponses.remove(callId)
+                        .handleCreateConnectionSuccess(mCallIdMapper, connection);
             }
         }
     }
diff --git a/src/com/android/telecomm/CreateConnectionProcessor.java b/src/com/android/telecomm/CreateConnectionProcessor.java
index 9e3b5ee..cc2e8c0 100644
--- a/src/com/android/telecomm/CreateConnectionProcessor.java
+++ b/src/com/android/telecomm/CreateConnectionProcessor.java
@@ -16,6 +16,7 @@
 
 package com.android.telecomm;
 
+import android.content.Context;
 import android.telecomm.ParcelableConnection;
 import android.telecomm.PhoneAccount;
 import android.telecomm.PhoneAccountHandle;
@@ -176,6 +177,12 @@
     }
 
     private boolean shouldSetConnectionManager() {
+        Context context = TelecommApp.getInstance();
+        if (!context.getResources().getBoolean(R.bool.connection_manager_enabled)) {
+            // Connection Manager support has been turned off, disregard.
+            return false;
+        }
+
         if (mAttemptRecords.size() == 0) {
             return false;
         }
@@ -265,7 +272,9 @@
         }
 
         @Override
-        public void handleCreateConnectionSuccess(ParcelableConnection connection) {
+        public void handleCreateConnectionSuccess(
+                CallIdMapper idMapper,
+                ParcelableConnection connection) {
             if (mResponse == null) {
                 // Nobody is listening for this connection attempt any longer; ask the responsible
                 // ConnectionService to tear down any resources associated with the call
@@ -273,7 +282,7 @@
             } else {
                 // Success -- share the good news and remember that we are no longer interested
                 // in hearing about any more attempts
-                mResponse.handleCreateConnectionSuccess(connection);
+                mResponse.handleCreateConnectionSuccess(idMapper, connection);
                 mResponse = null;
             }
         }
diff --git a/src/com/android/telecomm/CreateConnectionResponse.java b/src/com/android/telecomm/CreateConnectionResponse.java
index b907e3a..13d1573 100644
--- a/src/com/android/telecomm/CreateConnectionResponse.java
+++ b/src/com/android/telecomm/CreateConnectionResponse.java
@@ -22,6 +22,6 @@
  * A callback for providing the result of creating a connection.
  */
 interface CreateConnectionResponse {
-    void handleCreateConnectionSuccess(ParcelableConnection connection);
+    void handleCreateConnectionSuccess(CallIdMapper idMapper, ParcelableConnection connection);
     void handleCreateConnectionFailure(int code, String message);
 }
diff --git a/src/com/android/telecomm/ErrorDialogActivity.java b/src/com/android/telecomm/ErrorDialogActivity.java
new file mode 100644
index 0000000..098a15f
--- /dev/null
+++ b/src/com/android/telecomm/ErrorDialogActivity.java
@@ -0,0 +1,127 @@
+/*
+ * 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.telecomm;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.os.Bundle;
+import android.telecomm.TelecommManager;
+
+/**
+ * Used to display an error dialog from within the Telecomm service when an outgoing call fails
+ */
+public class ErrorDialogActivity extends Activity {
+    private static final String TAG = ErrorDialogActivity.class.getSimpleName();
+
+    public static final String SHOW_MISSING_VOICEMAIL_NO_DIALOG_EXTRA = "show_missing_voicemail";
+    public static final String ERROR_MESSAGE_ID_EXTRA = "error_message_id";
+
+    /**
+     * Intent action to bring up Voicemail Provider settings.
+     */
+    public static final String ACTION_ADD_VOICEMAIL =
+            "com.android.phone.CallFeaturesSetting.ADD_VOICEMAIL";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        final boolean showVoicemailDialog = getIntent().getBooleanExtra(
+                SHOW_MISSING_VOICEMAIL_NO_DIALOG_EXTRA, false);
+
+        if (showVoicemailDialog) {
+            showMissingVoicemailErrorDialog();
+        } else {
+            final int error = getIntent().getIntExtra(ERROR_MESSAGE_ID_EXTRA, -1);
+            if (error == -1) {
+                Log.w(TAG, "ErrorDialogActivity called with no error type extra.");
+                finish();
+            } else {
+                showGenericErrorDialog(error);
+            }
+        }
+    }
+
+    private void showGenericErrorDialog(int resid) {
+        final CharSequence msg = getResources().getText(resid);
+        final DialogInterface.OnClickListener clickListener;
+        final DialogInterface.OnCancelListener cancelListener;
+
+        clickListener = new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                finish();
+            }
+        };
+
+        cancelListener = new DialogInterface.OnCancelListener() {
+            @Override
+            public void onCancel(DialogInterface dialog) {
+                finish();
+            }
+        };
+
+        final AlertDialog errorDialog = new AlertDialog.Builder(this)
+                .setMessage(msg).setPositiveButton(android.R.string.ok, clickListener)
+                        .setOnCancelListener(cancelListener).create();
+
+        errorDialog.show();
+    }
+
+    private void showMissingVoicemailErrorDialog() {
+        new AlertDialog.Builder(this)
+                .setTitle(R.string.no_vm_number)
+                .setMessage(R.string.no_vm_number_msg)
+                .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+                            finish();
+                        }})
+                .setNegativeButton(R.string.add_vm_number_str,
+                        new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int which) {
+                                    addVoiceMailNumberPanel(dialog);
+                                }})
+                .setOnCancelListener(new DialogInterface.OnCancelListener() {
+                        @Override
+                        public void onCancel(DialogInterface dialog) {
+                            finish();
+                        }}).show();
+    }
+
+
+    private void addVoiceMailNumberPanel(DialogInterface dialog) {
+        if (dialog != null) {
+            dialog.dismiss();
+        }
+
+        // Navigate to the Voicemail setting in the Call Settings activity.
+        Intent intent = new Intent(ACTION_ADD_VOICEMAIL);
+        startActivity(intent);
+        finish();
+    }
+
+    @Override
+    public void finish() {
+        super.finish();
+        // Don't show the return to previous task animation to avoid showing a black screen.
+        // Just dismiss the dialog and undim the previous activity immediately.
+        overridePendingTransition(0, 0);
+    }
+}
diff --git a/src/com/android/telecomm/InCallController.java b/src/com/android/telecomm/InCallController.java
index 2e7bc45..21581f5 100644
--- a/src/com/android/telecomm/InCallController.java
+++ b/src/com/android/telecomm/InCallController.java
@@ -31,6 +31,7 @@
 import android.os.RemoteException;
 import android.os.UserHandle;
 import android.telecomm.AudioState;
+import android.telecomm.CallProperties;
 import android.telecomm.CallState;
 import android.telecomm.InCallService;
 import android.telecomm.ParcelableCall;
@@ -425,10 +426,14 @@
         if (CallsManager.getInstance().isAddCallCapable(call)) {
             capabilities |= PhoneCapabilities.ADD_CALL;
         }
-        if (!call.isEmergencyCall()) {
-            capabilities |= PhoneCapabilities.MUTE;
+
+        // Disable mute for emergency calls.
+        if (call.isEmergencyCall()) {
+            capabilities &= ~PhoneCapabilities.MUTE;
         }
 
+        int properties = call.isConference() ? CallProperties.CONFERENCE : 0;
+
         int state = call.getState();
         if (state == CallState.ABORTED) {
             state = CallState.DISCONNECTED;
@@ -476,6 +481,7 @@
                 call.getDisconnectMessage(),
                 call.getCannedSmsResponses(),
                 capabilities,
+                properties,
                 connectTimeMillis,
                 handle,
                 call.getHandlePresentation(),
diff --git a/src/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java b/src/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java
index a45f4ef..1c44fb2 100644
--- a/src/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java
+++ b/src/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java
@@ -26,6 +26,7 @@
 import android.telecomm.GatewayInfo;
 import android.telecomm.TelecommManager;
 import android.telecomm.VideoProfile;
+import android.telephony.DisconnectCause;
 import android.telephony.PhoneNumberUtils;
 import android.text.TextUtils;
 
@@ -66,6 +67,7 @@
 
     private static final String SCHEME_TEL = "tel";
     private static final String SCHEME_SIP = "sip";
+    private static final String SCHEME_VOICEMAIL = "voicemail";
 
     private final CallsManager mCallsManager;
     private final Call mCall;
@@ -150,9 +152,10 @@
      * - CALL_PRIVILEGED (intent launched by system apps e.g. system Dialer, voice Dialer)
      * - CALL_EMERGENCY (intent launched by lock screen emergency dialer)
      *
-     * @return whether or not the caller was allowed to start the outgoing call.
+     * @return {@link CallActivity#OUTGOING_CALL_SUCCEEDED} if the call succeeded, and an
+     *         appropriate {@link DisconnectCause} if the call did not, describing why it failed.
      */
-    boolean processIntent() {
+    int processIntent() {
         Log.v(this, "Processing call intent in OutgoingCallIntentBroadcaster.");
 
         final Context context = TelecommApp.getInstance();
@@ -161,8 +164,14 @@
         String handle = PhoneNumberUtils.getNumberFromIntent(intent, context);
 
         if (TextUtils.isEmpty(handle)) {
-            Log.w(this, "Empty handle obtained from the call intent.");
-            return false;
+            final Uri data = intent.getData();
+            if (data != null && SCHEME_VOICEMAIL.equals(data.getScheme())) {
+                Log.w(this, "Voicemail scheme provided but no voicemail number set.");
+                return DisconnectCause.VOICEMAIL_NUMBER_MISSING;
+            } else {
+                Log.w(this, "Empty handle obtained from the call intent.");
+                return DisconnectCause.INVALID_NUMBER;
+            }
         }
 
         boolean isUriNumber = PhoneNumberUtils.isUriNumber(handle);
@@ -187,7 +196,7 @@
                     Log.w(this, "Cannot call potential emergency number %s with CALL Intent %s "
                             + "unless caller is system or default dialer.", handle, intent);
                     launchSystemDialer(context, intent.getData());
-                    return false;
+                    return DisconnectCause.OUTGOING_CANCELED;
                 } else {
                     callImmediately = true;
                 }
@@ -196,12 +205,12 @@
             if (!isPotentialEmergencyNumber) {
                 Log.w(this, "Cannot call non-potential-emergency number %s with EMERGENCY_CALL "
                         + "Intent %s.", handle, intent);
-                return false;
+                return DisconnectCause.OUTGOING_CANCELED;
             }
             callImmediately = true;
         } else {
             Log.w(this, "Unhandled Intent %s. Ignoring and not placing call.", intent);
-            return false;
+            return DisconnectCause.INVALID_NUMBER;
         }
 
         if (callImmediately) {
@@ -223,7 +232,7 @@
         }
 
         broadcastIntent(intent, handle, context, !callImmediately);
-        return true;
+        return DisconnectCause.NOT_DISCONNECTED;
     }
 
     /**
diff --git a/src/com/android/telecomm/PhoneAccountPreferencesActivity.java b/src/com/android/telecomm/PhoneAccountPreferencesActivity.java
index a7a6a62..7b64631 100644
--- a/src/com/android/telecomm/PhoneAccountPreferencesActivity.java
+++ b/src/com/android/telecomm/PhoneAccountPreferencesActivity.java
@@ -57,12 +57,12 @@
             mDefaultOutgoingAccount.setModel(
                     registrar,
                     registrar.getOutgoingPhoneAccounts(),
-                    registrar.getDefaultOutgoingPhoneAccount(),
+                    registrar.getUserSelectedOutgoingPhoneAccount(),
                     getString(R.string.account_ask_every_time));
 
             mSimCallManagerAccount.setModel(
                     registrar,
-                    getSimCallManagers(registrar),
+                    registrar.getAllConnectionManagerPhoneAccounts(),
                     registrar.getSimCallManager(),
                     getString(R.string.do_not_use_sim_call_manager));
 
@@ -83,17 +83,5 @@
             }
             return false;
         }
-
-        private List<PhoneAccountHandle> getSimCallManagers(PhoneAccountRegistrar registrar) {
-            List<PhoneAccountHandle> simCallManagers = new ArrayList<>();
-            List<PhoneAccountHandle> allAccounts = registrar.getAllPhoneAccountHandles();
-            for (int i = 0; i < allAccounts.size(); i++) {
-                PhoneAccount account = registrar.getPhoneAccount(allAccounts.get(i));
-                if ((account.getCapabilities() & PhoneAccount.CAPABILITY_CONNECTION_MANAGER) != 0) {
-                    simCallManagers.add(allAccounts.get(i));
-                }
-            }
-            return simCallManagers;
-        }
     }
 }
diff --git a/src/com/android/telecomm/PhoneAccountRegistrar.java b/src/com/android/telecomm/PhoneAccountRegistrar.java
index f3a5a0b..f7cce27 100644
--- a/src/com/android/telecomm/PhoneAccountRegistrar.java
+++ b/src/com/android/telecomm/PhoneAccountRegistrar.java
@@ -50,6 +50,7 @@
 import java.lang.SecurityException;
 import java.lang.String;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
@@ -64,6 +65,9 @@
  */
 public final class PhoneAccountRegistrar {
 
+    public static final PhoneAccountHandle NO_ACCOUNT_SELECTED =
+            new PhoneAccountHandle(new ComponentName("null", "null"), "NO_ACCOUNT_SELECTED");
+
     public abstract static class Listener {
         public void onAccountsChanged(PhoneAccountRegistrar registrar) {}
         public void onDefaultOutgoingChanged(PhoneAccountRegistrar registrar) {}
@@ -74,6 +78,7 @@
 
     private final List<Listener> mListeners = new CopyOnWriteArrayList<>();
     private final AtomicFile mAtomicFile;
+    private final Context mContext;
     private State mState;
 
     public PhoneAccountRegistrar(Context context) {
@@ -85,20 +90,14 @@
         // TODO: Change file location when Telecomm is part of system
         mAtomicFile = new AtomicFile(new File(context.getFilesDir(), fileName));
         mState = new State();
+        mContext = context;
         read();
     }
 
     public PhoneAccountHandle getDefaultOutgoingPhoneAccount() {
-        if (mState.defaultOutgoing != null) {
-            // Return the registered outgoing default iff it still exists (we keep a sticky
-            // default to survive account deletion and re-addition)
-            for (int i = 0; i < mState.accounts.size(); i++) {
-                if (mState.accounts.get(i).getAccountHandle().equals(mState.defaultOutgoing)) {
-                    return mState.defaultOutgoing;
-                }
-            }
-            // At this point, there was a registered default but it has been deleted; proceed
-            // as though there were no default
+        final PhoneAccountHandle userSelected = getUserSelectedOutgoingPhoneAccount();
+        if (userSelected != null) {
+            return userSelected;
         }
 
         List<PhoneAccountHandle> outgoing = getOutgoingPhoneAccounts();
@@ -115,6 +114,21 @@
         }
     }
 
+    PhoneAccountHandle getUserSelectedOutgoingPhoneAccount() {
+        if (mState.defaultOutgoing != null) {
+            // Return the registered outgoing default iff it still exists (we keep a sticky
+            // default to survive account deletion and re-addition)
+            for (int i = 0; i < mState.accounts.size(); i++) {
+                if (mState.accounts.get(i).getAccountHandle().equals(mState.defaultOutgoing)) {
+                    return mState.defaultOutgoing;
+                }
+            }
+            // At this point, there was a registered default but it has been deleted; proceed
+            // as though there were no default
+        }
+        return null;
+    }
+
     public void setDefaultOutgoingPhoneAccount(PhoneAccountHandle accountHandle) {
         if (accountHandle == null) {
             // Asking to clear the default outgoing is a valid request
@@ -148,6 +162,10 @@
     }
 
     public void setSimCallManager(PhoneAccountHandle callManager) {
+        if (!isEnabledConnectionManager()) {
+            return;
+        }
+
         if (callManager != null) {
             PhoneAccount callManagerAccount = getPhoneAccount(callManager);
             if (callManagerAccount == null) {
@@ -157,14 +175,24 @@
                 Log.d(this, "setSimCallManager: Not a call manager: %s", callManagerAccount);
                 return;
             }
+        } else {
+            callManager = NO_ACCOUNT_SELECTED;
         }
         mState.simCallManager = callManager;
+
         write();
         fireSimCallManagerChanged();
     }
 
     public PhoneAccountHandle getSimCallManager() {
+        if (!isEnabledConnectionManager()) {
+            return null;
+        }
+
         if (mState.simCallManager != null) {
+            if (NO_ACCOUNT_SELECTED.equals(mState.simCallManager)) {
+                return null;
+            }
             // Return the registered sim call manager iff it still exists (we keep a sticky
             // setting to survive account deletion and re-addition)
             for (int i = 0; i < mState.accounts.size(); i++) {
@@ -175,11 +203,10 @@
         }
 
         // See if the OEM has specified a default one.
-        Context context = TelecommApp.getInstance();
         String defaultConnectionMgr =
-                context.getResources().getString(R.string.default_connection_manager_component);
+                mContext.getResources().getString(R.string.default_connection_manager_component);
         if (!TextUtils.isEmpty(defaultConnectionMgr)) {
-            PackageManager pm = context.getPackageManager();
+            PackageManager pm = mContext.getPackageManager();
 
             ComponentName componentName = ComponentName.unflattenFromString(defaultConnectionMgr);
             Intent intent = new Intent(ConnectionService.SERVICE_INTERFACE);
@@ -219,7 +246,14 @@
     }
 
     public List<PhoneAccountHandle> getOutgoingPhoneAccounts() {
-        return getCallProviderAccountHandles();
+        return getPhoneAccountHandles(PhoneAccount.CAPABILITY_CALL_PROVIDER);
+    }
+
+    public List<PhoneAccountHandle> getAllConnectionManagerPhoneAccounts() {
+        if (isEnabledConnectionManager()) {
+            return getPhoneAccountHandles(PhoneAccount.CAPABILITY_CONNECTION_MANAGER);
+        }
+        return Collections.emptyList();
     }
 
     public PhoneAccount getPhoneAccount(PhoneAccountHandle handle) {
@@ -323,6 +357,10 @@
         }
     }
 
+    private boolean isEnabledConnectionManager() {
+        return mContext.getResources().getBoolean(R.bool.connection_manager_enabled);
+    }
+
     /**
      * Determines if the connection service specified by a {@link PhoneAccountHandle} has the
      * {@link Manifest.permission#BIND_CONNECTION_SERVICE} permission.
@@ -352,10 +390,13 @@
         return (account.getCapabilities() & capability) == capability;
     }
 
-    private List<PhoneAccountHandle> getCallProviderAccountHandles() {
+    /**
+     * Returns a list of phone account handles with the specified flag.
+     */
+    private List<PhoneAccountHandle> getPhoneAccountHandles(int flags) {
         List<PhoneAccountHandle> accountHandles = new ArrayList<>();
         for (PhoneAccount m : mState.accounts) {
-            if (has(m, PhoneAccount.CAPABILITY_CALL_PROVIDER)) {
+            if (has(m, flags)) {
                 accountHandles.add(m.getAccountHandle());
             }
         }
diff --git a/src/com/android/telecomm/ProximitySensorManager.java b/src/com/android/telecomm/ProximitySensorManager.java
index c6b018a..287c6d4 100644
--- a/src/com/android/telecomm/ProximitySensorManager.java
+++ b/src/com/android/telecomm/ProximitySensorManager.java
@@ -74,7 +74,7 @@
         if (mProximityWakeLock.isHeld()) {
             Log.i(this, "Releasing proximity wake lock");
             int flags =
-                (screenOnImmediately ? 0 : PowerManager.WAIT_FOR_PROXIMITY_NEGATIVE);
+                (screenOnImmediately ? 0 : PowerManager.WAIT_FOR_DISTANT_PROXIMITY);
             mProximityWakeLock.release(flags);
         } else {
             Log.i(this, "Proximity wake lock already released");
diff --git a/src/com/android/telecomm/TelecommServiceImpl.java b/src/com/android/telecomm/TelecommServiceImpl.java
index 7af1534..9838036 100644
--- a/src/com/android/telecomm/TelecommServiceImpl.java
+++ b/src/com/android/telecomm/TelecommServiceImpl.java
@@ -29,7 +29,7 @@
 import android.os.Looper;
 import android.os.Message;
 import android.os.ServiceManager;
-import android.phone.PhoneManager;
+import android.os.UserHandle;
 import android.telecomm.CallState;
 import android.telecomm.PhoneAccount;
 import android.telecomm.PhoneAccountHandle;
@@ -170,6 +170,18 @@
     }
 
     @Override
+    public void setDefaultOutgoingPhoneAccount(PhoneAccountHandle accountHandle) {
+        enforceModifyPermission();
+
+        try {
+            mPhoneAccountRegistrar.setDefaultOutgoingPhoneAccount(accountHandle);
+        } catch (Exception e) {
+            Log.e(this, e, "setDefaultOutgoingPhoneAccount");
+            throw e;
+        }
+    }
+
+    @Override
     public List<PhoneAccountHandle> getOutgoingPhoneAccounts() {
         try {
             return mPhoneAccountRegistrar.getOutgoingPhoneAccounts();
@@ -190,6 +202,38 @@
     }
 
     @Override
+    public PhoneAccountHandle getSimCallManager() {
+        try {
+            return mPhoneAccountRegistrar.getSimCallManager();
+        } catch (Exception e) {
+            Log.e(this, e, "getSimCallManager");
+            throw e;
+        }
+    }
+
+    @Override
+    public void setSimCallManager(PhoneAccountHandle accountHandle) {
+        enforceModifyPermission();
+
+        try {
+            mPhoneAccountRegistrar.setSimCallManager(accountHandle);
+        } catch (Exception e) {
+            Log.e(this, e, "setSimCallManager");
+            throw e;
+        }
+    }
+
+    @Override
+    public List<PhoneAccountHandle> getSimCallManagers() {
+        try {
+            return mPhoneAccountRegistrar.getAllConnectionManagerPhoneAccounts();
+        } catch (Exception e) {
+            Log.e(this, e, "getSimCallManagers");
+            throw e;
+        }
+    }
+
+    @Override
     public void registerPhoneAccount(PhoneAccount account) {
         try {
             enforceModifyPermissionOrCallingPackage(
@@ -250,10 +294,10 @@
     }
 
     /**
-     * @see TelecommManager#isInAPhoneCall
+     * @see TelecommManager#isInCall
      */
     @Override
-    public boolean isInAPhoneCall() {
+    public boolean isInCall() {
         enforceReadPermission();
         // Do not use sendRequest() with this method since it could cause a deadlock with
         // audio service, which we call into from the main thread: AudioManager.setMode().
@@ -288,16 +332,16 @@
     }
 
     /**
-     * @see PhoneManager#showCallScreen
+     * @see TelecommManager#showInCallScreen
      */
     @Override
-    public void showCallScreen(boolean showDialpad) {
+    public void showInCallScreen(boolean showDialpad) {
         enforceReadPermissionOrDefaultDialer();
         sendRequestAsync(MSG_SHOW_CALL_SCREEN, showDialpad ? 1 : 0);
     }
 
     /**
-     * @see PhoneManager#cancelMissedCallsNotification
+     * @see TelecommManager#cancelMissedCallsNotification
      */
     @Override
     public void cancelMissedCallsNotification() {
@@ -306,7 +350,7 @@
     }
 
     /**
-     * @see PhoneManager#handlePinMmi
+     * @see TelecommManager#handleMmi
      */
     @Override
     public boolean handlePinMmi(String dialString) {
@@ -356,7 +400,7 @@
             }
 
             long token = Binder.clearCallingIdentity();
-            TelecommApp.getInstance().startActivity(intent);
+            TelecommApp.getInstance().startActivityAsUser(intent, UserHandle.CURRENT);
             Binder.restoreCallingIdentity(token);
         }
     }
@@ -441,10 +485,6 @@
         mAppOpsManager.checkPackage(Binder.getCallingUid(), packageName);
     }
 
-    private void showCallScreenInternal(boolean showDialpad) {
-        CallsManager.getInstance().getInCallController().bringToForeground(showDialpad);
-    }
-
     private boolean isDefaultDialerCalling() {
         ComponentName defaultDialerComponent = getDefaultPhoneApp();
         if (defaultDialerComponent != null) {
diff --git a/tests/src/com/android/telecomm/testapps/CallNotificationReceiver.java b/tests/src/com/android/telecomm/testapps/CallNotificationReceiver.java
index e941c2d..fb44069 100644
--- a/tests/src/com/android/telecomm/testapps/CallNotificationReceiver.java
+++ b/tests/src/com/android/telecomm/testapps/CallNotificationReceiver.java
@@ -70,7 +70,7 @@
     private void sendIncomingCallIntent(Context context, boolean isVideoCall) {
         PhoneAccountHandle phoneAccount = new PhoneAccountHandle(
                 new ComponentName(context, TestConnectionService.class),
-                CallServiceNotifier.CALL_PROVIDER_ID);
+                CallServiceNotifier.SIM_SUBSCRIPTION_ID);
 
         // For the purposes of testing, indicate whether the incoming call is a video call by
         // stashing an indicator in the EXTRA_INCOMING_CALL_EXTRAS.
diff --git a/tests/src/com/android/telecomm/testapps/TestConnectionManager.java b/tests/src/com/android/telecomm/testapps/TestConnectionManager.java
index 902ace7..95f0718 100644
--- a/tests/src/com/android/telecomm/testapps/TestConnectionManager.java
+++ b/tests/src/com/android/telecomm/testapps/TestConnectionManager.java
@@ -19,28 +19,28 @@
 import android.app.PendingIntent;
 import android.net.Uri;
 import android.telecomm.AudioState;
+import android.telecomm.Conference;
 import android.telecomm.Connection;
 import android.telecomm.ConnectionRequest;
 import android.telecomm.ConnectionService;
 import android.telecomm.PhoneAccountHandle;
+import android.telecomm.RemoteConference;
 import android.telecomm.RemoteConnection;
 import android.telecomm.StatusHints;
 import android.util.Log;
 
-import java.util.Random;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Service which acts as a fake ConnectionManager if so configured.
  * TODO(santoscordon): Rename all classes in the directory to Dummy* (e.g., DummyConnectionService).
  */
 public class TestConnectionManager extends ConnectionService {
-    /**
-     * Random number generator used to generate phone numbers.
-     */
-    private Random mRandom = new Random();
-
-    private final class TestManagedConnection extends Connection {
-        private final RemoteConnection.Listener mProxyListener = new RemoteConnection.Listener() {
+    public final class TestManagedConnection extends Connection {
+        private final RemoteConnection.Listener mRemoteListener = new RemoteConnection.Listener() {
             @Override
             public void onStateChanged(RemoteConnection connection, int state) {
                 setState(state);
@@ -103,62 +103,76 @@
             @Override
             public void onDestroyed(RemoteConnection connection) {
                 destroy();
+                mManagedConnectionByRemote.remove(mRemote);
+            }
+
+            @Override
+            public void onConferenceableConnectionsChanged(
+                    RemoteConnection connect,
+                    List<RemoteConnection> conferenceable) {
+                List<Connection> c = new ArrayList<>();
+                for (RemoteConnection remote : conferenceable) {
+                    if (mManagedConnectionByRemote.containsKey(remote)) {
+                        c.add(mManagedConnectionByRemote.get(remote));
+                    }
+                }
+                setConferenceableConnections(c);
             }
         };
 
-        private final RemoteConnection mRemoteConnection;
+        private final RemoteConnection mRemote;
         private final boolean mIsIncoming;
 
-        TestManagedConnection(RemoteConnection remoteConnection, boolean isIncoming) {
-            mRemoteConnection = remoteConnection;
+        TestManagedConnection(RemoteConnection remote, boolean isIncoming) {
+            mRemote = remote;
             mIsIncoming = isIncoming;
-            mRemoteConnection.addListener(mProxyListener);
-            setState(mRemoteConnection.getState());
+            mRemote.addListener(mRemoteListener);
+            setState(mRemote.getState());
         }
 
         @Override
         public void onAbort() {
-            mRemoteConnection.abort();
+            mRemote.abort();
         }
 
         /** ${inheritDoc} */
         @Override
         public void onAnswer(int videoState) {
-            mRemoteConnection.answer(videoState);
+            mRemote.answer(videoState);
         }
 
         /** ${inheritDoc} */
         @Override
         public void onDisconnect() {
-            mRemoteConnection.disconnect();
+            mRemote.disconnect();
         }
 
         @Override
         public void onPlayDtmfTone(char c) {
-            mRemoteConnection.playDtmfTone(c);
+            mRemote.playDtmfTone(c);
         }
 
         /** ${inheritDoc} */
         @Override
         public void onHold() {
-            mRemoteConnection.hold();
+            mRemote.hold();
         }
 
         /** ${inheritDoc} */
         @Override
         public void onReject() {
-            mRemoteConnection.reject();
+            mRemote.reject();
         }
 
         /** ${inheritDoc} */
         @Override
         public void onUnhold() {
-            mRemoteConnection.unhold();
+            mRemote.unhold();
         }
 
         @Override
         public void onSetAudioState(AudioState state) {
-            mRemoteConnection.setAudioState(state);
+            mRemote.setAudioState(state);
         }
 
         private void setState(int state) {
@@ -180,29 +194,125 @@
         }
     }
 
+    public final class TestManagedConference extends Conference {
+        private final RemoteConference.Listener mRemoteListener = new RemoteConference.Listener() {
+            @Override
+            public void onStateChanged(RemoteConference conference, int oldState, int newState) {
+                switch (newState) {
+                    case Connection.STATE_DISCONNECTED:
+                        // See onDisconnected below
+                        break;
+                    case Connection.STATE_HOLDING:
+                        setOnHold();
+                        break;
+                    case Connection.STATE_ACTIVE:
+                        setActive();
+                        break;
+                    default:
+                        log("unrecognized state for Conference: " + newState);
+                        break;
+                }
+            }
+
+            @Override
+            public void onDisconnected(RemoteConference conference, int cause, String message) {
+                setDisconnected(cause, message);
+            }
+
+            @Override
+            public void onConnectionAdded(
+                    RemoteConference conference,
+                    RemoteConnection connection) {
+                TestManagedConnection c = mManagedConnectionByRemote.get(connection);
+                if (c == null) {
+                    log("onConnectionAdded cannot find remote connection: " + connection);
+                } else {
+                    addConnection(c);
+                }
+            }
+
+            @Override
+            public void onConnectionRemoved(
+                    RemoteConference conference,
+                    RemoteConnection connection) {
+                TestManagedConnection c = mManagedConnectionByRemote.get(connection);
+                if (c == null) {
+                    log("onConnectionRemoved cannot find remote connection: " + connection);
+                } else {
+                    removeConnection(c);
+                }
+            }
+
+            @Override
+            public void onCapabilitiesChanged(RemoteConference conference, int capabilities) {
+                setCapabilities(capabilities);
+            }
+
+            @Override
+            public void onDestroyed(RemoteConference conference) {
+                destroy();
+                mRemote.removeListener(mRemoteListener);
+                mManagedConferenceByRemote.remove(mRemote);
+            }
+        };
+
+        private final RemoteConference mRemote;
+
+        public TestManagedConference(RemoteConference remote) {
+            super(null);
+            mRemote = remote;
+            remote.addListener(mRemoteListener);
+            setActive();
+            for (RemoteConnection r : remote.getConnections()) {
+                TestManagedConnection c = mManagedConnectionByRemote.get(r);
+                if (c != null) {
+                    addConnection(c);
+                }
+            }
+        }
+    }
+
     private static void log(String msg) {
         Log.w("telecomtestcs", "[TestConnectionManager] " + msg);
     }
 
+    private final Map<RemoteConference, TestManagedConference> mManagedConferenceByRemote
+            = new HashMap<>();
+    private final Map<RemoteConnection, TestManagedConnection> mManagedConnectionByRemote
+            = new HashMap<>();
+
     @Override
     public Connection onCreateOutgoingConnection(
             PhoneAccountHandle connectionManagerAccount,
             final ConnectionRequest request) {
-        return new TestManagedConnection(
-                createRemoteOutgoingConnection(
-                        request.getAccountHandle(),
-                        request),
-                false);
+        return makeConnection(request, false);
     }
 
     @Override
     public Connection onCreateIncomingConnection(
             PhoneAccountHandle connectionManagerAccount,
             final ConnectionRequest request) {
-        return new TestManagedConnection(
-                createRemoteIncomingConnection(
-                        request.getAccountHandle(),
-                        request),
-                true);
+        return makeConnection(request, true);
+    }
+
+    @Override
+    public void onConference(Connection a, Connection b) {
+        conferenceRemoteConnections(
+                ((TestManagedConnection) a).mRemote,
+                ((TestManagedConnection) b).mRemote);
+    }
+
+    @Override
+    public void onRemoteConferenceAdded(RemoteConference remoteConference) {
+        addConference(new TestManagedConference(remoteConference));
+    }
+
+    private Connection makeConnection(ConnectionRequest request, boolean incoming) {
+        RemoteConnection remote = incoming
+                ? createRemoteIncomingConnection(request.getAccountHandle(), request)
+                : createRemoteOutgoingConnection(request.getAccountHandle(), request);
+        TestManagedConnection local = new TestManagedConnection(remote, false);
+        mManagedConnectionByRemote.put(remote, local);
+        return local;
     }
 }
diff --git a/tests/src/com/android/telecomm/testapps/TestConnectionService.java b/tests/src/com/android/telecomm/testapps/TestConnectionService.java
index 09a8929..c50e7ab 100644
--- a/tests/src/com/android/telecomm/testapps/TestConnectionService.java
+++ b/tests/src/com/android/telecomm/testapps/TestConnectionService.java
Binary files differ