diff --git a/res/layout-xlarge/date_time_settings_setupwizard.xml b/res/layout-xlarge/date_time_settings_setupwizard.xml
index 1ee37d4..aa1bbcf 100644
--- a/res/layout-xlarge/date_time_settings_setupwizard.xml
+++ b/res/layout-xlarge/date_time_settings_setupwizard.xml
@@ -32,7 +32,7 @@
         android:layout_alignParentLeft="true"
         android:layout_marginLeft="16dip"
         android:layout_alignParentTop="true"
-        android:textSize="30dip"
+        android:textSize="32dip"
         android:textColor="#FF99cc00"
         android:text="@string/date_and_time_settings_title_setup_wizard"
         android:gravity="bottom" />
@@ -62,7 +62,8 @@
             android:layout_alignParentLeft="true"
             android:layout_alignBottom="@+id/date_time_auto"
             android:gravity="left|center_vertical"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textSize="20dip" />
 
         <LinearLayout
             android:id="@+id/date_time_auto"
@@ -80,7 +81,8 @@
                 android:minHeight="?android:attr/listPreferredItemHeight"
                 android:layout_marginLeft="16dip"
                 android:text="@string/date_time_auto"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textSize="20dip" />
 
             <!-- Divider -->
             <View
@@ -108,6 +110,7 @@
                 android:layout_height="48dip"
                 android:text="@string/date_picker_title"
                 android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textSize="20dip"
                 android:clickable="false"
                 android:longClickable="false"
                 android:gravity="center" />
@@ -135,6 +138,7 @@
                 android:layout_height="48dip"
                 android:text="@string/time_picker_title"
                 android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textSize="20dip"
                 android:gravity="center" />
 
             <TimePicker
diff --git a/res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml b/res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml
index 9b4a93d..715b7cd 100644
--- a/res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml
+++ b/res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml
@@ -45,7 +45,7 @@
         android:layout_centerVertical="true"
         android:layout_marginLeft="16dip"
         android:layout_below="@id/top_padding_layout"
-        android:textSize="30dip"
+        android:textSize="32dip"
         android:textColor="#ff99cc00"
         android:text="@string/wifi_setup_title"
         android:gravity="bottom"/>
@@ -104,9 +104,10 @@
                 android:id="@+id/connecting_status"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:lineSpacingExtra="12dip"
+                android:lineSpacingExtra="10dip"
                 android:inputType="textMultiLine"
                 android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textSize="20sp"
                 android:clickable="false"
                 android:longClickable="false" />
         </LinearLayout>
diff --git a/res/layout/custom_list_item.xml b/res/layout/date_time_setup_custom_list_item_2.xml
similarity index 96%
rename from res/layout/custom_list_item.xml
rename to res/layout/date_time_setup_custom_list_item_2.xml
index afcbc8c..623ac32 100644
--- a/res/layout/custom_list_item.xml
+++ b/res/layout/date_time_setup_custom_list_item_2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
+<!-- Copyright (C) 2011 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
diff --git a/res/layout/wifi_config_ui_for_setup_wizard.xml b/res/layout/wifi_config_ui_for_setup_wizard.xml
index da145d7..15778ef 100644
--- a/res/layout/wifi_config_ui_for_setup_wizard.xml
+++ b/res/layout/wifi_config_ui_for_setup_wizard.xml
@@ -30,6 +30,7 @@
             android:layout_height="wrap_content"
             android:singleLine="true"
             android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textSize="20sp"
             android:ellipsize="marquee"
             android:fadingEdge="horizontal" />
 
@@ -52,73 +53,115 @@
         <TextView
                   android:layout_width="match_parent"
                   android:layout_height="wrap_content"
-                  android:text="@string/wifi_wps_pin" />
+                  android:text="@string/wifi_wps_pin"
+                  android:textAppearance="?android:attr/textAppearanceMedium"
+                  android:textSize="20sp" />
 
         <EditText android:id="@+id/wps_pin"
                   android:layout_width="match_parent"
                   android:layout_height="wrap_content"
                   android:singleLine="true"
-                  android:inputType="textPassword" />
+                  android:inputType="textPassword"
+                  android:textAppearance="?android:attr/textAppearanceMedium"
+                  android:textSize="20sp" />
     </LinearLayout>
-    <LinearLayout android:id="@+id/security_fields"
+    <RelativeLayout android:id="@+id/security_fields"
                   android:layout_width="match_parent"
                   android:layout_height="wrap_content"
                   android:orientation="vertical"
                   android:visibility="gone">
-        <LinearLayout android:layout_width="match_parent"
-                      android:layout_height="wrap_content"
-                      android:orientation="horizontal">
-            <TextView android:layout_width="wrap_content"
-                      android:minWidth="80dip"
-                      android:layout_height="wrap_content"
-                      android:text="@string/wifi_password" />
+        <TextView android:id="@+id/password_text"
+                  android:layout_width="wrap_content"
+                  android:minWidth="80dip"
+                  android:layout_height="wrap_content"
+                  android:minHeight="48dip"
+                  android:layout_marginRight="8dip"
+                  android:layout_alignParentLeft="true"
+                  android:text="@string/wifi_password"
+                  android:textAppearance="?android:attr/textAppearanceMedium"
+                  android:textSize="20sp"
+                  android:gravity="bottom" />
+
+        <FrameLayout android:id="@+id/password_layout"
+                     android:layout_width="wrap_content"
+                     android:layout_height="wrap_content"
+                     android:minHeight="48dip"
+                     android:layout_alignParentTop="true"
+                     android:layout_toRightOf="@id/password_text"
+                     android:layout_alignBottom="@id/password_text">
             <EditText android:id="@+id/password"
-                      android:layout_width="320dip"
+                      android:layout_width="368dip"
                       android:layout_height="wrap_content"
                       android:singleLine="true"
-                      android:password="true" />
-        </LinearLayout>
+                      android:password="true"
+                      android:textAppearance="?android:attr/textAppearanceMedium"
+                      android:textSize="20sp" />
+        </FrameLayout>
 
         <CheckBox android:id="@+id/show_password"
                   android:layout_width="match_parent"
                   android:layout_height="wrap_content"
-                  android:text="@string/wifi_show_password" />
-    </LinearLayout>
-    <LinearLayout android:id="@+id/type"
-                  android:layout_width="match_parent"
+                  android:layout_marginTop="16dip"
+                  android:layout_below="@id/password_layout"
+                  android:layout_alignLeft="@id/password_layout"
+                  android:text="@string/wifi_show_password"
+                  android:textAppearance="?android:attr/textAppearanceMedium"
+                  android:textSize="20sp" />
+    </RelativeLayout>
+    <RelativeLayout android:id="@+id/type"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:visibility="gone">
+        <TextView android:id="@+id/ssid_text"
+                  android:layout_width="wrap_content"
+                  android:minWidth="128dip"
                   android:layout_height="wrap_content"
-                  android:orientation="vertical"
-                  android:visibility="gone">
-        <LinearLayout android:layout_width="match_parent"
-                      android:layout_height="wrap_content"
-                      android:minHeight="48dip"
-                      android:orientation="horizontal">
-            <TextView android:layout_width="wrap_content"
-                      android:minWidth="112dip"
-                      android:layout_height="wrap_content"
-                      android:text="@string/wifi_ssid" />
+                  android:minHeight="48dip"
+                  android:layout_alignParentLeft="true"
+                  android:text="@string/wifi_ssid"
+                  android:textAppearance="?android:attr/textAppearanceMedium"
+                  android:textSize="20sp"
+                  android:gravity="bottom"/>
+
+        <FrameLayout android:id="@+id/ssid_layout"
+                     android:layout_width="wrap_content"
+                     android:layout_height="wrap_content"
+                     android:layout_alignBottom="@id/ssid_text"
+                     android:layout_toRightOf="@id/ssid_text">
             <EditText android:id="@+id/ssid"
-                      android:layout_width="398dip"
+                      android:layout_width="368dip"
                       android:layout_height="wrap_content"
                       android:singleLine="true"
-                      android:inputType="textNoSuggestions" />
-        </LinearLayout>
+                      android:inputType="textNoSuggestions"
+                      android:textAppearance="?android:attr/textAppearanceMedium"
+                      android:textSize="20sp" />
+        </FrameLayout>
 
-        <LinearLayout android:layout_width="match_parent"
-                      android:layout_height="wrap_content"
-                      android:minHeight="48dip"
-                      android:orientation="horizontal">
-            <TextView android:layout_width="wrap_content"
-                      android:minWidth="112dip"
-                      android:layout_height="wrap_content"
-                      android:text="@string/wifi_security" />
-            <Spinner android:id="@+id/security"
-                     android:layout_width="398dip"
-                     android:layout_height="wrap_content"
-                     android:prompt="@string/wifi_security"
-                     android:entries="@array/wifi_security" />
-        </LinearLayout>
-    </LinearLayout> <!-- android:id="@+id/type" -->
+        <TextView android:id="@+id/security_text"
+                  android:layout_width="wrap_content"
+                  android:minWidth="128dip"
+                  android:layout_height="wrap_content"
+                  android:layout_marginTop="16dip"
+                  android:minHeight="48dip"
+                  android:layout_below="@id/ssid_text"
+                  android:layout_alignLeft="@id/ssid_text"
+                  android:text="@string/wifi_security"
+                  android:textAppearance="?android:attr/textAppearanceMedium"
+                  android:textSize="20sp"
+                  android:gravity="bottom"/>
+
+        <Spinner android:id="@+id/security"
+                 android:layout_width="368dip"
+                 android:layout_height="wrap_content"
+                 android:minHeight="48dip"
+                 android:layout_alignBottom="@id/security_text"
+                 android:layout_toRightOf="@id/security_text"
+                 android:paddingLeft="4dip"
+                 android:textAppearance="?android:attr/textAppearanceMedium"
+                 android:textSize="20sp"
+                 android:gravity="left|center_vertical"/>
+    </RelativeLayout> <!-- android:id="@+id/type" -->
 
     <LinearLayout android:id="@+id/eap_not_supported"
                   android:layout_width="match_parent"
@@ -130,7 +173,8 @@
                   android:layout_height="wrap_content"
                   android:lineSpacingExtra="12dip"
                   android:text="@string/wifi_setup_eap_not_supported"
-                  android:textAppearance="?android:attr/textAppearanceMedium" />
+                  android:textAppearance="?android:attr/textAppearanceMedium"
+                  android:textSize="20sp" />
     </LinearLayout>
 
     <!-- All the views below are "gone".
diff --git a/res/layout/wifi_setup_custom_list_item_1.xml b/res/layout/wifi_setup_custom_list_item_1.xml
new file mode 100644
index 0000000..355490e
--- /dev/null
+++ b/res/layout/wifi_setup_custom_list_item_1.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Based on simple_list_item_1.xml in framework -->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/text1"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:textAppearance="?android:attr/textAppearanceMedium"
+    android:textSize="20sp"
+    android:gravity="center_vertical"
+    android:paddingLeft="10dip"
+    android:minHeight="48dip"
+/>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 37cf86c..3faffb5 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -272,31 +272,41 @@
     <string name="security_settings_summary" msgid="967393342537986570">"تعيين موقعي، إلغاء تأمين الشاشة، تأمين بطاقة SIM، تأمين تخزين الاعتماد"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"تعيين موقعي، إلغاء تأمين الشاشة، تأمين تخزين الاعتماد"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"كلمات المرور"</string>
-    <!-- no translation found for crypt_keeper_settings_title (2288841695457542418) -->
+    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (5790930764432654508) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (1447090863225003474) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
     <skip />
     <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
     <skip />
     <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (3806424855201189058) -->
+    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (942926028858386912) -->
+    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (4150888307809341579) -->
+    <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (2736956499115931645) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (3220993215104112865) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5169437210993176052) -->
+    <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5672516169559235283) -->
+    <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
     <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
     <skip />
@@ -746,7 +756,7 @@
     <!-- no translation found for master_clear_desc_also_erases_external (1903185203791274237) -->
     <skip />
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"لمسح الموسيقى والصور وبيانات المستخدم الأخرى أيضًا، يلزم محو "<b>"وحدة تخزين USB"</b>"."</string>
-    <!-- syntax error in translation for master_clear_desc_erase_external_storage (7339100478676372901) org.xmlpull.v1.XmlPullParserException: expected: /string read: b (position:END_TAG </b>@1:177 in java.io.StringReader@4277158a)  -->
+    <!-- syntax error in translation for master_clear_desc_erase_external_storage (7339100478676372901) org.xmlpull.v1.XmlPullParserException: expected: /string read: b (position:END_TAG </b>@1:177 in java.io.StringReader@4d61f10f)  -->
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"محو وحدة تخزين USB"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"محو بطاقة SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"محو كل البيانات على وحدة تخزين USB الداخلية، مثل الموسيقى والصور."</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index a52495d..2aaf325 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -272,31 +272,41 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Задаване на Моето местоположение, отключване на екран, заключване на SIM картата и на хранилището за идентификационни данни"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Задаване на Моето местоположение, отключване на екран и заключване на хранилището за идентификационни данни"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Пароли"</string>
-    <!-- no translation found for crypt_keeper_settings_title (2288841695457542418) -->
+    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (5790930764432654508) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (1447090863225003474) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
     <skip />
     <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
     <skip />
     <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (3806424855201189058) -->
+    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (942926028858386912) -->
+    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (4150888307809341579) -->
+    <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (2736956499115931645) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (3220993215104112865) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5169437210993176052) -->
+    <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5672516169559235283) -->
+    <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
     <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
     <skip />
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 8e93199..75f55da 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -272,31 +272,41 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Defineix La meva ubicació, el desbloqueig de la pantalla, el bloqueig de la targeta SIM i el bloqueig de l\'emmagatzematge de credencials"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Defineix La meva ubicació, el desbloqueig de pantalla i el bloqueig d\'emmagatzematge de credencials"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Contrasenyes"</string>
-    <!-- no translation found for crypt_keeper_settings_title (2288841695457542418) -->
+    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (5790930764432654508) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (1447090863225003474) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
     <skip />
     <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
     <skip />
     <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (3806424855201189058) -->
+    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (942926028858386912) -->
+    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (4150888307809341579) -->
+    <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (2736956499115931645) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (3220993215104112865) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5169437210993176052) -->
+    <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5672516169559235283) -->
+    <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
     <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
     <skip />
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index f4db70b..0784d95 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -272,31 +272,41 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Moje poloha, odemknutí obrazovky, zámek SIM, zámek úložiště pověření"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Nastavení funkce Moje poloha, odemknutí obrazovky a zamknutí úložiště pověření"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Hesla"</string>
-    <!-- no translation found for crypt_keeper_settings_title (2288841695457542418) -->
+    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (5790930764432654508) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (1447090863225003474) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
     <skip />
     <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
     <skip />
     <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (3806424855201189058) -->
+    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (942926028858386912) -->
+    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (4150888307809341579) -->
+    <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (2736956499115931645) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (3220993215104112865) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5169437210993176052) -->
+    <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5672516169559235283) -->
+    <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
     <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
     <skip />
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 0690286..0003215 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -272,31 +272,41 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Angiv Min placering, oplåsning af skærmen, låsning af SIM-kort og oplysningslagring"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Angiv Min placering, oplåsning af skærmen, oplysningslagring"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Adgangskoder"</string>
-    <!-- no translation found for crypt_keeper_settings_title (2288841695457542418) -->
+    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (5790930764432654508) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (1447090863225003474) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
     <skip />
     <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
     <skip />
     <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (3806424855201189058) -->
+    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (942926028858386912) -->
+    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (4150888307809341579) -->
+    <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (2736956499115931645) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (3220993215104112865) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5169437210993176052) -->
+    <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5672516169559235283) -->
+    <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
     <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
     <skip />
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 051e103..0c3f91a 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -90,7 +90,7 @@
     <!-- outdated translation 9005474640702409944 -->     <string name="battery_info_health_cold" msgid="3835692786176707318">"Kalt"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_visibility" msgid="2930835434091839916">"Sichtbar"</string>
-    <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Für <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> Sekunden erkennbar..."</string>
+    <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Für <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> Sekunden sichtbar..."</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Gerät sichtbar machen"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Sprachwahl sperren"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Verwendung des Bluetooth-Dialers bei gesperrtem Bildschirm verhindern"</string>
@@ -272,60 +272,65 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Meinen Standort, Display-Entsperrung, SIM-Kartensperre und Sperre für Anmeldeinformationsspeicher festlegen"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Meinen Standort, Display-Entsperrung, SIM-Kartensperrung und Sperrung des Anmeldeinformationsspeichers festlegen"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Passwörter"</string>
-    <!-- no translation found for crypt_keeper_settings_title (2288841695457542418) -->
+    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (5790930764432654508) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (1447090863225003474) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
     <skip />
     <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
     <skip />
     <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (3806424855201189058) -->
