diff --git a/res/layout/app_percentage_item.xml b/res/layout/app_percentage_item.xml
index e5710e4..949999a 100644
--- a/res/layout/app_percentage_item.xml
+++ b/res/layout/app_percentage_item.xml
@@ -18,8 +18,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:minHeight="?android:attr/listPreferredItemHeight"
-    android:paddingLeft="@*android:dimen/preference_item_padding_side"
-    android:paddingRight="@*android:dimen/preference_item_padding_side"
+    android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
+    android:paddingRight="?android:attr/listPreferredItemPaddingRight"
     android:paddingTop="8dip"
     android:paddingBottom="8dip"
     android:columnCount="3">
diff --git a/res/layout/crypt_keeper_status.xml b/res/layout/crypt_keeper_status.xml
index b92bbe8..80da437 100644
--- a/res/layout/crypt_keeper_status.xml
+++ b/res/layout/crypt_keeper_status.xml
@@ -30,7 +30,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
-        android:layout_alignParentLeft="true"
         android:layout_marginTop="8dip"
         android:layout_gravity="center"
         android:layout_marginBottom="8dip"
diff --git a/res/layout/data_usage_cycles.xml b/res/layout/data_usage_cycles.xml
index 136fec6..c9647c8 100644
--- a/res/layout/data_usage_cycles.xml
+++ b/res/layout/data_usage_cycles.xml
@@ -20,8 +20,8 @@
     android:layout_height="40dip"
     android:orientation="horizontal"
     android:gravity="center_vertical"
-    android:paddingLeft="@*android:dimen/preference_item_padding_side"
-    android:paddingRight="@*android:dimen/preference_item_padding_side">
+    android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
+    android:paddingRight="?android:attr/listPreferredItemPaddingRight">
 
     <TextView
         android:layout_width="wrap_content"
diff --git a/res/layout/data_usage_detail.xml b/res/layout/data_usage_detail.xml
index 639fcf5..0ce17d2 100644
--- a/res/layout/data_usage_detail.xml
+++ b/res/layout/data_usage_detail.xml
@@ -18,20 +18,22 @@
     android:id="@+id/app_detail"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:visibility="gone">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@*android:dimen/preference_item_padding_side"
-        android:layout_marginRight="@*android:dimen/preference_item_padding_side"
+        android:layout_marginLeft="?android:attr/listPreferredItemPaddingLeft"
+        android:layout_marginRight="?android:attr/listPreferredItemPaddingRight"
         android:orientation="horizontal">
 
         <LinearLayout
             android:layout_width="0dip"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:layout_marginRight="@*android:dimen/preference_item_padding_inner"
+            android:layout_marginTop="8dip"
+            android:layout_marginRight="8dip"
             android:orientation="vertical">
 
             <ImageView
@@ -82,8 +84,8 @@
         android:id="@+id/app_settings"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@*android:dimen/preference_item_padding_side"
-        android:layout_marginRight="@*android:dimen/preference_item_padding_side"
+        android:layout_marginLeft="?android:attr/listPreferredItemPaddingLeft"
+        android:layout_marginRight="?android:attr/listPreferredItemPaddingRight"
         android:layout_marginTop="16dip"
         android:layout_marginBottom="16dip"
         android:text="@string/data_usage_app_settings" />
diff --git a/res/layout/data_usage_header.xml b/res/layout/data_usage_header.xml
index a7b12b7..619956d 100644
--- a/res/layout/data_usage_header.xml
+++ b/res/layout/data_usage_header.xml
@@ -41,8 +41,8 @@
         android:id="@+id/usage_summary"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingLeft="@*android:dimen/preference_item_padding_side"
-        android:paddingRight="@*android:dimen/preference_item_padding_side"
+        android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
+        android:paddingRight="?android:attr/listPreferredItemPaddingRight"
         android:paddingTop="8dip"
         android:paddingBottom="8dip"
         android:textAppearance="?android:attr/textAppearanceSmall" />
@@ -52,8 +52,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:visibility="gone"
-        android:paddingLeft="@*android:dimen/preference_item_padding_side"
-        android:paddingRight="@*android:dimen/preference_item_padding_side"
+        android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
+        android:paddingRight="?android:attr/listPreferredItemPaddingRight"
         android:paddingBottom="8dip"
         android:text="@string/data_usage_empty"
         android:textAppearance="?android:attr/textAppearanceSmall" />
diff --git a/res/layout/user_dictionary_add_word_fullscreen.xml b/res/layout/user_dictionary_add_word_fullscreen.xml
new file mode 100644
index 0000000..9e2617b
--- /dev/null
+++ b/res/layout/user_dictionary_add_word_fullscreen.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 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.
+  -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:id="@+id/user_dict_settings_add_dialog_top"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:orientation="vertical">
+
+  <TextView
+     android:layout_height="wrap_content"
+     android:layout_width="match_parent"
+     android:text="@string/user_dict_settings_add_screen_title"
+     style="?android:attr/listSeparatorTextViewStyle" />
+
+  <EditText android:id="@+id/user_dictionary_add_word_text"
+            android:maxLength="@integer/maximum_user_dictionary_word_length"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:layout_gravity="fill_horizontal|center_vertical"
+            android:layout_marginLeft="8dip"
+            android:layout_marginBottom="8dip"
+            android:layout_marginTop="8dip"
+            android:inputType="textNoSuggestions"
+            android:imeOptions="flagNoFullscreen">
+    <requestFocus />
+  </EditText>
+  <GridLayout android:id="@+id/user_dictionary_add_word_grid"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:layout_marginLeft="8dip"
+              android:layout_marginRight="8dip"
+              android:columnCount="2">
+    <TextView android:id="@+id/user_dictionary_add_shortcut_label"
+              style="?android:attr/textAppearanceSmall"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_gravity="left|center_vertical"
+              android:text="@string/user_dict_settings_add_shortcut_option_name" />
+    <EditText android:id="@+id/user_dictionary_settings_add_dialog_shortcut"
+              android:maxLength="@integer/maximum_user_dictionary_word_length"
+              android:layout_width="wrap_content"
+              android:layout_gravity="fill_horizontal|center_vertical"
+              android:layout_marginLeft="8dip"
+              android:layout_marginBottom="8dip"
+              android:layout_marginTop="8dip"
+              android:inputType="textNoSuggestions"
+              android:imeOptions="flagNoFullscreen" />
+    <TextView android:id="@+id/user_dictionary_add_locale_label"
+              style="?android:attr/textAppearanceSmall"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_gravity="left|center_vertical"
+              android:text="@string/user_dict_settings_add_locale_option_name" />
+    <Spinner  android:id="@+id/user_dictionary_settings_add_dialog_locale"
+              android:layout_marginLeft="8dip"
+              android:layout_marginBottom="8dip"
+              android:layout_marginTop="8dip"
+              android:layout_width="wrap_content"
+              android:layout_gravity="fill_horizontal|center_vertical" />
+    </GridLayout>
+</LinearLayout>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 7012fe9..29e25b1 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -1356,10 +1356,8 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Verwyder alle sertifikate"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Vertroude eiebewyse"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Wys vertroude CA-sertifikate"</string>
-    <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) -->
-    <skip />
-    <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) -->
-    <skip />
+    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Teken jou ontsluitpatroon"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Jy moet jou ontsluitpatroon teken om eiebewysinstallasie te bevestig."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Voer die wagwoord in vir eiebewysberging."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Huidige wagwoord:"</string>
@@ -1579,6 +1577,7 @@
     <string name="data_usage_metered_body" msgid="1616820728096597564">"Kies die netwerke wie se datagebruik beperk is. Programme se gebruik van hierdie netwerke kan beperk word as hulle in die agtergrond is. Programme kan dalk ook waarsku voordat hierdie netwerke vir groot aflaaisels gebruik word."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Selnetwerke"</string>
     <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Wi-Fi-netwerke"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="3656830919281429036">"Om beperkte Wi-Fi-netwerke te kies, skakel Wi-Fi aan."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Noodoproep"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Keer terug na oproep"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Naam"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index b45c110..6e986fc 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -1356,10 +1356,8 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"ሁሉንም ምስክሮችአስወግድ"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"የሚታመን ማስረጃ"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"ታማኝ የCA  ምስክር አሳይ"</string>
-    <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) -->
-    <skip />
-    <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) -->
-    <skip />
+    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"የቁልፍ መክፈቻ ስርዓተ ጥለትህን ሳል"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"የአሳማኝ መታውቂያ ጭነትን ለማረጋገጥ የመክፈቻ ስርዓተ ጥለትህን መሳል አለብህ።"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"ለምስክርነት ማረጋገጫ ማከማቻ የይለፍቃልን ተይብ::"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"የአሁኑ ይለፍ ቃል፡"</string>
@@ -1579,6 +1577,8 @@
     <string name="data_usage_metered_body" msgid="1616820728096597564">"የውሂብ አጠቃቀም በጊዜ የሚተመን የሆነባቸውን አውታረ መረቦች ምረጥ። መተግበሪያዎች በጀርባ ውስጥ ሲሆኑ እነዚህን አውታረ መረቦች እንዳይጠቀሙ ሊታገዱ ይችላሉ። መተግበሪያዎች እነዚህን አውታረ መረቦች ለትልልቅ ውርዶች ከመጠቀማቸው በፊት ሊያስጠነቅቁም ይችላሉ።"</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"የተንቀሳቃሽ ስልክ አውታረ መረብ"</string>
     <string name="data_usage_metered_wifi" msgid="4151511616349458705">"የገመድ አልባ አውታረ መረቦች"</string>
+    <!-- no translation found for data_usage_metered_wifi_disabled (3656830919281429036) -->
+    <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"የአደጋ ጊዜ ጥሪ"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"ወደ ስልክ ጥሪ ተመለስ"</string>
     <string name="vpn_name" msgid="4689699885361002297">"ስም"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 63aceb3..01192b8 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -1356,10 +1356,8 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"إزالة جميع الشهادات"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"بيانات اعتماد موثوقة"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"عرض شهادات CA الموثوقة"</string>
-    <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) -->
-    <skip />
-    <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) -->
-    <skip />
+    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"ارسم نقش إلغاء القفل"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"يجب عليك رسم نقش إلغاء القفل لتأكيد تثبيت بيانات الاعتماد."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"اكتب كلمة المرور لوحدة تخزين بيانات الاعتماد."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"كلمة المرور الحالية:"</string>
@@ -1579,6 +1577,7 @@
     <string name="data_usage_metered_body" msgid="1616820728096597564">"حدد الشبكات التي تم فيها قياس استخدام البيانات. ويمكن منع التطبيقات من استخدام هذه الشبكات عندما تعمل في الخلفية. كما يمكن أن تعرض التطبيقات أيضًا تحذيرًا قبل استخدام هذه الشبكات للتنزيلات كبيرة الحجم."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"شبكات الجوال"</string>
     <string name="data_usage_metered_wifi" msgid="4151511616349458705">"شبكات Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="3656830919281429036">"لتحديد شبكات Wi-Fi تم قياسها، شغل اتصال Wi-Fi."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"الاتصال بالطوارئ"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"العودة إلى المكالمة"</string>
     <string name="vpn_name" msgid="4689699885361002297">"الاسم"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 0f24ba4..1c50a14 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -1356,10 +1356,8 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Выдаліць усе сертыфікаты"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Давераныя паўнамоцтвы"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Паказаць правераныя сертыфікаты CA"</string>
-    <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) -->
-    <skip />
-    <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) -->
-    <skip />
+    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Намалюйце графiчны ключ разблакоўкі"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Каб пацвердзіць усталёўку ўлiковых дадзеных, намалюйце графiчны ключ разблакоўкі."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Увядзіце пароль для сховішча ўліковых дадзеных."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Бягучы пароль:"</string>
@@ -1579,6 +1577,8 @@
     <string name="data_usage_metered_body" msgid="1616820728096597564">"Вылучыце сеткі, у якіх выкарыстанне дадзеных вымяраецца. Выкарыстанне гэтых сетак праграмамі ў фонавым рэжыме можа быць абмежавана. Прыкладанні таксама могуць папярэджваць, перш чым выкарыстоўваць гэтыя сеткі для вялікіх спамповак."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Мабільныя сеткі"</string>
     <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Сеткі Wi-Fi"</string>
+    <!-- no translation found for data_usage_metered_wifi_disabled (3656830919281429036) -->
+    <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Экстраны выклік"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Вярнуцца да выкліку"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Назва"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index fe3b315..6d9999e 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -1356,10 +1356,8 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Премахване на всички сертификати"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Надеждни идент. данни"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Показване на надеждни сертификати от сертифициращи органи"</string>
-    <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) -->
-    <skip />
-    <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) -->
-    <skip />
+    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Начертайте фигурата си за отключване"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Трябва да начертаете фигурата си за отключване, за да потвърдите инсталирането на идентификационни данни."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Въведете паролата за хранилището за идентификационни данни."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Текуща парола:"</string>
@@ -1579,6 +1577,8 @@
     <string name="data_usage_metered_body" msgid="1616820728096597564">"Изберете мрежите, за които използването на данни е с отчитане. Приложенията могат да бъдат ограничени от ползването им, когато са на заден план. Възможно е също да предупреждават, преди да използват тези мрежи за големи изтегляния."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Мобилни мрежи"</string>
     <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Wi-Fi мрежи"</string>
+    <!-- no translation found for data_usage_metered_wifi_disabled (3656830919281429036) -->
+    <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Спешно обаждане"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Назад към обаждането"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Име"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index b8c584d..e8230af 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -1356,10 +1356,8 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Elimina tots els certificats"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Credencials de confiança"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Mostra certificats de CA de confiança"</string>
-    <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) -->
-    <skip />
-    <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) -->
-    <skip />
+    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Dibuixa el patró de desbloqueig"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Has de dibuixar el teu patró de desbloqueig per confirmar la instal·lació de les credencials."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Escriu la contrasenya per a l\'emmagatzematge de credencials."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Contrasenya actual:"</string>
@@ -1505,7 +1503,7 @@
     <string name="show_hw_screen_updates_summary" msgid="5280716513731970663">"Destaca les zones de pantalla en actual. amb GPU"</string>
     <string name="disable_overlays" msgid="3645736086368449005">"Desactiva superposicions"</string>
     <string name="disable_overlays_summary" msgid="7111098018524381234">"No utilitzis superpos. per a composició pantalla"</string>
-    <string name="debug_layout" msgid="5981361776594526155">"Mostra límits format"</string>
+    <string name="debug_layout" msgid="5981361776594526155">"Mostra límits de format"</string>
     <string name="debug_layout_summary" msgid="978411395294379156">"Mostra la informació sobre límits, separació, etc."</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Mostra l\'ús de la CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Superposició de pantalla mostra ús actual de CPU"</string>
@@ -1579,6 +1577,7 @@
     <string name="data_usage_metered_body" msgid="1616820728096597564">"Selecciona les xarxes en les quals es mesuri l\'ús de dades. Les aplicacions es poden restringir perquè no utilitzin aquestes xarxes en segon pla. A més, les aplicacions també poden enviar una notificació abans d\'utilitzar aquestes xarxes per a baixades grans."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Xarxes mòbils"</string>
     <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Xarxes Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="3656830919281429036">"Per seleccionar xarxes Wi-Fi, activa el Wi-Fi."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Trucada d\'emergència"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Torna a la trucada"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Nom"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 2a5adaf..30f303f 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -815,7 +815,7 @@
     <string name="menu_delete" msgid="6981294422841124659">"Smazat název přístupového bodu"</string>
     <string name="menu_new" msgid="3014205883303921729">"Nový název AP"</string>
     <string name="menu_save" msgid="8109345640668285399">"Uložit"</string>
-    <string name="menu_cancel" msgid="2194502410474697474">"Zrušit"</string>
+    <string name="menu_cancel" msgid="2194502410474697474">"Zahodit"</string>
     <string name="error_title" msgid="7631322303341024692"></string>
     <string name="error_name_empty" msgid="8418502878620394756">"Pole Název nesmí být prázdné."</string>
     <string name="error_apn_empty" msgid="6056233831214537267">"Název přístupového bodu (APN) nesmí být prázdný."</string>
