diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index b759bd3..a658104 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -1697,8 +1697,6 @@
     <string name="user_confirm_remove_message" msgid="5284111415714437285">"ከመሳሪያው ላይ ተጠቃሚውን እና ሁሉንም ተያያዥነት ያለው ውሂብ ለማስወገድ መፈለግህን እርግጠኛ ነህ?"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"ማሳወቂያዎች አሳይ"</string>
     <string name="help_label" msgid="1107174367904110532">"እገዛ"</string>
-    <!-- no translation found for cell_broadcast_settings (8415582011920085222) -->
-    <skip />
-    <!-- no translation found for cell_broadcast_settings_summary (3301339398950905913) -->
-    <skip />
+    <string name="cell_broadcast_settings" msgid="8415582011920085222">"የስልክ ስርጭቶች"</string>
+    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"የሚታዩ የአስቸኳይ አደጋ ማንቂያዎች አይነቶች ምረጥ።"</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 182dc1a..7b5e28b 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -1697,8 +1697,6 @@
     <string name="user_confirm_remove_message" msgid="5284111415714437285">"Наистина ли искате да премахнете потребителя и всички свързани данни от устройството?"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Известия: Показване"</string>
     <string name="help_label" msgid="1107174367904110532">"Помощ"</string>
-    <!-- no translation found for cell_broadcast_settings (8415582011920085222) -->
-    <skip />
-    <!-- no translation found for cell_broadcast_settings_summary (3301339398950905913) -->
-    <skip />
+    <string name="cell_broadcast_settings" msgid="8415582011920085222">"Клетъчни излъчвания"</string>
+    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Изберете типовете спешни сигнали, които да се показват."</string>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 082ef19..69c66ac 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -1416,12 +1416,9 @@
     <string name="local_backup_password_title" msgid="3860471654439418822">"Contrasenya per a còpia de seguretat d\'escriptori"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Actualment les còpies de seguretat d\'escriptori completes no estan protegides"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Toca per canviar o eliminar la contrasenya per a còpies de seguretat d\'escriptori completes"</string>
-    <!-- no translation found for local_backup_password_toast_success (582016086228434290) -->
-    <skip />
-    <!-- no translation found for local_backup_password_toast_confirmation_mismatch (3495167398824569524) -->
-    <skip />
-    <!-- no translation found for local_backup_password_toast_validation_failure (5646377234895626531) -->
-    <skip />
+    <string name="local_backup_password_toast_success" msgid="582016086228434290">"S\'ha definit una contrasenya per a còpia de seguretat nova"</string>
+    <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"La contrasenya nova i la confirmació no coincideixen"</string>
+    <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Error en definir la contrasenya de la còpia de seguretat"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Vols deixar de fer còpies de seguretat de les contrasenyes de Wi-Fi, dels marcadors i d\'altres paràmetres i de les dades d\'aplicacions i, a més, esborrar totes les còpies que n\'hi hagi als servidors de Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Configuració de l\'administració del dispositiu"</string>
@@ -1700,8 +1697,6 @@
     <string name="user_confirm_remove_message" msgid="5284111415714437285">"Estàs segur que vols eliminar l\'usuari i totes les dades associades del dispositiu?"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Mostra les notificacions"</string>
     <string name="help_label" msgid="1107174367904110532">"Ajuda"</string>
-    <!-- no translation found for cell_broadcast_settings (8415582011920085222) -->
-    <skip />
-    <!-- no translation found for cell_broadcast_settings_summary (3301339398950905913) -->
-    <skip />
+    <string name="cell_broadcast_settings" msgid="8415582011920085222">"Emissions mòbils"</string>
+    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Selecciona els tipus d\'alertes d\'emergència que es mostraran."</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 668a8c9..aea4a1c 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -1697,8 +1697,6 @@
     <string name="user_confirm_remove_message" msgid="5284111415714437285">"¿Seguro que quieres eliminar el usuario y todos los datos asociados del dispositivo?"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Mostrar notificaciones"</string>
     <string name="help_label" msgid="1107174367904110532">"Ayuda"</string>