+    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (942926028858386912) -->
+    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (4150888307809341579) -->
+    <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (2736956499115931645) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (3220993215104112865) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5169437210993176052) -->
+    <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5672516169559235283) -->
+    <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
     <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
     <skip />
-    <!-- outdated translation 7222261825322058694 -->     <string name="lock_settings_picker_title" msgid="8665454308380158195">"Bildschirmentsperrung"</string>
-    <!-- outdated translation 347866107250190753 -->     <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Bildschirmsperre einrichten"</string>
+    <string name="lock_settings_picker_title" msgid="8665454308380158195">"Sperrbildschirm konfig"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Bildschirmsperre konf."</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"Display-Sperre ändern"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Sperre (Muster, PIN, Passwort) ändern oder deaktivieren"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Methode zum Sperren des Bildschirms wählen"</string>
     <string name="unlock_set_unlock_off_title" msgid="1613932765246180079">"Aus"</string>
-    <!-- outdated translation 7839021413264124726 -->     <string name="unlock_set_unlock_off_summary" msgid="2791013557563587655">"Sperrbildschirm nicht anzeigen"</string>
-    <!-- outdated translation 6897899776351307938 -->     <string name="unlock_set_unlock_none_title" msgid="5165705762615690332">"Keine"</string>
-    <!-- outdated translation 8885805726462075726 -->     <string name="unlock_set_unlock_none_summary" msgid="2609139908913114644">"Bildschirmentsperrung deaktivieren"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="2791013557563587655">"Niemals den Bildschirm sperren"</string>
+    <string name="unlock_set_unlock_none_title" msgid="5165705762615690332">"Unsicher"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="2609139908913114644">"Kein Muster, Passwort oder PIN zum Entsp. v. Bildschirm nötig"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Muster"</string>
-    <!-- outdated translation 2255207039632944974 -->     <string name="unlock_set_unlock_pattern_summary" msgid="8467282436608077882">"Muster zum Entsperren des Bildschirms zeichnen"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="8467282436608077882">"Muster zur Bildschirmentsperrung erfordern"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
-    <!-- outdated translation 7340012856731870485 -->     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Numerische PIN zum Entsperren des Bildschirms eingeben"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Numerische PIN zur Bildschirmentsp. erfordern"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Passwort"</string>
-    <!-- outdated translation 2303105580723976714 -->     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Passwort zum Entsperren des Bildschirms eingeben"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Passwort zur Bildschirmentsperrung erfordern"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="8816944391772300580">"Vom Remote-Geräteadministrator deaktiviert"</string>
-    <!-- no translation found for unlock_set_unlock_mode_off (378729687629105388) -->
-    <skip />
-    <!-- no translation found for unlock_set_unlock_mode_none (7953821968316697309) -->
-    <skip />
-    <!-- no translation found for unlock_set_unlock_mode_pattern (464022606293547390) -->
-    <skip />
-    <!-- no translation found for unlock_set_unlock_mode_pin (1379365142708807163) -->
-    <skip />
-    <!-- no translation found for unlock_set_unlock_mode_password (6955742995327081060) -->
-    <skip />
+    <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Aus"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="7953821968316697309">"Unsicher"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Durch Muster geschützt"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Durch PIN geschützt"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Geschützt durch Passwort"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Display-Sperre deaktivieren"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Entsperrungsmuster entfernen"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Entsperrungs-PIN entfernen"</string>
@@ -460,7 +465,7 @@
     <string name="wifi_settings_category" msgid="2810363951104753710">"WLAN-Einstellungen"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"WLAN-Zugangspunkte festlegen und verwalten"</string>
     <string name="wifi_starting" msgid="6710266609710860129">"Aktivierung..."</string>
-    <string name="wifi_stopping" msgid="5952909472548218348">"Wird beendet..."</string>
+    <string name="wifi_stopping" msgid="5952909472548218348">"Deaktivierung..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"Fehler"</string>
     <string name="wifi_in_airplane_mode" msgid="7618393787965366655">"Im Flugmodus"</string>
     <string name="wifi_fail_to_scan" msgid="6194542252808587669">"Netzwerkscan nicht möglich"</string>
@@ -679,7 +684,7 @@
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD-Karte"</string>
     <!-- outdated translation 6839889533822270813 -->     <string name="memory_available" msgid="5052397223077021181">"Verfügbarer Speicher"</string>
     <!-- outdated translation 8153264935196755477 -->     <string name="memory_size" msgid="5458889090691922288">"Gesamtspeicher"</string>
-    <!-- outdated translation 4994844259856032553 -->     <string name="memory_calculating_size" msgid="2188358544203768588">"Berechnung wird durchgeführt..."</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"Berechnen…"</string>
     <!-- outdated translation 5551133116908528844 -->     <string name="memory_apps_usage" msgid="9079237985722858506">"Anwendungsnutzung"</string>
     <!-- outdated translation 7087487384373911251 -->     <string name="memory_media_usage" msgid="3738830697707880405">"Mediennutzung"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Freig. Speicher trennen"</string>
@@ -695,7 +700,7 @@
     <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"USB-Speicher löschen"</string>
     <string name="sd_format" product="default" msgid="2576054280507119870">"SD-Karte löschen"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Löscht alle Daten, z. B. Musik und Fotos, aus dem internen USB-Speicher"</string>
-    <!-- outdated translation 8577120345088226893 -->     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Löscht alle Daten, z. B. Musik und Fotos, aus dem internen USB-Speicher"</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"Löscht sämtliche Daten wie Musik und Fotos von der SD-Karte"</string>
     <string name="sd_unavailable" msgid="8580107589533213904">"Nicht verfügbar"</string>
     <string name="read_only" msgid="6702420168629076340">" (schreibgeschützt)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"USB-Speicher trennen"</string>
@@ -754,7 +759,7 @@
     <!-- no translation found for master_clear_desc_also_erases_external (1903185203791274237) -->
     <skip />
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Um auch Musik, Bilder und sonstige Nutzerdaten zu löschen, muss der "<b>"USB-Speicher"</b>" geleert werden."</string>
-    <!-- outdated translation 7986099264340112418 -->     <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Um auch Musik, Bilder und sonstige Nutzerdaten zu löschen, muss der "<b>"USB-Speicher"</b>" gelöscht werden."</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Damit auch Musik, Bilder und andere Nutzerdaten gelöscht werden können, muss die "<b>"SD-Karte"</b>" gelöscht werden."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB-Speicher löschen"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD-Karte löschen"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"Löscht alle Daten, z. B. Musik und Fotos, aus dem internen USB-Speicher"</string>
@@ -820,16 +825,16 @@
     <string name="location_title" msgid="1029961368397484576">"Mein Standort"</string>
     <string name="location_network_based" msgid="8815705866861993344">"Drahtlosnetzwerke"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"Standort über Drahtlosnetzwerke bestimmen (z. B. in Google Maps)"</string>
-    <string name="location_neighborhood_level" msgid="4656658097932515921">"Standort bestimmt von WLAN und/oder Mobilfunknetzen"</string>
+    <string name="location_neighborhood_level" msgid="4656658097932515921">"Standort über WLAN und/oder Mobilfunknetze bestimmen"</string>
     <string name="location_gps" msgid="6296125378829097831">"GPS-Satelliten"</string>
     <string name="location_street_level" msgid="7456259025474443314">"Genau auf Straßenebene lokalisieren"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"Auf Straßenebene lokalisieren (höherer Akkuverbrauch, im Freien)"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"Unterstütztes GPS verwenden"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Server zur Unterstützung von GPS verwenden (zur Verringerung der Netzwerkauslastung nicht auswählen)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Server zur Unterstützung von GPS verwenden (zur Verbesserung der GPS-Leistung deaktivieren)"</string>
-    <!-- outdated translation 6158635740500076705 -->     <string name="use_location_title" msgid="3659340070401464551">"Standort für Google-Suche verwenden"</string>
-    <!-- outdated translation 5137275253035183227 -->     <string name="use_location_summary_disabled" msgid="6518008620918354403">"Standort für Google-Suche und andere Google-Services verwenden"</string>
-    <!-- outdated translation 7252704818478660952 -->     <string name="use_location_summary_enabled" msgid="8110246289085796179">"Standort wird zur Verbesserung von Google-Suchergebnissen und anderen Google-Services verwendet."</string>
+    <string name="use_location_title" msgid="3659340070401464551">"Standort für Google-Suche verwenden"</string>
+    <string name="use_location_summary_disabled" msgid="6518008620918354403">"Standort für Google-Suche und andere Google-Services verwenden"</string>
+    <string name="use_location_summary_enabled" msgid="8110246289085796179">"Standort wird zur Verbesserung der Google-Suchergebnisse und anderer Google-Services verwendet."</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"Über das Tablet"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"Telefoninfo"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"Rechtliche Hinweise, Status und Softwareversion anzeigen"</string>
@@ -890,10 +895,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Weiter"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Sichern Ihres Tablets"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Sichern Ihres Telefons"</string>
-    <!-- unknown placeholder TAG_FONT_0 in lock_intro_message -->
-    <skip />
-    <!-- no translation found for lock_intro_message (3692151094288835065) -->
-    <skip />
+    <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"Schützen Sie Ihr Tablet durch die Erstellung eines persönlichen Bildschirm-Entsperrungsmusters vor unbefugten Zugriffen. Verbinden Sie auf dem nächsten Bildschirm die Punkte in beliebiger Reihenfolge mit dem Finger. Sie müssen mindestens vier Punkte verbinden."\n\n"Sind Sie bereit? Berühren Sie \"Weiter\"."</string>
     <string name="lock_intro_message" product="default" msgid="9100785646737118042"><font size="17">"Schützen Sie Ihr Telefon vor unerlaubter Verwendung, indem Sie ein persönliches Entsperrungsmuster erstellen. "\n<font height="17">\n</font><b>"1"</b>"  Auf dem nächsten Bildschirm sehen Sie, wie ein Beispielmuster gezeichnet wird. "\n<font height="17">\n</font><b>"2"</b>"  Anschließend können Sie Ihr eigenes Entsperrungsmuster zeichnen. Sie können verschiedene Muster ausprobieren, müssen jedoch immer mindestens vier Punkte miteinander verbinden. "\n<font height="17">\n</font><b>"3"</b>"  Zeichnen Sie Ihr Muster zur Bestätigung erneut. "\n<font height="17">\n</font><b>"Bereit? Wählen Sie “Weiter”"</b>". "\n<font height="3">\n</font>"Wählen Sie “Abbrechen”, wenn Sie Ihr Telefon nicht schützen möchten."</font></string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Anwendungen verwalten"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Installierte Anwendungen verwalten und entfernen"</string>
@@ -967,7 +969,7 @@
     <string name="move_app" msgid="5042838441401731346">"Verschieben"</string>
     <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Auf Tablet verschieben"</string>
     <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Auf Telefon verschieben"</string>
-    <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"In USB-Speicher versch."</string>
+    <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"In USB-Speicher verschieben"</string>
     <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Auf SD-Karte verschieben"</string>
     <string name="moving" msgid="6431016143218876491">"Verschieben"</string>
     <string name="insufficient_storage" msgid="8566913062094452962">"Es ist nicht genügend Speicher vorhanden."</string>
@@ -1192,9 +1194,9 @@
     <string name="voice_input_category" msgid="1589318440824204736">"Spracheingabe"</string>
     <string name="voice_output_category" msgid="2624538587784986229">"Sprachausgabe"</string>
     <string name="recognizer_title" msgid="3231385184559054457">"Spracherkennung"</string>
-    <string name="recognizer_settings_title" msgid="6038598099039717232">"Spracherkennungseinstellungen"</string>
+    <string name="recognizer_settings_title" msgid="6038598099039717232">"Spracherkennung"</string>
     <string name="recognizer_settings_summary" msgid="4472287934134546902">"Einstellungen für \'<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\'"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Text-in-Sprache-Einstellungen"</string>
+    <string name="tts_settings" msgid="8186971894801348327">"Text-in-Sprache"</string>
     <string name="tts_settings_title" msgid="4182348653053000933">"Text-in-Sprache-Einstellungen"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Immer meine Einst. verwenden"</string>
     <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"Standardeinstellungen überschreiben Anwendungseinstellungen"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 25c4b7a..a0310e2 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -272,31 +272,41 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Ορισμός του \"Η τοποθεσία μου\", ξεκλειδώματος οθόνης, κλειδώματος κάρτας SIM, κλειδώματος αποθηκευτικού χώρου διαπιστευτηρίων"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Ορισμός του \"Η τοποθεσία μου\", του ξεκλειδώματος οθόνης και του κλειδώματος αποθηκευτικού χώρου διαπιστευτηρίων"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Κωδικοί πρόσβασης"</string>
-    <!-- no translation found for crypt_keeper_settings_title (2288841695457542418) -->
+    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (5790930764432654508) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (1447090863225003474) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
     <skip />
     <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
     <skip />
     <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (3806424855201189058) -->
+    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (942926028858386912) -->
+    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (4150888307809341579) -->
+    <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (2736956499115931645) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (3220993215104112865) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5169437210993176052) -->
+    <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5672516169559235283) -->
+    <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
     <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
     <skip />
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index d6218e7..1fb94eb 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -272,31 +272,41 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Set My Location, screen unlock, SIM card lock, credential storage lock"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Set My Location, screen unlock, credential storage lock"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Passwords"</string>
-    <!-- no translation found for crypt_keeper_settings_title (2288841695457542418) -->
+    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (5790930764432654508) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (1447090863225003474) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
     <skip />
     <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
     <skip />
     <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (3806424855201189058) -->
+    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (942926028858386912) -->
+    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (4150888307809341579) -->
+    <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (2736956499115931645) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (3220993215104112865) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5169437210993176052) -->
+    <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5672516169559235283) -->
+    <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
     <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
     <skip />
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 1599c22..a6b78df 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -270,31 +270,41 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Establecer Mi ubicación, desbloqueo de pantalla, bloqueo de la tarjeta SIM, bloqueo de almacenamiento de la credencial"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Establecer Mi ubicación, desbloqueo de pantalla, bloqueo de almacenamiento de credencial"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Contraseñas"</string>
-    <!-- no translation found for crypt_keeper_settings_title (2288841695457542418) -->
+    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (5790930764432654508) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (1447090863225003474) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
     <skip />
     <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
     <skip />
     <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (3806424855201189058) -->
+    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (942926028858386912) -->
+    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (4150888307809341579) -->
+    <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (2736956499115931645) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (3220993215104112865) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5169437210993176052) -->
+    <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5672516169559235283) -->
+    <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
     <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
     <skip />
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index f5b606f..16c44d5 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -272,31 +272,41 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Establecer Mi ubicación, bloqueo de pantalla, bloqueo de tarjeta SIM y bloqueo de almacenamiento de credenciales"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Establecer ubicación, bloqueo de pantalla y bloqueo de almacenamiento de credenciales"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Contraseñas"</string>
-    <!-- no translation found for crypt_keeper_settings_title (2288841695457542418) -->
+    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (5790930764432654508) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (1447090863225003474) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
     <skip />
     <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
     <skip />
     <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (3806424855201189058) -->
+    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (942926028858386912) -->
+    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (4150888307809341579) -->
+    <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (2736956499115931645) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (3220993215104112865) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5169437210993176052) -->
+    <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5672516169559235283) -->
+    <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
     <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
     <skip />
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index d551e73..25930f8 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -272,31 +272,41 @@
     <string name="security_settings_summary" msgid="967393342537986570">"تنظیم مکان من، قفل صفحه، قفل سیم کارت، قفل محل ذخیره اطلاعات کاربری"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"تنظیم مکان من، بازگشایی قفل صفحه، قفل محل ذخیره اطلاعات کاربری"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"رمزهای ورود"</string>
-    <!-- no translation found for crypt_keeper_settings_title (2288841695457542418) -->
+    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (5790930764432654508) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (1447090863225003474) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
     <skip />
     <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
     <skip />
     <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (3806424855201189058) -->
+    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (942926028858386912) -->
+    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (4150888307809341579) -->
+    <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (2736956499115931645) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (3220993215104112865) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5169437210993176052) -->
+    <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5672516169559235283) -->
+    <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
     <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
     <skip />
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index db52cec..ff66a21 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -272,31 +272,41 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Aseta Oma sijainti, näytön lukituksen poisto, SIM-kortin lukitus, käyttöoikeustietojen tallennustilan lukitus"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Aseta Oma sijainti, näytön lukituksen poisto, käyttöoikeustietojen tallennustilan lukitus"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Salasanat"</string>
-    <!-- no translation found for crypt_keeper_settings_title (2288841695457542418) -->
+    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (5790930764432654508) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (1447090863225003474) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
     <skip />
     <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
     <skip />
     <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (3806424855201189058) -->