@@ -1068,10 +1068,10 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
-    <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"Počet procesů: <xliff:g id="NUMPROCESS">%1$d</xliff:g>; počet služeb: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
-    <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"Počet procesů: <xliff:g id="NUMPROCESS">%1$d</xliff:g>; počet služeb: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
-    <string name="running_processes_item_description_p_s" msgid="744424668287252915">"Počet procesů: <xliff:g id="NUMPROCESS">%1$d</xliff:g>; počet služeb: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
-    <string name="running_processes_item_description_p_p" msgid="1607384595790852782">"Počet procesů: <xliff:g id="NUMPROCESS">%1$d</xliff:g>; počet služeb: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
+    <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"procesy: <xliff:g id="NUMPROCESS">%1$d</xliff:g>, služby: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
+    <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"procesy: <xliff:g id="NUMPROCESS">%1$d</xliff:g>, služby: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
+    <string name="running_processes_item_description_p_s" msgid="744424668287252915">"procesy: <xliff:g id="NUMPROCESS">%1$d</xliff:g>, služby: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
+    <string name="running_processes_item_description_p_p" msgid="1607384595790852782">"procesy: <xliff:g id="NUMPROCESS">%1$d</xliff:g>, služby: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
     <string name="runningservicedetails_settings_title" msgid="3224004818524731568">"Spuštěná aplikace"</string>
     <string name="no_services" msgid="7133900764462288263">"Neaktivní"</string>
     <string name="runningservicedetails_services_title" msgid="391168243725357375">"Služby"</string>
@@ -1356,10 +1356,8 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Odebrat všechny certifikáty"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Důvěryhodná pověření"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Zobrazit důvěryhodné certifikáty CA"</string>
-    <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) -->
-    <skip />
-    <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) -->
-    <skip />
+    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Proveďte bezpečnostní gesto"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Instalaci pověření je třeba potvrdit provedením bezpečnostního gesta."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Zadejte heslo pro úložiště pověření."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Aktuální heslo:"</string>
@@ -1579,6 +1577,8 @@
     <string name="data_usage_metered_body" msgid="1616820728096597564">"Vyberte sítě, ve kterých jsou datové přenosy měřeny. Aplikacím na pozadí můžete využívání těchto sítí zakázat. Aplikace také mohou před stahováním velkých souborů pomocí těchto sítí zobrazit upozornění."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobilní sítě"</string>
     <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Sítě Wi-Fi"</string>
+    <!-- no translation found for data_usage_metered_wifi_disabled (3656830919281429036) -->
+    <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Tísňové volání"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Zpět k hovoru"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Název"</string>
@@ -1657,7 +1657,7 @@
     <string name="user_max_content_rating" msgid="8297759970216482772">"Klasifikace obsahu"</string>
     <string name="user_system_apps_heading" msgid="2408331798732183682">"Systémové aplikace"</string>
     <string name="user_market_apps_heading" msgid="4657387297168308251">"Nainstalované aplikace"</string>
-    <string name="user_discard_user_menu" msgid="6638388031088461242">"Zrušit"</string>
+    <string name="user_discard_user_menu" msgid="6638388031088461242">"Zahodit"</string>
     <string name="user_remove_user_menu" msgid="3210146886949340574">"Odebrat uživatele"</string>
     <string name="user_new_user_name" msgid="7603010274765911161">"Uličník"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Chcete uživatele odebrat?"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 52cb6c2..435d92f 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -1356,10 +1356,8 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Fjern alle certifikater"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Troværdige loginoplysninger"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Vis troværdige CA-certifikater"</string>
-    <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) -->
-    <skip />
-    <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) -->
-    <skip />
+    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Tegn dit oplåsningsmønster"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Du skal tegne dit oplåsningsmønster for at bekræfte en gendannelse af fabriksindstillingerne."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Skriv adgangskoden til lager for loginoplysninger."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Nuværende adgangskode:"</string>
@@ -1579,6 +1577,8 @@
     <string name="data_usage_metered_body" msgid="1616820728096597564">"Vælg de netværk, hvor dataforbruget måles. Apps kan forhindres i at bruge disse netværk, når de kører i baggrunden. Apps kan også give en advarsel, før de bruger disse netværk til store downloads."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobilnetværk"</string>
     <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Wi-Fi-netværk"</string>
+    <!-- no translation found for data_usage_metered_wifi_disabled (3656830919281429036) -->
+    <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Nødopkald"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Tilbage til opkald"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Navn"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 3cf2905..1a5f9ff 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -1357,10 +1357,8 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Alle Zertifikate entfernen"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Vertrauenswürdige Anmeldedaten"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Vertrauenswürdige CA-Zertifikate anzeigen"</string>
-    <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) -->
-    <skip />
-    <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) -->
-    <skip />
+    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Bitte zeichnen Sie Ihr Entsperrungsmuster."</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Sie müssen Ihr Entsperrungsmuster eingeben, um das Installieren der Anmeldedaten zu bestätigen."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Geben Sie das Passwort für den Anmeldeinformationsspeicher ein."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Aktuelles Passwort:"</string>
@@ -1580,6 +1578,8 @@
     <string name="data_usage_metered_body" msgid="1616820728096597564">"Wählen Sie die Netzwerke, bei denen der Datenverbrauch kostenpflichtig ist. Sie können die Verwendung dieser Netzwerke für Apps, die im Hintergrund ausgeführt werden, einschränken. Apps können auch eine Warnung ausgeben, bevor sie diese Netzwerke für große Downloads nutzen."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobilfunknetze"</string>
     <string name="data_usage_metered_wifi" msgid="4151511616349458705">"WLAN-Netzwerke"</string>
+    <!-- no translation found for data_usage_metered_wifi_disabled (3656830919281429036) -->
+    <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Notruf"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Zurück zum Anruf"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Name"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 1652483..bbdb62a 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -1356,10 +1356,8 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Κατάργηση όλων των πιστοποιητικών"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Αξιόπιστα διαπιστευτήρια"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Προβολή αξιόπιστων πιστοποιητικών CA"</string>
-    <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) -->
-    <skip />
-    <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) -->
-    <skip />
+    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Σχεδιάστε το μοτίβο ξεκλειδώματος"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Πρέπει να σχεδιάσετε το μοτίβο ξεκλειδώματος για να επιβεβαιώσετε την εγκατάσταση των διαπιστευτηρίων."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Πληκτρολογήστε τον κωδικό πρόσβασης του αποθηκευτικού χώρου διαπιστευτηρίων."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Τρέχον κωδικός πρόσβασης:"</string>
@@ -1579,6 +1577,8 @@
     <string name="data_usage_metered_body" msgid="1616820728096597564">"Επιλέξτε τα δίκτυα για τα οποία η χρήση δεδομένων μετράται. Οι εφαρμογές μπορεί να περιοριστούν από τη χρήση αυτών των δικτύων όταν βρίσκονται στο παρασκήνιο. Οι εφαρμογές μπορεί επίσης να προειδοποιούν πριν από τη χρήση αυτών των δικτύων για μεγάλες λήψεις."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Δίκτυα κινητής τηλεφωνίας"</string>
     <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Δίκτυα Wi-Fi"</string>
+    <!-- no translation found for data_usage_metered_wifi_disabled (3656830919281429036) -->
+    <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Κλήση έκτακτης ανάγκης"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Επιστροφή στην κλήση"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Όνομα"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 16564fc..2ff971b 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -1356,10 +1356,8 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Remove all certificates"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Trusted credentials"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Display trusted CA certificates"</string>
-    <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) -->
-    <skip />
-    <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) -->
-    <skip />
+    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Draw your unlock pattern"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"You need to draw your unlock pattern to confirm credential installation."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Type the password for credential storage."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Current password:"</string>
@@ -1579,6 +1577,7 @@
     <string name="data_usage_metered_body" msgid="1616820728096597564">"Select the networks for which data usage is metered. Apps can be restricted from using these networks when in the background. Apps may also warn before using these networks for large downloads."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobile networks"</string>
     <string name="data_usage_metered_wifi" msgid="4151511616349458705">"WiFi networks"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="3656830919281429036">"To select metered Wi-Fi networks, turn Wi-Fi on."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Emergency call"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Return to call"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Name"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index d37a115..63a2137 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -1579,6 +1579,8 @@
     <string name="data_usage_metered_body" msgid="1616820728096597564">"Selecciona las redes que miden el uso de datos. Puede restringirse el uso de estas redes por parte de las aplicaciones que se encuentran en segundo plano. Además, puede que las aplicaciones envíen una advertencia antes de usar estas redes para descargas grandes."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Redes móviles"</string>
     <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Redes Wi-Fi"</string>
+    <!-- no translation found for data_usage_metered_wifi_disabled (3656830919281429036) -->
+    <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Llamada de emergencia"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Regresar a llamada"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Nombre"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 60dcfca..f65c270 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -1356,10 +1356,8 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Eliminar todos los certificados"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Credenciales de confianza"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Mostrar certificados de CA de confianza"</string>
-    <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) -->
-    <skip />
-    <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) -->
-    <skip />
+    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Dibuja tu patrón de desbloqueo."</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Debes dibujar tu patrón de desbloqueo para confirmar la instalación de las credenciales."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Escribe la contraseña del almacenamiento de credenciales."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Contraseña actual:"</string>
@@ -1579,6 +1577,7 @@
     <string name="data_usage_metered_body" msgid="1616820728096597564">"Selecciona las redes que no tienen tarifa plana de datos. Se puede impedir que las aplicaciones utilicen estas redes cuando se ejecuten en segundo plano. Las aplicaciones también pueden mostrar un mensaje de advertencia antes de utilizar estas redes para descargas de gran tamaño."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Redes móviles"</string>
     <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Redes Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="3656830919281429036">"Para seleccionar redes Wi-Fi sin tarifa plana, activa el Wi-Fi."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Llamada de emergencia"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Volver a llamada"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Nombre"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 266742c..9d9d21e 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -1356,10 +1356,8 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Kõikide sertifikaatide eemaldamine"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Usaldusväärsed mandaadid"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Usaldusväärsete CA-sertifikaatide kuvamine"</string>
-    <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) -->
-    <skip />
-    <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) -->
-    <skip />
+    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Joonistage oma luku avamise muster"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Mandaadi installimise kinnitamiseks tuleb teil joonistada luku avamise muster."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Sisestage mandaadi salvestamise parool."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Kehtiv parool:"</string>
@@ -1579,6 +1577,8 @@
     <string name="data_usage_metered_body" msgid="1616820728096597564">"Valige võrgud, mille andmete kasutamist mõõdetakse. Saate keelata taustal töötavatel rakendustel nende võrkude kasutamise. Rakendused võivad edastada hoiatuse enne, kui neid võrke kasutatakse mahukateks allalaadimisteks."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobiilsidevõrgud"</string>
     <string name="data_usage_metered_wifi" msgid="4151511616349458705">"WiFi-võrgud"</string>
+    <!-- no translation found for data_usage_metered_wifi_disabled (3656830919281429036) -->
+    <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Hädaabikõne"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Tagasi kõne juurde"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Nimi"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 4ac9589..ebefc95 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -1506,13 +1506,13 @@
     <string name="disable_overlays" msgid="3645736086368449005">"غیرفعال کردن همپوشانی‌ها"</string>
     <string name="disable_overlays_summary" msgid="7111098018524381234">"از همپوشانی‌ها برای ترکیب صفحه استفاده نشود"</string>
     <string name="debug_layout" msgid="5981361776594526155">"نمایش محدوده‌های طرح‌بندی"</string>
-    <string name="debug_layout_summary" msgid="978411395294379156">"نمایش اطلاعات مربوط به محدوده‌ها، لایه و موارد دیگر."</string>
+    <string name="debug_layout_summary" msgid="978411395294379156">"نمایش اطلاعات مربوط به محدوده‌ها، لایه و موارد دیگر"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"نمایش میزان استفاده از CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"همپوشانی صفحه نمایش میزان استفاده از CPU فعلی"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"اجبار به تفسیر و اجرای GPU"</string>
     <string name="force_hw_ui_summary" msgid="8642000962902609976">"استفاده از شتاب‌دهنده سخت‌افزار 2D در برنامه‌ها"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"اجرای GPU نمایه"</string>
-    <string name="track_frame_time_summary" msgid="447577515813970287">"اندازه‌گیری زمان اجرا در لایه adb dumpsys gfxinfo"</string>
+    <string name="track_frame_time_summary" msgid="447577515813970287">"اندازه‌گیری زمان اجرا در adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"مقیاس انیمیشن پنجره"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"مقیاس انیمیشن انتقال"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"مقیاس طول مدت انیماتور"</string>
@@ -1579,6 +1579,8 @@
     <string name="data_usage_metered_body" msgid="1616820728096597564">"شبکه‌هایی را انتخاب کنید که استفاده داده در آنها اندازه‌گیری شده است. می‌توانید برنامه‌ها را محدود کنید تا زمانی که در پس‌زمینه فعال هستند، از این شبکه‌ها استفاده نکنند. همچنین قبل از استفاده از این شبکه‌ها برای دانلودهای بزرگ، برنامه‌ها به شما هشدار می‌دهند."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"شبکه‌های تلفن همراه"</string>
     <string name="data_usage_metered_wifi" msgid="4151511616349458705">"شبکه‌های Wi-Fi"</string>
+    <!-- no translation found for data_usage_metered_wifi_disabled (3656830919281429036) -->
+    <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"تماس اضطراری"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"بازگشت به تماس"</string>
     <string name="vpn_name" msgid="4689699885361002297">"نام"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index f312694..39c6dff 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -1356,10 +1356,8 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Poista kaikki varmenteet"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Luotetut todennustiedot"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Näytä luotetut CA-varmenteet"</string>
-    <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) -->
-    <skip />
-    <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) -->
-    <skip />
+    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Piirrä lukituksenpoistokuvio"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Vahvista kirjautumistunnuksien asennus piirtämällä lukituksenpoistokuviosi."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Anna käyttöoikeustietojen tallennustilan salasana."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Nykyinen salasana:"</string>
@@ -1579,6 +1577,8 @@
     <string name="data_usage_metered_body" msgid="1616820728096597564">"Valitse verkot, joissa tiedonsiirto on maksullista. Voit rajoittaa sovellusten taustatiedonsiirtoa näissä verkoissa. Sovellukset voivat myös varoittaa suurista latauksista maksullisissa verkoissa."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobiiliverkot"</string>
     <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Wifi-verkot"</string>
+    <!-- no translation found for data_usage_metered_wifi_disabled (3656830919281429036) -->
+    <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Hätäpuhelu"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Palaa puheluun"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Nimi"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 254463a..7eef5c1 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -1356,10 +1356,8 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Supprimer tous les certificats"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Certificats de confiance"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Afficher les certificats d\'autorité de confiance"</string>
-    <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) -->
-    <skip />
-    <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) -->
-    <skip />
+    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Dessinez votre schéma de déverrouillage."</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Pour confirmer l\'installation des certificats, vous devez dessiner votre schéma de déverrouillage."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Saisir le mot de passe de stockage des identifiants"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Mot de passe actuel :"</string>
@@ -1579,6 +1577,8 @@
     <string name="data_usage_metered_body" msgid="1616820728096597564">"Sélectionnez les réseaux pour lesquels la consommation de données est limitée. Vous pouvez empêcher les applications d\'utiliser ces réseaux lorsqu\'elles fonctionnent en arrière-plan. Les applications peuvent également vous mettre en garde avant d\'utiliser ces réseaux pour effectuer des téléchargements volumineux."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Réseaux mobiles"</string>
     <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Réseaux Wi-Fi"</string>
+    <!-- no translation found for data_usage_metered_wifi_disabled (3656830919281429036) -->
+    <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Appel d\'urgence"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Retour à l\'appel"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Nom"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 03b45b4..e1da97c 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -1356,10 +1356,8 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"सभी प्रमाणपत्र निकालें"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"विश्वस्त क्रेडेंशियल"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"विश्वस्त CA प्रमाणपत्र प्रदर्शित करें"</string>
-    <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) -->
-    <skip />
-    <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) -->
-    <skip />
+    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"अपना अनलॉक प्रतिमान आरेखित करें"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"आपको क्रेडेंशियल इंस्‍टॉलेशन की पुष्टि करने के लिए अपना अनलॉक प्रतिमान बनाना होगा."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"क्रेडेंशियल संग्रहण के लिए पासवर्ड लिखें."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"वर्तमान पासवर्ड:"</string>
@@ -1580,6 +1578,8 @@
     <string name="data_usage_metered_body" msgid="1616820728096597564">"उन नेटवर्क का चयन करें जिनके लिए डेटा उपयोग मापा जाता है. पृष्ठभूमि में होने पर एप्‍लिकेशन को इन नेटवर्क का उपयोग करने से प्रतिबंधित किया जा सकता है. बड़े डाउनलोड के लिए इन नेटवर्क का उपयोग करने से पहले एप्‍लिकेशन चेतावनी भी दे सकते हैं."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"मोबाइल नेटवर्क"</string>
     <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Wi-Fi नेटवर्क"</string>
