diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index ebf57d2..1c686f7 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -1045,8 +1045,8 @@
     <string name="clear_failed_dlg_text" msgid="1092177570631523106">"Kon nie data vir program uitvee nie."</string>
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Hierdie program het toegang tot die volgende op jou tablet:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"Hierdie program kan by die volgende op jou foon ingaan:"</string>
-    <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Hierdie program kan by die volgende inligting op jou tablet ingaan. Om prestasie te verbeter en geheuegebruik te verminder, is sommige van hierdie regte vir <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> beskikbaar, want dit loop in dieselfde proses as <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
-    <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Hierdie program kan by die volgende inligting op jou foon ingaan. Om prestasie te verbeter en geheuegebruik te verminder, is sommige van hierdie regte vir <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> beskikbaar, want dit loop in dieselfde proses as <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
+    <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Hierdie program kan by die volgende inligting op jou tablet ingaan. Om prestasie te verbeter en geheuegebruik te verminder, is sommige van hierdie regte aan <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> beskikbaar, want dit loop in dieselfde proses as <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
+    <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Hierdie program kan by die volgende inligting op jou foon ingaan. Om prestasie te verbeter en geheuegebruik te verminder, is sommige van hierdie regte aan <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> beskikbaar, want dit loop in dieselfde proses as <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
     <string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> en <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> en <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 55d4652..08d2d66 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -1045,7 +1045,7 @@
     <string name="clear_failed_dlg_text" msgid="1092177570631523106">"ለመተግበሪያ ውሂብ ማጽዳት አልተቻለም፡፡"</string>
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"ይህ መተግበሪያ የሚከተለውን በጡባዊህ ላይ መድረስ ይችላል፡"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"ይህ መተግበሪያ ስልክህ ላይ የሚከተለውን መድረስ ይችላል፡"</string>
-    <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"ይህ መተግበሪያ ጡባዊ ቱኮህ ላይ የሚከተለውን ሊደርስባቸው ይችላል። አፈጻጸሙን ለማሻሻልና የማህደረ ትውስታውን አጠቃቀም ለመቀነስ ሲባል ከእነኚህ ፍቃዶች ውስጥ አንዳንዶቹ ልክ <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> ባለበት ሂደት ውስጥ ስለሚካሄዱ ለ<xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>ም ይገኛሉ፦"</string>
+    <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"ይህ መተግበሪያ ጡባዊ ቱኮህ ላይ የሚከተለውን ሊደርስባቸው ይችላል። አፈጻጸሙን ለማሻሻልና የማህደረ ትውስታውን አጠቃቀም ለመቀነስ ሲባል ከእነኚህ ፍቃዶች ውስጥ አንዳንዶቹ ልክ <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> ባለበት ሂደት ውስጥ ስለሚካሄዱ ለ<xliff:g id="BASE_APP_NAME">%1$s</xliff:g>ም ይገኛሉ፦"</string>
     <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"ይህ መተግበሪያ ስልክህ ላይ የሚከተሉትን ሊደርስባቸው ይችላል። አፈጻጸሙን ለማሻሻልና የማህደረ ትውስታውን አጠቃቀም ለመቀነስ ሲባል ከእነኚህ ፍቃዶች ውስጥ አንዳንዶቹ ልክ <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> ባለበት ሂደት ውስጥ ስለሚካሄዱ ለ<xliff:g id="BASE_APP_NAME">%1$s</xliff:g>ም ይገኛሉ፦"</string>
     <string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> እና <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> እና <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index a532484..5e1d1a5 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -1416,12 +1416,9 @@
     <string name="local_backup_password_title" msgid="3860471654439418822">"Пароль для рэзервовага капіявання працоўнага стала"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Поўнае рэзервовае капіраванне рабочага стала зараз не абаронена"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Выберыце, каб змяніць або выдаліць пароль для поўнага рэзервовага капіравання рабочага стала"</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">"Усталяваны новы пароль для рэзервовага капіявання"</string>