+    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (942926028858386912) -->
+    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (4150888307809341579) -->
+    <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (2736956499115931645) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (3220993215104112865) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5169437210993176052) -->
+    <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5672516169559235283) -->
+    <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
     <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
     <skip />
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 1aa0b38..64ca2a9 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -272,60 +272,65 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Définir les paramètres de l\'option Ma position et de verrouillage"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Définir les paramètres de la fonction Ma position, de déverrouillage de l\'écran et de verrouillage du stockage des identifiants"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Mots de passe"</string>
-    <!-- no translation found for crypt_keeper_settings_title (2288841695457542418) -->
+    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (5790930764432654508) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (1447090863225003474) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
     <skip />
     <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
     <skip />
     <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (3806424855201189058) -->
+    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (942926028858386912) -->
+    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (4150888307809341579) -->
+    <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (2736956499115931645) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (3220993215104112865) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5169437210993176052) -->
+    <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5672516169559235283) -->
+    <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
     <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
     <skip />
-    <!-- outdated translation 7222261825322058694 -->     <string name="lock_settings_picker_title" msgid="8665454308380158195">"Sécurité du verrouillage de l\'écran"</string>
-    <!-- outdated translation 347866107250190753 -->     <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Verrouillage de l\'écran"</string>
+    <string name="lock_settings_picker_title" msgid="8665454308380158195">"Configurer écran verr."</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Configurer écran verr."</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"Modifier le verrouillage de l\'écran"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Modifier ou désactiver la sécurité : schéma, code PIN ou mot de passe"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Choisir une méthode pour verrouiller l\'écran"</string>
     <string name="unlock_set_unlock_off_title" msgid="1613932765246180079">"Désactiver"</string>
-    <!-- outdated translation 7839021413264124726 -->     <string name="unlock_set_unlock_off_summary" msgid="2791013557563587655">"Ne pas afficher l\'écran de verrouillage"</string>
-    <!-- outdated translation 6897899776351307938 -->     <string name="unlock_set_unlock_none_title" msgid="5165705762615690332">"Aucune"</string>
-    <!-- outdated translation 8885805726462075726 -->     <string name="unlock_set_unlock_none_summary" msgid="2609139908913114644">"Désactiver la sécurité du verrouillage de l\'écran"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="2791013557563587655">"Ne jamais verrouiller l\'écran"</string>
+    <string name="unlock_set_unlock_none_title" msgid="5165705762615690332">"Désécuriser"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="2609139908913114644">"Déverrouiller l\'écran sans schéma, code PIN ni mot de passe"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Schéma"</string>
-    <!-- outdated translation 2255207039632944974 -->     <string name="unlock_set_unlock_pattern_summary" msgid="8467282436608077882">"Dessiner un schéma pour déverrouiller l\'écran"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="8467282436608077882">"Exiger un schéma pour déverrouiller l\'écran"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"Code PIN"</string>
-    <!-- outdated translation 7340012856731870485 -->     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Saisir un code PIN numérique pour déverrouiller l\'écran"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Exiger PIN numérique pour déverrouiller écran"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Mot de passe"</string>
-    <!-- outdated translation 2303105580723976714 -->     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Saisir un mot de passe pour déverrouiller l\'écran"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Exiger mot de passe pour déverrouiller écran"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="8816944391772300580">"Désactivé par un administrateur distant"</string>
-    <!-- no translation found for unlock_set_unlock_mode_off (378729687629105388) -->
-    <skip />
-    <!-- no translation found for unlock_set_unlock_mode_none (7953821968316697309) -->
-    <skip />
-    <!-- no translation found for unlock_set_unlock_mode_pattern (464022606293547390) -->
-    <skip />
-    <!-- no translation found for unlock_set_unlock_mode_pin (1379365142708807163) -->
-    <skip />
-    <!-- no translation found for unlock_set_unlock_mode_password (6955742995327081060) -->
-    <skip />
+    <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Désactiver"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="7953821968316697309">"Désécuriser"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Sécurisé par un schéma"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Sécurisé par un code PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Sécurisé par mot de passe"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Désactiver le verrouillage de l\'écran"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Supprimer le schéma de déverrouillage"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Supprimer le code PIN de déverrouillage"</string>
@@ -679,7 +684,7 @@
     <string name="sd_memory" product="default" msgid="151871913888051515">"Carte SD"</string>
     <!-- outdated translation 6839889533822270813 -->     <string name="memory_available" msgid="5052397223077021181">"Espace disponible"</string>
     <!-- outdated translation 8153264935196755477 -->     <string name="memory_size" msgid="5458889090691922288">"Espace total"</string>
-    <!-- outdated translation 4994844259856032553 -->     <string name="memory_calculating_size" msgid="2188358544203768588">"Calcul en cours"</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"Calcul en cours"</string>
     <!-- outdated translation 5551133116908528844 -->     <string name="memory_apps_usage" msgid="9079237985722858506">"Utilisation des applications"</string>
     <!-- outdated translation 7087487384373911251 -->     <string name="memory_media_usage" msgid="3738830697707880405">"Utilisation des supports"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Démonter stockage partagé"</string>
@@ -695,7 +700,7 @@
     <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"Effacer la mémoire USB"</string>
     <string name="sd_format" product="default" msgid="2576054280507119870">"Effacer la carte SD"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Effacer les données de la mémoire de stockage USB interne (ex. : musique, photos)"</string>
-    <!-- outdated translation 8577120345088226893 -->     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Efface les données de la mémoire de stockage USB interne, telles que la musique ou les photos."</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"Effacer toutes les données de la carte SD, telles que la musique et les photos"</string>
     <string name="sd_unavailable" msgid="8580107589533213904">"Non disponible"</string>
     <string name="read_only" msgid="6702420168629076340">" (Lecture seule)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"Désinstaller la mémoire de stockage USB"</string>
@@ -754,7 +759,7 @@
     <!-- no translation found for master_clear_desc_also_erases_external (1903185203791274237) -->
     <skip />
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Pour supprimer également la musique, les photos et les autres données utilisateur, vous devez effacer la "<b>"mémoire de stockage USB"</b>"."</string>
-    <!-- outdated translation 7986099264340112418 -->     <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Pour supprimer également la musique, les photos et les autres données utilisateur, vous devez effacer la "<b>"mémoire de stockage USB"</b>"."</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Pour supprimer également de la musique, des images et d\'autres données utilisateur, la "<b>"carte SD"</b>" doit être effacée."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Effacer la mémoire USB"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Effacer la carte SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"Effacer toutes les données de la mémoire de stockage USB interne (ex. : musique, photos)"</string>
@@ -827,9 +832,9 @@
     <string name="assisted_gps" msgid="4649317129586736885">"Utiliser le GPS assisté"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Utiliser le serveur pour assister le GPS (désactiver pour réduire l\'utilisation du réseau)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Utiliser le serveur pour assister le GPS (désactiver pour améliorer les performances du GPS)"</string>
-    <!-- outdated translation 6158635740500076705 -->     <string name="use_location_title" msgid="3659340070401464551">"Utiliser Ma position pour la recherche Google"</string>
-    <!-- outdated translation 5137275253035183227 -->     <string name="use_location_summary_disabled" msgid="6518008620918354403">"Utiliser Ma position pour la recherche et les autres services Google"</string>
-    <!-- outdated translation 7252704818478660952 -->     <string name="use_location_summary_enabled" msgid="8110246289085796179">"Les résultats de recherche et les autres services Google sont améliorés grâce à Ma position."</string>
+    <string name="use_location_title" msgid="3659340070401464551">"Utiliser Ma position pour la recherche Google"</string>
+    <string name="use_location_summary_disabled" msgid="6518008620918354403">"Utiliser Ma position pour la recherche Google et les autres services Google"</string>
+    <string name="use_location_summary_enabled" msgid="8110246289085796179">"Utilisation de Ma position pour améliorer les résultats de recherche Google et autres services Google"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"À propos de la tablette"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"À propos du téléphone"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"Informations légales, état et version du logiciel"</string>
@@ -890,10 +895,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Suivant"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Sécurisation de votre tablette"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Sécurisation de votre téléphone"</string>
-    <!-- unknown placeholder TAG_FONT_0 in lock_intro_message -->
-    <skip />
-    <!-- no translation found for lock_intro_message (3692151094288835065) -->
-    <skip />
+    <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"Protégez votre tablette contre toute utilisation non autorisée en créant un schéma personnel de déverrouillage de l\'écran. À l\'aide de votre doigt, reliez les points dans l\'ordre de votre choix sur l\'écran suivant. Vous devez relier au moins quatre points. "\n\n"Vous êtes prêt ? Appuyez sur \"Suivant\"."</string>
     <string name="lock_intro_message" product="default" msgid="9100785646737118042"><font size="17">"Protégez votre téléphone contre toute utilisation non autorisée en créant un schéma personnel de déverrouillage de l\'écran. "\n<font height="17">\n</font><b>"1"</b>"  L\'écran suivant vous présente un exemple de schéma. "\n<font height="17">\n</font><b>"2"</b>"  Lorsque vous êtes prêt, dessinez votre propre schéma de déverrouillage. Essayez-en plusieurs, mais veillez à relier au moins quatre points. "\n<font height="17">\n</font><b>"3"</b>"  Reproduisez votre schéma pour confirmer votre choix. "\n<font height="17">\n</font><b>"Pour commencer, appuyez sur \"Suivant\""</b>". "\n<font height="3">\n</font>"Si vous ne souhaitez pas activer la protection, appuyez sur \"Annuler\"."</font></string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Gérer les applications"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Gérer et supprimer les applications installées"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 5ea2030..9e9bf38 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -272,60 +272,65 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Postavi Moju lokaciju, otključavanje zaslona, zaključavanje SIM kartice, zaključavanje spremnika za vjerodajnice"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Postavi Moju lokaciju, otključavanje zaslona, zaključavanje pohranjivanja vjerodajnica"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Zaporke"</string>
-    <!-- no translation found for crypt_keeper_settings_title (2288841695457542418) -->
+    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (5790930764432654508) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (1447090863225003474) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
     <skip />
     <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
     <skip />
     <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (3806424855201189058) -->
+    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (942926028858386912) -->
+    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (4150888307809341579) -->
+    <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (2736956499115931645) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (3220993215104112865) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5169437210993176052) -->
+    <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5672516169559235283) -->
+    <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
     <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
     <skip />
-    <!-- outdated translation 7222261825322058694 -->     <string name="lock_settings_picker_title" msgid="8665454308380158195">"Sigurnost otključavanja zaslona"</string>
-    <!-- outdated translation 347866107250190753 -->     <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Postavi zaključavanje zaslona"</string>
+    <string name="lock_settings_picker_title" msgid="8665454308380158195">"Konf. zak. zaslona"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Konfiguracija zaključavanja zaslona"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"Promijeni zaključavanje zaslona"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Promijenite ili onemogućite sigurnosni uzorak, PIN ili zaporku"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Odaberite metodu za zaključavanje zaslona"</string>
     <string name="unlock_set_unlock_off_title" msgid="1613932765246180079">"Isključeno"</string>
-    <!-- outdated translation 7839021413264124726 -->     <string name="unlock_set_unlock_off_summary" msgid="2791013557563587655">"Ne prikazuj zaslon za zaključavanje"</string>
-    <!-- outdated translation 6897899776351307938 -->     <string name="unlock_set_unlock_none_title" msgid="5165705762615690332">"Ništa"</string>
-    <!-- outdated translation 8885805726462075726 -->     <string name="unlock_set_unlock_none_summary" msgid="2609139908913114644">"Onemogući sigurnost otključavanja zaslona"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="2791013557563587655">"Nikada ne zaključavaj zaslon"</string>
+    <string name="unlock_set_unlock_none_title" msgid="5165705762615690332">"Nesigurno"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="2609139908913114644">"Bez uzorka, PIN-a ili zap. za otklj. zaslona"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Uzorak"</string>
-    <!-- outdated translation 2255207039632944974 -->     <string name="unlock_set_unlock_pattern_summary" msgid="8467282436608077882">"Iscrtajte uzorak za otključavanje zaslona"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="8467282436608077882">"Potreban je uzorak za otključavanje zaslona"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
-    <!-- outdated translation 7340012856731870485 -->     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Unesite numerički PIN za otključavanje zaslona"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Zahtijeva numerički PIN za otključavanje zaslona"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Zaporka"</string>
-    <!-- outdated translation 2303105580723976714 -->     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Unesite zaporku za otključavanje zaslona"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Potrebna je zaporka za otključavanje zaslona"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="8816944391772300580">"Onemogućio administrator udaljenog uređaja"</string>
-    <!-- no translation found for unlock_set_unlock_mode_off (378729687629105388) -->
-    <skip />
-    <!-- no translation found for unlock_set_unlock_mode_none (7953821968316697309) -->
-    <skip />
-    <!-- no translation found for unlock_set_unlock_mode_pattern (464022606293547390) -->
-    <skip />
-    <!-- no translation found for unlock_set_unlock_mode_pin (1379365142708807163) -->
-    <skip />
-    <!-- no translation found for unlock_set_unlock_mode_password (6955742995327081060) -->
-    <skip />
+    <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Isključeno"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="7953821968316697309">"Nesigurno"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Osigurano uzorkom"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Osigurano PIN-om"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Osigurano zaporkom"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Isključi zaključavanje zaslona"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Ukloni uzorak za otključavanje"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Ukloni otključavanje PIN-a"</string>
@@ -676,7 +681,7 @@
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD kartica"</string>
     <!-- outdated translation 6839889533822270813 -->     <string name="memory_available" msgid="5052397223077021181">"Dostupan prostor"</string>
     <!-- outdated translation 8153264935196755477 -->     <string name="memory_size" msgid="5458889090691922288">"Ukupno prostora"</string>
-    <!-- outdated translation 4994844259856032553 -->     <string name="memory_calculating_size" msgid="2188358544203768588">"Računanje..."</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"Izračun u tijeku..."</string>
     <!-- outdated translation 5551133116908528844 -->     <string name="memory_apps_usage" msgid="9079237985722858506">"Upotreba aplikacije"</string>
     <!-- outdated translation 7087487384373911251 -->     <string name="memory_media_usage" msgid="3738830697707880405">"Upotreba medija"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Isklj. dijeljenu pohranu"</string>
@@ -692,7 +697,7 @@
     <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"Izbriši USB memoriju"</string>
     <string name="sd_format" product="default" msgid="2576054280507119870">"Izbriši karticu SD"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Briše sve podatke na unutarnjoj memoriji USB, poput glazbe ili fotografija"</string>
-    <string name="sd_format_summary" product="default" msgid="212703692181793109">"Briše sve podatke na kartici SD, poput glazbe ili fotografija"</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"Briše sve podatke na kartici SD, poput glazbe i fotografija"</string>
     <string name="sd_unavailable" msgid="8580107589533213904">"Nije dostupno"</string>
     <string name="read_only" msgid="6702420168629076340">" (samo za čitanje)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"Isključi USB memoriju"</string>
@@ -751,7 +756,7 @@
     <!-- no translation found for master_clear_desc_also_erases_external (1903185203791274237) -->
     <skip />
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Da biste također izbrisali glazbu, slike i ostale korisničke podatke, "<b>"memorija USB"</b>" treba biti izbrisana."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Da biste također izbrisali glazbu, slike i ostale korisničke podatke, "<b>"kartica SD"</b>" treba biti izbrisana."</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Da biste izbrisali glazbu, slike i ostale korisničke podatke, trebate izbrisati "<b>"karticu SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Izbriši USB memoriju"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Izbriši karticu SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"Izbriši sve podatke na unutarnjoj USB memoriji, poput glazbe ili fotografija."</string>
@@ -824,9 +829,9 @@
     <string name="assisted_gps" msgid="4649317129586736885">"Koristite potpomognuti GPS"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Koristi poslužitelj za pomoć GPS-u (isključite za smanjenje mrežnog opterećenja)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Koristi poslužitelj za pomoć GPS-u (isključite za bolji rad GPS-a)"</string>