-    <!-- no translation found for cell_broadcast_settings (8415582011920085222) -->
-    <skip />
-    <!-- no translation found for cell_broadcast_settings_summary (3301339398950905913) -->
-    <skip />
+    <string name="cell_broadcast_settings" msgid="8415582011920085222">"Difusiones por teléfono celular"</string>
+    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Selecciona los tipos de alertas de emergencia a mostrar."</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index b7e7431..71f4f3c 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -1416,12 +1416,9 @@
     <string name="local_backup_password_title" msgid="3860471654439418822">"Contraseña copias ordenador"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Las copias de seguridad completas de ordenador no están protegidas"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Tocar para cambiar o eliminar la contraseña para copias de seguridad completas de ordenador"</string>
-    <!-- no translation found for local_backup_password_toast_success (582016086228434290) -->
-    <skip />
-    <!-- no translation found for local_backup_password_toast_confirmation_mismatch (3495167398824569524) -->
-    <skip />
-    <!-- no translation found for local_backup_password_toast_validation_failure (5646377234895626531) -->
-    <skip />
+    <string name="local_backup_password_toast_success" msgid="582016086228434290">"Nueva contraseña de seguridad establecida"</string>
+    <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"La nueva contraseña y la de confirmación no coinciden."</string>
+    <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Error al establecer contraseña de seguridad"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"¿Quieres dejar de crear copias de seguridad de las contraseñas Wi-Fi, de los marcadores y de otros ajustes y datos de aplicaciones, además de borrar todas las copias de los servidores de Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Ajustes de administración de dispositivos"</string>
@@ -1700,8 +1697,6 @@
     <string name="user_confirm_remove_message" msgid="5284111415714437285">"¿Seguro que quieres eliminar el usuario y todos los datos asociados del dispositivo?"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Mostrar notificaciones"</string>
     <string name="help_label" msgid="1107174367904110532">"Ayuda"</string>
-    <!-- no translation found for cell_broadcast_settings (8415582011920085222) -->
-    <skip />
-    <!-- no translation found for cell_broadcast_settings_summary (3301339398950905913) -->
-    <skip />
+    <string name="cell_broadcast_settings" msgid="8415582011920085222">"Difusiones móviles"</string>
+    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Selecciona los tipos de alertas de emergencia que quieres ver."</string>
 </resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 1e69639..82ae998 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -1697,8 +1697,6 @@
     <string name="user_confirm_remove_message" msgid="5284111415714437285">"Kas soovite kindlasti eemaldada seadmest kasutaja ja kõik seotud andmed?"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Kuva teatised"</string>
     <string name="help_label" msgid="1107174367904110532">"Abi"</string>
-    <!-- no translation found for cell_broadcast_settings (8415582011920085222) -->
-    <skip />
-    <!-- no translation found for cell_broadcast_settings_summary (3301339398950905913) -->
-    <skip />
+    <string name="cell_broadcast_settings" msgid="8415582011920085222">"Kärjeteated"</string>
+    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Valige kuvamiseks hädaolukorra märguannete tüübid."</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 231d7df..665d8fe 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -1697,8 +1697,6 @@
     <string name="user_confirm_remove_message" msgid="5284111415714437285">"آیا مطمئن هستید که می‌خواهید کاربر و تمام داده‌های مربوطه را از دستگاه حذف کنید؟"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"نمایش اعلان‌ها"</string>
     <string name="help_label" msgid="1107174367904110532">"راهنما"</string>