+    <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"Новы пароль і яго пацвярджэнне не супадаюць"</string>
+    <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Збой пры ўсталёўцы паролю для рэзервовага капіявання"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Спыніць рэзервовае капіяванне пароляў ад Wi-Fi, закладак, іншых налад і дадзеных, а таксама выдаліць усе копіі на серверах Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Налады адміністравання прылады"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 3b9af31..35591bc 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -1416,12 +1416,9 @@
     <string name="local_backup_password_title" msgid="3860471654439418822">"Наст. комп.: Парола"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Понастоящем пълните резервни копия за настолен компютър не са защитени"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Докоснете, за да промените или премахнете паролата за пълни резервни копия на настолния компютър"</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">"Зададена е нова парола за резервно копие"</string>
+    <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"Новата парола не съответства на потвърждаването й"</string>
+    <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Задаването на парола за резервно копие не бе успешно"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Да се спре ли създаването на резервни копия на вашите пароли за Wi-Fi, отметки, други настройки и данните за приложенията ви и да се изтрият всички копия от сървърите на Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Административни настройки на устройство"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 9819955..adfea92 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -1045,8 +1045,8 @@
     <string name="clear_failed_dlg_text" msgid="1092177570631523106">"No se pudieron borrar los datos de la aplicación."</string>
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Esta aplicación puede acceder a los siguientes elementos de tu tableta:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"Esta aplicación puede acceder a los siguientes elementos del dispositivo:"</string>
-    <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Esta aplicación puede acceder a la siguiente información de tu tablet. Para mejorar el rendimiento y reducir el uso de la memoria, algunos de estos permisos están disponibles en <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> porque se ejecuta en el mismo proceso que <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
-    <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Esta aplicación puede acceder a los siguientes elementos de tu teléfono. Para mejorar el rendimiento y reducir el uso de la memoria, algunos de estos permisos están disponibles en <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> porque se ejecuta en el mismo proceso que <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
+    <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Esta aplicación puede acceder a la siguiente información de tu tableta. Para mejorar el rendimiento y reducir el uso de la memoria, algunos de estos permisos están disponibles en <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> porque se ejecuta en el mismo proceso que <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
+    <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Esta aplicación puede acceder a los siguientes elementos de tu dispositivo. Para mejorar el rendimiento y reducir el uso de la memoria, algunos de estos permisos están disponibles en <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> porque se ejecuta en el mismo proceso que <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
     <string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> y <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> y <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 9b9efec..85f6552 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -1416,12 +1416,9 @@
     <string name="local_backup_password_title" msgid="3860471654439418822">"گذرواژه نسخه پشتیبان دسک‌تاپ"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"نسخه‌های پشتیبان کامل دسک‌تاپ در حال حاضر محافظت نمی‌شوند"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"برای تغییر یا حذف گذرواژه برای نسخه‌های پشتیبان کامل دسک‌تاپ لمس کنید"</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">"گذرواژه جدید نسخه پشتیبان تنظیم شد"</string>