-    <!-- outdated translation 6158635740500076705 -->     <string name="use_location_title" msgid="3659340070401464551">"Upotrijebi lokaciju za Google pretraživanje"</string>
-    <!-- outdated translation 5137275253035183227 -->     <string name="use_location_summary_disabled" msgid="6518008620918354403">"Upotrijebi lokaciju za Google Pretraživanje i ostale Google usluge"</string>
-    <!-- outdated translation 7252704818478660952 -->     <string name="use_location_summary_enabled" msgid="8110246289085796179">"Upotreba lokacije za poboljšanje Google rezultata pretraživanja i ostalih Google usluga"</string>
+    <string name="use_location_title" msgid="3659340070401464551">"Upotrijebi lokaciju za Google Pretraživanje"</string>
+    <string name="use_location_summary_disabled" msgid="6518008620918354403">"Upotrijebi lokaciju za Google Pretraživanje i ostale Google usluge"</string>
+    <string name="use_location_summary_enabled" msgid="8110246289085796179">"Upotreba lokacije za poboljšanje rezultata Google Pretraživanja i ostalih Google usluga"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"O tabletnom uređaju"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"O telefonu"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"Prikaži pravne informacije, status, verziju softvera"</string>
@@ -887,10 +892,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Dalje"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Osiguravanje tabletnog uređaja"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Osiguravanje telefona"</string>
-    <!-- unknown placeholder TAG_FONT_0 in lock_intro_message -->
-    <skip />
-    <!-- no translation found for lock_intro_message (3692151094288835065) -->
-    <skip />
+    <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"Zaštitite svoje tablet računalo od neovlaštenog korištenja stvaranjem osobnog uzorka za otključavanje zaslona. Prstom na zaslonu povežite točkice bilo kojim redoslijedom. Morate povezati barem četiri točkice. "\n\n"Jeste li spremni? Dodirnite Dalje."</string>
     <string name="lock_intro_message" product="default" msgid="9100785646737118042"><font size="17">"Zaštitite svoj telefon od neovlaštene upotrebe stvaranjem osobnog uzorka za zaključavanje zaslona. "\n<font height="17">\n</font><b>"1"</b>"  Na sljedećem zaslonu pratite stvaranje uzorka. "\n<font height="17">\n</font><b>"2"</b>"  Ako ste spremni iscrtajte vlastiti uzorak. Eksperimentirajte s različitim uzorcima, ali povežite barem četiri točke. "\n<font height="17">\n</font><b>"3"</b>"  Za potvrdu ponovno iscrtajte uzorak. "\n<font height="17">\n</font><b>"Jeste li spremni? Dotaknite “Dalje”"</b>". "\n<font height="3">\n</font>"Da biste telefon ostavili nezaštićen, dotaknite “Odustani”."</font></string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Upravljanje aplikacijama"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Upravljanje i uklanjanje instaliranih aplikacija"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 2fda06e..11c2710 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -272,31 +272,41 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Saját pozíció beállítása, képernyőzár feloldása, SIM-kártya zárolása, hitelesítési adatok tárolójának zárolása"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Saját pozíció beállítása, képernyőzár feloldása, hitelesítési adatok tárolójának zárolása"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Jelszavak"</string>
-    <!-- no translation found for crypt_keeper_settings_title (2288841695457542418) -->
+    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (5790930764432654508) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (1447090863225003474) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
     <skip />
     <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
     <skip />
     <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (3806424855201189058) -->
+    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (942926028858386912) -->
+    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (4150888307809341579) -->
+    <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (2736956499115931645) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (3220993215104112865) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5169437210993176052) -->
+    <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5672516169559235283) -->
+    <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
     <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
     <skip />
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 3648f42..5713598 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -272,31 +272,41 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Setel Lokasiku, pembuka kunci layar, kunci kartu SIM, kunci penyimpanan kredensial"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Setel Lokasiku, pembuka kunci layar, kunci penyimpanan kredensial"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Sandi"</string>
-    <!-- no translation found for crypt_keeper_settings_title (2288841695457542418) -->
+    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (5790930764432654508) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (1447090863225003474) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
     <skip />
     <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
     <skip />
     <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (3806424855201189058) -->
+    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (942926028858386912) -->
+    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (4150888307809341579) -->
+    <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (2736956499115931645) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (3220993215104112865) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5169437210993176052) -->
+    <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5672516169559235283) -->
+    <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
     <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
     <skip />
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 7a9cf4b..36c6c37 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -272,31 +272,41 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Imposta La mia posizione, sblocco schermo, blocco SIM, blocco cred."</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Imposta La mia posizione, sblocco schermo, blocco archivio credenziali"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Password"</string>
-    <!-- no translation found for crypt_keeper_settings_title (2288841695457542418) -->
+    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (5790930764432654508) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (1447090863225003474) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
     <skip />
     <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
     <skip />
     <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (3806424855201189058) -->
+    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (942926028858386912) -->
+    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (4150888307809341579) -->
+    <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (2736956499115931645) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (3220993215104112865) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5169437210993176052) -->
+    <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5672516169559235283) -->
+    <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
     <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
     <skip />
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index d33cbf8..58f66da 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -272,31 +272,41 @@
     <string name="security_settings_summary" msgid="967393342537986570">"הגדר את \'המיקום שלי\', ביטול נעילת צג, נעילת כרטיס SIM, נעילת אחסון אישורים"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"הגדר את \'המיקום שלי\', ביטול נעילת מסך, נעילת אחסון אישורים"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"סיסמאות"</string>
-    <!-- no translation found for crypt_keeper_settings_title (2288841695457542418) -->
+    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (5790930764432654508) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (1447090863225003474) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
     <skip />
     <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
     <skip />
     <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (3806424855201189058) -->
+    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (942926028858386912) -->
+    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (4150888307809341579) -->
+    <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (2736956499115931645) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (3220993215104112865) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5169437210993176052) -->
+    <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5672516169559235283) -->
+    <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
     <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
     <skip />
@@ -310,11 +320,11 @@
     <string name="unlock_set_unlock_none_title" msgid="5165705762615690332">"לא מאובטח"</string>
     <string name="unlock_set_unlock_none_summary" msgid="2609139908913114644">"אל תדרוש קו, PIN או סיסמה לביטול נעילת המסך"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"דפוס"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="8467282436608077882">"דרוש קו לביטול נעילת המסך"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="8467282436608077882">"דרוש דפוס לביטול נעילת המסך"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"דרוש PIN מספרי לביטול נעילת המסך"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"סיסמה"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"דרוש סיסמה לביטול נעילת המסך"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"דרושה סיסמה לביטול נעילת המסך"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="8816944391772300580">"הושבת על ידי מנהל מערכת מרוחק של התקן"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"כבוי"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7953821968316697309">"לא מאובטח"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 27d7e83..8728bf0 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -75,7 +75,7 @@
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
     <string name="battery_info_status_discharging" msgid="6222697503392774475">"放電中"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"充電していません"</string>
-    <string name="battery_info_status_full" msgid="2824614753861462808">"満充電"</string>
+    <string name="battery_info_status_full" msgid="2824614753861462808">"100%"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"電池使用時間:"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
@@ -272,60 +272,65 @@
     <string name="security_settings_summary" msgid="967393342537986570">"現在地、画面ロック、SIMカードロック、認証情報ストレージのロック"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"現在地、画面のロック解除、認証情報ストレージのロックを設定します"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"パスワード"</string>
-    <!-- no translation found for crypt_keeper_settings_title (2288841695457542418) -->
+    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (5790930764432654508) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (1447090863225003474) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
     <skip />
     <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
     <skip />
     <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (3806424855201189058) -->
+    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (942926028858386912) -->
+    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (4150888307809341579) -->
+    <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (2736956499115931645) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (3220993215104112865) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5169437210993176052) -->
+    <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5672516169559235283) -->
+    <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
     <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
     <skip />
-    <!-- outdated translation 7222261825322058694 -->     <string name="lock_settings_picker_title" msgid="8665454308380158195">"画面のロック解除セキュリティ"</string>
-    <!-- outdated translation 347866107250190753 -->     <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"画面ロックの設定"</string>
+    <string name="lock_settings_picker_title" msgid="8665454308380158195">"画面ロックの設定"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"画面ロックの設定"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"画面ロックの変更"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"パターン、PIN、パスワードセキュリティを変更または無効にする"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"画面をロックする方法を選択する"</string>
     <string name="unlock_set_unlock_off_title" msgid="1613932765246180079">"OFF"</string>
-    <!-- outdated translation 7839021413264124726 -->     <string name="unlock_set_unlock_off_summary" msgid="2791013557563587655">"ロック画面を表示しない"</string>
-    <!-- outdated translation 6897899776351307938 -->     <string name="unlock_set_unlock_none_title" msgid="5165705762615690332">"なし"</string>
-    <!-- outdated translation 8885805726462075726 -->     <string name="unlock_set_unlock_none_summary" msgid="2609139908913114644">"画面のロック解除セキュリティを無効にする"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="2791013557563587655">"画面をロックしない"</string>
+    <string name="unlock_set_unlock_none_title" msgid="5165705762615690332">"保護しない"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="2609139908913114644">"解除にパターン、PIN、パスワードを必要としない"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"パターン"</string>
-    <!-- outdated translation 2255207039632944974 -->     <string name="unlock_set_unlock_pattern_summary" msgid="8467282436608077882">"画面ロックを解除するパターンを入力"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="8467282436608077882">"画面ロックをパターンで解除する"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
-    <!-- outdated translation 7340012856731870485 -->     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"画面ロックを解除する数値PINを入力します"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"画面ロックを数値PINで解除する"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"パスワード"</string>
-    <!-- outdated translation 2303105580723976714 -->     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"画面ロックを解除するパスワードの入力"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"画面ロックをパスワードで解除する"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="8816944391772300580">"リモートの端末管理者が無効にしました"</string>
-    <!-- no translation found for unlock_set_unlock_mode_off (378729687629105388) -->
-    <skip />
-    <!-- no translation found for unlock_set_unlock_mode_none (7953821968316697309) -->
-    <skip />
-    <!-- no translation found for unlock_set_unlock_mode_pattern (464022606293547390) -->
-    <skip />
-    <!-- no translation found for unlock_set_unlock_mode_pin (1379365142708807163) -->
-    <skip />
-    <!-- no translation found for unlock_set_unlock_mode_password (6955742995327081060) -->
-    <skip />
+    <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"OFF"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="7953821968316697309">"保護されていません"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"パターンで保護されています"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"PINで保護されています"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"パスワードで保護されています"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"画面ロックをOFFにする"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"ロック解除パターンを削除"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"ロック解除PINを削除"</string>
@@ -679,7 +684,7 @@
     <string name="sd_memory" product="default" msgid="151871913888051515">"SDカード"</string>
     <!-- outdated translation 6839889533822270813 -->     <string name="memory_available" msgid="5052397223077021181">"空き容量"</string>
     <!-- outdated translation 8153264935196755477 -->     <string name="memory_size" msgid="5458889090691922288">"合計容量"</string>
-    <!-- outdated translation 4994844259856032553 -->     <string name="memory_calculating_size" msgid="2188358544203768588">"計算中..."</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"計算中..."</string>
     <!-- outdated translation 5551133116908528844 -->     <string name="memory_apps_usage" msgid="9079237985722858506">"アプリケーションの使用状況"</string>
     <!-- outdated translation 7087487384373911251 -->     <string name="memory_media_usage" msgid="3738830697707880405">"メディアの使用状況"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"共有ストレージのマウントを解除"</string>
@@ -695,7 +700,7 @@
     <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"USBストレージ内データを消去"</string>
     <string name="sd_format" product="default" msgid="2576054280507119870">"SDカード内データを消去"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"内部USBストレージ内の全データ（音楽、写真など）の消去"</string>
-    <!-- outdated translation 8577120345088226893 -->     <string name="sd_format_summary" product="default" msgid="212703692181793109">"内部USBストレージ内の全データ（音楽、画像など）の消去"</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"SDカード内の全データ（音楽、写真など）の消去"</string>
     <string name="sd_unavailable" msgid="8580107589533213904">"使用不可"</string>
     <string name="read_only" msgid="6702420168629076340">" （読み取り専用）"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"USBストレージのマウント解除"</string>
@@ -754,7 +759,7 @@
     <!-- no translation found for master_clear_desc_also_erases_external (1903185203791274237) -->
     <skip />
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"音楽、写真、その他のユーザーデータも消去する場合は"<b>"USBストレージ"</b>"を消去する必要があります。"</string>
-    <!-- outdated translation 7986099264340112418 -->     <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"音楽、画像、その他のユーザーデータも消去する場合は"<b>"USBストレージ"</b>"を消去する必要があります。"</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"音楽、写真などのユーザーデータも消去するためには、"<b>"SDカード"</b>"を消去する必要があります。"</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USBストレージ内データの消去"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SDカード内データを消去"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"内部USBストレージ内の全データ（音楽、写真など）を消去します。"</string>
@@ -827,9 +832,9 @@
     <string name="assisted_gps" msgid="4649317129586736885">"A-GPSを使用"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"サーバーでGPSを補助します（OFFにするとネットワーク使用率が減少します）"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"サーバーでGPSを補助します（OFFにするとGPS性能が向上します）"</string>
-    <!-- outdated translation 6158635740500076705 -->     <string name="use_location_title" msgid="3659340070401464551">"現在地情報をGoogle検索に利用する"</string>
-    <!-- outdated translation 5137275253035183227 -->     <string name="use_location_summary_disabled" msgid="6518008620918354403">"現在地情報をGoogleの検索やサービスで利用する"</string>
-    <!-- outdated translation 7252704818478660952 -->     <string name="use_location_summary_enabled" msgid="8110246289085796179">"現在地をGoogleの検索結果やサービスの向上に利用する"</string>
+    <string name="use_location_title" msgid="3659340070401464551">"Google検索に位置情報を使用する"</string>
+    <string name="use_location_summary_disabled" msgid="6518008620918354403">"現在地情報をGoogleの検索やサービスで利用する"</string>
+    <string name="use_location_summary_enabled" msgid="8110246289085796179">"現在地情報をGoogleの検索結果やサービスの向上に利用する"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"タブレット情報"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"端末情報"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"規約、ステータス、ソフトウェアバージョン"</string>
@@ -890,10 +895,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"次へ"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"タブレットの保護"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"携帯電話の保護"</string>
-    <!-- unknown placeholder TAG_FONT_0 in lock_intro_message -->
-    <skip />
-    <!-- no translation found for lock_intro_message (3692151094288835065) -->
-    <skip />
+    <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"秘密の画面ロック解除パターンを作成してタブレットを不正使用から守ります。次の画面で指を使って点を好きな順序で結んでください。4つ以上の点を結ぶ必要があります。"\n\n"準備ができたら[次へ]をタップしてください。"</string>
     <string name="lock_intro_message" product="default" msgid="9100785646737118042"><font size="17">"画面ロックの解除パターンを作成して携帯電話の不正使用を防ぐことができます。 "\n<font height="17">\n</font><b>"1"</b>" 次の画面に示すパターン作成の例を参考にしてください。"\n<font height="17">\n</font><b>"2"</b>"  ロック解除パターンを決めたら、そのパターンを指でなぞって描きます。さまざまなパターンを作成できますが、最低4つの点を結んでください。"\n<font height="17">\n</font><b>"3"</b>"  確認のためもう一度そのパターンを入力します。"\n<font height="17">\n</font><b>"[次へ]をタップすると次に進みます"</b>"。"\n<font height="3">\n</font>"パターンロックを設定しない場合は[キャンセル]を選択してください。"</font></string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"アプリケーションの管理"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"インストール済みアプリケーションを管理/削除する"</string>
@@ -1114,7 +1116,7 @@
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"電源ボタンで通話を終了する"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"画面をOFFにするのではなく電源ボタンを押して通話を終了する"</string>
     <string name="power_usage_summary_title" msgid="5180282911164282324">"電池使用量"</string>
-    <string name="power_usage_summary" msgid="7237084831082848168">"電池を使用している操作"</string>
+    <string name="power_usage_summary" msgid="7237084831082848168">"電池の使用状況"</string>
     <string name="power_usage_not_available" msgid="3583407442633768046">"電池使用量データなし"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"電池使用時間"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"リセット後の電池使用量"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 5850fb7..ade02e3 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -272,31 +272,41 @@
     <string name="security_settings_summary" msgid="967393342537986570">"내 위치, 화면 잠금해제, SIM 카드 잠금, 자격증명 저장소 잠금 설정"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"내 위치, 화면 잠금해제, 자격증명 저장소 잠금 설정"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"비밀번호"</string>
-    <!-- no translation found for crypt_keeper_settings_title (2288841695457542418) -->
+    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (5790930764432654508) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (1447090863225003474) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
     <skip />
     <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
     <skip />
     <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (3806424855201189058) -->