-    <!-- no translation found for cell_broadcast_settings (8415582011920085222) -->
-    <skip />
-    <!-- no translation found for cell_broadcast_settings_summary (3301339398950905913) -->
-    <skip />
+    <string name="cell_broadcast_settings" msgid="8415582011920085222">"پخش‌های سلولی"</string>
+    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"انواع هشدارهای اضطراری را برای نمایش انتخاب کنید."</string>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 938e267..e714b92 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -1697,8 +1697,6 @@
     <string name="user_confirm_remove_message" msgid="5284111415714437285">"Jeste li sigurni da želite ukloniti korisnika i sve povezane podatke iz uređaja?"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Prikaži obavijesti"</string>
     <string name="help_label" msgid="1107174367904110532">"Pomoć"</string>
-    <!-- no translation found for cell_broadcast_settings (8415582011920085222) -->
-    <skip />
-    <!-- no translation found for cell_broadcast_settings_summary (3301339398950905913) -->
-    <skip />
+    <string name="cell_broadcast_settings" msgid="8415582011920085222">"Poruke mobilne mreže"</string>
+    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Odaberite vrste hitnih obavijesti za prikaz."</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index c9bf2c1..def69a6 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -1697,8 +1697,6 @@
     <string name="user_confirm_remove_message" msgid="5284111415714437285">"기기에서 사용자와 모든 관련 데이터를 삭제하시겠습니까?"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"알림 표시"</string>
     <string name="help_label" msgid="1107174367904110532">"도움말"</string>
-    <!-- no translation found for cell_broadcast_settings (8415582011920085222) -->
-    <skip />
-    <!-- no translation found for cell_broadcast_settings_summary (3301339398950905913) -->
-    <skip />
+    <string name="cell_broadcast_settings" msgid="8415582011920085222">"셀 브로드캐스트"</string>
+    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"표시할 긴급 알림 유형을 선택합니다."</string>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index d8bb860..1ee5349 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -1697,8 +1697,6 @@
     <string name="user_confirm_remove_message" msgid="5284111415714437285">"Ar tikrai norite pašalinti naudotoją ir visus susijusius duomenis iš įrenginio?"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Rodyti pranešimus"</string>
     <string name="help_label" msgid="1107174367904110532">"Pagalba"</string>
-    <!-- no translation found for cell_broadcast_settings (8415582011920085222) -->
-    <skip />
-    <!-- no translation found for cell_broadcast_settings_summary (3301339398950905913) -->
-    <skip />
+    <string name="cell_broadcast_settings" msgid="8415582011920085222">"Tinklo transliacijos"</string>
+    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Pasirinkite rodomų nepaprastųjų įspėjimų tipus."</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 39091e7..87579d2 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -1697,8 +1697,6 @@
     <string name="user_confirm_remove_message" msgid="5284111415714437285">"Vai tiešām vēlaties no ierīces noņemt lietotāju un visus ar viņu saistītos datus?"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Rādīt paziņojumus"</string>
     <string name="help_label" msgid="1107174367904110532">"Palīdzība"</string>
-    <!-- no translation found for cell_broadcast_settings (8415582011920085222) -->
-    <skip />
-    <!-- no translation found for cell_broadcast_settings_summary (3301339398950905913) -->
-    <skip />
+    <string name="cell_broadcast_settings" msgid="8415582011920085222">"Šūnu apraides"</string>
+    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Atlasiet rādāmos ārkārtas situāciju brīdinājumus."</string>
 </resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 28d81b6..7f1f152 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -1697,8 +1697,6 @@
     <string name="user_confirm_remove_message" msgid="5284111415714437285">"Adakah anda pasti anda mahu mengalih keluar semua pengguna dan data berkaitan dari peranti?"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Tunjukkan pemberitahuan"</string>
     <string name="help_label" msgid="1107174367904110532">"Bantuan"</string>
-    <!-- no translation found for cell_broadcast_settings (8415582011920085222) -->
-    <skip />
-    <!-- no translation found for cell_broadcast_settings_summary (3301339398950905913) -->
-    <skip />
+    <string name="cell_broadcast_settings" msgid="8415582011920085222">"Siaran sel"</string>
+    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Pilih jenis amaran kecemasan untuk dipaparkan."</string>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index b4a1e66..87ebb11 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -1697,8 +1697,6 @@
     <string name="user_confirm_remove_message" msgid="5284111415714437285">"Er du sikker på at du vil slette brukeren og alle tilhørende data fra enheten?"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Vis varsler"</string>
     <string name="help_label" msgid="1107174367904110532">"Hjelp"</string>