+    <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"گذرواژه جدید و تأیید آن با یکدیگر مطابقت ندارند"</string>
+    <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"گذرواژه نسخه پشتیبانی تنظیم نشد"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"تهیه نسخه پشتیبان را از گذرواژه‌های Wi-Fi، نشانک ها و سایر تنظیمات خود و همچنین داده‌های برنامه متوقف میکنید و تمام نسخه‌های موجود در سرورهای Google را نیز پاک میکنید؟"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"تنظیمات سرپرستی دستگاه"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 05dc531..768a739 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -1045,8 +1045,8 @@
     <string name="clear_failed_dlg_text" msgid="1092177570631523106">"Brisanje podataka za aplikaciju nije uspjelo."</string>
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Ova aplikacija može pristupiti sljedećim stavkama na vašem tabletnom računalu:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"Ova aplikacija može pristupiti sljedećim stavkama na vašem telefonu:"</string>
-    <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Ta aplikacija može pristupiti sljedećim stavkama na vašem tabletnom računalu. Radi poboljšanja uspješnosti i smanjenja upotrebe memorije neke od tih dozvola dostupne su aplikaciji <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> jer radi u istom procesu kao i <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
-    <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Ta aplikacija može pristupiti sljedećim stavkama na vašem telefonu. Radi poboljšanja uspješnosti i smanjenja upotrebe memorije neke od tih dozvola dostupne su aplikaciji <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> jer radi u istom procesu kao i <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
+    <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Ta aplikacija može pristupiti sljedećim stavkama na vašem tabletnom računalu. Radi poboljšanja uspješnosti i smanjenja upotrebe memorije neke od tih dozvola dostupne su aplikaciji <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> jer izvodi isti proces kao i <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
+    <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Ta aplikacija može pristupiti sljedećim stavkama na vašem telefonu. Radi poboljšanja uspješnosti i smanjenja upotrebe memorije neke od tih dozvola dostupne su aplikaciji <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> jer izvodi isti proces kao i <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
     <string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> i <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> i <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index e749740..d189e6d 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -1417,7 +1417,7 @@
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Saat ini cadangan desktop penuh tidak dilindungi"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Sentuh guna mengubah atau menghapus sandi untuk cadangan lengkap desktop"</string>
     <string name="local_backup_password_toast_success" msgid="582016086228434290">"Sandi cadangan baru telah disetel"</string>
-    <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"Sandi dan konfirmasi baru tidak cocok."</string>
+    <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"Sandi baru dan konfirmasinya tidak cocok."</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Gagal saat menyetel sandi cadangan"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Hentikan mencadangkan sandi Wi-Fi, bookmark, setelan lainnya, dan data apl, serta menghapus semua salinan di server Google?"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 8997b72..706ae71 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -1418,12 +1418,9 @@
     <string name="local_backup_password_title" msgid="3860471654439418822">"PCバックアップパスワード"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"デスクトップのフルバックアップは現在保護されていません"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"デスクトップのフルバックアップ用のパスワードを変更または削除する場合にタップします"</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">"新しいバックアップパスワードが設定されました"</string>
+    <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"新しいパスワードと確認用のパスワードが一致しません。"</string>
+    <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"バックアップパスワードの設定に失敗しました"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Wi-Fiパスワード、ブックマーク、その他の設定とアプリのデータのバックアップを停止し、Googleサーバー上のすべてのコピーを消去しますか？"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"デバイス管理の設定"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index d6f59f7..2681481 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -1045,8 +1045,8 @@
     <string name="clear_failed_dlg_text" msgid="1092177570631523106">"앱 데이터를 지우지 못했습니다."</string>
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"이 앱은 태블릿에서 다음에 액세스할 수 있습니다."</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"이 앱은 휴대전화의 다음 항목에 액세스할 수 있습니다."</string>
-    <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"이 앱은 내 태블릿에서 다음에 액세스할 수 있습니다.<xliff:g id="BASE_APP_NAME">%1$s</xliff:g>(은)는 <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>(와)과 동시에 실행되기 때문에 성능을 향상시키고 메모리 사용량을 줄이기 위해서는 이러한 사용 권한 중 일부를 사용할 수 있습니다."</string>
-    <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"이 앱은 내 휴대전화에서 다음에 액세스할 수 있습니다. <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>(은)는 <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>(와)과 동시에 실행되기 때문에 성능을 향상시키고 메모리 사용량을 줄이기 위해서는 이러한 사용 권한 중 일부를 사용할 수 있습니다."</string>
+    <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"이 앱은 내 태블릿에서 다음에 액세스할 수 있습니다.<xliff:g id="BASE_APP_NAME">%1$s</xliff:g>(은)는 <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>(와)과 동일한 프로세스에서 실행되기 때문에 성능을 향상시키고 메모리 사용량을 줄이기 위해서는 이러한 사용 권한 중 일부를 사용할 수 있습니다."</string>
+    <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"이 앱은 내 휴대전화에서 다음에 액세스할 수 있습니다. <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>(은)는 <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>(와)과 동일한 프로세스에서 실행되기 때문에 성능을 향상시키고 메모리 사용량을 줄이기 위해서는 이러한 사용 권한 중 일부를 사용할 수 있습니다."</string>
     <string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> 및 <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index f5b1093..7a58da5 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -1045,8 +1045,8 @@
     <string name="clear_failed_dlg_text" msgid="1092177570631523106">"Não foi possível limpar os dados do aplicativo."</string>
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Este aplicativo pode acessar os seguintes itens em seu tablet:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"Este aplicativo pode acessar os seguintes itens em seu telefone:"</string>
-    <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Este aplicativo pode acessar os itens a seguir em seu tablet. Para melhorar o desempenho e reduzir o uso de memória, algumas destas permissões estão disponíveis para <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, pois é executado no mesmo processo que <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
-    <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Este aplicativo pode acessar os itens a seguir em seu telefone. Para melhorar o desempenho e reduzir o uso de memória, algumas destas permissões estão disponíveis para <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, pois é executado no mesmo processo que <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
+    <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Este aplicativo pode acessar os itens a seguir em seu tablet. Para melhorar o desempenho e reduzir o uso de memória, algumas destas permissões estão disponíveis para <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, pois tal aplicativo é executado no mesmo processo que <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
+    <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Este aplicativo pode acessar os itens a seguir em seu telefone. Para melhorar o desempenho e reduzir o uso de memória, algumas destas permissões estão disponíveis para <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, pois tal aplicativo é executado no mesmo processo que <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
     <string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> e <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> e <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index ca64e9a..c108a0c 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -1416,12 +1416,9 @@
     <string name="local_backup_password_title" msgid="3860471654439418822">"Geslo za varn. kop. rač."</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Popolne varnostne kopije namizja trenutno niso zaščitene"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Dotaknite se, če želite spremeniti ali odstraniti geslo za popolno varnostno kopiranje namizja."</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">"Novo varnostno geslo je nastavljeno"</string>