+    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (942926028858386912) -->
+    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (4150888307809341579) -->
+    <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (2736956499115931645) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (3220993215104112865) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5169437210993176052) -->
+    <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5672516169559235283) -->
+    <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
     <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
     <skip />
@@ -738,9 +748,9 @@
     <string name="error_mcc_not3" msgid="4560171714156251661">"MCC 필드는 3자리 숫자여야 합니다."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC 필드는 2~ 3자리 숫자여야 합니다."</string>
     <string name="restore_default_apn" msgid="2724583218635739913">"기본 APN 설정 복원 중"</string>
-    <string name="menu_restore" msgid="8260067415075573273">"기본값으로 재설정"</string>
-    <string name="restore_default_apn_completed" msgid="3990449939234957281">"기본 APN 설정을 재설정했습니다."</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"기본값 데이터 재설정"</string>
+    <string name="menu_restore" msgid="8260067415075573273">"초기화"</string>
+    <string name="restore_default_apn_completed" msgid="3990449939234957281">"기본 APN 설정을 초기화했습니다."</string>
+    <string name="master_clear_title" msgid="5907939616087039756">"초기화"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"태블릿의 모든 데이터 지우기"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"휴대전화의 모든 데이터 지우기"</string>
     <string name="master_clear_desc" product="tablet" msgid="1305457209008369655">"이렇게 하면 태블릿의 "<b>"내부 저장소"</b>"("\n\n<li>"Google 계정"</li>\n<li>"시스템과 애플리케이션 데이터 및 설정"</li>\n<li>"다운로드된 애플리케이션"</li>" 포함)에서 모든 데이터가 삭제됩니다."</string>
@@ -754,14 +764,14 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD 카드 지우기"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"내부 USB 저장소에 있는 모든 데이터(예: 음악 또는 사진)를 지웁니다."</string>
     <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"SD 카드에 있는 모든 데이터(예: 음악 또는 사진)를 지웁니다."</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"태블릿 재설정"</string>
-    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"휴대전화 재설정"</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"태블릿 초기화"</string>
+    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"휴대전화 초기화"</string>
     <string name="master_clear_final_desc" msgid="6917971132484622696">"모든 개인 정보와 다운로드한 애플리케이션을 삭제하시겠습니까? 수행한 작업은 취소할 수 없습니다."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"모두 지우기"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"잠금해제 패턴을 그리세요."</string>
-    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"기본값 데이터 재설정을 확인하려면 잠금해제 패턴을 그려야 합니다."</string>
+    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"초기화를 확인하려면 잠금해제 패턴을 그려야 합니다."</string>
     <string name="master_clear_failed" msgid="8655202125010189406">"시스템 지우기 서비스를 사용할 수 없어 재설정을 수행하지 못했습니다."</string>
-    <string name="master_clear_confirm_title" msgid="4845794266129586839">"재설정 확인"</string>
+    <string name="master_clear_confirm_title" msgid="4845794266129586839">"초기화 확인"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"USB 저장소 지우기"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"SD 카드 지우기"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"USB 저장소의 모든 데이터 지우기"</string>
@@ -922,14 +932,14 @@
     <string name="clear_activities" msgid="7408923511535174430">"기본 작업 지우기"</string>
     <string name="unknown" msgid="1592123443519355854">"알 수 없음"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"이름별 정렬"</string>
-    <string name="sort_order_size" msgid="7024513286636502362">"크기별 정렬"</string>
+    <string name="sort_order_size" msgid="7024513286636502362">"크기순 정렬"</string>
     <string name="show_running_services" msgid="5736278767975544570">"실행 중인 서비스 표시"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"캐시된 프로세스 표시"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"공간 관리"</string>
     <string name="filter" msgid="2018011724373033887">"필터"</string>
     <string name="filter_dlg_title" msgid="6507663329723966854">"필터 옵션 선택"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"모두"</string>
-    <string name="filter_apps_third_party" msgid="7786348047690140979">"다운로드됨"</string>
+    <string name="filter_apps_third_party" msgid="7786348047690140979">"다운로드"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"실행 중"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB 저장소"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD 카드"</string>
@@ -1109,7 +1119,7 @@
     <string name="power_usage_summary" msgid="7237084831082848168">"배터리를 사용한 항목"</string>
     <string name="power_usage_not_available" msgid="3583407442633768046">"배터리 사용 데이터가 없습니다."</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"플러그를 뽑은 이후 배터리 전원 사용"</string>
-    <string name="battery_since_reset" msgid="7464546661121187045">"재설정 이후 배터리 사용"</string>
+    <string name="battery_since_reset" msgid="7464546661121187045">"초기화 이후 배터리 사용"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"배터리 사용 시간: <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="battery_stats_duration" msgid="7464501326709469282">"플러그를 뽑은 후 <xliff:g id="TIME">%1$s</xliff:g>"</string>
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"충전 중"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 011a913..8292221 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -272,31 +272,41 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Nustatyti mano vietą, ekrano atrakinimą, SIM kortelės užraktą, įgaliojimų saugyklos užraktą"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Nustatyti mano vietą, ekrano atrakinimą, įgaliojimų saugyklos užraktą"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Slaptažodžiai"</string>
-    <!-- no translation found for crypt_keeper_settings_title (2288841695457542418) -->
+    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (5790930764432654508) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (1447090863225003474) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
     <skip />
     <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
     <skip />
     <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (3806424855201189058) -->
+    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (942926028858386912) -->
+    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (4150888307809341579) -->
+    <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (2736956499115931645) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (3220993215104112865) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5169437210993176052) -->
+    <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5672516169559235283) -->
+    <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
     <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
     <skip />
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 2a43c6e..fb45d9f 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -272,31 +272,41 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Manas atrašanās vietas, ekrāna atbloķēšanas, SIM kartes bloķēšanas, akreditācijas datu krātuves bloķēšanas iestatīšana"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Manas atrašanās vietas, ekrāna atbloķēšanas, akreditācijas datu krātuves bloķēšanas iestatīšana"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Paroles"</string>
-    <!-- no translation found for crypt_keeper_settings_title (2288841695457542418) -->
+    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (5790930764432654508) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (1447090863225003474) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
     <skip />
     <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
     <skip />
     <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (3806424855201189058) -->
+    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (942926028858386912) -->
+    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (4150888307809341579) -->
+    <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (2736956499115931645) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (3220993215104112865) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5169437210993176052) -->
+    <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5672516169559235283) -->
+    <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
     <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
     <skip />
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index c4848d6..3f86a91 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -272,31 +272,41 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Plassering, skjermlås, SIM-kort-lås"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Angi Min posisjon, lås opp skjerm, lås påloggingsopplysninger"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Passord"</string>
-    <!-- no translation found for crypt_keeper_settings_title (2288841695457542418) -->
+    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (5790930764432654508) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (1447090863225003474) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
     <skip />
     <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
     <skip />
     <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (3806424855201189058) -->
+    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (942926028858386912) -->
+    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (4150888307809341579) -->
+    <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (2736956499115931645) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (3220993215104112865) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5169437210993176052) -->
+    <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5672516169559235283) -->
+    <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
     <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
     <skip />
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 7c18e07..f1645f3 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -272,31 +272,41 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Mijn locatie\', schermontgrendeling, SIM- en referentieopslagvergrendeling instellen"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"\'Mijn locatie\' instellen, scherm ontgrendelen, opslag van referenties vergrendelen"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Wachtwoorden"</string>
-    <!-- no translation found for crypt_keeper_settings_title (2288841695457542418) -->
+    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (5790930764432654508) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (1447090863225003474) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
     <skip />
     <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
     <skip />
     <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (3806424855201189058) -->
+    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (942926028858386912) -->
+    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (4150888307809341579) -->
+    <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (2736956499115931645) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (3220993215104112865) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5169437210993176052) -->
+    <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5672516169559235283) -->
+    <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
     <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
     <skip />
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index 162dd46..b6054df 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -74,8 +74,8 @@
     <item msgid="4699640516390840297">"Bardzo wysokie"</item>
   </string-array>
   <string-array name="tts_lang_entries">
-    <item msgid="478030717868306353">"angielski (Stany Zjednoczone)"</item>
-    <item msgid="5192284521396794598">"angielski (Wielka Brytania)"</item>
+    <item msgid="478030717868306353">"angielski (USA)"</item>
+    <item msgid="5192284521396794598">"angielski (UK)"</item>
     <item msgid="3000262452051711991">"francuski"</item>
     <item msgid="9214080387341763401">"niemiecki"</item>
     <item msgid="5972100016440094433">"włoski"</item>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 56a6e1a..b3f736d 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -272,31 +272,41 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Ustaw funkcję Moja lokalizacja, odblokowywanie ekranu, blokadę karty SIM, blokadę magazynu danych logowania."</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Ustaw funkcję Moja lokalizacja, odblokowywanie ekranu, blokadę magazynu danych uwierzytelniania"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Hasła"</string>
-    <!-- no translation found for crypt_keeper_settings_title (2288841695457542418) -->
+    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (5790930764432654508) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (1447090863225003474) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
     <skip />
     <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
     <skip />
     <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (3806424855201189058) -->
+    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (942926028858386912) -->
+    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (4150888307809341579) -->
+    <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (2736956499115931645) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (3220993215104112865) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5169437210993176052) -->
+    <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5672516169559235283) -->
+    <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
     <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
     <skip />
@@ -413,7 +423,7 @@
     <!-- outdated translation 8027880654407151060 -->     <string name="bluetooth_profile_headset" msgid="81844079120986198">"Zestaw głośnomówiący"</string>
     <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Transfer"</string>
     <string name="bluetooth_profile_hid" msgid="3000858580917633478">"Urządzenie wejściowe"</string>
-    <string name="bluetooth_profile_pan" msgid="4225813400648547154">"Powiązanie"</string>
+    <string name="bluetooth_profile_pan" msgid="4225813400648547154">"Tethering"</string>
     <!-- no translation found for bluetooth_disconnect_a2dp_profile (3524648279150937177) -->
     <skip />
     <!-- no translation found for bluetooth_disconnect_headset_profile (8635908811168780720) -->
@@ -527,14 +537,14 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Brama"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Długość przedrostka sieci"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Przenośny punkt dostępu Wi-Fi"</string>
+    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Przenośny punkt Wi-Fi"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Przenośny punkt dostępu <xliff:g id="NETWORK_SSID">%1$s</xliff:g> jest aktywny"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Błąd przenośnego punktu dostępu Wi-Fi"</string>
-    <string name="wifi_tether_settings_text" msgid="123573487844470195">"Ustawienia przenośnych punktów dostępu Wi-Fi"</string>
-    <string name="wifi_tether_settings_subtext" msgid="8064755682383367008">"Skonfiguruj przenośne punkty dostępu Wi-Fi i zarządzaj nimi"</string>
-    <string name="wifi_tether_settings_title" msgid="3749063216348284432">"Ustawienia przenośnych punktów dostępu Wi-Fi"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="3474995108398156258">"Skonfiguruj punkt dostępu Wi-Fi"</string>
-    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"Przenośny punkt dostępu Wi-Fi <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
+    <string name="wifi_tether_settings_text" msgid="123573487844470195">"Ustawienia punktów Wi-Fi"</string>
+    <string name="wifi_tether_settings_subtext" msgid="8064755682383367008">"Konfiguruj przenośne punkty dostępu Wi-Fi"</string>
+    <string name="wifi_tether_settings_title" msgid="3749063216348284432">"Ustawienia punktów Wi-Fi"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="3474995108398156258">"Skonfiguruj punkt Wi-Fi"</string>
+    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"Przenośny punkt Wi-Fi <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Punkt dostępu Android"</string>
     <string name="sound_settings_title" msgid="8735891486683305886">"Dźwięk"</string>
     <!-- outdated translation 221091308884159495 -->     <string name="display_settings_title" msgid="2378894265964357591">"Wyświetlacz"</string>
@@ -567,8 +577,8 @@
     <string name="dtmf_tone_enable_summary_on" msgid="3028201873989887327">"Odtwarzaj dźwięki podczas wybierania numeru"</string>
     <string name="dtmf_tone_enable_summary_off" msgid="7791065951268525678">"Odtwarzaj dźwięki podczas wybierania numeru"</string>
     <string name="sound_effects_enable_title" msgid="3197313718929122833">"Dotyk ekranu"</string>
-    <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Odtwarzaj dźwięk podczas wybierania opcji na ekranie"</string>
-    <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Odtwarzaj dźwięk podczas wybierania opcji na ekranie"</string>
+    <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Odtwarzaj dźwięki podczas wybierania opcji na ekranie"</string>
+    <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Odtwarzaj dźwięki podczas wybierania opcji na ekranie"</string>
     <string name="lock_sounds_enable_title" msgid="1575990840389107141">"Dźwięki blokady ekranu"</string>
     <string name="lock_sounds_enable_summary_on" msgid="145741024028391473">"Odtwarzaj dźwięki podczas blokowania i odblokowywania ekranu"</string>
     <string name="lock_sounds_enable_summary_off" msgid="8481243116223542804">"Odtwarzaj dźwięki podczas blokowania i odblokowywania ekranu"</string>
@@ -778,11 +788,11 @@
     <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Aby potwierdzić zamiar wyczyszczenia karty SD, musisz narysować wzór odblokowania."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Ustawienia połączeń"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Poczta głosowa, przekierowania połączeń, poł. oczekujące, ID rozmówcy"</string>
-    <string name="tether_settings_title_usb" msgid="6688416425801386511">"Powiązanie USB"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"Tethering przez USB"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Przenośny punkt dostępu"</string>
-    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Powiązanie Bluetooth"</string>
-    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Powiązanie"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Powiązanie i punkt dostępu"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Tethering przez Bluetooth"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Tethering"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"Tethering i punkt dostępu"</string>
     <string name="tether_settings_summary_usb" product="tablet" msgid="785883365108362248">"Udostępniaj komórkowe połączenie transmisji danych tabletu przez USB"</string>
     <string name="tether_settings_summary_usb" product="default" msgid="3562431455625637370">"Udostępniaj bezprzewodowe połączenie transmisji danych swojego telefonu przez USB"</string>
     <string name="tether_settings_summary_wifi" msgid="5474383125137372164">"Udostępniaj komórkowe połączenie transmisji danych jako punkt dostępu Wi-Fi"</string>
@@ -796,17 +806,17 @@
     <string name="tether_settings_summary_all" product="tablet" msgid="6612660164315153427">"Udostępniaj komórkowe połączenie transmisji danych tabletu przez USB, Wi-Fi lub Bluetooth"</string>
     <string name="tether_settings_summary_all" product="default" msgid="1171769255924636665">"Udostępniaj komórkowe połączenie transmisji danych telefonu przez USB, Wi-Fi lub Bluetooth"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
-    <string name="usb_tethering_button_text" msgid="585829947108007917">"Powiązanie USB"</string>
+    <string name="usb_tethering_button_text" msgid="585829947108007917">"Tethering przez USB"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"Podłączono USB – zaznacz, aby powiązać"</string>
     <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Powiązano"</string>
     <string name="usb_tethering_storage_active_subtext" msgid="6608933594288072573">"Nie można utworzyć powiązania, gdy nośnik USB jest w użyciu"</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"Nie podłączono USB"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Błąd powiązania USB"</string>
-    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Powiązanie Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" msgid="3317112145693933963">"Powiązanie Bluetooth włączone, brak połączenia"</string>
-    <string name="bluetooth_tethering_connected_subtext" msgid="893888246368164894">"Powiązanie Bluetooth włączone, połączenie gotowe"</string>
-    <string name="bluetooth_tethering_off_subtext" msgid="1798863866978968964">"Powiązanie Bluetooth wyłączone"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Błąd powiązania Bluetooth"</string>
+    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Błąd tetheringu przez USB"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Tethering przez Bluetooth"</string>
+    <string name="bluetooth_tethering_available_subtext" msgid="3317112145693933963">"Tethering przez Bluetooth włączony, brak połączenia"</string>
+    <string name="bluetooth_tethering_connected_subtext" msgid="893888246368164894">"Tethering przez Bluetooth włączony, połączenie gotowe"</string>
+    <string name="bluetooth_tethering_off_subtext" msgid="1798863866978968964">"Tethering przez Bluetooth wyłączony"</string>
+    <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Błąd tetheringu przez Bluetooth"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"Nie można powiązać więcej niż <xliff:g id="MAXCONNECTION">%1$d</xliff:g> urządzeń"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Powiązanie z urządzeniem <xliff:g id="DEVICE_NAME">%1$s</xliff:g> zostanie anulowane."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Pomoc"</string>
@@ -886,9 +896,9 @@
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Zabezpieczanie tabletu"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Zabezpieczanie telefonu"</string>
     <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"Chroń tablet przed nieautoryzowanym użyciem przez utworzenie osobistego wzoru odblokowania ekranu. Na następnym ekranie połącz dotknięciami co najmniej cztery kropki w dowolnej kolejności."\n\n"Gotów? Dotknij opcji „Dalej”."</string>