+    <!-- no translation found for data_usage_metered_wifi_disabled (3656830919281429036) -->
+    <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"आपातकालीन कॉल"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"कॉल पर वापस लौटें"</string>
     <string name="vpn_name" msgid="4689699885361002297">"नाम"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index dd24fa2..ef53a80 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -992,7 +992,7 @@
     <string name="clear_user_data_text" msgid="5597622864770098388">"Izbriši podatke"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"Deinstaliraj ažuriranja"</string>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"Odlučili ste da se ta aplikacija pokreće prema zadanim postavkama za neke radnje."</string>
-    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"Odlučili ste dopustiti ovoj aplikaciji stvaranje widgeta i pristupanje njihovim podacima."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"Odlučili ste dopustiti ovoj aplikaciji izradu widgeta i pristupanje njihovim podacima."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Nema zadanih postavki."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Izbriši zadane postavke"</string>
     <string name="screen_compatibility_text" msgid="1616155457673106022">"Ta aplikacija možda nije dizajnirana za vaš zaslon. Ovdje možete provjeriti kako se prilagođava vašem zaslonu."</string>
@@ -1179,9 +1179,9 @@
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"Ove su postavke namijenjene samo razvojnim programerima. One mogu uzrokovati kvar ili neželjeno ponašanje vašeg uređaja i aplikacija na njemu."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Odaberi gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Odaberite widget"</string>
-    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Napraviti widget i dozvoliti pristup?"</string>
-    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Kada stvorite widget, aplikacija <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> može pristupiti svim podacima koje taj widget prikazuje."</string>
-    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Uvijek dopusti aplikaciji <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> stvaranje widgeta i pristupanje njihovim podacima"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Želite izraditi widget i dozvoliti pristup?"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Kada izradite widget, aplikacija <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> može pristupiti svim podacima koje taj widget prikazuje."</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Uvijek dopusti aplikaciji <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> izradu widgeta i pristupanje njihovim podacima"</string>
     <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> d <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> min <xliff:g id="SECONDS">%4$d</xliff:g> s"</string>
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g>min <xliff:g id="SECONDS">%3$d</xliff:g> s"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> s"</string>
@@ -1356,10 +1356,8 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Uklanjanje svih certifikata"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Pouzdane vjerodajnice"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Prikaz pouzdanih CA certifikata"</string>
-    <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) -->
-    <skip />
-    <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) -->
-    <skip />
+    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Iscrtajte obrazac za otključavanje"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Da biste potvrdili instalaciju vjerodajnica, trebate nacrtati svoj obrazac za otključavanje."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Upišite zaporku za pohranu vjerodajnica."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Trenutačna zaporka:"</string>
@@ -1579,6 +1577,8 @@
     <string name="data_usage_metered_body" msgid="1616820728096597564">"Odaberite mreže na kojima se prijenos podataka plaća prema količini prijenosa. Aplikacijama se može ograničiti upotreba tih mreža kada su u pozadini. Aplikacije također mogu dati upozorenje prije upotrebe tih mreža za velika preuzimanja."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobilne mreže"</string>
     <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Wi-Fi mreže"</string>
+    <!-- no translation found for data_usage_metered_wifi_disabled (3656830919281429036) -->
+    <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Hitan poziv"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Vrati se na poziv"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Naziv"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 6627421..2e93f58 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -1356,10 +1356,8 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Összes tanúsítvány eltávolítása"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Megbízható hitelesítő adatok"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Megbízható CA tanúsítványok megjelenítése"</string>
-    <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) -->
-    <skip />
-    <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) -->
-    <skip />
+    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Rajzolja le a feloldási mintát"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"A hitelesítési adatok telepítésének megerősítéséhez rajzolja le feloldási mintáját."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Írja be az azonosítótároló jelszavát."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Jelenlegi jelszó:"</string>
@@ -1579,6 +1577,8 @@
     <string name="data_usage_metered_body" msgid="1616820728096597564">"Válassza ki azokat a hálózatokat, amelyeknek adatforgalmát mérik. Megtilthatja, hogy a háttérben futó alkalmazások használják ezeket a hálózatokat. Továbbá az alkalmazások figyelmeztetést küldhetnek az ilyen hálózatokról történő nagy mennyiségű letöltések előtt."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobilhálózatok"</string>
     <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Wi-Fi hálózatok"</string>
+    <!-- no translation found for data_usage_metered_wifi_disabled (3656830919281429036) -->
+    <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Segélyhívás"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Hívás folytatása"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Név"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 2a3e48d..420f6df 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -1356,10 +1356,8 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Hapus semua sertifikat"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Kredensial tepercaya"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Tampilkan sertifikat CA tepercaya"</string>
-    <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) -->
-    <skip />
-    <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) -->
-    <skip />
+    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Gambar pola pembuka kunci Anda"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Anda perlu menggambar pola pembuka kunci untuk mengonfirmasi instalasi kredensial."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Ketik sandi untuk penyimpanan kredensial."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Sandi saat ini:"</string>
@@ -1579,6 +1577,8 @@
     <string name="data_usage_metered_body" msgid="1616820728096597564">"Pilih jaringan yang mengukur penggunaan data. Aplikasi dapat dibatasi agar tidak menggunakan jaringan ini ketika berada di latar belakang. Aplikasi juga dapat memberi peringatan sebelum menggunakan jaringan ini untuk unduhan berukuran besar."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Jaringan seluler"</string>
     <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Jaringan Wi-Fi"</string>
+    <!-- no translation found for data_usage_metered_wifi_disabled (3656830919281429036) -->
+    <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Panggilan darurat"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Kembali ke panggilan"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Nama"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 1957c97..e013822 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -1356,10 +1356,8 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Rimuovi tutti i certificati"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Credenziali attendibili"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Visualizza certificati CA attendibili"</string>
-    <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) -->
-    <skip />
-    <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) -->
-    <skip />
+    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Inserisci la sequenza di sblocco"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Per confermare l\'installazione delle credenziali devi inserire la sequenza di sblocco."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Digita la password per l\'archivio credenziali."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Password attuale:"</string>
@@ -1579,6 +1577,7 @@
     <string name="data_usage_metered_body" msgid="1616820728096597564">"Seleziona le reti per le quali l\'utilizzo dei dati è misurato. L\'utilizzo di tali reti può essere impedito alle applicazioni quando in background. Le applicazioni potrebbero anche mostrare un avviso prima di utilizzare tali reti per download di grandi dimensioni."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Reti mobili"</string>
     <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Reti Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="3656830919281429036">"Per selezionare le reti Wi-Fi metered, attiva il Wi-Fi."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Chiamata di emergenza"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Torna a chiamata"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Nome"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index be2200f..fe545e5 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -1356,10 +1356,8 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"הסר את כל האישורים"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"אישורים מהימנים"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"הצג אישורי CA מהימנים"</string>
-    <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) -->
-    <skip />
-    <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) -->
-    <skip />
+    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"שרטט את קו ביטול הנעילה"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"עליך לשרטט את קו ביטול הנעילה כדי לאשר התקנת הסמכות."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"הקלד את הסיסמה עבור אחסון אישורים."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"הסיסמה הנוכחית:"</string>
@@ -1579,6 +1577,8 @@
     <string name="data_usage_metered_body" msgid="1616820728096597564">"בחר את הרשתות שבהן נמדד השימוש בנתונים. ניתן להגביל את השימוש שעושים יישומים ברשתות אלה כשהם פועלים ברקע. קיימת גם אפשרות שיישומים יציגו אזהרה לפני שימוש באחת מרשתות אלה לביצוע הורדות בנפח גדול."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"רשתות לנייד"</string>
     <string name="data_usage_metered_wifi" msgid="4151511616349458705">"רשתות Wi-Fi"</string>
+    <!-- no translation found for data_usage_metered_wifi_disabled (3656830919281429036) -->
+    <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"שיחת חירום"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"חזור לשיחה"</string>
     <string name="vpn_name" msgid="4689699885361002297">"שם"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index e9f274a..891332a 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -1358,10 +1358,8 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"証明書をすべて削除する"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"信頼できる認証情報"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"信頼できるCA証明書を表示する"</string>
-    <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) -->
-    <skip />
-    <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) -->
-    <skip />
+    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"ロック解除パターンを入力してください"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"認証情報をインストールするには、ロック解除パターンを入力する必要があります。"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"認証情報ストレージのパスワードを入力してください。"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"現在のパスワード:"</string>
@@ -1581,6 +1579,8 @@
     <string name="data_usage_metered_body" msgid="1616820728096597564">"データ従量制のネットワークを選択してください。バックグラウンドで動作する際にこれらのネットワークを使用しないようアプリを制御できます。大きなファイルのダウンロードでこれらのネットワークを使用する前に警告を表示するよう設定することもできます。"</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"モバイルネットワーク"</string>
     <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Wi-Fiネットワーク"</string>
+    <!-- no translation found for data_usage_metered_wifi_disabled (3656830919281429036) -->
+    <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"緊急通報"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"通話に戻る"</string>
     <string name="vpn_name" msgid="4689699885361002297">"名前"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index dd199d6..4c7e5ed 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -1356,10 +1356,8 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"모든 인증서 삭제"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"신뢰할 수 있는 자격증명"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"신뢰할 수 있는 CA 인증서 표시"</string>
-    <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) -->
-    <skip />
-    <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) -->
-    <skip />
+    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"잠금해제 패턴을 그리세요."</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"자격증명 설치를 확인하려면 잠금해제 패턴을 그려야 합니다."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"자격증명 저장소 비밀번호를 입력하세요."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"현재 비밀번호:"</string>
@@ -1529,7 +1527,7 @@
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"4G 사용 구분"</string>
     <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Wi-Fi 사용량 표시"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"이더넷 사용량 표시"</string>
-    <string name="data_usage_menu_metered" msgid="8386567111915152271">"요금이 부과되는 네트워크"</string>
+    <string name="data_usage_menu_metered" msgid="8386567111915152271">"종량제 네트워크"</string>
     <string name="data_usage_change_cycle" msgid="7776556448920114866">"주기 변경..."</string>
     <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"데이터 사용 주기를 재설정할 날짜:"</string>
     <string name="data_usage_empty" msgid="8621855507876539282">"이 기간 동안 데이터를 사용한 앱이 없습니다."</string>
@@ -1553,10 +1551,10 @@
     <string name="data_usage_enable_4g" msgid="3635854097335036738">"4G 데이터"</string>
     <string name="data_usage_app_settings" msgid="8430240158135453271">"앱 설정 보기"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"백그라운드 데이터 제한"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="7414394653383835260">"요금이 부과되는 네트워크에서 백그라운드 데이터를 사용하지 않도록 설정합니다. 가능한 경우 무제한 네트워크가 사용됩니다."</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="7414394653383835260">"종량제 네트워크에서 백그라운드 데이터를 사용하지 않도록 설정합니다. 가능한 경우 무제한 네트워크가 사용됩니다."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"이 앱에 대해 백그라운드 데이터를 제한하려면 먼저 모바일 데이터 제한을 설정하세요."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"백그라운드 데이터 사용 제한"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1551946513417839948">"요금이 부과되는 네트워크만 사용할 수 있는 경우 백그라운드 데이터에 의존하는 앱이 중단될 수 있습니다. "\n\n"앱 설정에서 데이터 사용을 더 적절하게 관리할 수 있는 컨트롤을 찾아 볼 수 있습니다."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1551946513417839948">"종량제 네트워크만 사용할 수 있는 경우 백그라운드 데이터에 의존하는 앱이 중단될 수 있습니다. "\n\n"앱 설정에서 데이터 사용을 더 적절하게 관리할 수 있는 컨트롤을 찾아 볼 수 있습니다."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"백그라운드 데이터는 모바일 데이터 한도를 설정한 경우에만 제한할 수 있습니다."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"사용 주기 재설정"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"날짜:"</string>
@@ -1575,10 +1573,12 @@
     <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: 약 <xliff:g id="TOTAL">%1$s</xliff:g> 사용됨"</string>
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: 약 <xliff:g id="TOTAL">%1$s</xliff:g> 사용됨 - 태블릿을 기준으로 측정된 데이터 사용량이며 이동통신사에서는 사용량을 다르게 계산할 수 있습니다."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: 약 <xliff:g id="TOTAL">%1$s</xliff:g> 사용됨 - 휴대전화를 기준으로 측정된 데이터 사용량이며 이동통신사에서는 사용량을 다르게 계산할 수 있습니다."</string>
-    <string name="data_usage_metered_title" msgid="311250454694217878">"요금 부과 네트워크"</string>
-    <string name="data_usage_metered_body" msgid="1616820728096597564">"데이터 사용 요금이 부과되는 네트워크를 선택하세요. 앱이 백그라운드에 있을 때 해당 네트워크를 사용할 수 없도록 제한할 수 있습니다. 또한 네트워크를 사용하여 대용량 다운로드를 하기 전에 앱에서 경고해 줍니다."</string>
+    <string name="data_usage_metered_title" msgid="311250454694217878">"종량제 네트워크"</string>
+    <string name="data_usage_metered_body" msgid="1616820728096597564">"종량제 네트워크를 선택하세요. 앱이 백그라운드에 있을 때 해당 네트워크를 사용할 수 없도록 제한할 수 있습니다. 또한 네트워크를 사용하여 대용량 다운로드를 하기 전에 앱에서 경고해 줍니다."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"모바일 네트워크"</string>
     <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Wi-Fi 네트워크"</string>
+    <!-- no translation found for data_usage_metered_wifi_disabled (3656830919281429036) -->
+    <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"긴급 전화"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"통화로 돌아가기"</string>
     <string name="vpn_name" msgid="4689699885361002297">"이름"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index afea087..c91a89b 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -1356,10 +1356,8 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Pašalinti visus sertifikatus"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Patikimi įgaliojimai"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Rodyti patikimus CA sertifikatus"</string>
-    <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) -->
-    <skip />
-    <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) -->
-    <skip />
+    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Nubrėžti atrakinimo piešinį"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Kad patvirtintumėte kredencialų diegimą, turite nubrėžti atrakinimo piešinį."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Įveskite kredencialų atmintinės slaptažodį."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Dabartinis slaptažodis:"</string>
@@ -1579,6 +1577,8 @@
     <string name="data_usage_metered_body" msgid="1616820728096597564">"Pasirinkite tinklus, kuriuose duomenų naudojimas matuojamas. Galima drausti programose naudoti šiuos tinklus, kai jos veikia fone. Be to, programos gali įspėti prieš naudodamos šiuos tinklus, kai reikia atsisiųsti daug duomenų."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobiliojo ryšio tinklai"</string>
     <string name="data_usage_metered_wifi" msgid="4151511616349458705">"„Wi-Fi“ tinklai"</string>
+    <!-- no translation found for data_usage_metered_wifi_disabled (3656830919281429036) -->
+    <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Skambutis pagalbos numeriu"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Grįžti prie skambučio"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Pavadinimas"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 02d951e..3f832ea 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -1356,10 +1356,8 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Noņemt visus sertifikātus"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Uzticami akreditācijas dati"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Attēlot uzticamus CA sertifikātus"</string>
-    <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) -->
-    <skip />
-    <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) -->
-    <skip />
+    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Norādiet atbloķēšanas kombināciju."</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Lai apstiprinātu akreditācijas datu instalēšanu, norādiet atbloķēšanas kombināciju."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Ierakstiet akreditācijas datu krātuves paroli."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Pašreizējā parole:"</string>
@@ -1579,6 +1577,8 @@
     <string name="data_usage_metered_body" msgid="1616820728096597564">"Atlasiet tīklus, kuru datu lietošana ir par maksu. Var ierobežot šo tīklu lietošanu fonā esošām lietotnēm. Var arī iestatīt, lai lietotnēs tiktu rādīti brīdinājumi pirms šo tīklu lietošanas lielām lejupielādēm."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobilie tīkli"</string>
     <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Wi-Fi tīkli"</string>