+    <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"Novo geslo in potrditev se ne ujemata."</string>
+    <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Neuspela nastavitev varnostnega gesla"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Ali želite ustaviti varnostno kopiranje gesel za Wi-Fi, zaznamkov, drugih nastavitev in podatkov programov ter izbrisati vse kopije v Googlovih strežnikih?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Nastavitve skrbništva naprave"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 0f42195..5dd3825 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -1416,12 +1416,9 @@
     <string name="local_backup_password_title" msgid="3860471654439418822">"Пароль резерв.копії на ПК"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Повні резервні копії на комп’ютері наразі не захищені"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Торкніться, щоб змінити чи видалити пароль для повного резервного копіювання на комп’ютер"</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">"Новий пароль резервної копії встановлено"</string>
+    <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"Новий пароль і підтвердження не збігаються"</string>
+    <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Помилка встановлення пароля резервної копії"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Припинити створення резервних копій паролів Wi-Fi, закладок, інших налаштувань і даних програм і стерти всі копії на серверах Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Налашт-ня адміністрації пристрою"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index fe147d3..b8c0960 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -1416,12 +1416,9 @@
     <string name="local_backup_password_title" msgid="3860471654439418822">"電腦備份密碼"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"電腦完整備份目前未受保護"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"輕觸即可變更或移除電腦完整備份的密碼"</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">"已設定新備份密碼"</string>
+    <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"新密碼與確認密碼不符。"</string>
+    <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"無法設定備份密碼"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"停止備份您的 Wi-Fi 密碼、書籤、其他設定，以及應用程式資料，並清除 Google 伺服器上儲存的所有副本嗎？"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"裝置管理設定"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 48881d3..b47dc89 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -1423,9 +1423,9 @@
     <string name="local_backup_password_title" msgid="3860471654439418822">"Iphasiwedi yokusekela ngokulondoloza ye-Desktop"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Ukusekela ngokulondoloza okugcwele kwe-Desktop akuvikelekile okwamanje."</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Khetha ukushintsha noma ukususa iphasiwedi yokwenziwa kwezipele ngokugcwele kwideskithophu"</string>