-    <!-- no translation found for cell_broadcast_settings (8415582011920085222) -->
-    <skip />
-    <!-- no translation found for cell_broadcast_settings_summary (3301339398950905913) -->
-    <skip />
+    <string name="cell_broadcast_settings" msgid="8415582011920085222">"Kringkastede meldinger"</string>
+    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Velg hvilke nødvarsler som skal vises."</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index f3b8c64..6830bee 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -1697,8 +1697,6 @@
     <string name="user_confirm_remove_message" msgid="5284111415714437285">"Tem certeza que deseja remover o usuário e todos os dados associados do dispositivo?"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Mostrar notificações"</string>
     <string name="help_label" msgid="1107174367904110532">"Ajuda"</string>
-    <!-- no translation found for cell_broadcast_settings (8415582011920085222) -->
-    <skip />
-    <!-- no translation found for cell_broadcast_settings_summary (3301339398950905913) -->
-    <skip />
+    <string name="cell_broadcast_settings" msgid="8415582011920085222">"Transmissões por celular"</string>
+    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Selecione os tipos de alertas de emergência a exibir."</string>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index f0165a0..761dd50 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -1698,8 +1698,6 @@
     <string name="user_confirm_remove_message" msgid="5284111415714437285">"Sigur doriţi să eliminaţi de pe dispozitiv utilizatorul şi toate datele asociate acestuia?"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Afişaţi notificările"</string>
     <string name="help_label" msgid="1107174367904110532">"Ajutor"</string>
-    <!-- no translation found for cell_broadcast_settings (8415582011920085222) -->
-    <skip />
-    <!-- no translation found for cell_broadcast_settings_summary (3301339398950905913) -->
-    <skip />
+    <string name="cell_broadcast_settings" msgid="8415582011920085222">"Transmisii celulare"</string>
+    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Selectaţi tipurile de alerte de urgenţă de afişat."</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 0cc4e74..579e048 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -1697,8 +1697,6 @@
     <string name="user_confirm_remove_message" msgid="5284111415714437285">"Ali ste prepričani, da želite iz naprave odstraniti uporabnika in vse povezane podatke?"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Pokaži obvestila"</string>
     <string name="help_label" msgid="1107174367904110532">"Pomoč"</string>
-    <!-- no translation found for cell_broadcast_settings (8415582011920085222) -->
-    <skip />
-    <!-- no translation found for cell_broadcast_settings_summary (3301339398950905913) -->
-    <skip />
+    <string name="cell_broadcast_settings" msgid="8415582011920085222">"Oddaje v celici"</string>
+    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Izberite vrste nujnih opozoril, ki jih želite prikazati."</string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 9934fee..1f05f4d 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -1697,8 +1697,6 @@
     <string name="user_confirm_remove_message" msgid="5284111415714437285">"Желите ли заиста да уклоните корисника и све повезане податке са уређаја?"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Прикажи обавештења"</string>
     <string name="help_label" msgid="1107174367904110532">"Помоћ"</string>
-    <!-- no translation found for cell_broadcast_settings (8415582011920085222) -->
-    <skip />
-    <!-- no translation found for cell_broadcast_settings_summary (3301339398950905913) -->
-    <skip />
+    <string name="cell_broadcast_settings" msgid="8415582011920085222">"Поруке инфо сервиса"</string>
+    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Изаберите типове упозорења на хитне случајеве који ће се приказивати."</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 236a70c..83a185c 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -1476,7 +1476,7 @@
     <string name="background_data_summary" msgid="8328521479872763452">"Uyglr istediğiniz zaman verileri senk eder, gönderir ve alır"</string>
     <string name="background_data_dialog_title" msgid="6059217698124786537">"Arka plan verileri kapatılsın mı?"</string>
     <string name="background_data_dialog_message" msgid="6981661606680941633">"Arka plan verilerini devre dışı bırakmak, pilden tasarruf sağlar ve veri kullanımını azaltır. Bazı uygulamalar yine de arka plan veri bağlantısını kullanmaya devam edebilir."</string>