+    <!-- no translation found for data_usage_metered_wifi_disabled (3656830919281429036) -->
+    <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Ārkārtas zvans"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Atgriezties pie zvana"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Nosaukums"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 846cd2a..d1bbc9d 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -1356,10 +1356,8 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Alih keluar semua sijil"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Bukti kelayakan dipercayai"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Paparkan sijil CA yang dipercayai"</string>
-    <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) -->
-    <skip />
-    <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) -->
-    <skip />
+    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Lukis corak buka kunci anda"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Anda perlu melukiskan corak buka kunci anda untuk mengesahkan pemasangan bukti kelayakan."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Taip kata laluan untuk storan bukti kelayakan."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Kata laluan semasa:"</string>
@@ -1502,7 +1500,7 @@
     <string name="show_screen_updates" msgid="8282711794220426931">"Tunjukkan kms kini skrin"</string>
     <string name="show_screen_updates_summary" msgid="1716122382094924596">"Kelipkan kawasan skrin apabila ia mengemas kini"</string>
     <string name="show_hw_screen_updates" msgid="1066779731201521925">"Tunjuk kms kini skrin GPU"</string>
-    <string name="show_hw_screen_updates_summary" msgid="5280716513731970663">"Denyar kwsn skrin apbl mereka mengemas kini GPU"</string>
+    <string name="show_hw_screen_updates_summary" msgid="5280716513731970663">"Denyar kwsn skrin apabila mereka kemas kini GPU"</string>
     <string name="disable_overlays" msgid="3645736086368449005">"Lumpuhkan tindihan atas"</string>
     <string name="disable_overlays_summary" msgid="7111098018524381234">"Jangan gunakan tindihan atas untuk komposit skrin"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Tunjukkan batas reka letak"</string>
@@ -1579,6 +1577,8 @@
     <string name="data_usage_metered_body" msgid="1616820728096597564">"Pilih rangkaian yang penggunaan datanya bermeter. Apl boleh disekat daripada menggunakan rangkaian ini semasa di latar belakang. Apl juga boleh memberi amaran sebelum menggunakan rangkaian ini untuk muat turun yang besar."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Rangkaian mudah alih"</string>
     <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Rangkaian Wi-Fi"</string>
+    <!-- no translation found for data_usage_metered_wifi_disabled (3656830919281429036) -->
+    <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Panggilan kecemasan"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Kembali ke panggilan"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Nama"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index e036a8c..410474b 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -1179,7 +1179,7 @@
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"Disse innstillingene er bare beregnet for bruk under programutvikling. De kan forårsake problemer med enheten din og tilhørende apper."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Velg gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Velg skrivebordselement"</string>
-    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Opprette modul og gi tilgang?"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Vil du opprette modulen og gi tilgang?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Når du har opprettet modulen, kan <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> lese alle dataene den viser."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Gi alltid <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> tillatelse til å opprette moduler og lese moduldata"</string>
     <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>d <xliff:g id="HOURS">%2$d</xliff:g>t <xliff:g id="MINUTES">%3$d</xliff:g>m <xliff:g id="SECONDS">%4$d</xliff:g>s"</string>
@@ -1356,10 +1356,8 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Fjern alle sertifikater"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Pålitelig legitimasjon"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Vis pålitelige CA-sertifikater"</string>
-    <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) -->
-    <skip />
-    <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) -->
-    <skip />
+    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Tegn opplåsingsmønsteret"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Du må tegne opplåsingsmønsteret for å bekrefte installasjonen av legitimasjon."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Skriv inn passordet for legitimasjonslageret."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Nåværende passord:"</string>
@@ -1556,7 +1554,7 @@
     <string name="data_usage_app_restrict_background_summary" msgid="7414394653383835260">"Deaktiver bakgrunnsdata på målte nettverk. Umålte nettverk brukes når det er mulig."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Hvis du ønsker å begrense bakgrunnsdata for denne appen, må du først angi en grense for bruk av mobildata."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Vil du begrense bruken av bakgrunnsdata?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1551946513417839948">"Denne funksjonen kan gjøre at en app som er avhengig av bakgrunnsdata slutter å fungere når bare målte nettverk er tilgjengelige."\n\n"Du finner bedre egnede alternativer for databruk i appens innstillinger."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1551946513417839948">"Denne funksjonen kan gjøre at apper som er avhengig av bakgrunnsdata slutter å fungere når bare målte nettverk er tilgjengelige."\n\n"Du finner bedre egnede alternativer for databruk i appens innstillinger."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Du kan begrense bakgrunnsdata, men bare hvis du har angitt en grense for bruk av mobildata."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Tilbakestillingsdato for brukssyklus"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Dato for hver måned:"</string>
@@ -1579,6 +1577,8 @@
     <string name="data_usage_metered_body" msgid="1616820728096597564">"Velg nettverk der databruk måles. Apper kan hindres i å bruke disse nettverkene når de kjører i bakgrunnen. Apper kan også gi et varsel før et slikt nettverk brukes for store nedlastninger."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobilnettverk"</string>
     <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Wi-Fi-nettverk"</string>
+    <!-- no translation found for data_usage_metered_wifi_disabled (3656830919281429036) -->
+    <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Nødanrop"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Tilbake til anrop"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Navn"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index fb59f91..8c8fc0d 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -1356,10 +1356,8 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Alle certificaten verwijderen"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Vertrouwde id-gegevens"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Vertrouwde CA-certificaten weergeven"</string>
-    <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) -->
-    <skip />
-    <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) -->
-    <skip />
+    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Teken uw ontgrendelingspatroon"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"U moet uw ontgrendelingspatroon tekenen om de identificatie-installatie te bevestigen."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Typ het wachtwoord voor referentieopslag."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Huidig wachtwoord:"</string>
@@ -1579,6 +1577,8 @@
     <string name="data_usage_metered_body" msgid="1616820728096597564">"Selecteer de betaalde netwerken. Bij gebruik van deze netwerken, kunnen apps worden beperkt als ze op de achtergrond gebruikt worden. Apps kunnen ook waarschuwingen uitgeven voordat deze netwerken worden gebruikt voor grote downloads."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobiele netwerken"</string>
     <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Wifi-netwerken"</string>
+    <!-- no translation found for data_usage_metered_wifi_disabled (3656830919281429036) -->
+    <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Noodoproep"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Terug naar gesprek"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Naam"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index b9f69d0..70ad2cd 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -1356,10 +1356,8 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Usuń wszystkie certyfikaty"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Zaufane dane uwierzytelniające"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Wyświetlanie zaufanych certyfikatów CA"</string>
-    <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) -->
-    <skip />
-    <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) -->
-    <skip />
+    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Narysuj wzór odblokowania"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Aby potwierdzić instalację danych logowania, musisz narysować wzór odblokowania."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Podaj hasło do magazynu danych logowania."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Bieżące hasło:"</string>
@@ -1579,6 +1577,8 @@
     <string name="data_usage_metered_body" msgid="1616820728096597564">"Wybierz sieci, w których transmisja danych jest mierzona. Możesz ograniczyć aplikacjom działającym w tle dostęp do tych sieci. Aplikacje mogą też ostrzegać, zanim użyją tych sieci do pobrania dużych ilości danych."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Sieci komórkowe"</string>
     <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Sieci Wi-Fi"</string>
+    <!-- no translation found for data_usage_metered_wifi_disabled (3656830919281429036) -->
+    <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Połączenie alarmowe"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Powrót do połączenia"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Nazwa"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index d3d1207..e9e0d92 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -1356,10 +1356,8 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Remover todos os certificados"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Credenciais fiáveis"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Mostrar certificados da AC fiáveis"</string>
-    <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) -->
-    <skip />
-    <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) -->
-    <skip />
+    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Desenhe a sua sequência de desbloqueio"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"É necessário desenhar a sequência de desbloqueio para confirmar a instalação de credenciais."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Introduzir palavra-passe do armazenamento de credenciais."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Palavra-passe actual:"</string>
@@ -1579,6 +1577,7 @@
     <string name="data_usage_metered_body" msgid="1616820728096597564">"Selecione as redes para as quais a utilização de dados é limitada. As aplicações podem ser impedidas de utilizar estas redes quando estão em segundo plano. As aplicações podem também emitir um aviso antes de utilizarem estas redes para transferências grandes."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Redes móveis"</string>
     <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Redes Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="3656830919281429036">"Para selecionar redes Wi-Fi com tráfego limitado, ative Wi-Fi."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Chamada de emergência"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Regressar à chamada"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Nome"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 8968f75..ef5cd80 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -1356,10 +1356,8 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Remover todos os certificados"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Credenciais confiáveis"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Mostrar certificados CA de confiança"</string>
-    <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) -->
-    <skip />
-    <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) -->
-    <skip />
+    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Desenhe seu padrão de desbloqueio"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"É necessário que você desenhe seu padrão de desbloqueio para confirmar a instalação de credenciais."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Digite a senha para o armazenamento de credenciais."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Senha atual:"</string>
@@ -1579,6 +1577,7 @@
     <string name="data_usage_metered_body" msgid="1616820728096597564">"Selecione as redes nas quais o uso de dados é limitado. Os aplicativos podem ser impedidos de utilizar essas redes quando estiverem em segundo plano. Os aplicativos também podem avisar antes de usar essas redes para downloads extensos."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Redes móveis"</string>
     <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Redes Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="3656830919281429036">"Para selecionar redes Wi-Fi de acesso limitado, ative o Wi-Fi."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Chamada de emergência"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Retornar à chamada"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Nome"</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index cbc12a1..2fceec2 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -2420,6 +2420,8 @@
     <skip />
     <!-- no translation found for data_usage_metered_wifi (4151511616349458705) -->
     <skip />
+    <!-- no translation found for data_usage_metered_wifi_disabled (3656830919281429036) -->
+    <skip />
     <!-- no translation found for cryptkeeper_emergency_call (198578731586097145) -->
     <skip />
     <!-- no translation found for cryptkeeper_return_to_call (5613717339452772491) -->
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 766a7b5..6276886 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -592,7 +592,7 @@
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Redenumiţi dispozitivul"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Împerecheaţi dispozitivele"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Conectarea nu s-a putut realiza."</string>
-    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Redenumirea dispozitivului a eşuat."</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Dispozitivul nu a fost redenumit."</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Deconectaţi?"</string>
     <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"Dacă vă deconectaţi, conexiunea cu <xliff:g id="PEER_NAME">%1$s</xliff:g> se va încheia."</string>
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Dacă vă deconectaţi, conexiunea cu <xliff:g id="PEER_NAME">%1$s</xliff:g> şi cu alte <xliff:g id="PEER_COUNT">%2$s</xliff:g> dispozitive se va încheia."</string>
@@ -1357,10 +1357,8 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Eliminaţi toate certificatele"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Acreditări de încredere"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Afişaţi certificatele CA de încredere"</string>
-    <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) -->
-    <skip />
-    <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) -->
-    <skip />
+    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Desenaţi modelul pentru deblocare"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Trebuie să desenaţi modelul pentru deblocare pentru a confirma instalarea acreditării."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Introduceţi parola pentru spaţiul de stocare a certificatelor."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Parola actuală:"</string>
@@ -1506,14 +1504,14 @@
     <string name="show_hw_screen_updates_summary" msgid="5280716513731970663">"Iluminează zonele ecranului la actualizarea cu GPU"</string>
     <string name="disable_overlays" msgid="3645736086368449005">"Dezactivaţi suprapunerile"</string>
     <string name="disable_overlays_summary" msgid="7111098018524381234">"Nu utilizaţi suprapuneri pt. compunerea ecranului"</string>
-    <string name="debug_layout" msgid="5981361776594526155">"Afişaţi limite pt. aspect"</string>
+    <string name="debug_layout" msgid="5981361776594526155">"Afişaţi limite aspect"</string>
     <string name="debug_layout_summary" msgid="978411395294379156">"Afişaţi informaţii despre limite, spaţiere etc."</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Afişaţi utiliz. procesor."</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Suprap. pe ecran indic. util. curentă a procesor."</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Forţaţi redarea cu GPU"</string>
     <string name="force_hw_ui_summary" msgid="8642000962902609976">"Utilizaţi accelerarea hardware 2D în aplicaţii"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"Profil redare cu GPU"</string>
-    <string name="track_frame_time_summary" msgid="447577515813970287">"Măsur. timp de redare în adb shell dumpsys gfxinfo"</string>
+    <string name="track_frame_time_summary" msgid="447577515813970287">"Măsurare timp redare în adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Scara anim. în fereastră"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Scară pt. anim. cu tranz."</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Scară durată Animator"</string>
@@ -1580,6 +1578,8 @@
     <string name="data_usage_metered_body" msgid="1616820728096597564">"Selectaţi reţelele pentru care utilizarea de date este contorizată. Utilizarea acestor reţele de către aplicaţii poate fi restricţionată când ele se află în fundal. De asemenea, aplicaţiile pot emite o avertizare înainte de a utiliza aceste reţele pentru descărcări mari."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Reţele mobile"</string>
     <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Reţele Wi-Fi"</string>
+    <!-- no translation found for data_usage_metered_wifi_disabled (3656830919281429036) -->
+    <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Apel de urgenţă"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Reveniţi la apel"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Nume"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 2f6cef2..b36ab49 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -1356,10 +1356,8 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Удалить все сертификаты"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Надежные учетные данные"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Показывать надежные сертификаты ЦС"</string>
-    <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) -->
-    <skip />
-    <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) -->
-    <skip />
+    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Начертите графический ключ"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Чтобы подтвердить установку учетных данных, начертите графический ключ."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Введите пароль для хранилища учетных данных."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Текущий пароль:"</string>
@@ -1579,6 +1577,7 @@
     <string name="data_usage_metered_body" msgid="1616820728096597564">"Укажите сети с тарификацией трафика. Они не будут использоваться приложениями в фоновом режиме. Кроме того, перед загрузкой больших файлов может появляться предупреждение."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Мобильные сети"</string>
     <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Сети Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="3656830919281429036">"To select metered Wi-Fi networks, turn Wi-Fi on."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Вызов службы экстренной помощи"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Вернуться к вызову"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Название сети"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 4088c7f..7ecbad3 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -1356,10 +1356,8 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Odstrániť všetky certifikáty"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Dôveryhodné poverenia"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Zobraziť dôveryhodné certifikáty CA"</string>
-    <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) -->
-    <skip />
-    <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) -->
-    <skip />
+    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Nakreslite bezpečnostný vzor"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Inštaláciu poverení je potrebné potvrdiť nakreslením bezpečnostného vzoru."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Zadajte heslo pre úložisko poverení."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Aktuálne heslo:"</string>
@@ -1579,6 +1577,8 @@
     <string name="data_usage_metered_body" msgid="1616820728096597564">"Vyberte siete, v ktorých sa merajú dátové prenosy. Aplikáciám na pozadí môžete využívanie týchto sietí zakázať. Aplikácie môžu tiež pred prevzatím veľkých súborov pomocou týchto sietí zobraziť upozornenie."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobilné siete"</string>
     <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Siete Wi-Fi"</string>
+    <!-- no translation found for data_usage_metered_wifi_disabled (3656830919281429036) -->
+    <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Tiesňové volanie"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Späť na hovor"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Názov"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 6d23ce9..63a9945 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -1579,6 +1579,7 @@
     <string name="data_usage_metered_body" msgid="1616820728096597564">"Izberite omrežja s plačljivim prenosom. Aplikacijam lahko preprečite uporabo teh omrežij, ko so v ozadju, za velike prenose pa lahko pred uporabo teh omrežij tudi prikažejo opozorilo."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobilna omrežja"</string>
     <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Omrežja Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="3656830919281429036">"Za izbiro omrežij z omejeno količ. prenosa Wi-Fi vklopite Wi-Fi."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Klic v sili"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Nazaj na klic"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Ime"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 340aece..538ea6b 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -1356,10 +1356,8 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Уклањање свих сертификата"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Поуздани акредитиви"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Прикажи поуздане CA сертификате"</string>
-    <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) -->
-    <skip />
-    <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) -->
-    <skip />
+    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Нацртајте шаблон за откључавање"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Потребно је да нацртате шаблон за откључавање да бисте потврдили инсталацију акредитива."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Унесите лозинку за складиште акредитива."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Тренутна лозинка:"</string>
@@ -1579,6 +1577,8 @@
     <string name="data_usage_metered_body" msgid="1616820728096597564">"Изаберите мреже на којима се коришћење података ограничава. Апликацијама може да буде ограничено коришћење ових мрежа када се користе у позадини. Апликације могу и да упозоравају пре него што користе ове мреже за велика преузимања."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Мобилне мреже"</string>
     <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Wi-Fi мреже"</string>