-    <string name="local_backup_password_toast_success" msgid="582016086228434290">"New backup password set"</string>
-    <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"New password and confirmation don\'t match"</string>
-    <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Failure setting backup password"</string>
+    <string name="local_backup_password_toast_success" msgid="582016086228434290">"Iphasiwedi entsha eyisipele isethiwe"</string>
+    <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"Iphasiwedi entsha nokuqinisekisa akufani"</string>
+    <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Ukungaphumeleli kokusetha iphasiwedi eyisipele"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Yeka ukulondoloza amaphasiwedi akho e-Wi-Fi, amabhukumaka, ezinye izilungiselelo, kanye nemininingwne yensinhlelo zokusebenza, uphinde ususe wonke amakhophi kwiseva ye-Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Izilungiselelo zomphathi wedivaysi"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 41d562f..744a814 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4099,4 +4099,9 @@
     <string name="help_url_backup_reset" translatable="false"></string>
     <!-- Help URL, Tethering [DO NOT TRANSLATE] -->
     <string name="help_url_tether" translatable="false"></string>
+
+    <!-- Cell Broadcast settings title [CHAR LIMIT=50] -->
+    <string name="cell_broadcast_settings">Cell broadcasts</string>
+    <!-- Cell Broadcast settings description [CHAR LIMIT=100] -->
+    <string name="cell_broadcast_settings_summary">Select the types of emergency alerts to display.</string>
 </resources>
diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml
index 866a617..3cd72b3 100644
--- a/res/xml/wireless_settings.xml
+++ b/res/xml/wireless_settings.xml
@@ -75,4 +75,14 @@
         android:key="proxy_settings"
         android:title="@string/proxy_settings_title" />
 
+    <PreferenceScreen
+        android:key="cell_broadcast_settings"
+        android:title="@string/cell_broadcast_settings"
+        android:summary="@string/cell_broadcast_settings_summary" >
+        <intent
+            android:action="android.intent.action.MAIN"
+            android:targetPackage="com.android.cellbroadcastreceiver"
+            android:targetClass="com.android.cellbroadcastreceiver.CellBroadcastSettings" />
+    </PreferenceScreen>
+
 </PreferenceScreen>
diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java
index 3b67ec3..347315a 100644
--- a/src/com/android/settings/WirelessSettings.java
+++ b/src/com/android/settings/WirelessSettings.java
@@ -50,6 +50,7 @@
     private static final String KEY_PROXY_SETTINGS = "proxy_settings";
     private static final String KEY_MOBILE_NETWORK_SETTINGS = "mobile_network_settings";
     private static final String KEY_TOGGLE_NSD = "toggle_nsd"; //network service discovery
+    private static final String KEY_CELL_BROADCAST_SETTINGS = "cell_broadcast_settings";
 
     public static final String EXIT_ECM_RESULT = "exit_ecm_result";
     public static final int REQUEST_CODE_EXIT_ECM = 1;
@@ -171,6 +172,26 @@
             Preference p = findPreference(KEY_TETHER_SETTINGS);
             p.setTitle(Utils.getTetheringLabel(cm));
         }
+
+        // Enable link to CMAS app settings depending on the value in config.xml.
+        boolean isCellBroadcastAppLinkEnabled = this.getResources().getBoolean(
+                com.android.internal.R.bool.config_cellBroadcastAppLinks);
+        try {
+            if (isCellBroadcastAppLinkEnabled) {
+                PackageManager pm = getPackageManager();
+                if (pm.getApplicationEnabledSetting("com.android.cellbroadcastreceiver")
+                        == PackageManager.COMPONENT_ENABLED_STATE_DISABLED) {
+                    isCellBroadcastAppLinkEnabled = false;  // CMAS app disabled
+                }
+            }
+        } catch (IllegalArgumentException ignored) {
+            isCellBroadcastAppLinkEnabled = false;  // CMAS app not installed
+        }
+        if (!isCellBroadcastAppLinkEnabled) {
+            PreferenceScreen root = getPreferenceScreen();
+            Preference ps = findPreference(KEY_CELL_BROADCAST_SETTINGS);
+            if (ps != null) root.removePreference(ps);
+        }
     }
 
     @Override