-    <string name="lock_intro_message" product="default" msgid="9100785646737118042"><font size="17">"Chroń swój telefon przed nieautoryzowanym użyciem, tworząc osobisty wzorzec odblokowywania ekranu. "\n<font height="17">\n</font><b>"1"</b>"  Na następnym ekranie obejrzyj procedurę rysowania przykładowego wzorca. "\n<font height="17">\n</font><b>"2"</b>"  Po przygotowaniu się narysuj własny osobisty wzorzec odblokowywania. Wypróbuj różne wzorce, łącząc co najmniej cztery kropki. "\n<font height="17">\n</font><b>"3"</b>"  Ponownie narysuj swój wzorzec, aby go potwierdzić. "\n<font height="17">\n</font><b>"Wszystko gotowe? Dotknij przycisku „Dalej”"</b>". "\n<font height="3">\n</font>"Aby pozostawić telefon bez ochrony, dotknij przycisku „Anuluj”."</font></string>
+    <string name="lock_intro_message" product="default" msgid="9100785646737118042"><font size="17">"Chroń swój telefon przed niepowołanym użyciem, ustawiając blokadę ekranu. "\n<font height="17">\n</font><b>"1"</b>"  Na następnym ekranie zobaczysz, jak narysować przykładowy wzorzec. "\n<font height="17">\n</font><b>"2"</b>"  Jak tylko będziesz gotów, narysuj własny wzorzec blokady ekranu. Wypróbuj różne wzorce, łącząc co najmniej cztery kropki. "\n<font height="17">\n</font><b>"3"</b>"  Ponownie narysuj swój wzorzec, aby go potwierdzić. "\n<font height="17">\n</font><b>"Wszystko gotowe? Kliknij „Dalej”"</b>". "\n<font height="3">\n</font>"Aby pozostawić telefon bez blokady, kliknij „Anuluj”."</font></string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Zarządzaj aplikacjami"</string>
-    <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Zarządzaj zainstalowanymi aplikacjami oraz usuwaj je"</string>
+    <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Zarządzaj zainstalowanymi aplikacjami lub usuwaj je"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Aplikacje"</string>
     <string name="applications_settings_summary" msgid="2714215108369119717">"Zarządzaj aplikacjami, skonfiguruj skróty szybkiego uruchamiania"</string>
     <string name="applications_settings_header" msgid="6018266337275422250">"Ustawienia aplikacji"</string>
@@ -935,7 +945,7 @@
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Na karcie SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Wyłączone"</string>
     <string name="no_applications" msgid="5190227407135243904">"Brak aplikacji."</string>
-    <string name="internal_storage" msgid="1584700623164275282">"Pamięć wewn."</string>
+    <string name="internal_storage" msgid="1584700623164275282">"Pamięć wewnętrzna"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Nośnik USB"</string>
     <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Pamięć karty SD"</string>
     <string name="recompute_size" msgid="7722567982831691718">"Przeliczanie rozmiaru..."</string>
@@ -1187,7 +1197,7 @@
     <string name="recognizer_settings_title" msgid="6038598099039717232">"Rozpoznawanie mowy"</string>
     <string name="recognizer_settings_summary" msgid="4472287934134546902">"Ustawienia dla „<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>”"</string>
     <string name="tts_settings" msgid="8186971894801348327">"Przetwarzanie tekstu na mowę"</string>
-    <string name="tts_settings_title" msgid="4182348653053000933">"Ustawienia przetwarzania tekstu na mowę"</string>
+    <string name="tts_settings_title" msgid="4182348653053000933">"Przetwarzanie tekstu na mowę"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Używaj moich ustawień"</string>
     <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"Poniższe ustawienia domyślne zastępują ustawienia innych aplikacji"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Ustawienia domyślne"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index df4ed24..bc48b36 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -272,31 +272,41 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Definir A minha localização, desbloqueio do ecrã, bloqueio do cartão SIM, bloqueio do armazenamento de credenciais"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Definir O meu local, desbloqueio do ecrã, bloqueio do armazenamento de credenciais"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Palavras-passe"</string>
-    <!-- no translation found for crypt_keeper_settings_title (2288841695457542418) -->
+    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (5790930764432654508) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (1447090863225003474) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
     <skip />
     <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
     <skip />
     <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (3806424855201189058) -->
+    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (942926028858386912) -->
+    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (4150888307809341579) -->
+    <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (2736956499115931645) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (3220993215104112865) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5169437210993176052) -->
+    <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5672516169559235283) -->
+    <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
     <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
     <skip />
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index 9059575..89b894e 100644
--- a/res/values-pt/arrays.xml
+++ b/res/values-pt/arrays.xml
@@ -183,6 +183,6 @@
     <item msgid="3388952299521009213">"Sempre"</item>
     <item msgid="6293147072807231256">"Nunca"</item>
     <item msgid="1276641209451816572">"Somente no modo silencioso"</item>
-    <item msgid="8418930333779132418">"Somente quando não está no modo silencioso"</item>
+    <item msgid="8418930333779132418">"Somente fora do modo silencioso"</item>
   </string-array>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index a12258a..85218ff 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -272,60 +272,65 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Definir Meu local, desbloqueio de tela, bloqueio do SIM e do armazenamento de credenciais"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Definir o Meu local, o desbloqueio de tela, o bloqueio do armazenamento de credenciais"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Senhas"</string>
-    <!-- no translation found for crypt_keeper_settings_title (2288841695457542418) -->
+    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (5790930764432654508) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (1447090863225003474) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
     <skip />
     <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
     <skip />
     <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (3806424855201189058) -->
+    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (942926028858386912) -->
+    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (4150888307809341579) -->
+    <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (2736956499115931645) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (3220993215104112865) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5169437210993176052) -->
+    <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5672516169559235283) -->
+    <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
     <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
     <skip />
-    <!-- outdated translation 7222261825322058694 -->     <string name="lock_settings_picker_title" msgid="8665454308380158195">"Segurança do desbloqueio da tela"</string>
-    <!-- outdated translation 347866107250190753 -->     <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Configurar bloqueio de tela"</string>
+    <string name="lock_settings_picker_title" msgid="8665454308380158195">"Config. tela de bloqueio"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Config. tela de bloqueio"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"Alterar bloqueio de tela"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Alterar ou desativar o padrão, o PIN ou a segurança da senha"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Escolha um método para bloquear a tela"</string>
     <string name="unlock_set_unlock_off_title" msgid="1613932765246180079">"Desativado"</string>
-    <!-- outdated translation 7839021413264124726 -->     <string name="unlock_set_unlock_off_summary" msgid="2791013557563587655">"Não mostrar a tela de bloqueio"</string>
-    <!-- outdated translation 6897899776351307938 -->     <string name="unlock_set_unlock_none_title" msgid="5165705762615690332">"Nenhum"</string>
-    <!-- outdated translation 8885805726462075726 -->     <string name="unlock_set_unlock_none_summary" msgid="2609139908913114644">"Desativar o bloqueio de tela"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="2791013557563587655">"Nunca bloquear a tela"</string>
+    <string name="unlock_set_unlock_none_title" msgid="5165705762615690332">"Não seguro"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="2609139908913114644">"Não exige padrão, PIN e senha p/ desbl. a tela"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Padrão"</string>
-    <!-- outdated translation 2255207039632944974 -->     <string name="unlock_set_unlock_pattern_summary" msgid="8467282436608077882">"Defina o padrão para desbloquear a tela"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="8467282436608077882">"Exige um padrão para desbloquear a tela"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
-    <!-- outdated translation 7340012856731870485 -->     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Insira um PIN numérico para desbloquear a tela"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Exige senha numérica para desbloquear a tela"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Senha"</string>
-    <!-- outdated translation 2303105580723976714 -->     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Digite uma senha para desbloquear a tela"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Exige uma senha para desbloquear a tela"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="8816944391772300580">"Desativ. pelo administrador remoto do aparelho"</string>
-    <!-- no translation found for unlock_set_unlock_mode_off (378729687629105388) -->
-    <skip />
-    <!-- no translation found for unlock_set_unlock_mode_none (7953821968316697309) -->
-    <skip />
-    <!-- no translation found for unlock_set_unlock_mode_pattern (464022606293547390) -->
-    <skip />
-    <!-- no translation found for unlock_set_unlock_mode_pin (1379365142708807163) -->
-    <skip />
-    <!-- no translation found for unlock_set_unlock_mode_password (6955742995327081060) -->
-    <skip />
+    <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Desativado"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="7953821968316697309">"Não seguro"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Protegido com padrão"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Protegido com PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Protegido com senha"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Desativar o bloqueio da tela"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Remover padrão de desbloqueio"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Remover PIN de desbloqueio"</string>
@@ -679,7 +684,7 @@
     <string name="sd_memory" product="default" msgid="151871913888051515">"Cartão SD"</string>
     <!-- outdated translation 6839889533822270813 -->     <string name="memory_available" msgid="5052397223077021181">"Espaço disponível"</string>
     <!-- outdated translation 8153264935196755477 -->     <string name="memory_size" msgid="5458889090691922288">"Espaço total"</string>
-    <!-- outdated translation 4994844259856032553 -->     <string name="memory_calculating_size" msgid="2188358544203768588">"Calculando..."</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"Calculando..."</string>
     <!-- outdated translation 5551133116908528844 -->     <string name="memory_apps_usage" msgid="9079237985722858506">"Uso do aplicativo"</string>
     <!-- outdated translation 7087487384373911251 -->     <string name="memory_media_usage" msgid="3738830697707880405">"Uso da mídia"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Desconectar armaz. comp."</string>
@@ -695,7 +700,7 @@
     <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"Apagar armazenamento USB"</string>
     <string name="sd_format" product="default" msgid="2576054280507119870">"Apagar cartão SD"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Apaga todos os dados do armazenamento USB interno, como músicas e fotos"</string>
-    <!-- outdated translation 8577120345088226893 -->     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Apaga todos os dados do armazenamento USB interno, como músicas e fotos"</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"Apaga todos os dados do cartão SD, como músicas e fotos"</string>
     <string name="sd_unavailable" msgid="8580107589533213904">"Não disponível"</string>
     <string name="read_only" msgid="6702420168629076340">" (Somente leitura)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"Desconectar armaz. USB"</string>
@@ -754,7 +759,7 @@
     <!-- no translation found for master_clear_desc_also_erases_external (1903185203791274237) -->
     <skip />
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Para também limpar músicas, fotos e outros dados de usuário, o "<b>"armazenamento USB"</b>" precisa ser apagado."</string>
-    <!-- outdated translation 7986099264340112418 -->     <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Para também limpar músicas, fotos e outros dados de usuário, o "<b>"armazenamento USB"</b>" precisa ser apagado."</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n" "\n"Para também apagar músicas, fotos e outros dados de usuário, o "<b>"cartão SD "</b>"precisa ser apagado."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Apagar armazenamento USB"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Apagar cartão SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"Apagar todos os dados do armazenamento USB interno, como músicas e fotos."</string>
@@ -827,9 +832,9 @@
     <string name="assisted_gps" msgid="4649317129586736885">"Usar GPS associado"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Usar servidor para auxiliar GPS (desmarque para reduzir o uso da rede)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Usar servidor para auxiliar GPS (desmarque para aprimorar o desempenho do GPS)"</string>
-    <!-- outdated translation 6158635740500076705 -->     <string name="use_location_title" msgid="3659340070401464551">"Usar local para a pesquisa do Google"</string>
-    <!-- outdated translation 5137275253035183227 -->     <string name="use_location_summary_disabled" msgid="6518008620918354403">"Usar local para a pesquisa do Google e outros serviços do Google"</string>
-    <!-- outdated translation 7252704818478660952 -->     <string name="use_location_summary_enabled" msgid="8110246289085796179">"Local usado para aprimorar resultados da pesquisa do Google e outros serviços do Google"</string>
+    <string name="use_location_title" msgid="3659340070401464551">"Usar o local para a Pesquisa do Google"</string>
+    <string name="use_location_summary_disabled" msgid="6518008620918354403">"Usar local para a Pesquisa e outros serviços do Google"</string>
+    <string name="use_location_summary_enabled" msgid="8110246289085796179">"Local utilizado para melhorar os resultados de pesquisa e outros serviços do Google"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"Sobre o tablet"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"Sobre o telefone"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"Ver informações legais, status, versão do software"</string>
@@ -890,10 +895,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Avançar"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Como proteger seu tablet"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Proteção do seu telefone"</string>
-    <!-- unknown placeholder TAG_FONT_0 in lock_intro_message -->
-    <skip />
-    <!-- no translation found for lock_intro_message (3692151094288835065) -->
-    <skip />
+    <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"Proteja seu tablet contra o uso não autorizado criando um padrão de desbloqueio de tela pessoal. Use os dedos para ligar os pontos em qualquer ordem na próxima tela. Você deve conectar pelo menos quatro pontos. "\n\n"Pronto para começar? Toque em \"Próximo\"."</string>
     <string name="lock_intro_message" product="default" msgid="9100785646737118042"><font size="17">"Proteja o seu telefone contra o uso não autorizado criando um padrão de desbloqueio de tela personalizado. "\n<font height="17">\n</font><b>"1"</b>"  Na próxima tela, observe enquanto um exemplo de padrão é desenhado. "\n<font height="17">\n</font><b>"2"</b>"  Quando estiver pronto, desenhe o seu próprio padrão de desbloqueio pessoal. Experimente padrões diferentes, mas conecte no mínimo quatro pontos. "\n<font height="17">\n</font><b>"3"</b>"  Desenhe novamente o seu padrão para confirmar. "\n<font height="17">\n</font><b>"Pronto para começar? Toque em “Avançar”"</b>". "\n<font height="3">\n</font>"Para deixar o seu telefone sem proteção, toque em “Cancelar”."</font></string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Gerenciar aplicativos"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Gerenciar e remover aplicativos instalados"</string>
@@ -937,10 +939,10 @@
     <string name="filter" msgid="2018011724373033887">"Filtro"</string>
     <string name="filter_dlg_title" msgid="6507663329723966854">"Selecionar as opções de filtro"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Todos"</string>
-    <string name="filter_apps_third_party" msgid="7786348047690140979">"Download concluído"</string>
-    <string name="filter_apps_running" msgid="7767071454371350486">"Em execução"</string>
+    <string name="filter_apps_third_party" msgid="7786348047690140979">"Descarregados"</string>
+    <string name="filter_apps_running" msgid="7767071454371350486">"Rodando"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Armazenamento USB"</string>
-    <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"No cartão SD"</string>
+    <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Cartão SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Desativado"</string>
     <string name="no_applications" msgid="5190227407135243904">"Nenhum aplicativo."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Armaz. interno"</string>
@@ -1060,7 +1062,7 @@
     <string name="input_method" msgid="5434026103176856164">"Método de entrada"</string>
     <!-- outdated translation 1106006204280275670 -->     <string name="current_input_method" msgid="2146807723398303917">"Método de entrada atual"</string>
     <!-- outdated translation 4603564747071938112 -->     <string name="input_method_selector" msgid="4311213129681430709">"Seletor de método de entrada"</string>
-    <!-- outdated translation 1706737268175339595 -->     <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"Automático"</string>
+    <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"Automático"</string>
     <!-- outdated translation 3708432810001453807 -->     <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"Mostrar sempre"</string>
     <!-- outdated translation 4836415734240597745 -->     <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"Sempre ocultar"</string>
     <!-- outdated translation 6026015289285751240 -->     <string name="configure_input_method" msgid="7773992829158322455">"Configurar métodos de entrada"</string>
@@ -1349,14 +1351,14 @@
     <string name="privacy_settings_title" msgid="1987089301293213705">"Configurações de privacidade"</string>
     <string name="backup_section_title" msgid="8856083167469467588">"Backup e restauração"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Dados pessoais"</string>
-    <string name="backup_data_title" msgid="1239105919852668016">"Fazer backup dos meus dados"</string>
+    <string name="backup_data_title" msgid="1239105919852668016">"Fazer backup"</string>
     <string name="backup_data_summary" msgid="6515285107793232815">"Dados de aplicativos de backup, senhas da rede Wi-Fi e outras configurações nos servidores do Google"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Conta de backup"</string>
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Nenhuma conta está armazenando o backup dos dados"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Restauração automática"</string>
     <string name="auto_restore_summary" msgid="83177150536734378">"Caso o aplicativo seja reinstalado, restaurar as configurações ou outros dados de backup"</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Backup"</string>