+    <!-- no translation found for data_usage_metered_wifi_disabled (3656830919281429036) -->
+    <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Хитни позив"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Назад на позив"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Назив"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index be2ce32..3587efd 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -1356,10 +1356,8 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Ta bort alla certifikat"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Tillförlitlig autentisering"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Visa tillförlitliga CA-certifikat"</string>
-    <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) -->
-    <skip />
-    <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) -->
-    <skip />
+    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Rita ditt grafiska lösenord"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Du måste rita ditt grafiska lösenord för att bekräfta uppgifterna."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Ange lösenordet för uppgiftslagring."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Nuvarande lösenord:"</string>
@@ -1579,6 +1577,7 @@
     <string name="data_usage_metered_body" msgid="1616820728096597564">"Välj de nätverk där dataanvändningen är begränsad. Du kan förhindra att appar använder dessa nätverk när de körs i bakgrunden. I vissa appar visas även en varning innan dessa nätverk används för större hämtningar."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobila nätverk"</string>
     <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Wi-Fi-nätverk"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="3656830919281429036">"Aktivera Wi-Fi om du vill välja Wi-Fi-nätverk med databegränsning."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Nödsamtal"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Tillbaka till samtal"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Namn"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 8296e16..4d5a2d2 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -582,8 +582,7 @@
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Pea kifaa jina jipya"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Vifaa shiriki"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Haikuweza kuunganisha."</string>
-    <!-- no translation found for wifi_p2p_failed_rename_message (2562182284946936380) -->
-    <skip />
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Imeshindwa kubadili jina la kifaa."</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Tenganisha?"</string>
     <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"Ukitenganisha, muunganisho wako na <xliff:g id="PEER_NAME">%1$s</xliff:g> utakoma."</string>
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Ukitenganisha, muunganisho wako na <xliff:g id="PEER_NAME">%1$s</xliff:g> na vifaa vingine <xliff:g id="PEER_COUNT">%2$s</xliff:g> utakoma."</string>
@@ -1347,10 +1346,8 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Ondoa vyeti vyote"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Stakabadhi aminifu"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Onyesha vyeti vyako amilifu vya CA"</string>
-    <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) -->
-    <skip />
-    <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) -->
-    <skip />
+    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Chora mchoro wako wa kufungua"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Unahitaji kuchora mchoro wako wa kufungua ili kuthibitisha usakinishaji wa hati tambulishi."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Ingiza nenosiri ya hifadhi ya stakabadhi"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Nenosiri la sasa:"</string>
@@ -1492,24 +1489,18 @@
     <string name="show_touches_summary" msgid="6684407913145150041">"Onyesha mwitikio wa kuonekana wa miguso"</string>
     <string name="show_screen_updates" msgid="8282711794220426931">"Onyesha sasisho za skrini"</string>
     <string name="show_screen_updates_summary" msgid="1716122382094924596">"Mulika maeneo ya skrini wakati yanasasisha"</string>
-    <!-- no translation found for show_hw_screen_updates (1066779731201521925) -->
-    <skip />
-    <!-- no translation found for show_hw_screen_updates_summary (5280716513731970663) -->
-    <skip />
+    <string name="show_hw_screen_updates" msgid="1066779731201521925">"Onyesha sasisho za skrini ya GPU"</string>
+    <string name="show_hw_screen_updates_summary" msgid="5280716513731970663">"Mweka maeneo ya skrini wakati yanaposasisha na GPU"</string>
     <string name="disable_overlays" msgid="3645736086368449005">"Lemaza gaga"</string>
     <string name="disable_overlays_summary" msgid="7111098018524381234">"Usitumie gaga za utungaji skrini"</string>
-    <!-- no translation found for debug_layout (5981361776594526155) -->
-    <skip />
-    <!-- no translation found for debug_layout_summary (978411395294379156) -->
-    <skip />
+    <string name="debug_layout" msgid="5981361776594526155">"Onyesha mipaka ya mpangilio"</string>
+    <string name="debug_layout_summary" msgid="978411395294379156">"Onyesha maelezo kuhusu mipaka, kujaza, na kadhalika."</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Onyesha matumizi ya CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Kuegeshwa kwa skrini ikionyesha matumizi ya sasa ya CPU"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Lazimisha kutungiliza  GPU"</string>
     <string name="force_hw_ui_summary" msgid="8642000962902609976">"Tumia maunzi ya kasi ya 2P katika programu"</string>
-    <!-- no translation found for track_frame_time (6146354853663863443) -->
-    <skip />
-    <!-- no translation found for track_frame_time_summary (447577515813970287) -->
-    <skip />
+    <string name="track_frame_time" msgid="6146354853663863443">"Utungilizaji wa GPU ya maelezo mafupi"</string>
+    <string name="track_frame_time_summary" msgid="447577515813970287">"Pima muda wa kutungiliza katika adp shell dumpys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Kipimo cha uhiani wa Window"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Mageuzi ya kipimo cha huiani"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Mizani ya muda wa uhuishaji"</string>
@@ -1576,6 +1567,7 @@
     <string name="data_usage_metered_body" msgid="1616820728096597564">"Chagua mitandao ambayo matumizi ya data yamepimwa. Programu zinaweza kuzuiwa kutumia mitandao hii zikiwa katika usuli. Huenda pia programu zikakuonya kabla ya kutumia mitandao hii kwa vipakuzi vikubwa."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mitandao ya simu"</string>
     <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Mitandao ya Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="3656830919281429036">"Ili kuchagua mitandao yenye dira ya Wi-Fi, washa Wi-Fi."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Simu ya dharura"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Rudi kwa kupiga simu"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Jina"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 5280d56..1b42ad8 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -496,7 +496,7 @@
     <string name="wifi_settings_category" msgid="2810363951104753710">"การตั้งค่า Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"ตั้งค่าและจัดการจุดเข้าใช้งานระบบไร้สาย"</string>
-    <string name="wifi_setup_wizard_title" msgid="8794440659600351945">"เลือกเครือข่าย Wi-Fi"</string>
+    <string name="wifi_setup_wizard_title" msgid="8794440659600351945">"เลือกเครือข่าย WiFi"</string>
     <string name="wifi_starting" msgid="6716593470710880000">"เปิด Wi-Fi…"</string>
     <string name="wifi_stopping" msgid="244864762599017659">"กำลังปิด Wi-Fi..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"ข้อผิดพลาด"</string>
@@ -1356,10 +1356,8 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"นำใบรับรองทั้งหมดออก"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"ข้อมูลรับรองที่เชื่อถือได้"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"แสดงใบรับรอง CA ที่เชื่อถือได้"</string>
-    <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) -->
-    <skip />
-    <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) -->
-    <skip />
+    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"วาดรูปแบบการปลดล็อกของคุณ"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"คุณจำเป็นต้องวาดรูปแบบการปลดล็อกของคุณเพื่อยืนยันการติดตั้งข้อมูลรับรอง"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"พิมพ์รหัสผ่านสำหรับที่เก็บข้อมูลรับรอง"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"รหัสผ่านปัจจุบัน:"</string>
@@ -1579,6 +1577,8 @@
     <string name="data_usage_metered_body" msgid="1616820728096597564">"เลือกเครือข่ายที่มีการตรวจวัดการใช้งานข้อมูล อาจมีการจำกัดแอปไม่ให้ใช้งานเครือข่ายเหล่านี้เมื่อทำงานในพื้นหลัง แอปอาจแจ้งเตือนก่อนที่จะใช้เครือข่ายเหล่านี้ในการดาวน์โหลดไฟล์ที่มีขนาดใหญ่ด้วย"</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"เครือข่ายมือถือ"</string>
     <string name="data_usage_metered_wifi" msgid="4151511616349458705">"เครือข่าย WiFi"</string>
+    <!-- no translation found for data_usage_metered_wifi_disabled (3656830919281429036) -->
+    <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"หมายเลขฉุกเฉิน"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"กลับสู่การโทร"</string>
     <string name="vpn_name" msgid="4689699885361002297">"ชื่อ"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 3440a48..90788a8 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -1356,10 +1356,8 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Alisin ang lahat ng certificate"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Pinagkakatiwalaang kredensyal"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Ipakita ang mga pinagkakatiwalaang mga CA certificate"</string>
-    <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) -->
-    <skip />
-    <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) -->
-    <skip />
+    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Iguhit ang iyong pattern sa pag-unlock"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Kailangan mong iguhit ang iyong pattern sa pag-unlock upang kumpirmahin ang pag-install ng kredensyal."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"I-type ang password para sa storage ng kredensyal."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Kasalukuyang password:"</string>
@@ -1579,6 +1577,8 @@
     <string name="data_usage_metered_body" msgid="1616820728096597564">"Piliin ang mga network kung saan nakametro ang paggamit ng data. Maaaring paghigpitan ang apps sa paggamit sa mga network na ito kapag nasa background. Maaari ring magbabala ang apps bago gamitin ang mga network na ito para sa malalaking download."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mga mobile network"</string>
     <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Mga Wi-Fi network"</string>
+    <!-- no translation found for data_usage_metered_wifi_disabled (3656830919281429036) -->
+    <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Emergency na tawag"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Balikan ang tawag"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Pangalan"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index edd6019..aced817 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -1356,10 +1356,8 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Tüm sertifikaları kaldır"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Güvenilir kimlik bilgisi"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Güvenilir CA sertifikalarını görüntüle"</string>
-    <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) -->
-    <skip />
-    <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) -->
-    <skip />
+    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Kilit açma deseninizi çizin"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Kimlik bilgisi yüklemesini onaylamak için kilit açma desenini çizmeniz gerekiyor."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Kimlik bilgileri deposu için şifreyi yazın."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Geçerli şifre:"</string>
@@ -1579,6 +1577,8 @@
     <string name="data_usage_metered_body" msgid="1616820728096597564">"Veri kullanımının ölçüldüğü ağları seçin. Arka planda çalışırken uygulamaların bu ağları kullanmaları kısıtlanabilir. Uygulamalar ayrıca yüksek hacimli indirme işlemleri için bu ağları kullanmadan önce kullanıcıyı uyarabilir."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobil ağlar"</string>
     <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Kablosuz ağlar"</string>
+    <!-- no translation found for data_usage_metered_wifi_disabled (3656830919281429036) -->
+    <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Acil durum çağrısı"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Çağrıya dön"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Ad"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 3cc2961..7ed979a 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -1356,10 +1356,8 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Видалити всі сертифікати"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Надійні облікові дані"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Показати надійні сертифікати ЦС"</string>
-    <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) -->
-    <skip />
-    <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) -->
-    <skip />
+    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Намалюйте ключ розблокування"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Щоб підтвердити встановлення облікових даних, потрібно намалювати ключ розблокування."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Ввести пароль для сховища облікових даних."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Поточний пароль:"</string>
@@ -1501,8 +1499,8 @@
     <string name="show_touches_summary" msgid="6684407913145150041">"Показувати візуальну реакцію на торкання"</string>
     <string name="show_screen_updates" msgid="8282711794220426931">"Показати оновлення екрана"</string>
     <string name="show_screen_updates_summary" msgid="1716122382094924596">"Підсвічувати області екрана, коли ті оновлюються"</string>
-    <string name="show_hw_screen_updates" msgid="1066779731201521925">"Показ.оновл-ня граф.проц."</string>
-    <string name="show_hw_screen_updates_summary" msgid="5280716513731970663">"Підсвіч. екран під час оновл. за доп. граф. проц."</string>
+    <string name="show_hw_screen_updates" msgid="1066779731201521925">"Показувати оновл. екрана"</string>
+    <string name="show_hw_screen_updates_summary" msgid="5280716513731970663">"Підсвічувати екран під час оновлення з GPU"</string>
     <string name="disable_overlays" msgid="3645736086368449005">"Вимкнути накладання"</string>
     <string name="disable_overlays_summary" msgid="7111098018524381234">"Не використов. накладання для компонування екрана"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Показувати межі макета"</string>
@@ -1511,8 +1509,8 @@
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Наклад-ня на екрані, яке показ.поточне використ.ЦП"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Примус.візуал. граф.проц."</string>
     <string name="force_hw_ui_summary" msgid="8642000962902609976">"Використання апаратного прискорення 2D в програмах"</string>
-    <string name="track_frame_time" msgid="6146354853663863443">"Проф.візуаліз. граф.проц."</string>
-    <string name="track_frame_time_summary" msgid="447577515813970287">"Вимірюв. час візуаліз. в adb shell dumpsys gfxinfo"</string>
+    <string name="track_frame_time" msgid="6146354853663863443">"Запис часу роботи GPU"</string>
+    <string name="track_frame_time_summary" msgid="447577515813970287">"Вимірювати час роботи в adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Ступінь анімації вікна"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Ступінь анімації переходу"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Тривалість анімації"</string>
@@ -1579,6 +1577,8 @@
     <string name="data_usage_metered_body" msgid="1616820728096597564">"Виберіть мережі з тарифікацією трафіку. Програмам можна заборонити користуватися цими мережами у фоновому режимі. Також можна створити попередження, якщо програмам потрібно скористатися такими мережами для великих завантажень."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Мобільні мережі"</string>
     <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Мережі Wi-Fi"</string>
+    <!-- no translation found for data_usage_metered_wifi_disabled (3656830919281429036) -->
+    <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Аварійний виклик"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Повернутися до дзвінка"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Назва"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 4a2dd9f..3a82cdc 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -592,8 +592,7 @@
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Đổi tên thiết bị"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Thiết bị ngang hàng"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Không thể kết nối."</string>
-    <!-- no translation found for wifi_p2p_failed_rename_message (2562182284946936380) -->
-    <skip />
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Không thể đổi tên thiết bị."</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Ngắt kết nối?"</string>
     <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"Nếu bạn ngắt kết nối, kết nối của bạn với <xliff:g id="PEER_NAME">%1$s</xliff:g> sẽ kết thúc."</string>
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Nếu bạn ngắt kết nối, kết nối của bạn với <xliff:g id="PEER_NAME">%1$s</xliff:g> và <xliff:g id="PEER_COUNT">%2$s</xliff:g> thiết bị khác sẽ kết thúc."</string>
@@ -1357,10 +1356,8 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Xóa tất cả chứng chỉ"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Thông tin đăng nhập tin cậy"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Hiển thị chứng chỉ CA tin cậy"</string>
-    <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) -->
-    <skip />
-    <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) -->
-    <skip />
+    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Vẽ hình mở khóa của bạn"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Bạn cần vẽ hình mở khóa của mình để xác nhận cài đặt thông tin xác thực."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Nhập mật khẩu cho vùng lưu trữ thông tin xác thực."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Mật khẩu hiện tại:"</string>
@@ -1502,24 +1499,18 @@
     <string name="show_touches_summary" msgid="6684407913145150041">"Hiển thị phản hồi trực quan cho các lần chạm"</string>
     <string name="show_screen_updates" msgid="8282711794220426931">"H.thị t.tin cập nhật màn hình"</string>
     <string name="show_screen_updates_summary" msgid="1716122382094924596">"Vùng flash của màn hình khi chúng cập nhật"</string>
-    <!-- no translation found for show_hw_screen_updates (1066779731201521925) -->
-    <skip />
-    <!-- no translation found for show_hw_screen_updates_summary (5280716513731970663) -->
-    <skip />
+    <string name="show_hw_screen_updates" msgid="1066779731201521925">"Hiển thị cập nhật màn hình GPU"</string>
+    <string name="show_hw_screen_updates_summary" msgid="5280716513731970663">"Các khu vực flash của màn hình khi chúng cập nhật với GPU"</string>
     <string name="disable_overlays" msgid="3645736086368449005">"Vô hiệu lớp phủ"</string>
     <string name="disable_overlays_summary" msgid="7111098018524381234">"Không sử dụng lớp phủ cho tổng hợp màn hình"</string>
-    <!-- no translation found for debug_layout (5981361776594526155) -->
-    <skip />
-    <!-- no translation found for debug_layout_summary (978411395294379156) -->
-    <skip />
+    <string name="debug_layout" msgid="5981361776594526155">"Hiển thị ranh giới bố cục"</string>
+    <string name="debug_layout_summary" msgid="978411395294379156">"Hiển thị thông tin về ranh giới, hình đệm, v.v."</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Hiển thị mức sử dụng CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Lớp phủ màn hình hiển thị mức sử dụng CPU hiện tại"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Bắt buộc kết xuất GPU"</string>
     <string name="force_hw_ui_summary" msgid="8642000962902609976">"Sử dụng tăng tốc phần cứng 2D trong các ứng dụng"</string>
