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/values-af/strings.xml b/res/values-af/strings.xml
index c3c8ffc..29e25b1 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -1577,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 747cb92..6e986fc 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -1357,7 +1357,7 @@
     <string name="trusted_credentials" msgid="4266945289534242402">"የሚታመን ማስረጃ"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"ታማኝ የCA  ምስክር አሳይ"</string>
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"የቁልፍ መክፈቻ ስርዓተ ጥለትህን ሳል"</string>
-    <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"የምስክርነት ጭነት ለማረጋገጥ የመክፈቻ ስርዓተ ጥለትህን መሳል አለብህ።"</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>
@@ -1577,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 6b14d31..1c50a14 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -1577,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 fa8dce1..e8230af 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -1577,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 97127a0..30f303f 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -1577,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>
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 4b7cad4..bbdb62a 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -1577,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 9e349b8..2ff971b 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -1577,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 233367d..7eef5c1 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -1577,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 53bb8fc..ef53a80 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -1577,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 d3e1528..2e93f58 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -1577,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 a81a358..420f6df 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -1357,7 +1357,7 @@
     <string name="trusted_credentials" msgid="4266945289534242402">"Kredensial tepercaya"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Tampilkan sertifikat CA tepercaya"</string>
     <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 pemasangan kredensial."</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>
@@ -1577,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 7618c5b..e013822 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -1577,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 0fbc368..4c7e5ed 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -1577,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-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 cc54191..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>
@@ -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 7e81c77..410474b 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -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>
@@ -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 57c7d88..8c8fc0d 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -1577,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 68e8f6c..e9e0d92 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -1577,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 ad8683b..ef5cd80 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -1577,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 f021797..6276886 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -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>
@@ -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 f717540..b36ab49 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -1577,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 113f8aa..4d5a2d2 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -1489,12 +1489,12 @@
     <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>
-    <string name="show_hw_screen_updates" msgid="1066779731201521925">"Onyesha visasishi vya skrini ya GPU"</string>
-    <string name="show_hw_screen_updates_summary" msgid="5280716513731970663">"Mweka maeneo ya skrini wakati wanaposasisha na GPU"</string>
+    <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>
-    <string name="debug_layout" msgid="5981361776594526155">"Onyesha midundo ya mipangilio"</string>
-    <string name="debug_layout_summary" msgid="978411395294379156">"Onyesha mipangilio kuhusu midundo, kujaza, na kadhalika."</string>
+    <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>
@@ -1567,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 107ea03..1b42ad8 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -1577,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 0784dda..90788a8 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -1577,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 f0ffa19..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>
@@ -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 1dd146f..3a82cdc 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -1577,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 0ac121a..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>
@@ -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 48a6da3..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>
@@ -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-zu/strings.xml b/res/values-zu/strings.xml
index 1da8b69..b266e86 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -1578,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/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/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..8772f53 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -269,7 +269,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 +306,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 +329,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);
     }