-    <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Tem certeza de que deseja parar de fazer backup das suas senhas da rede Wi-Fi, dos favoritos e de outras configurações e dados de aplicativo e apagar todas as cópias nos servidores do Google?"</string>
+    <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Tem certeza de que deseja interromper backup das suas senhas da rede Wi-Fi, dos favoritos e de outras configurações e dados de aplicativo, e apagar todas as cópias dos servidores do Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Configurações de administração do dispositivo"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Administrador do dispositivo"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Desativar"</string>
@@ -1371,7 +1373,7 @@
     <string name="sound_category_sound_title" msgid="1488759370067953996">"Geral"</string>
     <string name="sound_category_calls_title" msgid="3688531959256239012">"Chamadas recebidas"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Notificações"</string>
-    <string name="sound_category_feedback_title" msgid="4399742321363475393">"Comentários"</string>
+    <string name="sound_category_feedback_title" msgid="4399742321363475393">"Retorno"</string>
     <!-- outdated translation 459632371726748549 -->     <string name="wifi_setup_title" msgid="661074868726906436">"Configuração WiFi"</string>
     <!-- no translation found for wifi_setup_title_editing_network (7304321031985059969) -->
     <skip />
@@ -1439,7 +1441,7 @@
     <!-- outdated translation 1346555381324556167 -->     <string name="finish_button_label" msgid="481587707657751116">"Concluir"</string>
     <!-- outdated translation 6530859245072522666 -->     <string name="really_remove_account_title" msgid="6574643117748564960">"Remover conta"</string>
     <string name="really_remove_account_message" product="tablet" msgid="4448645571715719563">"Deseja mesmo remover esta conta? Sua remoção excluirá todas as suas mensagens, contatos e outros dados do telefone. "\n"Continuar?"</string>
-    <string name="really_remove_account_message" product="default" msgid="1005751790899989319">"Deseja mesmo remover esta conta? Sua remoção excluirá todas as suas mensagens, contatos e outros dados do celular. "\n"Continuar?"</string>
+    <string name="really_remove_account_message" product="default" msgid="1005751790899989319">"Deseja mesmo remover esta conta? A remoção excluirá todas as suas mensagens, contatos e outros dados do celular. "\n"Continuar?"</string>
     <!-- outdated translation 2043864489637138343 -->     <string name="remove_account_failed" product="tablet" msgid="1093911989149396624">"Esta conta é necessária para alguns aplicativos. Só é possível removê-la redefinindo o tablet para os padrões de fábrica (o que exclui todos os seus dados pessoais). Isso é feito no aplicativo \"Configurações\", em \"Privacidade\"."</string>
     <!-- outdated translation 2043864489637138343 -->     <string name="remove_account_failed" product="default" msgid="9174390193652391412">"Esta conta é necessária para alguns aplicativos. Só é possível removê-la redefinindo o tablet para os padrões de fábrica (o que exclui todos os seus dados pessoais). Isso é feito no aplicativo \"Configurações\", em \"Privacidade\"."</string>
     <!-- outdated translation 5253020684282273567 -->     <string name="provider_label" msgid="7724593781904508866">"Enviar inscrições"</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 03d8f78..cb0945b 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -286,31 +286,41 @@
     <string name="security_settings_summary" msgid="967393342537986570">"\"Definir ils parameters da Mia posiziun, da la debloccada dal visur, da la bloccada da la carta SIM e da la bloccada da la memoria da las infurmaziuns d\'annunzia\""</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"\"Definir mia posiziun, debloccar il visur, bloccar la memoria dad infurmaziuns d\'annunzia\""</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Pleds-clav"</string>
-    <!-- no translation found for crypt_keeper_settings_title (2288841695457542418) -->
+    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (5790930764432654508) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (1447090863225003474) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
     <skip />
     <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
     <skip />
     <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (3806424855201189058) -->
+    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (942926028858386912) -->
+    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (4150888307809341579) -->
+    <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (2736956499115931645) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (3220993215104112865) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5169437210993176052) -->
+    <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5672516169559235283) -->
+    <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
     <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
     <skip />
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index cd9460f..765e7e9 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -272,31 +272,41 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Setaţi Locaţia mea, deblocarea ecranului, blocarea cardului SIM, blocarea stocării acreditărilor"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Setaţi Locaţia mea, deblocarea ecranului, blocarea stocării acreditărilor"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Parole"</string>
-    <!-- no translation found for crypt_keeper_settings_title (2288841695457542418) -->
+    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (5790930764432654508) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (1447090863225003474) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
     <skip />
     <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
     <skip />
     <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (3806424855201189058) -->
+    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (942926028858386912) -->
+    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (4150888307809341579) -->
+    <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (2736956499115931645) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (3220993215104112865) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5169437210993176052) -->
+    <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5672516169559235283) -->
+    <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
     <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
     <skip />
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 2421027..6327e3e 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -272,31 +272,41 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Настройка функции \"Мое местоположение\", разблокировка экрана и блокировка хранилища регистрационных данных"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Настройка функции \"Мое местоположение\", разблокировка экрана и блокировка хранилища регистрационных данных"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Пароли"</string>
-    <!-- no translation found for crypt_keeper_settings_title (2288841695457542418) -->
+    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (5790930764432654508) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (1447090863225003474) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
     <skip />
     <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
     <skip />
     <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (3806424855201189058) -->
+    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (942926028858386912) -->
+    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (4150888307809341579) -->
+    <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (2736956499115931645) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (3220993215104112865) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5169437210993176052) -->
+    <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5672516169559235283) -->
+    <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
     <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
     <skip />
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 6e67eda..c4aac88 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -272,31 +272,41 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Moja poloha, odomknutie obrazovky, zámok SIM, zámok ukladacieho priestoru poverení"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Nastavenie funkcie Moje poloha, odomknutie obrazovky a zamknutie ukladacieho priestoru poverení"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Heslá"</string>
-    <!-- no translation found for crypt_keeper_settings_title (2288841695457542418) -->
+    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (5790930764432654508) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (1447090863225003474) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
     <skip />
     <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
     <skip />
     <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (3806424855201189058) -->
+    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (942926028858386912) -->
+    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (4150888307809341579) -->
+    <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (2736956499115931645) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (3220993215104112865) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5169437210993176052) -->
+    <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5672516169559235283) -->
+    <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
     <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
     <skip />
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index b1a3e18..f20d415 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -272,31 +272,41 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Nastavi Mojo lokacijo, odklepanje zaslona, zaklepanje kartice SIM, zaklepanje shrambe poverilnic"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Nastavitev Moje lokacije, odklepanja zaslona, zaklepanja shrambe poverilnic"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Gesla"</string>
-    <!-- no translation found for crypt_keeper_settings_title (2288841695457542418) -->
+    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (5790930764432654508) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (1447090863225003474) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
     <skip />
     <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
     <skip />
     <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (3806424855201189058) -->
+    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (942926028858386912) -->
+    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (4150888307809341579) -->
+    <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (2736956499115931645) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (3220993215104112865) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5169437210993176052) -->
+    <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5672516169559235283) -->
+    <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
     <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
     <skip />
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 90777df..552c98b 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -272,31 +272,41 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Подешавање Моје локације, откључавања екрана, закључавања SIM картице и закључавања акредитива складишта"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Подешавање Моје локације, откључавања екрана, закључавања складишта акредитива"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Лозинке"</string>
-    <!-- no translation found for crypt_keeper_settings_title (2288841695457542418) -->
+    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (5790930764432654508) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (1447090863225003474) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
     <skip />
     <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
     <skip />
     <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (3806424855201189058) -->
+    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (942926028858386912) -->
+    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (4150888307809341579) -->
+    <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (2736956499115931645) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (3220993215104112865) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5169437210993176052) -->
+    <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5672516169559235283) -->
+    <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
     <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
     <skip />
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index cf1100a..c3bf94a 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -272,31 +272,41 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Ställ in Min plats, skärmupplåsning, lås för SIM-kort och lås för uppgiftslagring"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Ställ in Min plats, skärmupplåsning, lås för uppgiftslagring"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Lösenord"</string>
-    <!-- no translation found for crypt_keeper_settings_title (2288841695457542418) -->
+    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (5790930764432654508) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (1447090863225003474) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
     <skip />
     <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
     <skip />
     <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (3806424855201189058) -->
+    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (942926028858386912) -->
+    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (4150888307809341579) -->
+    <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (2736956499115931645) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (3220993215104112865) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5169437210993176052) -->
+    <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5672516169559235283) -->
+    <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
     <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
     <skip />
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 4246d30..94b769e 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -272,31 +272,41 @@
     <string name="security_settings_summary" msgid="967393342537986570">"ตั้งค่าตำแหน่งของฉัน ปลดล็อกหน้าจอ ล็อกซิมการ์ด ล็อกที่จัดเก็บข้อมูลรับรอง"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"ตั้งค่าตำแหน่งของฉัน การปลดล็อกหน้าจอ การล็อกที่จัดเก็บข้อมูลรับรอง"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"รหัสผ่าน"</string>
-    <!-- no translation found for crypt_keeper_settings_title (2288841695457542418) -->
+    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (5790930764432654508) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (1447090863225003474) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
     <skip />
     <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
     <skip />
     <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (3806424855201189058) -->
+    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (942926028858386912) -->
+    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (4150888307809341579) -->
+    <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (2736956499115931645) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (3220993215104112865) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5169437210993176052) -->
+    <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5672516169559235283) -->
+    <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
     <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
     <skip />
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 434538f..c313879 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -272,31 +272,41 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Itakda ang Aking Lokasyon, pag-unlock ng screen, lock ng SIM card, lock ng imbakan ng kredensyal"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Itakda ang Aking Lokasyon, pag-unlock ng screen, lock ng imbakan ng kredensyal"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Mga Password"</string>
-    <!-- no translation found for crypt_keeper_settings_title (2288841695457542418) -->
+    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (5790930764432654508) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (1447090863225003474) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
     <skip />
     <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
     <skip />
     <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (3806424855201189058) -->
+    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (942926028858386912) -->
+    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (4150888307809341579) -->
+    <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (2736956499115931645) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (3220993215104112865) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5169437210993176052) -->
+    <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5672516169559235283) -->
+    <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
     <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
     <skip />
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 51aa04a..1d59b47 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -272,31 +272,41 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Konumum, ekran kil. açma, SIM kart kil., kim. bilg. dep.kilidini ayarla"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Konumum, ekran kilidi açma, kimlik bilgileri deposunun kilidi özelliklerini ayarla"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Şifreler"</string>
-    <!-- no translation found for crypt_keeper_settings_title (2288841695457542418) -->
+    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (5790930764432654508) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (1447090863225003474) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
     <skip />
     <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
     <skip />
     <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (3806424855201189058) -->
+    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (942926028858386912) -->
+    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (4150888307809341579) -->
+    <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (2736956499115931645) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (3220993215104112865) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5169437210993176052) -->
+    <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5672516169559235283) -->
+    <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
     <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
     <skip />
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index da09d81..888c5d0 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -272,31 +272,41 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Устан. Моє місцезн., розблок. екрана, блок. SIM-карти, сховища обл. даних"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Устан. Моє місцезн., розбл. екрана, блок. схов. обл. даних"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Паролі"</string>
-    <!-- no translation found for crypt_keeper_settings_title (2288841695457542418) -->
+    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (5790930764432654508) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (1447090863225003474) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
     <skip />
     <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
     <skip />
     <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (3806424855201189058) -->
+    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (942926028858386912) -->
+    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (4150888307809341579) -->
+    <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (2736956499115931645) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (3220993215104112865) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5169437210993176052) -->
+    <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5672516169559235283) -->
+    <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
     <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
     <skip />
@@ -882,7 +892,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"Далі"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Захист вашого пристрою"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Захист вашого телефону"</string>
-    <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"Захистіть свій пристрій від несанкціонованого використання, створивши особистий шаблон розблокування екрана. На наступному крані пальцем з\'єднайте крапки в будь-якому порядку. Потрібно з\'єднати принаймні чотири крапки. "\n\n"Готові? Торкніться \"Далі\"."</string>
+    <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"Захистіть свій пристрій від несанкціонованого використання, створивши особистий шаблон розблокування екрана. На наступному крані пальцем з\'єднайте крапки в будь-якому порядку. Потрібно з\'єднати принаймні чотири крапки. "\n\n"Готові? Натисніть \"Далі\"."</string>
     <string name="lock_intro_message" product="default" msgid="9100785646737118042"><font size="17">"Захистіть свій тел. від несанкціон. використ., створ. особистий ключ розблок. екрана. "\n<font height="17">\n</font><b>"1"</b>"  На наст. екрані перегляньте приклад малювання ключа. "\n<font height="17">\n</font><b>"2"</b>"  Коли будете готові, намалюйте власний особистий ключ розблок. Експеримент. з різними ключами, але з\'єднайте принаймні чотири точки. "\n<font height="17">\n</font><b>"3"</b>"  Ще раз намал. ключ для підтвердж. "\n<font height="17">\n</font><b>"Готові? Натисніть \"Далі\""</b>". "\n<font height="3">\n</font>"Щоб залиш. тел. незахищ., натисніть \"Скасувати\"."</font></string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Керувати програмами"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Керувати та видаляти встановлені програми"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 2de53bd..39f9bb6 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -272,31 +272,41 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Đặt Vị trí của tôi, mở khoá màn hình, khoá thẻ SIM, khoá bộ nhớ thông tin xác thực"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Đặt Vị trí của tôi, mở khoá màn hình, khoá bộ nhớ thông tin xác thực"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Mật khẩu"</string>
-    <!-- no translation found for crypt_keeper_settings_title (2288841695457542418) -->
+    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (5790930764432654508) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (1447090863225003474) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
     <skip />
     <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
     <skip />
     <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (3806424855201189058) -->
+    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (942926028858386912) -->
+    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (4150888307809341579) -->
+    <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (2736956499115931645) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (3220993215104112865) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5169437210993176052) -->
+    <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5672516169559235283) -->
+    <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
     <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
     <skip />
diff --git a/res/values-xlarge/styles.xml b/res/values-xlarge/styles.xml
index 9b125ad..1e99e45 100644
--- a/res/values-xlarge/styles.xml
+++ b/res/values-xlarge/styles.xml
@@ -55,6 +55,7 @@
         <item name="android:minWidth">208dip</item>
         <item name="android:layout_height">48dip</item>
         <item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
+        <item name="android:textSize">20sp</item>
     </style>
 
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 3daa15c..d38ce61 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -272,60 +272,65 @@
     <string name="security_settings_summary" msgid="967393342537986570">"设置我的位置、屏幕解锁、SIM 卡锁定和凭据存储锁定"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"设置我的位置、屏幕解锁和凭据存储锁定"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"密码"</string>
-    <!-- no translation found for crypt_keeper_settings_title (2288841695457542418) -->
+    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (5790930764432654508) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (1447090863225003474) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
     <skip />
     <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
     <skip />
     <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (3806424855201189058) -->
+    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (942926028858386912) -->
+    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (4150888307809341579) -->
+    <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (2736956499115931645) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (3220993215104112865) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5169437210993176052) -->
+    <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5672516169559235283) -->
+    <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
     <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
     <skip />
-    <!-- outdated translation 7222261825322058694 -->     <string name="lock_settings_picker_title" msgid="8665454308380158195">"屏幕解锁保护"</string>
-    <!-- outdated translation 347866107250190753 -->     <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"设置屏幕锁定"</string>
+    <string name="lock_settings_picker_title" msgid="8665454308380158195">"配置锁定屏幕"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"配置锁定屏幕"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"更改屏幕锁定"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"更改或停用图案、PIN 或密码保护"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"选择锁定屏幕的方法"</string>
     <string name="unlock_set_unlock_off_title" msgid="1613932765246180079">"关闭"</string>
-    <!-- outdated translation 7839021413264124726 -->     <string name="unlock_set_unlock_off_summary" msgid="2791013557563587655">"不显示锁定屏幕"</string>
-    <!-- outdated translation 6897899776351307938 -->     <string name="unlock_set_unlock_none_title" msgid="5165705762615690332">"无"</string>
-    <!-- outdated translation 8885805726462075726 -->     <string name="unlock_set_unlock_none_summary" msgid="2609139908913114644">"停用屏幕解锁保护"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="2791013557563587655">"绝不锁定屏幕"</string>
+    <string name="unlock_set_unlock_none_title" msgid="5165705762615690332">"不设置安全保护"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="2609139908913114644">"不需要图案、PIN 或密码就可以解锁屏幕"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"图案"</string>
-    <!-- outdated translation 2255207039632944974 -->     <string name="unlock_set_unlock_pattern_summary" msgid="8467282436608077882">"绘制图案以解锁屏幕"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="8467282436608077882">"需要图案才能解锁屏幕"</string>
     <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