-    <!-- no translation found for track_frame_time (6146354853663863443) -->
-    <skip />
-    <!-- no translation found for track_frame_time_summary (447577515813970287) -->
-    <skip />
+    <string name="track_frame_time" msgid="6146354853663863443">"Kết xuất GPU cấu hình"</string>
+    <string name="track_frame_time_summary" msgid="447577515813970287">"Đo thời gian kết xuất trong adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Tỷ lệ hình động của cửa sổ"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Tỷ lệ hình động chuyển đổi"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"T.lệ th.lượng tr.tạo h.đ"</string>
@@ -1586,6 +1577,8 @@
     <string name="data_usage_metered_body" msgid="1616820728096597564">"Chọn các mạng có mức sử dụng dữ liệu được kiểm soát. Ứng dụng có thể bị hạn chế sử dụng các mạng này khi chạy dưới nền. Ứng dụng cũng có thể cảnh báo trước khi sử dụng các mạng này để tải xuống tệp có kích thước lớn."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mạng di động"</string>
     <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Mạng Wi-Fi"</string>
+    <!-- no translation found for data_usage_metered_wifi_disabled (3656830919281429036) -->
+    <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Cuộc gọi khẩn cấp"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Quay lại cuộc gọi"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Tên"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 0e18bb5..5d7a094 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -592,7 +592,7 @@
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"重命名设备"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"对等设备"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"无法连接。"</string>
-    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"无法对设备进行重命名。"</string>
+    <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"无法重命名设备。"</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"断开连接？"</string>
     <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"如果断开连接，您与<xliff:g id="PEER_NAME">%1$s</xliff:g>的连接将中断。"</string>
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"如果断开连接，您与<xliff:g id="PEER_NAME">%1$s</xliff:g>和另外 <xliff:g id="PEER_COUNT">%2$s</xliff:g> 台设备的连接将中断。"</string>
@@ -972,7 +972,7 @@
     <string name="application_info_label" msgid="5736524913065714880">"应用信息"</string>
     <string name="storage_label" msgid="8700867073480107253">"存储"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"默认启动"</string>
-    <string name="auto_launch_label_generic" msgid="3230569852551968694">"默认设置"</string>
+    <string name="auto_launch_label_generic" msgid="3230569852551968694">"默认操作"</string>
     <string name="screen_compatibility_label" msgid="663250687205465394">"屏幕兼容性"</string>
     <string name="permissions_label" msgid="2605296874922726203">"权限"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"缓存"</string>
@@ -1356,10 +1356,8 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"删除所有证书"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"受信任的凭据"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"显示受信任的 CA 证书"</string>
-    <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) -->
-    <skip />
-    <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) -->
-    <skip />
+    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"绘制您的解锁图案"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"您需要绘制解锁图案，以确认凭据安装操作。"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"键入凭据存储的密码。"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"当前密码："</string>
@@ -1502,11 +1500,11 @@
     <string name="show_screen_updates" msgid="8282711794220426931">"显示屏幕更新"</string>
     <string name="show_screen_updates_summary" msgid="1716122382094924596">"屏幕上的区域更新时闪烁相应区域"</string>
     <string name="show_hw_screen_updates" msgid="1066779731201521925">"显示 GPU 屏幕更新"</string>
-    <string name="show_hw_screen_updates_summary" msgid="5280716513731970663">"更新 GPU 时闪烁显示屏幕区域"</string>
+    <string name="show_hw_screen_updates_summary" msgid="5280716513731970663">"GPU 更新屏幕区域时闪烁显示相应区域"</string>
     <string name="disable_overlays" msgid="3645736086368449005">"停用叠加层"</string>
     <string name="disable_overlays_summary" msgid="7111098018524381234">"不要将重叠层用于屏幕合成"</string>
     <string name="debug_layout" msgid="5981361776594526155">"显示布局边界"</string>
-    <string name="debug_layout_summary" msgid="978411395294379156">"显示关于边界、边距等数据的信息"</string>
+    <string name="debug_layout_summary" msgid="978411395294379156">"显示边界、边距等相关信息"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"显示 CPU 使用情况"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"屏幕叠加层显示当前 CPU 使用情况"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"强制进行 GPU 渲染"</string>
@@ -1579,6 +1577,8 @@
     <string name="data_usage_metered_body" msgid="1616820728096597564">"选择按数据流量计费的网络。这样可限制应用在后台使用这些网络。应用在使用这些网络下载较大的文件时，还可能会发出警告。"</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"移动网络"</string>
     <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Wi-Fi 网络"</string>
+    <!-- no translation found for data_usage_metered_wifi_disabled (3656830919281429036) -->
+    <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"紧急呼救"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"返回通话"</string>
     <string name="vpn_name" msgid="4689699885361002297">"名称"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index d818b94..97a101b 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -1356,10 +1356,8 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"移除所有憑證"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"信任的憑證"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"顯示信任的 CA 憑證"</string>
-    <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) -->
-    <skip />
-    <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) -->
-    <skip />
+    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"畫出解鎖圖形"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"您必須畫出解鎖圖形，才能確認安裝憑證。"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"輸入認證儲存空間的密碼。"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"目前的密碼："</string>
@@ -1529,7 +1527,7 @@
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"獨立顯示 4G 用量"</string>
     <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"顯示 Wi-Fi 用量"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"顯示乙太網路使用量"</string>
-    <string name="data_usage_menu_metered" msgid="8386567111915152271">"有限網路"</string>
+    <string name="data_usage_menu_metered" msgid="8386567111915152271">"按傳輸量計費網路"</string>
     <string name="data_usage_change_cycle" msgid="7776556448920114866">"變更週期..."</string>
     <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"資料用量週期的重設日期："</string>
     <string name="data_usage_empty" msgid="8621855507876539282">"這段期間沒有應用程式使用數據。"</string>
@@ -1553,10 +1551,10 @@
     <string name="data_usage_enable_4g" msgid="3635854097335036738">"4G 數據"</string>
     <string name="data_usage_app_settings" msgid="8430240158135453271">"查看應用程式設定"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"限制背景資料"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="7414394653383835260">"停用有限網路的背景數據傳輸，盡可能使用吃到飽費率網路。"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="7414394653383835260">"停用按傳輸量計費網路的背景數據傳輸，儘可能使用傳輸量無限 (吃到飽費率) 網路。"</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"您必須設定行動數據限制，才能限制這個應用程式的背景資料。"</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"限制背景資料？"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1551946513417839948">"如果採用這項功能，當只有有限網路可供使用時，需要背景數據傳輸的應用程式可能會停止運作。"\n\n"您可以前往應用程式內的設定，發掘更多適當的數據用量控制項。"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1551946513417839948">"如果採用這項功能，當只有按傳輸量計費網路可供使用時，需要背景數據傳輸的應用程式可能會停止運作。"\n\n"您可以前往應用程式內的設定，找出更多適當的數據用量控制項。"</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"您必須設定行動數據限制，才能限制背景資料。"</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"用量週期重設日期"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"每月固定日期："</string>
@@ -1575,10 +1573,12 @@
     <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>：已使用約 <xliff:g id="TOTAL">%1$s</xliff:g>。"</string>
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>：根據平板電腦計算，已使用約 <xliff:g id="TOTAL">%1$s</xliff:g>。您的行動通訊業者採用的計費方式可能有所不同。"</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>：根據手機計算，已使用約 <xliff:g id="TOTAL">%1$s</xliff:g>。您的行動通訊業者採用的計費方式可能有所不同。"</string>
-    <string name="data_usage_metered_title" msgid="311250454694217878">"有限網路"</string>
-    <string name="data_usage_metered_body" msgid="1616820728096597564">"請選取數據用量設有限制的網路。背景應用程式可能無法使用這些網路；如要透過這些網路下載大量資料，應用程式可能會先發出警告。"</string>
+    <string name="data_usage_metered_title" msgid="311250454694217878">"按傳輸量計費網路"</string>
+    <string name="data_usage_metered_body" msgid="1616820728096597564">"請選取按傳輸量計費網路。背景應用程式可能無法使用這些網路；如要透過這些網路下載大量資料，應用程式可能會先發出警告。"</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"行動網路"</string>
     <string name="data_usage_metered_wifi" msgid="4151511616349458705">"WiFi 網路"</string>
+    <!-- no translation found for data_usage_metered_wifi_disabled (3656830919281429036) -->
+    <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"緊急電話"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"返回通話"</string>
     <string name="vpn_name" msgid="4689699885361002297">"名稱"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index dd5a1a3..b266e86 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -1357,10 +1357,8 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Susa zonke izitifiketi"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Izifakazeli ezithenjwayo"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Bonisa izitifiketi ze-CA ezithenjwayo"</string>
-    <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) -->
-    <skip />
-    <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) -->
-    <skip />
+    <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Dweba iphethini yakho yokuvula"</string>
+    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Udinga ukudweba iphethini yakho yokuvula ukuze uqinisekise ukufakwa kwezincwadi ezichaza ngomuntu."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Thayipha iphasiwedi yokulondoloza ukufakazela ubuqiniso"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Iphasiwedi yamanje:"</string>
@@ -1580,6 +1578,8 @@
     <string name="data_usage_metered_body" msgid="1616820728096597564">"Khetha amanethiwekhi anokusetshenziswa kwedatha okulinganisiwe. Izinhlelo zokusebenza zingavinjelwa ekusebenziseni lawo manethiwekhi uma engemuva. Izinhlelo zokusebenza futhi zingaxwayisa ngaphambi kokusebenzisa lawo manethiwekhi ekulandeni okukhulu."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Amanethiwekhi eselula"</string>
     <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Amanethiwekhi e-Wi-Fi"</string>
+    <!-- no translation found for data_usage_metered_wifi_disabled (3656830919281429036) -->
+    <skip />
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Ikholi ephuthmayo"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Buyela ekholini"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Igama"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8ee96e4..92a3a9d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2664,6 +2664,8 @@
     <string name="user_dict_settings_add_menu_title">Add</string>
     <!-- User dictionary settings. The title of the dialog to add a new word to the user dictionary. [CHAR LIMIT=25] -->
     <string name="user_dict_settings_add_dialog_title">Add to dictionary</string>
+    <!-- User dictionary settings. The title of the screen to add/edit a new word to the user dictionary; it describes the phrase that will be added to the user dictionary. [CHAR LIMIT=25] -->
+    <string name="user_dict_settings_add_screen_title">Phrase</string>
     <!-- User dictionary settings. Text on the dialog button to pop more options for adding a word. [CHAR LIMIT=16] -->
     <string name="user_dict_settings_add_dialog_more_options">More options</string>
     <!-- User dictionary settings. Text on the dialog button mask advanced options. [CHAR LIMIT=15] -->
@@ -3784,6 +3786,8 @@
     <string name="data_usage_metered_mobile">Mobile networks</string>
     <!-- Header for list of Wi-Fi networks. [CHAR LIMIT=32] -->
     <string name="data_usage_metered_wifi">Wi-Fi networks</string>
+    <!-- Body text prompting user to enable Wi-Fi to configure metered networks. [CHAR LIMIT=64] -->
+    <string name="data_usage_metered_wifi_disabled">To select metered Wi-Fi networks, turn Wi-Fi on.</string>
 
     <!-- Button at the bottom of the CryptKeeper screen to make an emergency call. -->
     <string name="cryptkeeper_emergency_call">Emergency call</string>
diff --git a/res/xml/data_usage_metered_prefs.xml b/res/xml/data_usage_metered_prefs.xml
index 7ec3059..a0c6df4 100644
--- a/res/xml/data_usage_metered_prefs.xml
+++ b/res/xml/data_usage_metered_prefs.xml
@@ -29,6 +29,14 @@
     <PreferenceCategory
         android:key="wifi"
         android:title="@string/data_usage_metered_wifi"
-        android:persistent="false" />
+        android:persistent="false">
+
+        <Preference
+            android:key="wifi_disabled"
+            android:summary="@string/data_usage_metered_wifi_disabled"
+            android:persistent="false"
+            android:selectable="false" />
+
+    </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/src/com/android/settings/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java
index 2739d91..10c067d 100644
--- a/src/com/android/settings/CryptKeeper.java
+++ b/src/com/android/settings/CryptKeeper.java
@@ -33,6 +33,7 @@
 import android.os.ServiceManager;
 import android.os.SystemProperties;
 import android.os.storage.IMountService;
+import android.provider.Settings;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.util.Log;
@@ -49,6 +50,7 @@
 import android.widget.TextView;
 
 import com.android.internal.telephony.ITelephony;
+import com.android.internal.telephony.Phone;
 
 import java.util.List;
 
@@ -296,6 +298,7 @@
                 | StatusBarManager.DISABLE_HOME
                 | StatusBarManager.DISABLE_RECENT);
 
+        setAirplaneModeIfNecessary();
         mAudioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
         // Check for (and recover) retained instance data
         final Object lastInstance = getLastNonConfigurationInstance();
@@ -607,6 +610,33 @@
     }
 
     /**
+     * Set airplane mode on the device if it isn't an LTE device.
+     * Full story: In minimal boot mode, we cannot save any state. In particular, we cannot save
+     * any incoming SMS's. So SMSs that are received here will be silently dropped to the floor.
+     * That is bad. Also, we cannot receive any telephone calls in this state. So to avoid
+     * both these problems, we turn the radio off. However, on certain networks turning on and
+     * off the radio takes a long time. In such cases, we are better off leaving the radio
+     * running so the latency of an E911 call is short.
+     * The behavior after this is:
+     * 1. Emergency dialing: the emergency dialer has logic to force the device out of
+     *    airplane mode and restart the radio.
+     * 2. Full boot: we read the persistent settings from the previous boot and restore the
+     *    radio to whatever it was before it restarted. This also happens when rebooting a
+     *    phone that has no encryption.
+     */
+    private final void setAirplaneModeIfNecessary() {
+        final boolean isLteDevice =
+                TelephonyManager.getDefault().getLteOnCdmaMode() == Phone.LTE_ON_CDMA_TRUE;
+        if (!isLteDevice) {
+            Log.d(TAG, "Going into airplane mode.");
+            Settings.System.putInt(getContentResolver(), Settings.System.AIRPLANE_MODE_ON, 1);
+            final Intent intent = new Intent(Intent.ACTION_AIRPLANE_MODE_CHANGED);
+            intent.putExtra("state", true);
+            sendBroadcast(intent);
+        }
+    }
+
+    /**
      * Code to update the state of, and handle clicks from, the "Emergency call" button.
      *
      * This code is mostly duplicated from the corresponding code in
diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
index 1255b6b..3b0ce59 100644
--- a/src/com/android/settings/DataUsageSummary.java
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -394,9 +394,6 @@
         mUsageSummary = (TextView) mHeader.findViewById(R.id.usage_summary);
         mEmpty = (TextView) mHeader.findViewById(android.R.id.empty);
 
-        // only assign layout transitions once first layout is finished
-        mListView.getViewTreeObserver().addOnGlobalLayoutListener(mFirstLayoutListener);
-
         mAdapter = new DataUsageAdapter(mUidDetailProvider, mInsetSide);
         mListView.setOnItemClickListener(mListListener);
         mListView.setAdapter(mAdapter);
@@ -574,25 +571,22 @@
     }
 
     /**
-     * Listener to setup {@link LayoutTransition} after first layout pass.
+     * Build and assign {@link LayoutTransition} to various containers. Should
+     * only be assigned after initial layout is complete.
      */