-    <string name="sync_automatically" msgid="1682730255435062059">"Uygulama verilerini otomatk senk et"</string>
+    <string name="sync_automatically" msgid="1682730255435062059">"Otomatik senkronizasyon"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Senkronizasyon AÇIK"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"Senkronizasyon KAPALI"</string>
     <string name="sync_error" msgid="5060969083117872149">"Senk. hatası"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 39d322e..f43a53b 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -1697,8 +1697,6 @@
     <string name="user_confirm_remove_message" msgid="5284111415714437285">"Дійсно видалити користувача та всі пов’язані дані з цього пристрою?"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Показати сповіщення"</string>
     <string name="help_label" msgid="1107174367904110532">"Довідка"</string>
-    <!-- no translation found for cell_broadcast_settings (8415582011920085222) -->
-    <skip />
-    <!-- no translation found for cell_broadcast_settings_summary (3301339398950905913) -->
-    <skip />
+    <string name="cell_broadcast_settings" msgid="8415582011920085222">"Широкомовні повідомлення мережі"</string>
+    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Виберіть типи сповіщень про надзвичайні ситуації, які мають відображатися."</string>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 811ab3e..30a9543 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -1697,8 +1697,6 @@
     <string name="user_confirm_remove_message" msgid="5284111415714437285">"Bạn có chắc chắn muốn xóa người dùng và tất cả các dữ liệu được liên kết khỏi thiết bị này không?"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Hiển thị thông báo"</string>
     <string name="help_label" msgid="1107174367904110532">"Trợ giúp"</string>
-    <!-- no translation found for cell_broadcast_settings (8415582011920085222) -->
-    <skip />
-    <!-- no translation found for cell_broadcast_settings_summary (3301339398950905913) -->
-    <skip />
+    <string name="cell_broadcast_settings" msgid="8415582011920085222">"Phát sóng trên di động"</string>
+    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Chọn các loại cảnh báo khẩn cấp để hiển thị."</string>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index f1dbb0e..afd4391 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -1704,8 +1704,6 @@
     <string name="user_confirm_remove_message" msgid="5284111415714437285">"Ingabe unesiqinisekiso sokuthi ufuna ukususa umsebenzisi nayo yonke idatha ephathelene kusuka kudivayisi?"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Bonisa izaziso"</string>
     <string name="help_label" msgid="1107174367904110532">"Usizo"</string>
-    <!-- no translation found for cell_broadcast_settings (8415582011920085222) -->
-    <skip />
-    <!-- no translation found for cell_broadcast_settings_summary (3301339398950905913) -->
-    <skip />
+    <string name="cell_broadcast_settings" msgid="8415582011920085222">"Ukusakazwa kweselula"</string>
+    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Khetha izinhlobo zezaziso zesimo esiphuthumayo ongazibonisa."</string>
 </resources>
diff --git a/src/com/android/settings/applications/ApplicationsState.java b/src/com/android/settings/applications/ApplicationsState.java
index 0a5c26e..3256fb2 100644
--- a/src/com/android/settings/applications/ApplicationsState.java
+++ b/src/com/android/settings/applications/ApplicationsState.java
@@ -73,6 +73,16 @@
         long dataSize;
         long externalCodeSize;
         long externalDataSize;