-    <!-- outdated translation 7340012856731870485 -->     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"输入数字 PIN 以解锁屏幕"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"需要数字 PIN 才能解锁屏幕"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"密码"</string>
-    <!-- outdated translation 2303105580723976714 -->     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"输入密码以解锁屏幕"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"需要密码才能解锁屏幕"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="8816944391772300580">"已由远程设备管理员停用"</string>
-    <!-- no translation found for unlock_set_unlock_mode_off (378729687629105388) -->
-    <skip />
-    <!-- no translation found for unlock_set_unlock_mode_none (7953821968316697309) -->
-    <skip />
-    <!-- no translation found for unlock_set_unlock_mode_pattern (464022606293547390) -->
-    <skip />
-    <!-- no translation found for unlock_set_unlock_mode_pin (1379365142708807163) -->
-    <skip />
-    <!-- no translation found for unlock_set_unlock_mode_password (6955742995327081060) -->
-    <skip />
+    <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"关闭"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="7953821968316697309">"不设置安全保护"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"使用图案设置安全保护"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"使用 PIN 设置安全保护"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"通过密码设置安全保护"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"关闭屏幕锁定"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"删除解锁图案"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"删除解锁 PIN"</string>
@@ -679,7 +684,7 @@
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD 卡"</string>
     <!-- outdated translation 6839889533822270813 -->     <string name="memory_available" msgid="5052397223077021181">"可用空间"</string>
     <!-- outdated translation 8153264935196755477 -->     <string name="memory_size" msgid="5458889090691922288">"总容量"</string>
-    <!-- outdated translation 4994844259856032553 -->     <string name="memory_calculating_size" msgid="2188358544203768588">"正在计算..."</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"正在计算..."</string>
     <!-- outdated translation 5551133116908528844 -->     <string name="memory_apps_usage" msgid="9079237985722858506">"应用程序使用情况"</string>
     <!-- outdated translation 7087487384373911251 -->     <string name="memory_media_usage" msgid="3738830697707880405">"媒体存储空间使用情况"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"卸载共享存储设备"</string>
@@ -695,7 +700,7 @@
     <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"格式化 USB 存储设备"</string>
     <string name="sd_format" product="default" msgid="2576054280507119870">"格式化 SD 卡"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"清除内部 USB 存储设备中的全部数据，例如音乐和照片"</string>
-    <!-- outdated translation 8577120345088226893 -->     <string name="sd_format_summary" product="default" msgid="212703692181793109">"清除内部 USB 存储设备中的全部数据，例如音乐和照片"</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"清除 SD 卡中的全部数据，例如音乐和照片"</string>
     <string name="sd_unavailable" msgid="8580107589533213904">"不可用"</string>
     <string name="read_only" msgid="6702420168629076340">" （只读）"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"卸载 USB 存储设备"</string>
@@ -754,7 +759,7 @@
     <!-- no translation found for master_clear_desc_also_erases_external (1903185203791274237) -->
     <skip />
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"要清除音乐、照片和其他用户数据，请格式化 "<b>"USB 存储设备"</b>"。"</string>
-    <!-- outdated translation 7986099264340112418 -->     <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"要清除音乐、照片和其他用户数据，请清除 "<b>"USB 存储设备"</b>"。"</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"如果也要删除音乐、图片和其他用户数据，请清除 "<b>"SD 卡"</b>"。"</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"格式化 USB 存储设备"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"格式化 SD 卡"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"清除内部 USB 存储设备中的全部数据，例如音乐或照片。"</string>
@@ -827,9 +832,9 @@
     <string name="assisted_gps" msgid="4649317129586736885">"使用增强型 GPS"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"使用服务器来辅助 GPS（取消选中可降低网络使用率）"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"使用服务器来辅助 GPS（取消选中可提高 GPS 性能）"</string>
-    <!-- outdated translation 6158635740500076705 -->     <string name="use_location_title" msgid="3659340070401464551">"将位置用于 Google 搜索"</string>
-    <!-- outdated translation 5137275253035183227 -->     <string name="use_location_summary_disabled" msgid="6518008620918354403">"将位置用于 Google 搜索和 Google 的其他服务"</string>
-    <!-- outdated translation 7252704818478660952 -->     <string name="use_location_summary_enabled" msgid="8110246289085796179">"已将位置用于改进 Google 搜索结果和 Google 的其他服务"</string>
+    <string name="use_location_title" msgid="3659340070401464551">"将位置信息用于“Google 搜索”"</string>
+    <string name="use_location_summary_disabled" msgid="6518008620918354403">"将位置信息用于“Google 搜索”和 Google 的其他服务"</string>
+    <string name="use_location_summary_enabled" msgid="8110246289085796179">"已将位置信息用于改善“Google 搜索”结果和 Google 的其他服务"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"关于平板电脑"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"关于手机"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"查看法律信息、状态和软件版本"</string>
@@ -890,10 +895,7 @@
     <string name="next_button_label" msgid="8890792540116568321">"下一步"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"保护您的平板电脑"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"手机安全设置"</string>
-    <!-- unknown placeholder TAG_FONT_0 in lock_intro_message -->
-    <skip />
-    <!-- no translation found for lock_intro_message (3692151094288835065) -->
-    <skip />
+    <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"通过创建个人屏幕解锁图案，防止他人未经授权使用您的平板电脑。用手指按任意顺序连接下一屏幕上的点，但至少要连接四个点。"\n\n"可以开始了吗？触摸“下一步”。"</string>
     <string name="lock_intro_message" product="default" msgid="9100785646737118042"><font size="17">"通过创建个人屏幕解锁图案，防止他人未经授权使用您的手机。"\n<font height="17">\n</font><b>"1"</b>"  在下一屏幕上，观看示例图案的绘制过程。"\n<font height="17">\n</font><b>"2"</b>"  准备就绪后，绘制您自己的个人解锁图案。可尝试不同的图案，但至少要连接四个点。"\n<font height="17">\n</font><b>"3"</b>"  重新绘制您的图案进行确认。"\n<font height="17">\n</font><b>"可以开始了吗？触摸“下一步”"</b>"。"\n<font height="3">\n</font>"要让手机处于不受保护的状态，请触摸“取消”。"</font></string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"管理应用程序"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"管理和删除安装的应用程序"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 7388378..331ec12 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -272,31 +272,41 @@
     <string name="security_settings_summary" msgid="967393342537986570">"設定我的位置、畫面解鎖、SIM 卡鎖定、認證儲存空間鎖定"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"設定我的位置、解除鎖定畫面及鎖定認證儲存空間"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"密碼"</string>
-    <!-- no translation found for crypt_keeper_settings_title (2288841695457542418) -->
+    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_title (5790930764432654508) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (1447090863225003474) -->
+    <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
     <skip />
     <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
     <skip />
     <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (3806424855201189058) -->
+    <!-- no translation found for crypt_keeper_desc (2150571569618349332) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (942926028858386912) -->
+    <!-- no translation found for crypt_keeper_desc (7366703764847750586) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (2008346408473255519) -->
     <skip />
-    <!-- no translation found for crypt_keeper_final_desc (4150888307809341579) -->
+    <!-- no translation found for crypt_keeper_low_charge_text (5920622844033087792) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (2736956499115931645) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (3220993215104112865) -->
     <skip />
     <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5169437210993176052) -->
+    <!-- no translation found for crypt_keeper_setup_description (3975741105437032042) -->
     <skip />
-    <!-- no translation found for crypt_keeper_setup_description (5672516169559235283) -->
+    <!-- no translation found for crypt_keeper_setup_description (8820144832981707567) -->
     <skip />
     <!-- no translation found for crypt_keeper_cooldown (6736063610343230255) -->
     <skip />
diff --git a/res/xml/wifi_advanced_settings.xml b/res/xml/wifi_advanced_settings.xml
index 8c545de..4d85178 100644
--- a/res/xml/wifi_advanced_settings.xml
+++ b/res/xml/wifi_advanced_settings.xml
@@ -18,15 +18,6 @@
         android:title="@string/wifi_advanced_titlebar">
 
     <ListPreference
-            android:key="sleep_policy"
-            android:title="@string/wifi_setting_sleep_policy_title"
-            android:summary="@string/wifi_setting_sleep_policy_summary"
-            android:persistent="false"
-            android:entries="@array/wifi_sleep_policy_entries"
-            android:entryValues="@array/wifi_sleep_policy_values"
-            />
-
-    <ListPreference
             android:key="frequency_band"
             android:title="@string/wifi_setting_frequency_band_title"
             android:summary="@string/wifi_setting_frequency_band_summary"
diff --git a/res/xml/wifi_settings.xml b/res/xml/wifi_settings.xml
index 9433c05..24f4432 100644
--- a/res/xml/wifi_settings.xml
+++ b/res/xml/wifi_settings.xml
@@ -30,6 +30,15 @@
             android:summary="@string/wifi_notify_open_networks_summary"
             android:persistent="false" />
 
+    <ListPreference
+            android:key="sleep_policy"
+            android:title="@string/wifi_setting_sleep_policy_title"
+            android:summary="@string/wifi_setting_sleep_policy_summary"
+            android:persistent="false"
+            android:entries="@array/wifi_sleep_policy_entries"
+            android:entryValues="@array/wifi_sleep_policy_values"
+            />
+
     <com.android.settings.ProgressCategory
             android:key="access_points"
             android:dependency="enable_wifi"
diff --git a/src/com/android/settings/DateTimeSettingsSetupWizard.java b/src/com/android/settings/DateTimeSettingsSetupWizard.java
index 6964175..90a0f8b 100644
--- a/src/com/android/settings/DateTimeSettingsSetupWizard.java
+++ b/src/com/android/settings/DateTimeSettingsSetupWizard.java
@@ -101,7 +101,7 @@
         // mTimeZoneButton.setText(DateTimeSettings.getTimeZoneText(tz));
         mTimeZoneButton.setOnClickListener(this);
         mTimeZoneAdapter = ZonePicker.constructTimezoneAdapter(this, false,
-                R.layout.custom_list_item);
+                R.layout.date_time_setup_custom_list_item_2);
 
         final boolean autoDateTimeEnabled;
         final Intent intent = getIntent();
diff --git a/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java b/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java
index 406ac8f..de15dcc 100644
--- a/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java
+++ b/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java
@@ -635,7 +635,7 @@
 
         @Override
         public int getDrawableResource() {
-            return R.drawable.ic_bt_headphones_a2dp;
+            return 0;   // no icon for OPP
         }
     }
 
diff --git a/src/com/android/settings/wifi/AdvancedSettings.java b/src/com/android/settings/wifi/AdvancedSettings.java
index 74948f0..d5d55b1 100644
--- a/src/com/android/settings/wifi/AdvancedSettings.java
+++ b/src/com/android/settings/wifi/AdvancedSettings.java
@@ -27,7 +27,6 @@
 import android.os.SystemProperties;
 import android.preference.ListPreference;
 import android.preference.Preference;
-import android.provider.Settings;
 import android.text.TextUtils;
 import android.widget.Toast;
 import android.util.Log;
@@ -38,7 +37,6 @@
     private static final String TAG = "AdvancedSettings";
     private static final String KEY_MAC_ADDRESS = "mac_address";
     private static final String KEY_CURRENT_IP_ADDRESS = "current_ip_address";
-    private static final String KEY_SLEEP_POLICY = "sleep_policy";
     private static final String KEY_FREQUENCY_BAND = "frequency_band";
 
     private WifiManager mWifiManager;
@@ -63,18 +61,12 @@
     }
 
     private void initPreferences() {
-        ListPreference pref = (ListPreference) findPreference(KEY_SLEEP_POLICY);
-        pref.setOnPreferenceChangeListener(this);
-        int value = Settings.System.getInt(getContentResolver(),
-                Settings.System.WIFI_SLEEP_POLICY,
-                Settings.System.WIFI_SLEEP_POLICY_NEVER_WHILE_PLUGGED);
-        pref.setValue(String.valueOf(value));
 
-        pref = (ListPreference) findPreference(KEY_FREQUENCY_BAND);
+        ListPreference pref = (ListPreference) findPreference(KEY_FREQUENCY_BAND);
 
         if (mWifiManager.isDualBandSupported()) {
             pref.setOnPreferenceChangeListener(this);
-            value = mWifiManager.getFrequencyBand();
+            int value = mWifiManager.getFrequencyBand();
             if (value != -1) {
                 pref.setValue(String.valueOf(value));
             } else {
@@ -89,16 +81,7 @@
         String key = preference.getKey();
         if (key == null) return true;
 
-        if (key.equals(KEY_SLEEP_POLICY)) {
-            try {
-                Settings.System.putInt(getContentResolver(),
-                        Settings.System.WIFI_SLEEP_POLICY, Integer.parseInt(((String) newValue)));
-            } catch (NumberFormatException e) {
-                Toast.makeText(getActivity(), R.string.wifi_setting_sleep_policy_error,
-                        Toast.LENGTH_SHORT).show();
-                return false;
-            }
-        } else if (key.equals(KEY_FREQUENCY_BAND)) {
+        if (key.equals(KEY_FREQUENCY_BAND)) {
             try {
                 mWifiManager.setFrequencyBand(Integer.parseInt(((String) newValue)), true);
             } catch (NumberFormatException e) {
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index 62d314e..750e168 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -159,6 +159,13 @@
             mSsidView.addTextChangedListener(this);
             mSecuritySpinner = ((Spinner) mView.findViewById(R.id.security));
             mSecuritySpinner.setOnItemSelectedListener(this);
+            if (context instanceof WifiSettingsForSetupWizardXL) {
+                // We want custom layout. The content must be same as the other cases.
+                mSecuritySpinner.setAdapter(
+                        new ArrayAdapter<String>(context, R.layout.wifi_setup_custom_list_item_1,
+                                android.R.id.text1,
+                                context.getResources().getStringArray(R.array.wifi_security)));
+            }
             mConfigUi.setSubmitButton(context.getString(R.string.wifi_save));
         } else {
             mConfigUi.setTitle(mAccessPoint.ssid);
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 2e26eba..7d16141 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -45,9 +45,11 @@
 import android.os.Message;
 import android.preference.CheckBoxPreference;
 import android.preference.Preference;
+import android.preference.ListPreference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceScreen;
 import android.provider.Settings.Secure;
+import android.provider.Settings;
 import android.security.Credentials;
 import android.security.KeyStore;
 import android.view.ContextMenu;
@@ -78,12 +80,13 @@
  * other decorations specific to that screen.
  */
 public class WifiSettings extends SettingsPreferenceFragment
-        implements DialogInterface.OnClickListener {
+        implements DialogInterface.OnClickListener, Preference.OnPreferenceChangeListener  {
     private static final int MENU_ID_SCAN = Menu.FIRST;
     private static final int MENU_ID_ADVANCED = Menu.FIRST + 1;
     private static final int MENU_ID_CONNECT = Menu.FIRST + 2;
     private static final int MENU_ID_FORGET = Menu.FIRST + 3;
     private static final int MENU_ID_MODIFY = Menu.FIRST + 4;
+    private static final String KEY_SLEEP_POLICY = "sleep_policy";
 
     private final IntentFilter mFilter;
     private final BroadcastReceiver mReceiver;
@@ -206,6 +209,13 @@
             mAccessPoints.setOrderingAsAdded(false);
             mAddNetwork = findPreference("add_network");
 
+            ListPreference pref = (ListPreference) findPreference(KEY_SLEEP_POLICY);
+            pref.setOnPreferenceChangeListener(this);
+            int value = Settings.System.getInt(getContentResolver(),
+                    Settings.System.WIFI_SLEEP_POLICY,
+                    Settings.System.WIFI_SLEEP_POLICY_NEVER);
+            pref.setValue(String.valueOf(value));
+
             registerForContextMenu(getListView());
             setHasOptionsMenu(true);
         }
@@ -353,6 +363,25 @@
         return true;
     }
 
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        String key = preference.getKey();
+        if (key == null) return true;
+
+        if (key.equals(KEY_SLEEP_POLICY)) {
+            try {
+                Settings.System.putInt(getContentResolver(),
+                        Settings.System.WIFI_SLEEP_POLICY, Integer.parseInt(((String) newValue)));
+            } catch (NumberFormatException e) {
+                Toast.makeText(getActivity(), R.string.wifi_setting_sleep_policy_error,
+                        Toast.LENGTH_SHORT).show();
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+
     /**
      * Shows an appropriate Wifi configuration component.
      * Called when a user clicks "Add network" preference or one of available networks is selected.