-    private OnGlobalLayoutListener mFirstLayoutListener = new OnGlobalLayoutListener() {
-        @Override
-        public void onGlobalLayout() {
-            mListView.getViewTreeObserver().removeOnGlobalLayoutListener(mFirstLayoutListener);
+    private void ensureLayoutTransitions() {
+        // skip when already setup
+        if (mChart.getLayoutTransition() != null) return;
 
-            mTabsContainer.setLayoutTransition(buildLayoutTransition());
-            mHeader.setLayoutTransition(buildLayoutTransition());
-            mNetworkSwitchesContainer.setLayoutTransition(buildLayoutTransition());
+        mTabsContainer.setLayoutTransition(buildLayoutTransition());
+        mHeader.setLayoutTransition(buildLayoutTransition());
+        mNetworkSwitchesContainer.setLayoutTransition(buildLayoutTransition());
 
-            final LayoutTransition chartTransition = buildLayoutTransition();
-            chartTransition.setStartDelay(LayoutTransition.APPEARING, 0);
-            chartTransition.setStartDelay(LayoutTransition.DISAPPEARING, 0);
-            chartTransition.setAnimator(LayoutTransition.APPEARING, null);
-            chartTransition.setAnimator(LayoutTransition.DISAPPEARING, null);
-            mChart.setLayoutTransition(chartTransition);
-        }
-    };
+        final LayoutTransition chartTransition = buildLayoutTransition();
+        chartTransition.disableTransitionType(LayoutTransition.APPEARING);
+        chartTransition.disableTransitionType(LayoutTransition.DISAPPEARING);
+        mChart.setLayoutTransition(chartTransition);
+    }
 
     private static LayoutTransition buildLayoutTransition() {
         final LayoutTransition transition = new LayoutTransition();
@@ -1176,6 +1170,9 @@
         }
 
         mUsageSummary.setText(getString(summaryRes, totalPhrase, rangePhrase));
+
+        // initial layout is finished above, ensure we have transitions
+        ensureLayoutTransitions();
     }
 
     private final LoaderCallbacks<ChartData> mChartDataCallbacks = new LoaderCallbacks<
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 88fac0a..b0daf6c 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -321,7 +321,10 @@
                 AccountSyncSettings.class.getName().equals(fragmentName) ||
                 UserDictionarySettings.class.getName().equals(fragmentName) ||
                 Memory.class.getName().equals(fragmentName) ||
-                ManageApplications.class.getName().equals(fragmentName)) {
+                ManageApplications.class.getName().equals(fragmentName) ||
+                WirelessSettings.class.getName().equals(fragmentName) ||
+                SoundSettings.class.getName().equals(fragmentName) ||
+                PrivacySettings.class.getName().equals(fragmentName)) {
             intent.putExtra(EXTRA_CLEAR_UI_OPTIONS, true);
         }
 
diff --git a/src/com/android/settings/UserDictionarySettings.java b/src/com/android/settings/UserDictionarySettings.java
index 0b93a6a..8d4e8b4 100644
--- a/src/com/android/settings/UserDictionarySettings.java
+++ b/src/com/android/settings/UserDictionarySettings.java
@@ -45,7 +45,7 @@
 import android.widget.SimpleCursorAdapter;
 import android.widget.TextView;
 
-import com.android.settings.inputmethod.UserDictionaryAddWordActivity;
+import com.android.settings.inputmethod.UserDictionaryAddWordContents;
 
 import java.util.Locale;
 
@@ -183,13 +183,17 @@
      * @param editingWord the word to edit, or null if it's an add.
      */
     private void showAddOrEditDialog(final String editingWord) {
-        final Intent intent = new Intent(null == editingWord
-                ? UserDictionaryAddWordActivity.MODE_INSERT_ACTION
-                : UserDictionaryAddWordActivity.MODE_EDIT_ACTION);
-        // The following are fine if they are null
-        intent.putExtra(UserDictionaryAddWordActivity.EXTRA_WORD, editingWord);
-        intent.putExtra(UserDictionaryAddWordActivity.EXTRA_LOCALE, mLocale);
-        startActivity(intent);
+        final Bundle args = new Bundle();
+        args.putInt(UserDictionaryAddWordContents.EXTRA_MODE, null == editingWord
+                ? UserDictionaryAddWordContents.MODE_INSERT
+                : UserDictionaryAddWordContents.MODE_EDIT);
+        args.putString(UserDictionaryAddWordContents.EXTRA_WORD, editingWord);
+        args.putString(UserDictionaryAddWordContents.EXTRA_LOCALE, mLocale);
+        android.preference.PreferenceActivity pa =
+                (android.preference.PreferenceActivity)getActivity();
+        pa.startPreferencePanel(
+                com.android.settings.inputmethod.UserDictionaryAddWordFragment.class.getName(),
+                args, R.string.details_title, null, null, 0);
     }
 
     private String getWord(int position) {
diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java
index 884ff91..3b67ec3 100644
--- a/src/com/android/settings/WirelessSettings.java
+++ b/src/com/android/settings/WirelessSettings.java
@@ -103,7 +103,10 @@
 
         mAirplaneModeEnabler = new AirplaneModeEnabler(activity, mAirplaneModePreference);
         mNfcEnabler = new NfcEnabler(activity, nfc, androidBeam);
-        mNsdEnabler = new NsdEnabler(activity, nsd);
+
+        // Remove NSD checkbox by default
+        getPreferenceScreen().removePreference(nsd);
+        //mNsdEnabler = new NsdEnabler(activity, nsd);
 
         String toggleable = Settings.System.getString(activity.getContentResolver(),
                 Settings.System.AIRPLANE_MODE_TOGGLEABLE_RADIOS);
@@ -178,7 +181,9 @@
         if (mNfcEnabler != null) {
             mNfcEnabler.resume();
         }
-        mNsdEnabler.resume();
+        if (mNsdEnabler != null) {
+            mNsdEnabler.resume();
+        }
     }
 
     @Override
@@ -189,7 +194,9 @@
         if (mNfcEnabler != null) {
             mNfcEnabler.pause();
         }
-        mNsdEnabler.pause();
+        if (mNsdEnabler != null) {
+            mNsdEnabler.pause();
+        }
     }
 
     @Override
diff --git a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
index b48df03..cb350b2 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
@@ -200,6 +200,8 @@
                     new Intent(UserDictionaryList.USER_DICTIONARY_SETTINGS_INTENT_ACTION);
             userDictionaryPreference.setTitle(R.string.user_dict_single_settings_title);
             userDictionaryPreference.setIntent(intent);
+            userDictionaryPreference.setFragment(
+                    com.android.settings.UserDictionarySettings.class.getName());
             // If the size of localeList is 0, we don't set the locale parameter in the
             // extras. This will be interpreted by the UserDictionarySettings class as
             // meaning "the current locale".
diff --git a/src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java b/src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java
index cb4058f..c7d8c89 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java
@@ -22,6 +22,7 @@
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
+import android.content.res.Resources;
 import android.preference.CheckBoxPreference;
 import android.preference.Preference;
 import android.preference.PreferenceScreen;