+
+        // This is the part of externalDataSize that is in the cache
+        // section of external storage.  Note that we don't just combine
+        // this with cacheSize because currently the platform can't
+        // automatically trim this data when needed, so it is something
+        // the user may need to manage.  The externalDataSize also includes
+        // this value, since what this is here is really the part of
+        // externalDataSize that we can just consider to be "cache" files
+        // for purposes of cleaning them up in the app details UI.
+        long externalCacheSize;
     }
     
     public static class AppEntry extends SizeInfo {
@@ -820,13 +830,15 @@
                                     entry.codeSize != stats.codeSize ||
                                     entry.dataSize != stats.dataSize ||
                                     entry.externalCodeSize != externalCodeSize ||
-                                    entry.externalDataSize != externalDataSize) {
+                                    entry.externalDataSize != externalDataSize ||
+                                    entry.externalCacheSize != stats.externalCacheSize) {
                                 entry.size = newSize;
                                 entry.cacheSize = stats.cacheSize;
                                 entry.codeSize = stats.codeSize;
                                 entry.dataSize = stats.dataSize;
                                 entry.externalCodeSize = externalCodeSize;
                                 entry.externalDataSize = externalDataSize;
+                                entry.externalCacheSize = stats.externalCacheSize;
                                 entry.sizeStr = getSizeStr(entry.size);
                                 entry.internalSize = getTotalInternalSize(stats);
                                 entry.internalSizeStr = getSizeStr(entry.internalSize);
diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index 9166b15..d85c341 100644
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -394,8 +394,8 @@
         
         // Initialize clear data and move install location buttons
         View data_buttons_panel = view.findViewById(R.id.data_buttons_panel);
-        mClearDataButton = (Button) data_buttons_panel.findViewById(R.id.left_button);
-        mMoveAppButton = (Button) data_buttons_panel.findViewById(R.id.right_button);
+        mClearDataButton = (Button) data_buttons_panel.findViewById(R.id.right_button);
+        mMoveAppButton = (Button) data_buttons_panel.findViewById(R.id.left_button);
         
         // Cache section
         mCacheSize = (TextView) view.findViewById(R.id.cache_size_text);
@@ -687,26 +687,28 @@
                 mLastExternalCodeSize = mAppEntry.externalCodeSize;
                 mExternalCodeSize.setText(getSizeStr(mAppEntry.externalCodeSize));
             }
-            if (mLastExternalDataSize != mAppEntry.externalDataSize) {
-                mLastExternalDataSize = mAppEntry.externalDataSize;
-                mExternalDataSize.setText(getSizeStr(mAppEntry.externalDataSize));
+            long nonCacheExtDataSize = mAppEntry.externalDataSize - mAppEntry.externalCacheSize;
+            if (mLastExternalDataSize != nonCacheExtDataSize) {
+                mLastExternalDataSize = nonCacheExtDataSize;
+                mExternalDataSize.setText(getSizeStr(nonCacheExtDataSize));
             }
-            if (mLastCacheSize != mAppEntry.cacheSize) {
-                mLastCacheSize = mAppEntry.cacheSize;
-                mCacheSize.setText(getSizeStr(mAppEntry.cacheSize));
+            long cacheSize = mAppEntry.cacheSize + mAppEntry.externalCacheSize;
+            if (mLastCacheSize != cacheSize) {
+                mLastCacheSize = cacheSize;
+                mCacheSize.setText(getSizeStr(cacheSize));
             }
             if (mLastTotalSize != mAppEntry.size) {
                 mLastTotalSize = mAppEntry.size;
                 mTotalSize.setText(getSizeStr(mAppEntry.size));
             }
             
-            if (mAppEntry.dataSize <= 0 || !mCanClearData) {
+            if ((mAppEntry.dataSize+nonCacheExtDataSize) <= 0 || !mCanClearData) {
                 mClearDataButton.setEnabled(false);
             } else {
                 mClearDataButton.setEnabled(true);
                 mClearDataButton.setOnClickListener(this);
             }
-            if (mAppEntry.cacheSize <= 0) {
+            if (cacheSize <= 0) {
                 mClearCacheButton.setEnabled(false);
             } else {
                 mClearCacheButton.setEnabled(true);