@@ -36,6 +37,7 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 public class InputMethodAndSubtypeUtil {
@@ -46,6 +48,7 @@
     private static final char INPUT_METHOD_SEPARATER = ':';
     private static final char INPUT_METHOD_SUBTYPE_SEPARATER = ';';
     private static final int NOT_A_SUBTYPE_ID = -1;
+    private static final Locale ENGLISH_LOCALE = new Locale("en");
 
     private static final TextUtils.SimpleStringSplitter sStringInputMethodSplitter
             = new TextUtils.SimpleStringSplitter(INPUT_METHOD_SEPARATER);
@@ -183,7 +186,7 @@
                 getEnabledInputMethodsAndSubtypeList(resolver);
         HashSet<String> disabledSystemIMEs = getDisabledSystemIMEs(resolver);
 
-        final boolean onlyOneIME = inputMethodInfos.size() == 1;
+        final int imiCount = inputMethodInfos.size();
         boolean needsToResetSelectedSubtype = false;
         for (InputMethodInfo imi : inputMethodInfos) {
             final String imiId = imi.getId();
@@ -193,11 +196,11 @@
             // pref is instance of CheckBoxPreference in the Configure input method screen.
             final boolean isImeChecked = (pref instanceof CheckBoxPreference) ?
                     ((CheckBoxPreference) pref).isChecked()
-                            : enabledIMEAndSubtypesMap.containsKey(imiId);
+                    : enabledIMEAndSubtypesMap.containsKey(imiId);
             final boolean isCurrentInputMethod = imiId.equals(currentInputMethodId);
-            final boolean auxIme = isAuxiliaryIme(imi);
             final boolean systemIme = isSystemIme(imi);
-            if (((onlyOneIME || (systemIme && !auxIme)) && !hasHardKeyboard) || isImeChecked) {
+            if ((!hasHardKeyboard && isAlwaysCheckedIme(imi, context.getActivity(), imiCount))
+                    || isImeChecked) {
                 if (!enabledIMEAndSubtypesMap.containsKey(imiId)) {
                     // imiId has just been enabled
                     enabledIMEAndSubtypesMap.put(imiId, new HashSet<String>());
@@ -373,4 +376,47 @@
     public static boolean isAuxiliaryIme(InputMethodInfo imi) {
         return imi.isAuxiliaryIme();
     }
+
+    public static boolean isAlwaysCheckedIme(InputMethodInfo imi, Context context, int imiCount) {
+        if (imiCount <= 1) {
+            return true;
+        }
+        if (!isSystemIme(imi)) {
+            return false;
+        }
+        if (isAuxiliaryIme(imi)) {
+            return false;
+        }
+        if (isValidDefaultIme(imi, context)) {
+            return true;
+        }
+        return containsSubtypeOf(imi, ENGLISH_LOCALE.getLanguage());
+    }
+
+    private static boolean isValidDefaultIme(InputMethodInfo imi, Context context) {
+        if (imi.getIsDefaultResourceId() != 0) {
+            try {
+                Resources res = context.createPackageContext(
+                        imi.getPackageName(), 0).getResources();
+                if (res.getBoolean(imi.getIsDefaultResourceId())
+                        && containsSubtypeOf(imi, context.getResources().getConfiguration().
+                                locale.getLanguage())) {
+                    return true;
+                }
+            } catch (PackageManager.NameNotFoundException ex) {
+            } catch (Resources.NotFoundException ex) {
+            }
+        }
+        return false;
+    }
+
+    private static boolean containsSubtypeOf(InputMethodInfo imi, String language) {
+        final int N = imi.getSubtypeCount();
+        for (int i = 0; i < N; ++i) {
+            if (imi.getSubtypeAt(i).getLocale().startsWith(language)) {
+                return true;
+            }
+        }
+        return false;
+    }
 }
diff --git a/src/com/android/settings/inputmethod/InputMethodPreference.java b/src/com/android/settings/inputmethod/InputMethodPreference.java
index 4ecdb8e..6402dff 100644
--- a/src/com/android/settings/inputmethod/InputMethodPreference.java
+++ b/src/com/android/settings/inputmethod/InputMethodPreference.java
@@ -51,7 +51,7 @@
     private final InputMethodInfo mImi;
     private final InputMethodManager mImm;
     private final Intent mSettingsIntent;
-    private final boolean mIsSystemIme;
+    private final boolean mAlwaysChecked;
 
     private AlertDialog mDialog = null;
     private ImageView mInputMethodSettingsButton;
@@ -66,10 +66,10 @@
                 return;
             }
             if (isChecked()) {
-                setChecked(false);
+                setChecked(false, true /* save */);
             } else {
-                if (mIsSystemIme) {
-                    setChecked(true);
+                if (mAlwaysChecked) {
+                    setChecked(true, true /* save */);
                 } else {
                     showSecurityWarnDialog(mImi, InputMethodPreference.this);
                 }
@@ -87,9 +87,9 @@
         mImm = imm;
         mImi = imi;
         updateSummary();
-        mIsSystemIme = InputMethodAndSubtypeUtil.isSystemIme(imi);
-        final boolean isAuxIme = InputMethodAndSubtypeUtil.isAuxiliaryIme(imi);
-        if (imiCount <= 1 || (mIsSystemIme && !isAuxIme)) {
+        mAlwaysChecked = InputMethodAndSubtypeUtil.isAlwaysCheckedIme(
+                imi, fragment.getActivity(), imiCount);
+        if (mAlwaysChecked) {
             setEnabled(false);
         }
     }
@@ -222,14 +222,25 @@
         setSummary(summary);
     }
 
-    @Override
-    public void setChecked(boolean checked) {
+    /**
+     * Sets the checkbox state and optionally saves the settings.
+     * @param checked whether to check the box
+     * @param save whether to save IME settings
+     */
+    public void setChecked(boolean checked, boolean save) {
         super.setChecked(checked);
-        saveImeSettings();
+        if (save) {
+            saveImeSettings();
+        }
         updateSummary();
     }
 
-    private void showSecurityWarnDialog(InputMethodInfo imi, final CheckBoxPreference chkPref) {
+    @Override
+    public void setChecked(boolean checked) {
+        setChecked(checked, false);
+    }
+
+    private void showSecurityWarnDialog(InputMethodInfo imi, final InputMethodPreference chkPref) {
         if (mDialog != null && mDialog.isShowing()) {
             mDialog.dismiss();
         }
@@ -241,7 +252,7 @@
                         new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
-                        chkPref.setChecked(true);
+                        chkPref.setChecked(true, true);
                     }
                 })
                 .setNegativeButton(android.R.string.cancel,
diff --git a/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java b/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java
index 13c226f..f741d19 100644
--- a/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java
+++ b/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java
@@ -41,18 +41,11 @@
 
 public class UserDictionaryAddWordActivity extends Activity
         implements AdapterView.OnItemSelectedListener {
-    public static final String EXTRA_WORD = "word";
-    public static final String EXTRA_LOCALE = "locale";
-    private static final int FREQUENCY_FOR_USER_DICTIONARY_ADDS = 250;
 
     private static final String STATE_KEY_IS_OPEN = "isOpen";
-    private static final String STATE_KEY_WORD = "word";
-    private static final String STATE_KEY_LOCALE = "locale";
 
     public static final String MODE_EDIT_ACTION = "com.android.settings.USER_DICTIONARY_EDIT";
     public static final String MODE_INSERT_ACTION = "com.android.settings.USER_DICTIONARY_INSERT";
-    private static final int MODE_EDIT = 0;
-    private static final int MODE_INSERT = 1;
 
     private static final int[] IDS_SHOWN_ONLY_IN_MORE_OPTIONS_MODE = {
         R.id.user_dictionary_add_word_label,
@@ -62,10 +55,7 @@
         R.id.user_dictionary_settings_add_dialog_locale,
     };
 
-    private EditText mEditText;
-    private int mMode; // Either MODE_EDIT or MODE_INSERT
-    private String mOldWord;
-    private String mLocale; // may not be null: will be converted to default locale if received null
+    private UserDictionaryAddWordContents mContents;
 
     private boolean mIsShowingMoreOptions = false;
 
@@ -75,39 +65,30 @@
         setContentView(R.layout.user_dictionary_add_word);
         final Intent intent = getIntent();
         final String action = intent.getAction();
+        final int mode;
         if (MODE_EDIT_ACTION.equals(action)) {
-            mMode = MODE_EDIT;
+            mode = UserDictionaryAddWordContents.MODE_EDIT;
         } else if (MODE_INSERT_ACTION.equals(action)) {
-            mMode = MODE_INSERT;
+            mode = UserDictionaryAddWordContents.MODE_INSERT;
         } else {
             // Can never come here because we only support these two actions in the manifest
             throw new RuntimeException("Unsupported action: " + action);
         }
 
-        String savedWord = null;
-        String savedLocale = null;
+        // The following will get the EXTRA_WORD and EXTRA_LOCALE fields that are in the intent.
+        // We do need to add the action by hand, because UserDictionaryAddWordContents expects
+        // it to be in the bundle, in the EXTRA_MODE key.
+        final Bundle args = intent.getExtras();
+        args.putInt(UserDictionaryAddWordContents.EXTRA_MODE, mode);
+
         if (null != savedInstanceState) {
             mIsShowingMoreOptions =
                     savedInstanceState.getBoolean(STATE_KEY_IS_OPEN, mIsShowingMoreOptions);
-            savedWord = savedInstanceState.getString(STATE_KEY_WORD);
-            savedLocale = savedInstanceState.getString(STATE_KEY_LOCALE);
+            // Override options if we have a saved state.
+            args.putAll(savedInstanceState);
         }
 
-        mOldWord = intent.getStringExtra(EXTRA_WORD);
-        if (null != savedLocale) {
-            mLocale = savedLocale;
-        } else {
-            final String locale = intent.getStringExtra(EXTRA_LOCALE); // this may be null
-            mLocale = null == locale ? Locale.getDefault().toString() : locale;
-        }
-        mEditText = (EditText)findViewById(R.id.user_dictionary_add_word_text);
-        if (null != savedWord) {
-            mEditText.setText(savedWord);
-            mEditText.setSelection(savedWord.length());
-        } else if (null != mOldWord) {
-            mEditText.setText(mOldWord);
-            mEditText.setSelection(mOldWord.length());
-        }
+        mContents = new UserDictionaryAddWordContents(getWindow().getDecorView(), args);
 
         if (mIsShowingMoreOptions) {
             onClickMoreOptions(findViewById(R.id.user_dictionary_settings_add_dialog_more_options));
@@ -125,8 +106,9 @@
     @Override
     public void onSaveInstanceState(final Bundle outState) {
         outState.putBoolean(STATE_KEY_IS_OPEN, mIsShowingMoreOptions);
-        outState.putString(STATE_KEY_WORD, mEditText.getText().toString());
-        outState.putString(STATE_KEY_LOCALE, mLocale);
+        outState.putString(
+                UserDictionaryAddWordContents.EXTRA_WORD, mContents.mEditText.getText().toString());
+        outState.putString(UserDictionaryAddWordContents.EXTRA_LOCALE, mContents.mLocale);
     }
 
     public void onClickCancel(final View v) {
@@ -134,33 +116,7 @@
     }
 
     public void onClickConfirm(final View v) {
-        if (MODE_EDIT == mMode && !TextUtils.isEmpty(mOldWord)) {
-            UserDictionarySettings.deleteWord(mOldWord, this.getContentResolver());
-        }
-        final String newWord = mEditText.getText().toString();
-        if (TextUtils.isEmpty(newWord)) {
-            // If the word is somehow empty, don't insert it.
-            // TODO: grey out the Ok button when the text is empty?
-            finish();
-            return;
-        }
-        // Disallow duplicates.
-        // TODO: Redefine the logic when we support shortcuts.
-        UserDictionarySettings.deleteWord(newWord, this.getContentResolver());
-
-        if (TextUtils.isEmpty(mLocale)) {
-            // Empty string means insert for all languages.
-            UserDictionary.Words.addWord(this, newWord.toString(),
-                    FREQUENCY_FOR_USER_DICTIONARY_ADDS, UserDictionary.Words.LOCALE_TYPE_ALL);
-        } else {
-            // TODO: fix the framework so that it can accept a locale when we add a word
-            // to the user dictionary instead of querying the system locale.
-            final Locale prevLocale = Locale.getDefault();
-            Locale.setDefault(Utils.createLocaleFromString(mLocale));
-            UserDictionary.Words.addWord(this, newWord.toString(),
-                    FREQUENCY_FOR_USER_DICTIONARY_ADDS, UserDictionary.Words.LOCALE_TYPE_CURRENT);
-            Locale.setDefault(prevLocale);
-        }
+        mContents.apply(this);
         finish();
     }
 
@@ -206,7 +162,7 @@
 
         final Set<String> locales = UserDictionaryList.getUserDictionaryLocalesList(this);
         // Remove our locale if it's in, because we're always gonna put it at the top
-        locales.remove(mLocale); // mLocale may not be null
+        locales.remove(mContents.mLocale); // mLocale may not be null
         final String systemLocale = Locale.getDefault().toString();
         // The system locale should be inside. We want it at the 2nd spot.
         locales.remove(systemLocale); // system locale may not be null
@@ -214,8 +170,8 @@
         final ArrayList<LocaleRenderer> localesList = new ArrayList<LocaleRenderer>();
         // Add the passed locale, then the system locale at the top of the list. Add an
         // "all languages" entry at the bottom of the list.
-        addLocaleDisplayNameToList(this, localesList, mLocale);
-        if (!systemLocale.equals(mLocale)) {
+        addLocaleDisplayNameToList(this, localesList, mContents.mLocale);
+        if (!systemLocale.equals(mContents.mLocale)) {
             addLocaleDisplayNameToList(this, localesList, systemLocale);
         }
         for (final String l : locales) {
@@ -250,14 +206,13 @@
     public void onItemSelected(final AdapterView<?> parent, final View view, final int pos,
             final long id) {
         final LocaleRenderer locale = (LocaleRenderer)parent.getItemAtPosition(pos);
-        mLocale = locale.getLocaleString();
+        mContents.updateLocale(locale.getLocaleString());
     }
 
     @Override
     public void onNothingSelected(AdapterView<?> parent) {
         // I'm not sure we can come here, but if we do, that's the right thing to do.
         final Intent intent = getIntent();
-        final String locale = intent.getStringExtra(EXTRA_LOCALE); // this may be null
-        mLocale = null == locale ? Locale.getDefault().toString() : locale;
+        mContents.updateLocale(intent.getStringExtra(UserDictionaryAddWordContents.EXTRA_LOCALE));
     }
 }
diff --git a/src/com/android/settings/inputmethod/UserDictionaryAddWordContents.java b/src/com/android/settings/inputmethod/UserDictionaryAddWordContents.java
new file mode 100644
index 0000000..5de6f03
--- /dev/null
+++ b/src/com/android/settings/inputmethod/UserDictionaryAddWordContents.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2012 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.settings.inputmethod;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.os.Bundle;
+import android.provider.UserDictionary;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.EditText;
+
+import com.android.settings.R;
+import com.android.settings.UserDictionarySettings;
+import com.android.settings.Utils;
+
+import java.util.Locale;
+
+/**
+ * A container class to factor common code to UserDictionaryAddWordFragment
+ * and UserDictionaryAddWordActivity.
+ */
+public class UserDictionaryAddWordContents {
+    public static final String EXTRA_MODE = "mode";
+    public static final String EXTRA_WORD = "word";
+    public static final String EXTRA_LOCALE = "locale";
+
+    public static final int MODE_EDIT = 0;
+    public static final int MODE_INSERT = 1;
+
+    private static final int FREQUENCY_FOR_USER_DICTIONARY_ADDS = 250;
+
+    /* package */ final int mMode; // Either MODE_EDIT or MODE_INSERT
+    /* package */ final EditText mEditText;
+    /* package */ String mLocale;
+    /* package */ String mOldWord;
+
+    /* package */ UserDictionaryAddWordContents(final View view, final Bundle args) {
+        mEditText = (EditText)view.findViewById(R.id.user_dictionary_add_word_text);
+        final String word = args.getString(EXTRA_WORD);
+        if (null != word) {
+            mEditText.setText(word);
+            mEditText.setSelection(word.length());
+        }
+        mMode = args.getInt(EXTRA_MODE); // default return value for #getInt() is 0 = MODE_EDIT
+        mOldWord = args.getString(EXTRA_WORD);
+        updateLocale(args.getString(EXTRA_LOCALE));
+    }
+
+    // locale may be null, this means default locale
+    // It may also be the empty string, which means "all locales"
+    /* package */ void updateLocale(final String locale) {
+        mLocale = null == locale ? Locale.getDefault().toString() : locale;
+    }
+
+    /* package */ void apply(final Context context) {
+        final ContentResolver resolver = context.getContentResolver();
+        if (UserDictionaryAddWordContents.MODE_EDIT == mMode && !TextUtils.isEmpty(mOldWord)) {
+            UserDictionarySettings.deleteWord(mOldWord, resolver);
+        }
+        final String newWord = mEditText.getText().toString();
+        if (TextUtils.isEmpty(newWord)) {
+            // If the word is somehow empty, don't insert it.
+            return;
+        }
+        // Disallow duplicates.
+        // TODO: Redefine the logic when we support shortcuts.
+        UserDictionarySettings.deleteWord(newWord, resolver);
+
+        // In this class we use the empty string to represent 'all locales' and mLocale cannot
+        // be null. However the addWord method takes null to mean 'all locales'.
+        UserDictionary.Words.addWord(context, newWord.toString(),
+                FREQUENCY_FOR_USER_DICTIONARY_ADDS, null /* shortcut */,
+                TextUtils.isEmpty(mLocale) ? null : Utils.createLocaleFromString(mLocale));
+    }
+}
diff --git a/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java b/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java
new file mode 100644
index 0000000..f4a39a2
--- /dev/null
+++ b/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2012 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.settings.inputmethod;
+
+import android.app.Fragment;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.android.settings.R;
+
+/**
+ * Fragment to add a word/shortcut to the user dictionary.
+ *
+ * As opposed to the UserDictionaryActivity, this is only invoked within Settings
+ * from the UserDictionarySettings.
+ */
+public class UserDictionaryAddWordFragment extends Fragment {
+
+    private static final int OPTIONS_MENU_DELETE = Menu.FIRST;
+
+    private UserDictionaryAddWordContents mContents;
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        setHasOptionsMenu(true);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedState) {
+        final View view = inflater.inflate(R.layout.user_dictionary_add_word_fullscreen, null);
+        mContents = new UserDictionaryAddWordContents(view, getArguments());
+        return view;
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        MenuItem actionItem = menu.add(0, OPTIONS_MENU_DELETE, 0, R.string.delete)
+                .setIcon(android.R.drawable.ic_menu_delete);
+        actionItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM |
+                MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        // We are being shown: display the word
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        mContents.apply(getActivity());
+        // We are being hidden: commit changes to the user dictionary
+    }
+}
diff --git a/src/com/android/settings/inputmethod/UserDictionaryList.java b/src/com/android/settings/inputmethod/UserDictionaryList.java
index 6b1ca7b..ff82a30 100644
--- a/src/com/android/settings/inputmethod/UserDictionaryList.java
+++ b/src/com/android/settings/inputmethod/UserDictionaryList.java
@@ -100,6 +100,7 @@
             newPref.getExtras().putString("locale", locale);
         }
         newPref.setIntent(intent);
+        newPref.setFragment(com.android.settings.UserDictionarySettings.class.getName());
         return newPref;
     }
 
diff --git a/src/com/android/settings/net/DataUsageMeteredSettings.java b/src/com/android/settings/net/DataUsageMeteredSettings.java
index fea8a12..69326bc 100644
--- a/src/com/android/settings/net/DataUsageMeteredSettings.java
+++ b/src/com/android/settings/net/DataUsageMeteredSettings.java
@@ -48,6 +48,7 @@
 
     private PreferenceCategory mMobileCategory;
     private PreferenceCategory mWifiCategory;
+    private Preference mWifiDisabled;
 
     @Override
     public void onCreate(Bundle icicle) {
@@ -63,9 +64,9 @@
         addPreferencesFromResource(R.xml.data_usage_metered_prefs);
         mMobileCategory = (PreferenceCategory) findPreference("mobile");
         mWifiCategory = (PreferenceCategory) findPreference("wifi");
+        mWifiDisabled = findPreference("wifi_disabled");
 
         updateNetworks(context);
-
     }
 
     private void updateNetworks(Context context) {
@@ -76,15 +77,15 @@
             getPreferenceScreen().removePreference(mMobileCategory);
         }
 
-        if (hasWifiRadio(context)) {
-            mWifiCategory.removeAll();
+        mWifiCategory.removeAll();
+        if (hasWifiRadio(context) && mWifiManager.isWifiEnabled()) {
             for (WifiConfiguration config : mWifiManager.getConfiguredNetworks()) {
                 if (config.SSID != null) {
                     mWifiCategory.addPreference(buildWifiPref(context, config));
                 }
             }
         } else {
-            getPreferenceScreen().removePreference(mWifiCategory);
+            mWifiCategory.addPreference(mWifiDisabled);
         }
     }
 
diff --git a/src/com/android/settings/widget/ChartDataUsageView.java b/src/com/android/settings/widget/ChartDataUsageView.java
index f8e6587..19de100 100644
--- a/src/com/android/settings/widget/ChartDataUsageView.java
+++ b/src/com/android/settings/widget/ChartDataUsageView.java
@@ -669,16 +669,6 @@
             start = TextUtils.indexOf(builder, bootstrap);
             end = start + bootstrap.length();
             builder.setSpan(key, start, end, Spannable.SPAN_INCLUSIVE_INCLUSIVE);
-
-            // Fix the AbsoluteSizeSpan created from html. Its flags must be set to
-            // SPAN_INCLUSIVE_INCLUSIVE so that it survives a removal of its entire content
-            Object[] spans = builder.getSpans(start, end, Object.class);
-            for (int i = 0; i < spans.length; i++) {
-                Object span = spans[i];
-                if (builder.getSpanStart(span) == start && builder.getSpanEnd(span) == end) {
-                    builder.setSpan(span, start, end, Spannable.SPAN_INCLUSIVE_INCLUSIVE);
-                }
-            }
         }
         builder.replace(start, end, text);
     }
diff --git a/src/com/android/settings/wifi/AdvancedWifiSettings.java b/src/com/android/settings/wifi/AdvancedWifiSettings.java
index 5d673c4..d8a4080 100644
--- a/src/com/android/settings/wifi/AdvancedWifiSettings.java
+++ b/src/com/android/settings/wifi/AdvancedWifiSettings.java
@@ -73,11 +73,17 @@
                 Secure.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, 0) == 1);
         notifyOpenNetworks.setEnabled(mWifiManager.isWifiEnabled());
 
-        CheckBoxPreference watchdogEnabled =
+        boolean watchdogEnabled = Secure.getInt(getContentResolver(),
+                Secure.WIFI_WATCHDOG_ON, 1) != 0;
+        CheckBoxPreference watchdog =
             (CheckBoxPreference) findPreference(KEY_ENABLE_WIFI_WATCHDOG);
-        if (watchdogEnabled != null) {
-            watchdogEnabled.setChecked(Secure.getInt(getContentResolver(),
+        if (watchdog != null) {
+            if (watchdogEnabled) {
+                watchdog.setChecked(Secure.getInt(getContentResolver(),
                         Secure.WIFI_WATCHDOG_POOR_NETWORK_TEST_ENABLED, 1) == 1);
+            } else {
+                getPreferenceScreen().removePreference(watchdog);
+            }
         }
 
         ListPreference frequencyPref = (ListPreference) findPreference(KEY_FREQUENCY_BAND);
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index a50b3cf..97f464f 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -133,9 +133,9 @@
 
     // this boolean extra specifies whether to disable the Next button when not connected
     private static final String EXTRA_ENABLE_NEXT_ON_CONNECT = "wifi_enable_next_on_connect";
-
     private static final String EXTRA_WIFI_SHOW_ACTION_BAR = "wifi_show_action_bar";
     private static final String EXTRA_WIFI_SHOW_MENUS = "wifi_show_menus";
+    private static final String EXTRA_WIFI_DISABLE_BACK = "wifi_disable_back";
 
     // should Next button only be enabled when we have a connection?
     private boolean mEnableNextOnConnection;
@@ -238,6 +238,11 @@
 
         addPreferencesFromResource(R.xml.wifi_settings);
 
+        // Back key is disabled if requested
+        if (intent.getBooleanExtra(EXTRA_WIFI_DISABLE_BACK, false)) {
+            getView().setSystemUiVisibility(View.STATUS_BAR_DISABLE_BACK);
+        }
+
         // Action bar is hidden for Setup Wizard
         final boolean showActionBar = intent.getBooleanExtra(EXTRA_WIFI_SHOW_ACTION_BAR, true);
         if (showActionBar) {
@@ -269,7 +274,9 @@
         if (mShowMenu) {
             registerForContextMenu(getListView());
         }
-        setHasOptionsMenu(mShowMenu);
+        // FIXME: When WPS image button is implemented, use mShowMenu instead of always showing
+        // the options menu
+        setHasOptionsMenu(true);
 
         // After confirming PreferenceScreen is available, we call super.
         super.onActivityCreated(savedInstanceState);
@@ -304,8 +311,8 @@
 
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        final boolean wifiIsEnabled = mWifiManager.isWifiEnabled();
         if (mShowMenu) {
-            final boolean wifiIsEnabled = mWifiManager.isWifiEnabled();
             menu.add(Menu.NONE, MENU_ID_WPS_PBC, 0, R.string.wifi_menu_wps_pbc)
                     .setEnabled(wifiIsEnabled)
                     .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
@@ -327,6 +334,11 @@
             menu.add(Menu.NONE, MENU_ID_ADVANCED, 0, R.string.wifi_menu_advanced)
                     //.setIcon(android.R.drawable.ic_menu_manage)
                     .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
+        } else {
+            // FIXME: Interim support for WPS, until ImageButton is available
+            menu.add(Menu.NONE, MENU_ID_WPS_PBC, 0, R.string.wifi_menu_wps_pbc)
+                    .setEnabled(wifiIsEnabled)
+                    .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
         }
         super.onCreateOptionsMenu(menu, inflater);
     }