diff --git a/Android.mk b/Android.mk
index 83df136..b171dbd 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,6 +1,8 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
+LOCAL_STATIC_JAVA_LIBRARIES := guava
+
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1b322ea..bb64059 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -72,6 +72,12 @@
             </intent-filter>
         </activity>
 
+        <activity android:name=".SubSettings"
+                android:taskAffinity="com.android.settings"
+                android:theme="@android:style/Theme.Holo"
+                >
+        </activity>
+
         <activity android:name="CreateShortcut" android:label="@string/settings_shortcut"
             android:theme="@style/Theme.CreateShortCut">
             <intent-filter>
@@ -644,7 +650,6 @@
             <intent-filter>
                 <action android:name="com.android.credentials.UNLOCK" />
                 <action android:name="com.android.credentials.INSTALL" />
-                <action android:name="com.android.credentials.SET_PASSWORD" />
                 <action android:name="com.android.credentials.RESET" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
@@ -1123,6 +1128,19 @@
                 android:resource="@id/security_settings" />
         </activity>
 
+        <activity android:name="Settings$DataUsageSummaryActivity"
+                android:label="@string/data_usage_summary_title">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.DATA_USAGE_SUMMARY" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.DataUsageSummary" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/wireless_settings" />
+        </activity>
+
         <receiver android:name=".widget.SettingsAppWidgetProvider"
                 android:label="@string/gadget_title"
                 android:exported="false"
@@ -1137,5 +1155,6 @@
             </intent-filter>
             <meta-data android:name="android.appwidget.provider" android:resource="@xml/appwidget_info" />
         </receiver>
+
     </application>
 </manifest>
diff --git a/res/drawable-hdpi/encroid_complete.png b/res/drawable-hdpi/encroid_complete.png
deleted file mode 100644
index 6c905d4..0000000
--- a/res/drawable-hdpi/encroid_complete.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_preferences_collapsed.png b/res/drawable-hdpi/ic_preferences_collapsed.png
deleted file mode 100644
index bc250d8..0000000
--- a/res/drawable-hdpi/ic_preferences_collapsed.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_preferences_expanded.png b/res/drawable-hdpi/ic_preferences_expanded.png
deleted file mode 100644
index 08c877d..0000000
--- a/res/drawable-hdpi/ic_preferences_expanded.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_sysbar_quicksettings.png b/res/drawable-hdpi/ic_sysbar_quicksettings.png
new file mode 100644
index 0000000..47b4ba2
--- /dev/null
+++ b/res/drawable-hdpi/ic_sysbar_quicksettings.png
Binary files differ
diff --git a/res/drawable-hdpi/preview.png b/res/drawable-hdpi/preview.png
new file mode 100644
index 0000000..d8f1880
--- /dev/null
+++ b/res/drawable-hdpi/preview.png
Binary files differ
diff --git a/res/drawable-mdpi/encroid_complete.png b/res/drawable-mdpi/encroid_complete.png
deleted file mode 100644
index a550212..0000000
--- a/res/drawable-mdpi/encroid_complete.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_preferences_collapsed.png b/res/drawable-mdpi/ic_preferences_collapsed.png
deleted file mode 100644
index bc250d8..0000000
--- a/res/drawable-mdpi/ic_preferences_collapsed.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_preferences_expanded.png b/res/drawable-mdpi/ic_preferences_expanded.png
deleted file mode 100644
index 08c877d..0000000
--- a/res/drawable-mdpi/ic_preferences_expanded.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_sysbar_quicksettings.png b/res/drawable-mdpi/ic_sysbar_quicksettings.png
new file mode 100644
index 0000000..7928104
--- /dev/null
+++ b/res/drawable-mdpi/ic_sysbar_quicksettings.png
Binary files differ
diff --git a/res/drawable/preview.png b/res/drawable-mdpi/preview.png
similarity index 100%
rename from res/drawable/preview.png
rename to res/drawable-mdpi/preview.png
Binary files differ
diff --git a/res/layout-land/choose_lock_password.xml b/res/layout-land/choose_lock_password.xml
index f2a2f46..005dd63 100644
--- a/res/layout-land/choose_lock_password.xml
+++ b/res/layout-land/choose_lock_password.xml
@@ -39,7 +39,7 @@
             android:layout_marginBottom="10dip"
             android:gravity="left"
             android:ellipsize="marquee"
-            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textAppearance="?android:attr/textAppearanceMedium"
         />
 
         <!-- Password entry field -->
@@ -58,15 +58,10 @@
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:background="@drawable/password_field_default"
             android:textColor="#ffffffff"
+            android:imeOptions="actionNext|flagNoEnterAction"
         />
     </LinearLayout>
 
-    <!-- Spacer between password entry and keyboard -->
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1" />
-
     <!-- Alphanumeric keyboard -->
     <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
         android:layout_alignParentBottom="true"
@@ -74,32 +69,30 @@
         android:layout_height="wrap_content"
         android:background="#00000000"
         android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"
+        android:visibility="gone"
     />
 
     <RelativeLayout
-        android:layout_height="wrap_content"
         android:layout_width="match_parent"
-        android:background="@android:drawable/bottom_bar"
-        android:visibility="gone">
-
-        <Button android:id="@+id/cancel_button"
-            android:layout_width="150dip"
-            android:layout_height="wrap_content"
-            android:layout_margin="5dip"
-            android:layout_alignParentLeft="true"
-            android:text="@string/lockpassword_cancel_label"
-        />
-
-        <Button android:id="@+id/next_button"
-            android:layout_width="150dip"
-            android:layout_height="wrap_content"
-            android:layout_margin="5dip"
+        android:layout_height="0dip"
+        android:layout_weight="1">
+        <LinearLayout
+            style="@style/SecurityPreferenceButtonContainer"
+            android:orientation="horizontal"
             android:layout_alignParentRight="true"
-            android:drawableRight="@drawable/ic_btn_next"
-            android:drawablePadding="10dip"
-            android:text="@string/lockpassword_continue_label"
-        />
+            android:layout_alignParentBottom="true">
 
+            <!-- left : cancel -->
+            <Button android:id="@+id/cancel_button"
+                style="@style/SecurityPreferenceButton"
+                android:text="@string/lockpassword_cancel_label"/>
+
+            <!-- right : continue -->
+            <Button android:id="@+id/next_button"
+                style="@style/SecurityPreferenceButton"
+                android:text="@string/lockpassword_continue_label"/>
+
+        </LinearLayout>
     </RelativeLayout>
 
 </LinearLayout>
diff --git a/res/layout-land/choose_lock_pattern_tutorial.xml b/res/layout-land/choose_lock_pattern_tutorial.xml
new file mode 100644
index 0000000..606d2e1
--- /dev/null
+++ b/res/layout-land/choose_lock_pattern_tutorial.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 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.
+-->
+
+<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/topLayout"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <RelativeLayout
+        android:layout_width="0dip"
+        android:layout_height="match_parent"
+        android:layout_weight="1">
+
+        <!-- left side: lock pattern -->
+        <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
+             android:layout_width="300dip"
+             android:layout_height="300dip"
+             android:layout_gravity="center_horizontal"
+             aspect="square"/>
+
+        <!-- right side: instructions and buttons -->
+        <!-- header message -->
+        <ScrollView
+            android:layout_width="300dip"
+            android:layout_height="180dip"
+            android:layout_alignParentTop="true"
+            android:layout_toRightOf="@id/lockPattern"
+            android:layout_marginLeft="25dip">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:padding="5dip">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_horizontal"
+                    android:text="@string/lock_title"
+                    android:paddingBottom="10dip"
+                    style="?android:attr/textAppearanceLarge"
+                />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:textSize="18sp"
+                    android:text="@string/lock_intro_message"
+                />
+
+            </LinearLayout>
+
+        </ScrollView>
+
+        <LinearLayout
+            style="@style/SecurityPreferenceButtonContainer"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentBottom="true"
+            android:orientation="horizontal">
+
+            <!-- left / top button: skip, or re-try -->
+            <Button android:id="@+id/skip_button"
+                style="@style/SecurityPreferenceButton"
+                android:text="@string/lockpattern_tutorial_cancel_label"/>
+
+            <!-- right / bottom button: confirm or ok -->
+            <Button android:id="@+id/next_button"
+                style="@style/SecurityPreferenceButton"
+                android:text="@string/lockpattern_tutorial_continue_label"/>
+
+        </LinearLayout>
+
+    </RelativeLayout>
+
+</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
+
diff --git a/res/layout-land/confirm_lock_password.xml b/res/layout-land/confirm_lock_password.xml
index 3a27b9d..e5580eb 100644
--- a/res/layout-land/confirm_lock_password.xml
+++ b/res/layout-land/confirm_lock_password.xml
@@ -16,12 +16,94 @@
 ** limitations under the License.
 */
 -->
+<!-- This is basically the same layout as choose_lock_password. -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical"
+    android:background="@android:color/background_dark"
+    android:gravity="center_horizontal">
 
-<!-- This is basically the same layout now, but will likely change -->
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-    <include
-        layout="@layout/choose_lock_password"
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+        <!-- "Enter PIN(Password) to unlock" -->
+        <TextView android:id="@+id/headerText"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="horizontal"
+            android:layout_marginRight="6dip"
+            android:layout_marginLeft="6dip"
+            android:layout_marginTop="10dip"
+            android:layout_marginBottom="10dip"
+            android:gravity="left"
+            android:ellipsize="marquee"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+        />
+
+        <!-- Password entry field -->
+        <EditText android:id="@+id/password_entry"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:singleLine="true"
+            android:textStyle="bold"
+            android:inputType="textPassword"
+            android:gravity="center"
+            android:layout_gravity="center"
+            android:textSize="24sp"
+            android:layout_marginTop="5dip"
+            android:layout_marginBottom="5dip"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:background="@drawable/password_field_default"
+            android:textColor="#ffffffff"
+            android:imeOptions="actionNext|flagNoEnterAction"
+        />
+    </LinearLayout>
+
+    <!-- Spacer between password entry and keyboard -->
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1" />
+
+    <!-- Alphanumeric keyboard -->
+    <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
+        android:layout_alignParentBottom="true"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="#00000000"
+        android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"
+        android:visibility="gone"
     />
-</merge>
+
+    <RelativeLayout
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:background="@android:drawable/bottom_bar"
+        android:visibility="gone">
+
+        <Button android:id="@+id/cancel_button"
+            android:layout_width="150dip"
+            android:layout_height="wrap_content"
+            android:layout_margin="5dip"
+            android:layout_alignParentLeft="true"
+            android:text="@string/lockpassword_cancel_label"
+        />
+
+        <Button android:id="@+id/next_button"
+            android:layout_width="150dip"
+            android:layout_height="wrap_content"
+            android:layout_margin="5dip"
+            android:layout_alignParentRight="true"
+            android:drawableRight="@drawable/ic_btn_next"
+            android:drawablePadding="10dip"
+            android:text="@string/lockpassword_continue_label"
+        />
+
+    </RelativeLayout>
+
+</LinearLayout>
+
diff --git a/res/layout-sw600dp/wifi_settings_for_setup_wizard_xl.xml b/res/layout-sw600dp/wifi_settings_for_setup_wizard_xl.xml
index d6df897..9260702 100644
--- a/res/layout-sw600dp/wifi_settings_for_setup_wizard_xl.xml
+++ b/res/layout-sw600dp/wifi_settings_for_setup_wizard_xl.xml
@@ -101,7 +101,7 @@
         <FrameLayout
             android:id="@+id/wifi_settings_fragment_layout"
             android:layout_width="716dip"
-            android:layout_height="370dip">
+            android:layout_height="377dip">
             <fragment
                 class="com.android.settings.wifi.WifiSettings"
                 android:id="@+id/wifi_setup_fragment"
diff --git a/res/layout/choose_lock_password.xml b/res/layout/choose_lock_password.xml
index 3ab1374..958cc16 100644
--- a/res/layout/choose_lock_password.xml
+++ b/res/layout/choose_lock_password.xml
@@ -29,14 +29,13 @@
         android:layout_height="wrap_content"
         android:gravity="center"
         android:lines="2"
-        android:textAppearance="?android:attr/textAppearanceLarge"/>
+        android:textAppearance="?android:attr/textAppearanceMedium"/>
 
     <!-- spacer above text entry field -->
     <View
         android:id="@+id/spacerBottom"
         android:layout_width="fill_parent"
         android:layout_height="1dip"
-        android:layout_marginTop="6dip"
         android:background="@android:drawable/divider_horizontal_dark"
     />
 
@@ -49,13 +48,13 @@
         android:inputType="textPassword"
         android:gravity="center"
         android:layout_gravity="center"
-        android:textSize="32sp"
-        android:layout_marginTop="15dip"
+        android:textSize="24sp"
         android:layout_marginLeft="30dip"
         android:layout_marginRight="30dip"
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:background="@drawable/password_field_default"
         android:textColor="#ffffffff"
+        android:imeOptions="actionNext|flagNoEnterAction"
     />
 
     <!-- Spacer between password entry and keyboard -->
@@ -64,39 +63,30 @@
         android:layout_height="0dip"
         android:layout_weight="1" />
 
+    <LinearLayout
+        style="@style/SecurityPreferenceButtonContainer"
+        android:orientation="horizontal">
+
+        <!-- left : cancel -->
+        <Button android:id="@+id/cancel_button"
+            style="@style/SecurityPreferenceButton"
+            android:text="@string/lockpassword_cancel_label"/>
+
+        <!-- right : continue -->
+        <Button android:id="@+id/next_button"
+            style="@style/SecurityPreferenceButton"
+            android:text="@string/lockpassword_continue_label"/>
+
+    </LinearLayout>
+
     <!-- Alphanumeric keyboard -->
     <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
         android:layout_alignParentBottom="true"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="#00000000"
-        android:layout_marginBottom="30dip"
         android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"
+        android:visibility="gone"
     />
 
-    <RelativeLayout
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:background="@android:drawable/bottom_bar">
-
-        <Button android:id="@+id/cancel_button"
-            android:layout_width="150dip"
-            android:layout_height="wrap_content"
-            android:layout_margin="5dip"
-            android:layout_alignParentLeft="true"
-            android:text="@string/lockpassword_cancel_label"
-        />
-
-        <Button android:id="@+id/next_button"
-            android:layout_width="150dip"
-            android:layout_height="wrap_content"
-            android:layout_margin="5dip"
-            android:layout_alignParentRight="true"
-            android:drawableRight="@drawable/ic_btn_next"
-            android:drawablePadding="10dip"
-            android:text="@string/lockpassword_continue_label"
-        />
-
-    </RelativeLayout>
-
 </LinearLayout>
diff --git a/res/layout/choose_lock_pattern.xml b/res/layout/choose_lock_pattern.xml
index 97c647f..79307c5 100644
--- a/res/layout/choose_lock_pattern.xml
+++ b/res/layout/choose_lock_pattern.xml
@@ -58,33 +58,19 @@
 
     </LinearLayout>
 
+    <LinearLayout
+        style="@style/SecurityPreferenceButtonContainer"
+        android:orientation="horizontal">
 
-    <LinearLayout style="@android:style/ButtonBar"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
+        <!-- left : cancel, or re-try -->
         <Button android:id="@+id/footerLeftButton"
-            android:layout_height="wrap_content"
-            android:layout_width="140dip"
-            android:ellipsize="marquee"
-            android:singleLine="true"
-            android:text="@string/lockpattern_restart_button_text"/>
+            style="@style/SecurityPreferenceButton"
+            android:text="@string/lockpattern_tutorial_cancel_label"/>
 
-        <View
-            android:visibility="invisible"
-            android:layout_height="0dip"
-            android:layout_width="1dip"
-            android:layout_weight="1" />
-
+        <!-- right : confirm or ok -->
         <Button android:id="@+id/footerRightButton"
-            android:layout_height="wrap_content"
-            android:layout_width="140dip"
-            android:ellipsize="marquee"
-            android:singleLine="true"
-            android:drawableRight="@drawable/ic_btn_next"
-            android:drawablePadding="3dip"
-            android:text="@string/lockpattern_confirm_button_text"/>
+            style="@style/SecurityPreferenceButton"
+            android:text="@string/lockpattern_tutorial_continue_label"/>
 
     </LinearLayout>
 
diff --git a/res/layout/choose_lock_pattern_tutorial.xml b/res/layout/choose_lock_pattern_tutorial.xml
index 3032c05..39fc0a1 100644
--- a/res/layout/choose_lock_pattern_tutorial.xml
+++ b/res/layout/choose_lock_pattern_tutorial.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 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.
      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.
@@ -17,71 +17,68 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_height="match_parent"
-    android:layout_width="match_parent">
-    
-    <ScrollView 
+    android:layout_width="match_parent"
+    android:gravity="center_horizontal">
+
+    <!-- top: instructions and buttons -->
+    <!-- header message -->
+    <ScrollView
         android:layout_width="match_parent"
         android:layout_height="0dip"
         android:layout_weight="1">
-        
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
             android:padding="5dip">
-            
+
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center_horizontal"
                 android:text="@string/lock_title"
                 android:paddingBottom="10dip"
-                android:layout_marginTop="3dip"
                 style="?android:attr/textAppearanceLarge"
             />
-        
-            <TextView 
+
+            <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_marginTop="10dip"
+                android:textSize="18sp"
                 android:text="@string/lock_intro_message"
             />
-            
-        </LinearLayout>
-       
-    </ScrollView>
-    
-    <LinearLayout style="@android:style/ButtonBar"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
 
+        </LinearLayout>
+
+    </ScrollView>
+
+    <!-- bottom: lock pattern -->
+    <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
+         android:layout_width="300dip"
+         android:layout_height="300dip"
+         aspect="square"/>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1"/>
+
+    <LinearLayout
+        style="@style/SecurityPreferenceButtonContainer"
+        android:orientation="horizontal">
+
+        <!-- left / top button: skip, or re-try -->
         <Button android:id="@+id/skip_button"
-            android:layout_height="wrap_content"
-            android:layout_width="140dip"
-            android:ellipsize="marquee"
-            android:singleLine="true"
-            android:text="@string/skip_button_label"
-        />
-        
-        <!-- Placeholder to get blank space between the two buttons -->
-        <View
-            android:visibility="invisible"
-            android:layout_height="0dip"
-            android:layout_width="1dip"
-            android:layout_weight="1" />
-        
+            style="@style/SecurityPreferenceButton"
+            android:text="@string/lockpattern_tutorial_cancel_label"/>
+
+        <!-- right / bottom button: confirm or ok -->
         <Button android:id="@+id/next_button"
-            android:layout_height="wrap_content"
-            android:layout_width="140dip"
-            android:drawableRight="@drawable/ic_btn_next"
-            android:drawablePadding="3dip"
-            android:ellipsize="marquee"
-            android:singleLine="true"
-            android:text="@string/next_button_label"
-        />
-        
+            style="@style/SecurityPreferenceButton"
+            android:text="@string/lockpattern_tutorial_continue_label"/>
+
     </LinearLayout>
-    
-</LinearLayout >
+
+</LinearLayout>
diff --git a/res/layout/confirm_lock_password.xml b/res/layout/confirm_lock_password.xml
index 3a27b9d..21eecc2 100644
--- a/res/layout/confirm_lock_password.xml
+++ b/res/layout/confirm_lock_password.xml
@@ -17,11 +17,87 @@
 */
 -->
 
-<!-- This is basically the same layout now, but will likely change -->
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-    <include
-        layout="@layout/choose_lock_password"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+<!-- This is the same layout as choose_lock_password -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical"
+    android:gravity="center_horizontal">
+
+    <!-- header text ('Enter Pin') -->
+    <TextView android:id="@+id/headerText"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:lines="2"
+        android:textAppearance="?android:attr/textAppearanceLarge"/>
+
+    <!-- spacer above text entry field -->
+    <View
+        android:id="@+id/spacerBottom"
+        android:layout_width="fill_parent"
+        android:layout_height="1dip"
+        android:layout_marginTop="6dip"
+        android:background="@android:drawable/divider_horizontal_dark"
     />
-</merge>
+
+    <!-- Password entry field -->
+    <EditText android:id="@+id/password_entry"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:singleLine="true"
+        android:textStyle="bold"
+        android:inputType="textPassword"
+        android:gravity="center"
+        android:layout_gravity="center"
+        android:textSize="24sp"
+        android:layout_marginLeft="30dip"
+        android:layout_marginRight="30dip"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:background="@drawable/password_field_default"
+        android:textColor="#ffffffff"
+        android:imeOptions="actionNext|flagNoEnterAction"
+    />
+
+    <!-- Spacer between password entry and keyboard -->
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1" />
+
+    <!-- Alphanumeric keyboard -->
+    <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
+        android:layout_alignParentBottom="true"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="#00000000"
+        android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"
+        android:visibility="gone"
+    />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+    />
+
+    <LinearLayout
+        style="@style/SecurityPreferenceButtonContainer"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentBottom="true"
+        android:orientation="horizontal">
+
+        <!-- left / top button: skip, or re-try -->
+        <Button android:id="@+id/cancel_button"
+            style="@style/SecurityPreferenceButton"
+            android:text="@string/lockpattern_tutorial_cancel_label"/>
+
+        <!-- right / bottom button: confirm or ok -->
+        <Button android:id="@+id/next_button"
+            style="@style/SecurityPreferenceButton"
+            android:text="@string/lockpattern_tutorial_continue_label"/>
+
+    </LinearLayout>
+
+</LinearLayout>
+
diff --git a/res/layout/credentials_dialog.xml b/res/layout/credentials_dialog.xml
index 506b3d6..9eacd54 100644
--- a/res/layout/credentials_dialog.xml
+++ b/res/layout/credentials_dialog.xml
@@ -49,32 +49,5 @@
                 android:password="true"
                 android:singleLine="true"
                 android:visibility="gone"/>
-
-        <LinearLayout android:id="@+id/new_passwords"
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:visibility="gone">
-
-            <TextView android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/credentials_new_password"/>
-
-            <EditText android:id="@+id/new_password"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:password="true"
-                    android:singleLine="true"/>
-
-            <TextView android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/credentials_confirm_password"/>
-
-            <EditText android:id="@+id/confirm_password"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:password="true"
-                    android:singleLine="true"/>
-        </LinearLayout>
     </LinearLayout>
 </ScrollView>
diff --git a/res/layout/data_usage_summary.xml b/res/layout/data_usage_summary.xml
new file mode 100644
index 0000000..9a356ae
--- /dev/null
+++ b/res/layout/data_usage_summary.xml
@@ -0,0 +1,33 @@
+<?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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <FrameLayout
+        android:id="@+id/chart_container"
+        android:layout_width="match_parent"
+        android:layout_height="200dip" />
+
+    <ListView
+        android:id="@+id/list"
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1" />
+
+</LinearLayout>
diff --git a/res/layout/dream_picker_row.xml b/res/layout/dream_picker_row.xml
new file mode 100644
index 0000000..e5c58d0
--- /dev/null
+++ b/res/layout/dream_picker_row.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 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.
+*/
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:paddingLeft="2dip"
+    android:gravity="center_vertical">
+
+    <ImageView android:id="@+id/icon"
+        android:layout_width="@android:dimen/app_icon_size"
+        android:layout_height="@android:dimen/app_icon_size"
+        android:scaleType="fitCenter" />
+
+    <TextView android:id="@+id/title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:paddingLeft="6dip" />
+        
+</LinearLayout>
+
diff --git a/res/layout/preference_memoryusage.xml b/res/layout/preference_memoryusage.xml
index 60b2ba8..2882535 100644
--- a/res/layout/preference_memoryusage.xml
+++ b/res/layout/preference_memoryusage.xml
@@ -13,17 +13,24 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:gravity="center_vertical"
+    android:paddingRight="?android:attr/scrollbarSize"
+    android:paddingLeft="@*android:dimen/preference_widget_width">
 
-<com.android.settings.deviceinfo.PercentageBarChart
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    <com.android.settings.deviceinfo.PercentageBarChart
+        android:id="@+id/percentage_bar_chart"
         android:layout_width="match_parent"
         android:layout_height="32dip"
         android:minHeight="?android:attr/listPreferredItemHeight"
         android:gravity="center_vertical"
-        android:id="@+id/percentage_bar_chart"
-        android:paddingRight="?android:attr/scrollbarSize"
         settings:minTickWidth="6dip"
         settings:emptyColor="@color/memory_avail">
+    </com.android.settings.deviceinfo.PercentageBarChart>
 
-</com.android.settings.deviceinfo.PercentageBarChart>
+</LinearLayout>
diff --git a/res/layout/preference_settings_checkbox_widget.xml b/res/layout/preference_settings_checkbox_widget.xml
new file mode 100644
index 0000000..a65e56f
--- /dev/null
+++ b/res/layout/preference_settings_checkbox_widget.xml
@@ -0,0 +1,50 @@
+<?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.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:gravity="center_vertical"
+    android:paddingRight="?android:attr/scrollbarSize">
+
+    <!-- Settings button -->
+    <ImageView
+        android:id="@+id/settings_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:padding="8dip"
+        android:background="?android:attr/selectableItemBackground"
+        android:src="@drawable/ic_sysbar_quicksettings"
+        android:contentDescription="@string/settings_button" />
+
+    <!-- Divider -->
+    <ImageView
+        android:id="@+id/divider"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:src="@drawable/nav_divider" />
+
+    <!-- CheckBox -->
+    <CheckBox xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+android:id/checkbox"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:focusable="false"
+        android:clickable="false" />
+
+</LinearLayout>
diff --git a/res/layout/wifi_config_ui_for_setup_wizard.xml b/res/layout/wifi_config_ui_for_setup_wizard.xml
index b0f0bb2..138458b 100644
--- a/res/layout/wifi_config_ui_for_setup_wizard.xml
+++ b/res/layout/wifi_config_ui_for_setup_wizard.xml
@@ -14,146 +14,180 @@
      limitations under the License.
 -->
 <!-- All ids in this layout must be in wifi_dialog.xml -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent">
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
     <!-- UI components that should be shown appropriately -->
-    <FrameLayout android:id="@+id/eap_not_supported"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:minHeight="360dip"
-                  android:orientation="vertical"
-                  android:visibility="gone">
-        <TextView android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:lineSpacingExtra="12dip"
-                  android:text="@string/wifi_setup_eap_not_supported"
-                  android:textAppearance="?android:attr/textAppearanceMedium"
-                  android:textSize="20sp" />
+    <FrameLayout
+        android:id="@+id/eap_not_supported"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="360dip"
+        android:orientation="vertical"
+        android:visibility="gone">
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:lineSpacingExtra="12dip"
+            android:text="@string/wifi_setup_eap_not_supported"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textSize="20sp" />
     </FrameLayout>
     <!-- In "add network" flow, we have security type field (@id/security below) below
          this View, so need a bit different layout than the other flow, in which we'll use
          @id/eap_not_supported. -->
-    <FrameLayout android:id="@+id/eap_not_supported_for_add_network"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical"
-                  android:visibility="gone">
-        <TextView android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:lineSpacingExtra="12dip"
-                  android:text="@string/wifi_setup_eap_not_supported"
-                  android:textAppearance="?android:attr/textAppearanceMedium"
-                  android:textSize="20sp" />
+    <FrameLayout
+        android:id="@+id/eap_not_supported_for_add_network"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:visibility="gone">
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:lineSpacingExtra="12dip"
+            android:text="@string/wifi_setup_eap_not_supported"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textSize="20sp" />
     </FrameLayout>
-    <LinearLayout android:id="@+id/wps_fields"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical"
-                  android:visibility="gone">
-        <TextView android:layout_width="match_parent"
-                  android:minWidth="128dip"
-                  android:layout_height="wrap_content"
-                  android:text="@string/wifi_wps_pin"
-                  android:textAppearance="?android:attr/textAppearanceMedium"
-                  android:textSize="20sp"
-                  android:gravity="bottom" />
+    <LinearLayout
+        android:id="@+id/wps_fields"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:visibility="gone">
+        <TextView
+            android:layout_width="match_parent"
+            android:minWidth="128dip"
+            android:layout_height="wrap_content"
+            android:text="@string/wifi_wps_pin"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textSize="20sp"
+            android:gravity="bottom" />
 
-        <EditText android:id="@+id/wps_pin"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:singleLine="true"
-                  android:inputType="textPassword"
-                  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:textAppearance="?android:attr/textAppearanceMedium"
+            android:textSize="20sp" />
     </LinearLayout>
-    <TableLayout android:layout_width="match_parent"
-                 android:layout_height="wrap_content"
-                 android:layout_marginBottom="16dip">
+    <TableLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16dip">
         <!-- To accomodate @id/type into TableLayout, we splitted the layout into two:
              @id/type_ssid and @id/type_security. -->
-        <TableRow android:id="@+id/type_ssid"
-                  android:visibility="gone">
-            <TextView android:id="@+id/ssid_text"
-                      android:layout_width="wrap_content"
-                      android:minWidth="128dip"
-                      android:layout_height="wrap_content"
-                      android:minHeight="48dip"
-                      android:layout_alignParentLeft="true"
-                      android:text="@string/wifi_ssid"
-                      android:textAppearance="?android:attr/textAppearanceMedium"
-                      android:textSize="20sp"
-                      android:gravity="bottom"/>
+        <TableRow
+            android:id="@+id/type_ssid"
+            android:minHeight="56dip"
+            android:visibility="gone">
+            <TextView
+                android:id="@+id/ssid_text"
+                android:layout_width="wrap_content"
+                android:minWidth="128dip"
+                android:layout_height="wrap_content"
+                android:minHeight="56dip"
+                android:paddingRight="16dip"
+                android:layout_alignParentLeft="true"
+                android:text="@string/wifi_ssid"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textSize="20sp"
+                android:gravity="left|center_vertical" />
 
-            <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="368dip"
-                          android:layout_height="wrap_content"
-                          android:singleLine="true"
-                          android:inputType="textNoSuggestions"
-                          android:textAppearance="?android:attr/textAppearanceMedium"
-                          android:textSize="20sp" />
+            <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="368dip"
+                    android:layout_height="wrap_content"
+                    android:singleLine="true"
+                    android:inputType="textNoSuggestions"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:textSize="20sp" />
             </FrameLayout>
         </TableRow>
 
-        <TableRow android:id="@+id/security_fields"
-                  android:visibility="gone">
-            <TextView android:id="@+id/password_text"
-                      android:layout_width="wrap_content"
-                      android:minWidth="128dip"
-                      android:layout_height="wrap_content"
-                      android:minHeight="48dip"
-                      android:text="@string/wifi_password"
-                      android:textAppearance="?android:attr/textAppearanceMedium"
-                      android:textSize="20sp"
-                      android:gravity="bottom" />
+        <TableRow
+            android:id="@+id/security_fields"
+            android:minHeight="56dip"
+            android:visibility="gone">
+            <TextView
+                android:id="@+id/password_text"
+                android:layout_width="wrap_content"
+                android:minWidth="128dip"
+                android:layout_height="wrap_content"
+                android:minHeight="56dip"
+                android:text="@string/wifi_password"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textSize="20sp"
+                android:gravity="left|center_vertical" />
 
-            <FrameLayout android:id="@+id/password_layout"
-                         android:layout_width="wrap_content"
-                         android:layout_height="wrap_content"
-                         android:minHeight="48dip">
-                <EditText android:id="@+id/password"
-                          android:layout_width="368dip"
-                          android:layout_height="wrap_content"
-                          android:singleLine="true"
-                          android:password="true"
-                          android:textAppearance="?android:attr/textAppearanceMedium"
-                          android:textSize="20sp" />
+            <LinearLayout
+                android:id="@+id/password_layout"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="bottom">
+                <EditText
+                    android:id="@+id/password"
+                    android:layout_width="368dip"
+                    android:layout_height="wrap_content"
+                    android:minHeight="56dip"
+                    android:singleLine="true"
+                    android:password="true"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:textSize="20sp" />
+            </LinearLayout>
+
+            <!-- It looks CheckBox isn't aligned well with TableRow -->
+            <FrameLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
+                <CheckBox
+                    android:id="@+id/show_password"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:minHeight="56dip"
+                    android:text="@string/wifi_show_password"
+                    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"
-                      android:textAppearance="?android:attr/textAppearanceMedium"
-                      android:textSize="20sp" />
         </TableRow>
 
-        <TableRow android:id="@+id/type_security"
-                  android:visibility="gone">
-            <TextView android:id="@+id/security_text"
-                      android:layout_width="wrap_content"
-                      android:minWidth="128dip"
-                      android:layout_height="wrap_content"
-                      android:minHeight="48dip"
-                      android:text="@string/wifi_security"
-                      android:textAppearance="?android:attr/textAppearanceMedium"
-                      android:textSize="20sp"
-                      android:gravity="bottom"/>
+        <TableRow
+            android:id="@+id/type_security"
+            android:minHeight="56dip"
+            android:visibility="gone">
+            <TextView
+                android:id="@+id/security_text"
+                android:layout_width="wrap_content"
+                android:minWidth="128dip"
+                android:layout_height="wrap_content"
+                android:minHeight="56dip"
+                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:paddingLeft="4dip"
-                     android:textAppearance="?android:attr/textAppearanceMedium"
-                     android:textSize="20sp"
-                     android:gravity="left|center_vertical"/>
+            <FrameLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="bottom">
+                <Spinner
+                    android:id="@+id/security"
+                    android:layout_width="368dip"
+                    android:layout_height="wrap_content"
+                    android:minHeight="56dip"
+                    android:paddingLeft="4dip"/>
+            </FrameLayout>
         </TableRow>
     </TableLayout>
 
diff --git a/res/layout/wifi_setup_custom_list_item_1.xml b/res/layout/wifi_setup_custom_list_item_1.xml
index 355490e..9d329ea 100644
--- a/res/layout/wifi_setup_custom_list_item_1.xml
+++ b/res/layout/wifi_setup_custom_list_item_1.xml
@@ -22,6 +22,6 @@
     android:textAppearance="?android:attr/textAppearanceMedium"
     android:textSize="20sp"
     android:gravity="center_vertical"
-    android:paddingLeft="10dip"
+    android:paddingLeft="16dip"
     android:minHeight="48dip"
 />
diff --git a/res/values-af-nokeys/strings.xml b/res/values-af-nokeys/strings.xml
new file mode 100644
index 0000000..6bebdde
--- /dev/null
+++ b/res/values-af-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="6616938758022986257">"Bestuur programme"</string>
+</resources>
diff --git a/res/values-af/arrays.xml b/res/values-af/arrays.xml
new file mode 100644
index 0000000..fdbf078
--- /dev/null
+++ b/res/values-af/arrays.xml
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2007 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="5296756001147094692">"Amerika"</item>
+    <item msgid="3005562397632768392">"Europa"</item>
+    <item msgid="5696915123093701218">"Afrika"</item>
+    <item msgid="4439789052790868249">"Asië"</item>
+    <item msgid="956915953069815961">"Australië"</item>
+    <item msgid="5345178126174698955">"Pasifies"</item>
+    <item msgid="8392017019801393511">"Alle"</item>
+  </string-array>
+  <string-array name="animations_entries">
+    <item msgid="207790005475613429">"Geen animasies nie"</item>
+    <item msgid="6291186755504776720">"\'n Paar animasies"</item>
+    <item msgid="3856065399819979491">"Alle animasies"</item>
+  </string-array>
+  <string-array name="animations_summaries">
+    <item msgid="4569165952409350897">"Nee vensteranimasies word gewys"</item>
+    <item msgid="4460915688877708508">"\'n Paar vensteranimasies word gewys"</item>
+    <item msgid="488968798204105119">"Alle vensteranimasies word gewys"</item>
+  </string-array>
+    <!-- no translation found for screen_timeout_entries:5 (2314124409517439288) -->
+    <!-- no translation found for screen_timeout_entries:6 (6864027152847611413) -->
+    <!-- no translation found for dream_timeout_entries:0 (3149294732238283185) -->
+    <!-- no translation found for dream_timeout_entries:1 (2194151041885903260) -->
+    <!-- no translation found for dream_timeout_entries:2 (5892295237131074341) -->
+    <!-- no translation found for dream_timeout_entries:3 (3538441365970038213) -->
+    <!-- no translation found for dream_timeout_entries:4 (412343871668955639) -->
+    <!-- no translation found for dream_timeout_entries:5 (5076853889688991690) -->
+    <!-- no translation found for dream_timeout_entries:6 (1903860996174927898) -->
+    <!-- no translation found for dream_timeout_entries:7 (6415509612413178727) -->
+    <!-- no translation found for lock_after_timeout_entries:0 (5416834369150305288) -->
+    <!-- no translation found for lock_after_timeout_entries:1 (6736512735606834431) -->
+    <!-- no translation found for lock_after_timeout_entries:2 (8044619388267891375) -->
+    <!-- no translation found for lock_after_timeout_entries:3 (1822002388249545488) -->
+    <!-- no translation found for lock_after_timeout_entries:4 (8538071621211916519) -->
+    <!-- no translation found for lock_after_timeout_entries:5 (5663439580228932882) -->
+    <!-- no translation found for lock_after_timeout_entries:6 (49888496216106852) -->
+    <!-- no translation found for lock_after_timeout_entries:7 (9002737361305019353) -->
+    <!-- no translation found for lock_after_timeout_entries:8 (4322676235684793329) -->
+    <!-- no translation found for entries_font_size:0 (2722636506084795405) -->
+    <!-- no translation found for entries_font_size:1 (383133849547816572) -->
+    <!-- no translation found for entries_font_size:2 (6490061470416867723) -->
+    <!-- no translation found for entries_font_size:3 (3579015730662088893) -->
+    <!-- no translation found for entries_font_size:4 (1678068858001018666) -->
+    <!-- no translation found for entries_font_size:5 (490158884605093126) -->
+    <!-- no translation found for entries_font_size:6 (2123802548987439763) -->
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"Baie stadig"</item>
+    <item msgid="2361722960903353554">"Stadig"</item>
+    <item msgid="1145554631248513562">"Normaal"</item>
+    <item msgid="7553665153391107454">"Vinnig"</item>
+    <item msgid="2538100882620724753">"Baie vinnig"</item>
+  </string-array>
+  <string-array name="tts_pitch_entries">
+    <item msgid="7526050907652687351">"Baie laag"</item>
+    <item msgid="2692137425242433765">"Laag"</item>
+    <item msgid="3332408460740717754">"Normaal"</item>
+    <item msgid="4907380534957572531">"Hoog"</item>
+    <item msgid="4699640516390840297">"Baie hoog"</item>
+  </string-array>
+  <string-array name="tts_lang_entries">
+    <item msgid="478030717868306353">"Amerikaanse Engels"</item>
+    <item msgid="5192284521396794598">"Britse Engels"</item>
+    <item msgid="3000262452051711991">"Frans"</item>
+    <item msgid="9214080387341763401">"Duits"</item>
+    <item msgid="5972100016440094433">"Italiaans"</item>
+    <item msgid="5811378076054402537">"Spaans"</item>
+  </string-array>
+    <!-- no translation found for wifi_status:1 (8934131797783724664) -->
+    <!-- no translation found for wifi_status:2 (8513729475867537913) -->
+    <!-- no translation found for wifi_status:3 (515055375277271756) -->
+    <!-- no translation found for wifi_status:4 (1943354004029184381) -->
+    <!-- no translation found for wifi_status:5 (4221763391123233270) -->
+    <!-- no translation found for wifi_status:6 (624838831631122137) -->
+    <!-- no translation found for wifi_status:7 (7979680559596111948) -->
+    <!-- no translation found for wifi_status:8 (1634960474403853625) -->
+    <!-- no translation found for wifi_status:9 (746097431216080650) -->
+    <!-- no translation found for wifi_status_with_ssid:1 (8878186979715711006) -->
+    <!-- no translation found for wifi_status_with_ssid:2 (355508996603873860) -->
+    <!-- no translation found for wifi_status_with_ssid:3 (554971459996405634) -->
+    <!-- no translation found for wifi_status_with_ssid:4 (7928343808033020343) -->
+    <!-- no translation found for wifi_status_with_ssid:5 (8937994881315223448) -->
+    <!-- no translation found for wifi_status_with_ssid:6 (1330262655415760617) -->
+    <!-- no translation found for wifi_status_with_ssid:7 (7698638434317271902) -->
+    <!-- no translation found for wifi_status_with_ssid:8 (197508606402264311) -->
+    <!-- no translation found for wifi_status_with_ssid:9 (8578370891960825148) -->
+    <!-- no translation found for wifi_security:0 (1435933968767043814) -->
+    <!-- no translation found for wifi_security:1 (6318432659048829665) -->
+    <!-- no translation found for wifi_security:2 (2966395706508338179) -->
+    <!-- no translation found for wifi_security:3 (9098390198768443435) -->
+    <!-- no translation found for wifi_eap_method:0 (1160193392455075561) -->
+    <!-- no translation found for wifi_eap_method:1 (7981731051382306293) -->
+    <!-- no translation found for wifi_eap_method:2 (2892994535305020162) -->
+    <!-- no translation found for bluetooth_visibility_timeout_entries:0 (1106621950288502195) -->
+    <!-- no translation found for bluetooth_visibility_timeout_entries:1 (5780349442819375570) -->
+    <!-- no translation found for bluetooth_visibility_timeout_entries:2 (1166466894270177580) -->
+    <!-- no translation found for bluetooth_visibility_timeout_entries:3 (9032073376232198148) -->
+    <!-- no translation found for wifi_signal:0 (2245412278046491293) -->
+    <!-- no translation found for wifi_signal:1 (5615082285463430971) -->
+    <!-- no translation found for wifi_signal:2 (3565079809875324621) -->
+    <!-- no translation found for wifi_signal:3 (5702329417707689835) -->
+  <string-array name="wifi_sleep_policy_entries">
+    <!-- outdated translation 3804733751095821976 -->     <item msgid="643915340724070374">"Wanneer skerm afskakel"</item>
+    <item msgid="1549288661423279207">"Nooit wanneer ingeprop nie"</item>
+    <!-- outdated translation 1986753720941888596 -->     <item msgid="6592896328877671197">"Nooit"</item>
+  </string-array>
+    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:0 (2659922042905569057) -->
+    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:1 (8137861573803398334) -->
+    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:2 (5996547094658157629) -->
+    <!-- no translation found for wifi_frequency_band_entries:0 (624340809384223320) -->
+    <!-- no translation found for wifi_frequency_band_entries:1 (6670588712989942178) -->
+    <!-- no translation found for wifi_frequency_band_entries:2 (2715516524973207876) -->
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="9077371706468756228">"Gebruikstyd"</item>
+    <item msgid="1908750532762193304">"Bekendstelling-aftelling"</item>
+    <item msgid="1213951670006606353">"Programnaam"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="8615575908717909498">"PEAP"</item>
+    <item msgid="8667872640594311615">"TLS"</item>
+    <item msgid="7182812872984827322">"TTLS"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="1818786254010764570">"Geen"</item>
+    <item msgid="6189918678874123056">"PAP"</item>
+    <item msgid="1524112260493662517">"MSCHAP"</item>
+    <item msgid="5923246669412752932">"MSCHAPV2"</item>
+    <item msgid="8651992560135239389">"GTC"</item>
+  </string-array>
+    <!-- no translation found for wifi_network_setup:0 (784271777398638325) -->
+    <!-- no translation found for wifi_network_setup:1 (700386742589384062) -->
+    <!-- no translation found for wifi_network_setup:2 (7131487972018976724) -->
+    <!-- no translation found for wifi_network_setup:3 (4809199848225172977) -->
+    <!-- no translation found for wifi_ip_settings:0 (3906714200993111074) -->
+    <!-- no translation found for wifi_ip_settings:1 (628395202971532382) -->
+    <!-- no translation found for wifi_proxy_settings:0 (4473276491748503377) -->
+    <!-- no translation found for wifi_proxy_settings:1 (8673874894887358090) -->
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Af"</item>
+    <item msgid="3165868966179561687">"Berig"</item>
+    <item msgid="6038758039030476855">"Vibreer"</item>
+  </string-array>
+    <!-- no translation found for apn_auth_entries:0 (3856896061242872146) -->
+    <!-- no translation found for apn_auth_entries:1 (5756844015743664882) -->
+    <!-- no translation found for apn_auth_entries:2 (535934025797984365) -->
+    <!-- no translation found for apn_auth_entries:3 (8383098660619805783) -->
+    <!-- no translation found for apn_protocol_entries:0 (4852355456199302715) -->
+    <!-- no translation found for apn_protocol_entries:1 (4394161344888484571) -->
+    <!-- no translation found for apn_protocol_entries:2 (8084938354605535381) -->
+    <!-- no translation found for app_install_location_entries:0 (8151497958991952759) -->
+    <!-- no translation found for app_install_location_entries:1 (3738430123799803530) -->
+    <!-- no translation found for app_install_location_entries:2 (4498124044785815005) -->
+    <!-- no translation found for vibrate_entries:0 (3388952299521009213) -->
+    <!-- no translation found for vibrate_entries:1 (6293147072807231256) -->
+    <!-- no translation found for vibrate_entries:2 (1276641209451816572) -->
+    <!-- no translation found for vibrate_entries:3 (8418930333779132418) -->
+    <!-- no translation found for long_press_timeout_selector_titles:0 (3511504869290423954) -->
+    <!-- no translation found for long_press_timeout_selector_titles:1 (2560532955514699713) -->
+    <!-- no translation found for long_press_timeout_selector_titles:2 (2372711992605524591) -->
+    <!-- no translation found for hdcp_checking_titles:0 (441827799230089869) -->
+    <!-- no translation found for hdcp_checking_titles:1 (6042769699089883931) -->
+    <!-- no translation found for hdcp_checking_titles:2 (9174900380056846820) -->
+    <!-- no translation found for hdcp_checking_summaries:0 (505558545611516707) -->
+    <!-- no translation found for hdcp_checking_summaries:1 (3878793616631049349) -->
+    <!-- no translation found for hdcp_checking_summaries:2 (45075631231212732) -->
+</resources>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
new file mode 100644
index 0000000..285e3b3
--- /dev/null
+++ b/res/values-af/strings.xml
@@ -0,0 +1,2403 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="yes" msgid="4676390750360727396">"Ja"</string>
+    <string name="no" msgid="6731231425810196216">"Nee"</string>
+    <!-- no translation found for device_info_default (7847265875578739287) -->
+    <skip />
+    <!-- no translation found for turn_on_radio (8706561489788373676) -->
+    <skip />
+    <!-- no translation found for turn_off_radio (1820294552893884115) -->
+    <skip />
+    <!-- no translation found for radioInfo_menu_viewADN (8743377494429930831) -->
+    <skip />
+    <!-- no translation found for radioInfo_menu_viewFDN (7934301566925610318) -->
+    <skip />
+    <!-- no translation found for radioInfo_menu_viewSDN (7130280686244955669) -->
+    <skip />
+    <!-- no translation found for radioInfo_menu_getPDP (560610293888406317) -->
+    <skip />
+    <!-- no translation found for radioInfo_service_in (1915416319177520020) -->
+    <skip />
+    <!-- no translation found for radioInfo_service_out (5238736759641916278) -->
+    <skip />
+    <!-- no translation found for radioInfo_service_emergency (2485604591272668370) -->
+    <skip />
+    <!-- no translation found for radioInfo_service_off (1434084741785525415) -->
+    <skip />
+    <!-- no translation found for radioInfo_roaming_in (9045363884600341051) -->
+    <skip />
+    <!-- no translation found for radioInfo_roaming_not (2851853244069662307) -->
+    <skip />
+    <!-- no translation found for radioInfo_phone_idle (7489244938838742820) -->
+    <skip />
+    <!-- no translation found for radioInfo_phone_ringing (4883724645684297895) -->
+    <skip />
+    <!-- no translation found for radioInfo_phone_offhook (4174402846862780998) -->
+    <skip />
+    <!-- no translation found for radioInfo_data_disconnected (1959735267890719418) -->
+    <skip />
+    <!-- no translation found for radioInfo_data_connecting (8404571440697917823) -->
+    <skip />
+    <!-- no translation found for radioInfo_data_connected (7074301157399238697) -->
+    <skip />
+    <!-- no translation found for radioInfo_data_suspended (5315325487890334196) -->
+    <skip />
+    <!-- no translation found for radioInfo_unknown (737385314432468266) -->
+    <skip />
+    <!-- no translation found for radioInfo_display_packets (8654359809877290639) -->
+    <skip />
+    <!-- no translation found for radioInfo_display_bytes (4018206969492931883) -->
+    <skip />
+    <!-- no translation found for radioInfo_display_dbm (3621221793699882781) -->
+    <skip />
+    <!-- no translation found for radioInfo_display_asu (1422248392727818082) -->
+    <skip />
+    <!-- no translation found for radioInfo_lac (8415219164758307156) -->
+    <skip />
+    <!-- no translation found for radioInfo_cid (4362599198392643138) -->
+    <skip />
+    <!-- no translation found for sdcard_unmount (6325292633327972272) -->
+    <skip />
+    <!-- no translation found for sdcard_unmount (3364184561355611897) -->
+    <skip />
+    <!-- outdated translation 362497552060004057 -->     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Formateer SD-kaart"</string>
+    <!-- outdated translation 362497552060004057 -->     <string name="sdcard_format" product="default" msgid="6713185532039187532">"Formateer SD-kaart"</string>
+    <!-- no translation found for small_font (2295331917424072635) -->
+    <skip />
+    <!-- no translation found for medium_font (2068475425515133701) -->
+    <skip />
+    <!-- no translation found for large_font (599055175160971446) -->
+    <skip />
+    <!-- no translation found for font_size_save (3450855718056759095) -->
+    <skip />
+    <!-- no translation found for sdcard_setting (8281011784066476192) -->
+    <skip />
+    <!-- no translation found for sdcard_setting (5922637503871474866) -->
+    <skip />
+    <!-- no translation found for battery_info_status_label (8109155295509700309) -->
+    <skip />
+    <string name="battery_info_power_label" msgid="7465140230991349382">"Kragprop:"</string>
+    <!-- no translation found for battery_info_scale_label (3649763192389778437) -->
+    <skip />
+    <!-- no translation found for battery_info_level_label (8706526709307788737) -->
+    <skip />
+    <!-- no translation found for battery_info_health_label (6416051542741886958) -->
+    <skip />
+    <!-- no translation found for battery_info_technology_label (788304533220748681) -->
+    <skip />
+    <!-- no translation found for battery_info_voltage_label (8971764146757637863) -->
+    <skip />
+    <!-- no translation found for battery_info_voltage_units (8658490792208288107) -->
+    <skip />
+    <!-- no translation found for battery_info_temperature_label (1968383098818648037) -->
+    <skip />
+    <!-- no translation found for battery_info_temperature_units (9098950587249987550) -->
+    <skip />
+    <!-- no translation found for battery_info_uptime (5548545143573527992) -->
+    <skip />
+    <!-- no translation found for battery_info_awake_battery (2557725975486185849) -->
+    <skip />
+    <!-- no translation found for battery_info_awake_plugged (176716874713478188) -->
+    <skip />
+    <!-- no translation found for battery_info_screen_on (376277447175613889) -->
+    <skip />
+    <!-- no translation found for battery_info_status_unknown (196130600938058547) -->
+    <skip />
+    <!-- no translation found for battery_info_status_charging (1705179948350365604) -->
+    <skip />
+    <!-- no translation found for battery_info_status_charging_ac (5874340256342956252) -->
+    <skip />
+    <!-- no translation found for battery_info_status_charging_usb (4059070156126770959) -->
+    <skip />
+    <!-- no translation found for battery_info_status_discharging (6222697503392774475) -->
+    <skip />
+    <!-- no translation found for battery_info_status_not_charging (2820070506621483576) -->
+    <skip />
+    <!-- no translation found for battery_info_status_full (2824614753861462808) -->
+    <skip />
+    <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Uitgeprop"</string>
+    <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
+    <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
+    <string name="battery_info_power_unknown" msgid="7344115502868899881">"Onbekend"</string>
+    <!-- no translation found for battery_info_health_unknown (5664295556921944255) -->
+    <skip />
+    <!-- no translation found for battery_info_health_good (8070356565806711806) -->
+    <skip />
+    <!-- no translation found for battery_info_health_overheat (8442959549291368806) -->
+    <skip />
+    <!-- no translation found for battery_info_health_dead (1725917445762829059) -->
+    <skip />
+    <!-- no translation found for battery_info_health_over_voltage (2420269351664490121) -->
+    <skip />
+    <!-- no translation found for battery_info_health_unspecified_failure (6347021103185471590) -->
+    <skip />
+    <!-- no translation found for battery_info_health_cold (3835692786176707318) -->
+    <skip />
+    <!-- no translation found for bluetooth (5549625000628014477) -->
+    <skip />
+    <!-- no translation found for bluetooth_visibility (2930835434091839916) -->
+    <skip />
+    <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Opspoorbaar vir <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> sekondes..."</string>
+    <!-- no translation found for bluetooth_is_discoverable_always (8573385118329733931) -->
+    <skip />
+    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Maak toestel opspoorbaar"</string>
+    <!-- no translation found for bluetooth_visibility_timeout (6634508002347847278) -->
+    <skip />
+    <!-- no translation found for bluetooth_visibility_timeout_summary (6483353842671501585) -->
+    <skip />
+    <!-- no translation found for bluetooth_lock_voice_dialing (3139322992062086225) -->
+    <skip />
+    <!-- no translation found for bluetooth_lock_voice_dialing_summary (4741338867496787042) -->
+    <skip />
+    <!-- no translation found for bluetooth_devices (1886018064039454227) -->
+    <skip />
+    <!-- no translation found for bluetooth_device_name (8415828355207423800) -->
+    <skip />
+    <!-- no translation found for bluetooth_name_not_set (2653752006416027426) -->
+    <skip />
+    <!-- no translation found for bluetooth_scan_for_devices (9214184305566815727) -->
+    <skip />
+    <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sal ontkoppel word."</string>
+    <!-- no translation found for bluetooth_connected (6038755206916626419) -->
+    <skip />
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Ontkoppel"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Ontkoppel tans…"</string>
+    <!-- no translation found for bluetooth_connecting (8555009514614320497) -->
+    <skip />
+    <string name="bluetooth_unknown" msgid="644716244548801421"></string>
+    <!-- no translation found for bluetooth_not_connected (3389882907500605937) -->
+    <skip />
+    <!-- no translation found for bluetooth_pairing (1426882272690346242) -->
+    <skip />
+    <string name="bluetooth_paired" msgid="1247541089000057726">"Saamgebind, maar nie gekoppel nie"</string>
+    <!-- no translation found for bluetooth_device (6873461446424952003) -->
+    <skip />
+    <!-- no translation found for progress_scanning (3760897655335759141) -->
+    <skip />
+    <!-- no translation found for bluetooth_notif_ticker (4726721390078512173) -->
+    <skip />
+    <string name="bluetooth_notif_title" msgid="2485175521845371514">"Saambindingsversoek"</string>
+    <!-- no translation found for bluetooth_notif_message (618099089987569242) -->
+    <skip />
+    <!-- no translation found for bluetooth_show_received_files_title (816172853268536399) -->
+    <skip />
+    <!-- no translation found for bluetooth_show_received_files_summary (7322193220909480775) -->
+    <skip />
+    <string name="device_picker" msgid="8721012448931226323">"Bluetooth-toestelkieser"</string>
+    <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth-toestemmingsversoek"</string>
+    <!-- outdated translation 2342558978033892004 -->     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"\'n Program op jou foon versoek tans toestemming om Bluetooth aan te skakel. Wil jy dit doen?"</string>
+    <!-- no translation found for bluetooth_ask_discovery (5950965604673262829) -->
+    <skip />
+    <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"\'n Program op jou foon versoek toestemming om jou foon opspoorbaar te maak vir ander Bluetooth-toestelle vir <xliff:g id="TIMEOUT">%1$d</xliff:g> sekondes. Wil jy dit toelaat?"</string>
+    <!-- no translation found for bluetooth_ask_lasting_discovery (1680661751413856600) -->
+    <skip />
+    <!-- no translation found for bluetooth_ask_lasting_discovery (3413855805411554871) -->
+    <skip />
+    <!-- no translation found for bluetooth_ask_enablement_and_discovery (5716077575971497298) -->
+    <skip />
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"\'n Program op jou foon versoek toestemming om Bluetooth aan te skakel en jou foon opspoorbaar te maak vir ander toestelle vir <xliff:g id="TIMEOUT">%1$d</xliff:g> sekondes. Wil jy dit doen?"</string>
+    <!-- no translation found for bluetooth_ask_enablement_and_lasting_discovery (6132824454823539873) -->
+    <skip />
+    <!-- no translation found for bluetooth_ask_enablement_and_lasting_discovery (7471195931669103553) -->
+    <skip />
+    <string name="bluetooth_turning_on" msgid="3107102168379705771">"Skakel tans Bluetooth aan…"</string>
+    <!-- no translation found for bluetooth_auto_connect (8013003320667198460) -->
+    <skip />
+    <!-- no translation found for date_and_time (4114084177056654663) -->
+    <skip />
+    <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00 nm"</string>
+    <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
+    <!-- no translation found for choose_timezone (7762866468013985022) -->
+    <skip />
+    <string name="normal_date_format" msgid="1982904221918374153">"Normaal (<xliff:g id="DATE">%s</xliff:g>)"</string>
+    <!-- no translation found for display_preview_label (1127597250917274792) -->
+    <skip />
+    <!-- no translation found for display_font_size_label (8941851418397475389) -->
+    <skip />
+    <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
+    <skip />
+    <string name="intent_sender_sendbroadcast_text" msgid="1415735148895872715">"Stuur <xliff:g id="BROADCAST">broadcast</xliff:g>"</string>
+    <string name="intent_sender_action_label" msgid="616458370005452389">"<xliff:g id="ACTION">Action</xliff:g>:"</string>
+    <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Begin <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
+    <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
+    <string name="intent_sender_account_label" msgid="465210404475603404">"Rekening:"</string>
+    <!-- no translation found for proxy_settings_title (5912878565897294401) -->
+    <skip />
+    <!-- no translation found for proxy_settings_summary (7898928000758321486) -->
+    <skip />
+    <!-- no translation found for proxy_clear_text (5555400754952012657) -->
+    <skip />
+    <!-- no translation found for proxy_port_label (5655276502233453400) -->
+    <skip />
+    <!-- no translation found for proxy_exclusionlist_label (7700491504623418701) -->
+    <skip />
+    <!-- no translation found for proxy_exclusionlist_hint (6084099226687226948) -->
+    <skip />
+    <!-- no translation found for proxy_defaultView_text (6387985519141433291) -->
+    <skip />
+    <!-- no translation found for proxy_action_text (2957063145357903951) -->
+    <skip />
+    <!-- no translation found for proxy_hostname_label (8490171412999373362) -->
+    <skip />
+    <!-- no translation found for proxy_hostname_hint (2076157057003936176) -->
+    <skip />
+    <!-- no translation found for proxy_error (8926675299638611451) -->
+    <skip />
+    <!-- no translation found for proxy_error_dismiss (4993171795485460060) -->
+    <skip />
+    <!-- no translation found for proxy_error_invalid_host (9120776460063182119) -->
+    <skip />
+    <!-- no translation found for proxy_error_invalid_exclusion_list (4753810662233875893) -->
+    <skip />
+    <!-- no translation found for proxy_error_empty_port (3525734169948795417) -->
+    <skip />
+    <!-- no translation found for proxy_error_empty_host_set_port (2451694104858226781) -->
+    <skip />
+    <!-- no translation found for proxy_error_invalid_port (1816315605424943626) -->
+    <skip />
+    <!-- no translation found for proxy_warning_limited_support (7442676587591460854) -->
+    <skip />
+    <!-- no translation found for radio_info_signal_location_label (16475158265551708) -->
+    <skip />
+    <!-- no translation found for radio_info_neighboring_location_label (2385625674055934880) -->
+    <skip />
+    <!-- no translation found for radio_info_data_attempts_label (1731106244577323381) -->
+    <skip />
+    <!-- no translation found for radio_info_gprs_service_label (2331818110375395364) -->
+    <skip />
+    <!-- no translation found for radio_info_roaming_label (6141505430275138647) -->
+    <skip />
+    <!-- no translation found for radio_info_imei_label (1220524224732944192) -->
+    <skip />
+    <!-- no translation found for radio_info_call_redirect_label (1654674226961476872) -->
+    <skip />
+    <!-- no translation found for radio_info_ppp_resets_label (3241667824729310546) -->
+    <skip />
+    <!-- no translation found for radio_info_gsm_disconnects_label (1683069665736339820) -->
+    <skip />
+    <!-- no translation found for radio_info_current_network_label (3256402602440102610) -->
+    <skip />
+    <!-- no translation found for radio_info_data_successes_label (4417894113689054945) -->
+    <skip />
+    <!-- no translation found for radio_info_ppp_received_label (3345184342444878849) -->
+    <skip />
+    <!-- no translation found for radio_info_gsm_service_label (2082332114596916985) -->
+    <skip />
+    <!-- no translation found for radio_info_signal_strength_label (1931937920896925766) -->
+    <skip />
+    <!-- no translation found for radio_info_call_status_label (4896238900685510883) -->
+    <skip />
+    <!-- no translation found for radio_info_ppp_sent_label (5009102250704375687) -->
+    <skip />
+    <!-- no translation found for radio_info_radio_resets_label (9211343458143291617) -->
+    <skip />
+    <!-- no translation found for radio_info_message_waiting_label (6981842420058672207) -->
+    <skip />
+    <!-- no translation found for radio_info_phone_number_label (7192944627907412169) -->
+    <skip />
+    <!-- no translation found for radio_info_band_mode_label (441469694142042022) -->
+    <skip />
+    <!-- no translation found for radio_info_network_type_label (3706382548257257987) -->
+    <skip />
+    <!-- no translation found for radio_info_set_perferred_label (9039200405863503267) -->
+    <skip />
+    <!-- no translation found for radio_info_ping_ipaddr (498747917793263530) -->
+    <skip />
+    <!-- no translation found for radio_info_ping_hostname (3054888474808217853) -->
+    <skip />
+    <!-- no translation found for radio_info_http_client_test (5733604021077701555) -->
+    <skip />
+    <!-- no translation found for ping_test_label (7255376471490860631) -->
+    <skip />
+    <!-- no translation found for radio_info_smsc_label (6399460520126501354) -->
+    <skip />
+    <!-- no translation found for radio_info_smsc_update_label (7258686760358791539) -->
+    <skip />
+    <!-- no translation found for radio_info_smsc_refresh_label (6902302130315125102) -->
+    <skip />
+    <string name="radio_info_toggle_dns_check_label" msgid="8292252930563286858">"Verwissel DNS-kontrole"</string>
+    <!-- no translation found for oem_radio_info_label (6163141792477958941) -->
+    <skip />
+    <!-- no translation found for band_mode_title (954174198903776205) -->
+    <skip />
+    <!-- no translation found for band_mode_loading (548764766363847336) -->
+    <skip />
+    <!-- no translation found for band_mode_set (5730560180249458484) -->
+    <skip />
+    <!-- no translation found for band_mode_failed (1495968863884716379) -->
+    <skip />
+    <!-- no translation found for band_mode_succeeded (2701016190055887575) -->
+    <skip />
+    <!-- no translation found for sdcard_changes_instructions (1364712901180556244) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_screen_mass_storage_text (3741220147296482474) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_total_bytes_label (9184160745785062144) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_not_present_status (2902787003418172125) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_not_present_status (6666688653496819947) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_available_bytes_label (763232429899373001) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_mass_storage_status (2736378870889777857) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_mass_storage_status (4786433969313661655) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_unmounted_status (7503300818792750913) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_unmounted_status (3812022095683863087) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_bad_removal_status (7761390725880773697) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_bad_removal_status (5145797653495907970) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_used_bytes_label (8820289486001170836) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_scanning_status (7503429447676219564) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_scanning_status (2763464949274455656) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_read_only_status (3771783090621312312) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_read_only_status (5706115860484118911) -->
+    <skip />
+    <!-- no translation found for skip_label (47510779345218297) -->
+    <skip />
+    <!-- no translation found for next_label (4693520878012668114) -->
+    <skip />
+    <!-- no translation found for language_picker_title (5349877711342869319) -->
+    <skip />
+    <!-- no translation found for activity_picker_label (4910700713930693329) -->
+    <skip />
+    <!-- no translation found for device_info_label (6551553813651711205) -->
+    <skip />
+    <!-- no translation found for battery_info_label (4132685016148679403) -->
+    <skip />
+    <!-- no translation found for display_label (8074070940506840792) -->
+    <skip />
+    <!-- no translation found for phone_info_label (7820855350955963628) -->
+    <skip />
+    <!-- no translation found for phone_info_label (2127552523124277664) -->
+    <skip />
+    <!-- no translation found for sd_card_settings_label (8101475181301178428) -->
+    <skip />
+    <!-- no translation found for sd_card_settings_label (5743100901106177102) -->
+    <skip />
+    <!-- no translation found for proxy_settings_label (3271174136184391743) -->
+    <skip />
+    <!-- no translation found for cancel (6859253417269739139) -->
+    <skip />
+    <!-- no translation found for settings_label (1626402585530130914) -->
+    <skip />
+    <!-- no translation found for settings_label_launcher (8344735489639482340) -->
+    <skip />
+    <!-- outdated translation 3672145147925639262 -->     <string name="settings_shortcut" msgid="8597387747077828217">"Instellings"</string>
+    <!-- no translation found for airplane_mode (8837269988154128601) -->
+    <skip />
+    <string name="airplane_mode_summary" msgid="3154817401368780988">"Deaktiveer alle draadlose verbindings"</string>
+    <!-- no translation found for airplane_mode_turning_on (8871739222526957255) -->
+    <skip />
+    <!-- no translation found for airplane_mode_turning_off (3393168549611505996) -->
+    <skip />
+    <string name="radio_controls_title" msgid="5868688473587168882">"Wi-Fi en netwerke"</string>
+    <!-- outdated translation 149274247949769551 -->     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Wi-Fi- en netwerkinstellings"</string>
+    <string name="radio_controls_summary" msgid="2998818677094465517">"Bestuur Wi-Fi, Bluetooth, vliegtuigmodus, mobiele netwerke en VPN\'s"</string>
+    <!-- no translation found for roaming (3596055926335478572) -->
+    <skip />
+    <!-- no translation found for roaming_enable (3737380951525303961) -->
+    <skip />
+    <!-- no translation found for roaming_disable (1295279574370898378) -->
+    <skip />
+    <!-- no translation found for roaming_reenable_message (9141007271031717369) -->
+    <skip />
+    <!-- no translation found for roaming_turn_it_on_button (4387601818162120589) -->
+    <skip />
+    <!-- no translation found for roaming_warning (1269870211689178511) -->
+    <skip />
+    <!-- no translation found for roaming_reenable_title (7626425894611573131) -->
+    <skip />
+    <!-- no translation found for networks (6333316876545927039) -->
+    <skip />
+    <!-- no translation found for sum_carrier_select (6648929373316748020) -->
+    <skip />
+    <!-- no translation found for date_and_time_settings_title (3350640463596716780) -->
+    <skip />
+    <!-- no translation found for date_and_time_settings_title_setup_wizard (2391530758339384324) -->
+    <skip />
+    <!-- no translation found for date_and_time_settings_summary (2435705040205950381) -->
+    <skip />
+    <!-- no translation found for date_time_auto (7076906458515908345) -->
+    <skip />
+    <!-- no translation found for date_time_auto_summaryOn (4609619490075140381) -->
+    <skip />
+    <!-- no translation found for date_time_auto_summaryOff (8698762649061882791) -->
+    <skip />
+    <!-- no translation found for zone_auto (334783869352026648) -->
+    <skip />
+    <!-- no translation found for zone_auto_summaryOn (6142830927278458314) -->
+    <skip />
+    <!-- no translation found for zone_auto_summaryOff (2597745783162041390) -->
+    <skip />
+    <!-- no translation found for date_time_24hour (1193032284921000063) -->
+    <skip />
+    <!-- no translation found for date_time_set_time (5716856602742530696) -->
+    <skip />
+    <string name="date_time_set_timezone" msgid="5045627174274377814">"Kies tydsone"</string>
+    <!-- no translation found for date_time_set_date (7021491668550232105) -->
+    <skip />
+    <!-- no translation found for date_time_date_format (436706100255870967) -->
+    <skip />
+    <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Rangskik alfabeties"</string>
+    <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Rangskik volgens tydsone"</string>
+    <!-- no translation found for date_picker_title (1338210036394128512) -->
+    <skip />
+    <!-- no translation found for time_picker_title (483460752287255019) -->
+    <skip />
+    <!-- no translation found for lock_after_timeout (940509402681580537) -->
+    <skip />
+    <!-- no translation found for lock_after_timeout_summary (4726009794344934278) -->
+    <skip />
+    <!-- no translation found for show_owner_info_on_lockscreen_label (5074906168357568434) -->
+    <skip />
+    <!-- no translation found for owner_info_settings_title (2723190010708381889) -->
+    <skip />
+    <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
+    <!-- no translation found for owner_info_settings_edit_text_hint (2382525043173672857) -->
+    <skip />
+    <string name="security_settings_title" msgid="5168491784222013179">"Ligging en sekuriteit"</string>
+    <string name="location_security_settings_title" msgid="4624434296446625554">"Ligging- en sekuriteitinstellings"</string>
+    <string name="security_settings_summary" msgid="967393342537986570">"Stel my ligging, ontsluit skerm, sluit SIM-kaart, eiebewys sluit"</string>
+    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Stel my ligging, skermontsluiting, eiebewysbergingslot"</string>
+    <!-- no translation found for security_passwords_title (2930627259125138363) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
+    <skip />
+    <!-- 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_desc (2150571569618349332) -->
+    <skip />
+    <!-- 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_low_charge_text (5920622844033087792) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_dialog_need_password_title (4058971800557767) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_dialog_need_password_message (17076329416977176) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (2496639211575162172) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (3248595818246515395) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_setup_description (5317479293244660361) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_setup_description (8166730416836285875) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_cooldown (685210918307862395) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_enter_password (1492603008983893532) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_title (1166918236711686187) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (1075638996134310507) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (3394708817932222518) -->
+    <skip />
+    <!-- no translation found for lock_settings_picker_title (8665454308380158195) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_title (4461562893699328786) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_change_title (6987228635944678726) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_change_summary (2790960639554590668) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_enable_summary (4791110798817242301) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_off_title (1613932765246180079) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_off_summary (2791013557563587655) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_none_title (7560817055143323842) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_none_summary (2609139908913114644) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pattern_title (2912067603917311700) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pattern_summary (8467282436608077882) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pin_title (5846029709462329515) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pin_summary (5556722736289132512) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_password_title (8775603825675090937) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_password_summary (7871968012198279034) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_disabled_summary (2120729867788851674) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_mode_off (378729687629105388) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_mode_none (7137296704741184239) -->
+    <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 />
+    <!-- no translation found for unlock_disable_lock_title (1427036227416979120) -->
+    <skip />
+    <!-- no translation found for unlock_disable_lock_pattern_summary (6801602880568869201) -->
+    <skip />
+    <!-- no translation found for unlock_disable_lock_pin_summary (8856842745366993387) -->
+    <skip />
+    <!-- no translation found for unlock_disable_lock_password_summary (192161194564577025) -->
+    <skip />
+    <!-- no translation found for unlock_change_lock_pattern_title (2044092014872741130) -->
+    <skip />
+    <!-- no translation found for unlock_change_lock_pin_title (806629901095938484) -->
+    <skip />
+    <!-- no translation found for unlock_change_lock_password_title (5606298470358768865) -->
+    <skip />
+    <!-- no translation found for lockpassword_password_too_short (7328975683669256660) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_short (2252847623267704683) -->
+    <skip />
+    <!-- no translation found for lockpassword_press_continue (122706614386757182) -->
+    <skip />
+    <!-- no translation found for lockpassword_continue_label (4602203784934526940) -->
+    <skip />
+    <!-- no translation found for lockpassword_password_too_long (5487426077939378487) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_long (6382649850551200693) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_contains_non_digits (3379277100136600632) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_recently_used (2729073062730842496) -->
+    <skip />
+    <!-- no translation found for lockpassword_illegal_character (6204396794254688549) -->
+    <skip />
+    <!-- no translation found for lockpassword_password_requires_alpha (5668524505560400449) -->
+    <skip />
+    <!-- no translation found for lockpassword_password_requires_digit (4840579514154254907) -->
+    <skip />
+    <!-- no translation found for lockpassword_password_requires_symbol (4140602725865312078) -->
+    <skip />
+    <!-- no translation found for lockpassword_password_requires_letters:one (1462968118065694590) -->
+    <!-- no translation found for lockpassword_password_requires_letters:other (7278096339907683541) -->
+    <!-- no translation found for lockpassword_password_requires_lowercase:one (2048653993044269649) -->
+    <!-- no translation found for lockpassword_password_requires_lowercase:other (588499075580432178) -->
+    <!-- no translation found for lockpassword_password_requires_uppercase:one (7677454174080582601) -->
+    <!-- no translation found for lockpassword_password_requires_uppercase:other (2183090598541826806) -->
+    <!-- no translation found for lockpassword_password_requires_numeric:one (8585088032818933985) -->
+    <!-- no translation found for lockpassword_password_requires_numeric:other (995673409754935278) -->
+    <!-- no translation found for lockpassword_password_requires_symbols:one (3930886641317826293) -->
+    <!-- no translation found for lockpassword_password_requires_symbols:other (3047460862484105274) -->
+    <!-- no translation found for lockpassword_password_requires_nonletter:one (1716355580615489062) -->
+    <!-- no translation found for lockpassword_password_requires_nonletter:other (5574191164708145973) -->
+    <!-- no translation found for lockpassword_password_recently_used (2739642871806935825) -->
+    <skip />
+    <!-- no translation found for lockpassword_ok_label (313822574062553672) -->
+    <skip />
+    <!-- no translation found for lockpassword_cancel_label (8818529276331121899) -->
+    <skip />
+    <!-- no translation found for lockpattern_tutorial_cancel_label (6431583477570493261) -->
+    <skip />
+    <!-- no translation found for lockpattern_tutorial_continue_label (3559793618653400434) -->
+    <skip />
+    <!-- no translation found for device_admin_title (3562216873644263804) -->
+    <skip />
+    <!-- no translation found for manage_device_admin (5059296715271077278) -->
+    <skip />
+    <!-- no translation found for manage_device_admin_summary (7672709110988761075) -->
+    <skip />
+    <!-- no translation found for bluetooth_quick_toggle_title (1037056952714061893) -->
+    <skip />
+    <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Skakel Bluetooth aan"</string>
+    <!-- no translation found for bluetooth_settings (2725796451253089609) -->
+    <skip />
+    <!-- no translation found for bluetooth_settings_title (2824020086246268296) -->
+    <skip />
+    <!-- no translation found for bluetooth_settings_summary (2091062709530570462) -->
+    <skip />
+    <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Bluetooth-saambinding-versoek"</string>
+    <!-- no translation found for bluetooth_enter_pin_msg (1499285355129256289) -->
+    <skip />
+    <!-- no translation found for bluetooth_enter_passkey_msg (8301499416158195044) -->
+    <skip />
+    <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"Om saam te bind met \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\", bevestig dat dit die wagwoordsleutel wys. <xliff:g id="PASSKEY">%2$s</xliff:g>."</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1076613564387784476">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n"wil saambind."</string>
+    <!-- no translation found for bluetooth_display_passkey_pin_msg (9139892462102104755) -->
+    <skip />
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Saambind"</string>
+    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"Moenie saambind nie"</string>
+    <string name="bluetooth_remote_device" msgid="2406662802908395389">"bluetooth-toestel"</string>
+    <string name="bluetooth_error_title" msgid="538287072376677166">"Aandag"</string>
+    <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"Daar was \'n probleem om te saam te bind met <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="6065697229258906937">"Kon nie met <xliff:g id="DEVICE_NAME">%1$s</xliff:g> saambind nie omdat die PIN of wagwoordsleutel nie korrek is nie."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="6688215193824686741">"Kan nie kommunikasie met <xliff:g id="DEVICE_NAME">%1$s</xliff:g> tot stand bring nie."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Saambinding verwerp deur <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"Kon nie aan <xliff:g id="DEVICE_NAME">%1$s</xliff:g> koppel nie."</string>
+    <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Soek vir toestelle"</string>
+    <!-- no translation found for bluetooth_preference_find_nearby_title (5087410003465463318) -->
+    <skip />
+    <!-- no translation found for bluetooth_preference_device_settings (907776049862799122) -->
+    <skip />
+    <!-- no translation found for bluetooth_preference_paired_devices (1970524193086791964) -->
+    <skip />
+    <!-- no translation found for bluetooth_preference_found_devices (3133019331974936204) -->
+    <skip />
+    <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Koppel"</string>
+    <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Ontkoppel"</string>
+    <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Saambind en koppel"</string>
+    <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Ontsaambind"</string>
+    <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Ontkoppel en ontsaambind"</string>
+    <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Opsies…"</string>
+    <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Koppel aan…"</string>
+    <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"Media"</string>
+    <!-- outdated translation 1874975688666658946 -->     <string name="bluetooth_profile_headset" msgid="81844079120986198">"Foon"</string>
+    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Dra oor"</string>
+    <!-- no translation found for bluetooth_profile_hid (3000858580917633478) -->
+    <skip />
+    <!-- no translation found for bluetooth_profile_pan (3391606497945147673) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_a2dp_profile (3524648279150937177) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_headset_profile (8635908811168780720) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_hid_profile (3282295189719352075) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_pan_user_profile (8037627994382458698) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_pan_nap_profile (5455448395850929200) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_pan_nap_profile (5266851881175033601) -->
+    <skip />
+    <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> opsies"</string>
+    <!-- no translation found for bluetooth_device_advanced_device_actions_title (3793430949811946844) -->
+    <skip />
+    <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Koppel"</string>
+    <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Koppel aan Bluetooth-toestel"</string>
+    <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Profiele"</string>
+    <!-- no translation found for bluetooth_device_advanced_rename_device (350508394033808532) -->
+    <skip />
+    <!-- no translation found for bluetooth_device_advanced_enable_opp_title (8222550640371627365) -->
+    <skip />
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Gekoppel aan media-oudio"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Gekoppel aan foonoudio"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Gekoppel aan lêeroordragbediener"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Nie gekoppel aan lêeroordragbediener nie"</string>
+    <!-- no translation found for bluetooth_hid_profile_summary_connected (3381760054215168689) -->
+    <skip />
+    <!-- no translation found for bluetooth_pan_user_profile_summary_connected (4602294638909590612) -->
+    <skip />
+    <!-- no translation found for bluetooth_pan_nap_profile_summary_connected (1561383706411975199) -->
+    <skip />
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Gebruik vir media-oudio"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Gebruik vir foonoudio"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Gebruik vir lêeroordrag"</string>
+    <!-- no translation found for bluetooth_hid_profile_summary_use_for (232727040453645139) -->
+    <skip />
+    <!-- no translation found for bluetooth_pan_profile_summary_use_for (5664884523822068653) -->
+    <skip />
+    <!-- no translation found for bluetooth_dock_settings (3218335822716052885) -->
+    <skip />
+    <!-- no translation found for bluetooth_dock_settings_title (5543069893044375188) -->
+    <skip />
+    <!-- no translation found for bluetooth_dock_settings_headset (1001821426078644650) -->
+    <skip />
+    <!-- no translation found for bluetooth_dock_settings_a2dp (8791004998846630574) -->
+    <skip />
+    <!-- no translation found for bluetooth_dock_settings_remember (5551459057010609115) -->
+    <skip />
+    <!-- no translation found for nfc_quick_toggle_title (6769159366307299004) -->
+    <skip />
+    <!-- no translation found for nfc_quick_toggle_summary (1988408027741447231) -->
+    <skip />
+    <!-- no translation found for nfc_toggle_error (2233172102497535522) -->
+    <!-- no translation found for nfc_toggle_error (8998642457947607263) -->
+    <skip />
+    <!-- no translation found for wifi_quick_toggle_title (874495178395350104) -->
+    <skip />
+    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Skakel Wi-Fi aan"</string>
+    <!-- no translation found for wifi_settings (4746946030627213196) -->
+    <skip />
+    <!-- no translation found for wifi_settings_category (2810363951104753710) -->
+    <skip />
+    <!-- no translation found for wifi_settings_summary (668767638556052820) -->
+    <skip />
+    <!-- no translation found for wifi_starting (6710266609710860129) -->
+    <skip />
+    <!-- no translation found for wifi_stopping (5952909472548218348) -->
+    <skip />
+    <!-- no translation found for wifi_error (3207971103917128179) -->
+    <skip />
+    <!-- no translation found for wifi_in_airplane_mode (7618393787965366655) -->
+    <skip />
+    <!-- no translation found for wifi_fail_to_scan (6194542252808587669) -->
+    <skip />
+    <!-- no translation found for wifi_notify_open_networks (3755768188029653293) -->
+    <skip />
+    <!-- no translation found for wifi_notify_open_networks_summary (3038290727701553612) -->
+    <skip />
+    <!-- outdated translation 1367731352485585528 -->     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Wi-Fi-slaapbeleid"</string>
+    <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Spesifiseer wanneer om van Wi-Fi oor te skakel na mobiele data"</string>
+    <!-- no translation found for wifi_setting_sleep_policy_summary_wifi_only (5025244230722670496) -->
+    <skip />
+    <!-- outdated translation 5103670439972135148 -->     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Kon nie die slaapbeleid stel nie."</string>
+    <!-- no translation found for wifi_add_network (1671334951296205616) -->
+    <skip />
+    <!-- no translation found for wifi_add_network_summary (6345544206968025811) -->
+    <skip />
+    <!-- no translation found for wifi_access_points (2664629396767022441) -->
+    <skip />
+    <!-- no translation found for wifi_menu_scan (1470911530412095868) -->
+    <skip />
+    <!-- no translation found for wifi_menu_advanced (7522252991919573664) -->
+    <skip />
+    <!-- no translation found for wifi_menu_connect (4996220309848349408) -->
+    <skip />
+    <!-- no translation found for wifi_menu_forget (8736964302477327114) -->
+    <skip />
+    <!-- no translation found for wifi_menu_modify (2068554918652440105) -->
+    <skip />
+    <!-- no translation found for wifi_network_setup (7974851890019344870) -->
+    <skip />
+    <!-- no translation found for wifi_wps_pin (5471842298708321115) -->
+    <skip />
+    <!-- no translation found for wifi_wps_setup_title (150518971269252336) -->
+    <skip />
+    <!-- no translation found for wifi_wps_pin_output (8682102965680650853) -->
+    <skip />
+    <!-- no translation found for wifi_wps_in_progress (2776555137392461525) -->
+    <skip />
+    <!-- no translation found for wifi_wps_failed (2277409652621482331) -->
+    <skip />
+    <!-- no translation found for wifi_ssid (641393708309146745) -->
+    <skip />
+    <!-- no translation found for wifi_security (6603611185592956936) -->
+    <skip />
+    <!-- no translation found for wifi_signal (5514120261628065287) -->
+    <skip />
+    <!-- no translation found for wifi_status (4824568012414605414) -->
+    <skip />
+    <!-- no translation found for wifi_speed (3526198708812322037) -->
+    <skip />
+    <!-- no translation found for wifi_ip_address (1440054061044402918) -->
+    <skip />
+    <!-- no translation found for wifi_eap_method (8529436133640730382) -->
+    <skip />
+    <string name="please_select_phase2" msgid="5231074529772044898">"Fase 2-stawing"</string>
+    <!-- no translation found for wifi_eap_ca_cert (3521574865488892851) -->
+    <skip />
+    <!-- no translation found for wifi_eap_user_cert (1291089413368160789) -->
+    <skip />
+    <!-- no translation found for wifi_eap_identity (4359453783379679103) -->
+    <skip />
+    <!-- no translation found for wifi_eap_anonymous (2989469344116577955) -->
+    <skip />
+    <!-- no translation found for wifi_password (5948219759936151048) -->
+    <skip />
+    <!-- no translation found for wifi_show_password (6461249871236968884) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings (3359331401377059481) -->
+    <skip />
+    <!-- no translation found for wifi_unchanged (3410422020930397102) -->
+    <skip />
+    <!-- no translation found for wifi_unspecified (5431501214192991253) -->
+    <skip />
+    <!-- no translation found for wifi_remembered (8426719916135950136) -->
+    <skip />
+    <!-- no translation found for wifi_disabled (2104752038187543712) -->
+    <skip />
+    <!-- no translation found for wifi_not_in_range (1136191511238508967) -->
+    <skip />
+    <!-- no translation found for wifi_open_with_wps (2606968531452521147) -->
+    <skip />
+    <!-- no translation found for wifi_secured (6759903183748011566) -->
+    <skip />
+    <!-- no translation found for wifi_secured_with_wps (1822538701086256007) -->
+    <skip />
+    <!-- no translation found for wifi_secured_with_status (6489317496506267302) -->
+    <skip />
+    <!-- no translation found for wifi_connect (1076622875777072845) -->
+    <skip />
+    <!-- no translation found for wifi_forget (8168174695608386644) -->
+    <skip />
+    <!-- no translation found for wifi_save (3331121567988522826) -->
+    <skip />
+    <!-- no translation found for wifi_cancel (6763568902542968964) -->
+    <skip />
+    <!-- no translation found for wifi_wps_overlap_error (6820987241637459748) -->
+    <skip />
+    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Gevorderd"</string>
+    <!-- no translation found for wifi_setting_frequency_band_title (7493768705046080060) -->
+    <skip />
+    <!-- no translation found for wifi_setting_frequency_band_summary (3250740757118009784) -->
+    <skip />
+    <!-- no translation found for wifi_setting_frequency_band_error (837281974489794378) -->
+    <skip />
+    <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC-adres"</string>
+    <!-- no translation found for wifi_advanced_ip_address_title (6215297094363164846) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_titlebar (4345739031248760326) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_menu_save (7296724066102908366) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_menu_cancel (6582567330136502340) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_ip_address (6387653152103405443) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_gateway (6383012465511093067) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_dns (3428867750550854065) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_network_prefix_length (8145730615716855433) -->
+    <skip />
+    <!-- no translation found for wifi_dns1 (7344118050720080045) -->
+    <skip />
+    <!-- no translation found for wifi_dns2 (1368601006824882659) -->
+    <skip />
+    <!-- no translation found for wifi_gateway (163914742461092086) -->
+    <skip />
+    <!-- no translation found for wifi_network_prefix_length (3028785234245085998) -->
+    <skip />
+    <!-- no translation found for wifi_tether_checkbox_text (6961605862058056788) -->
+    <skip />
+    <!-- no translation found for wifi_tether_enabled_subtext (8948641212931906143) -->
+    <skip />
+    <!-- no translation found for wifi_tether_failed_subtext (2654888578056042315) -->
+    <skip />
+    <!-- no translation found for wifi_tether_configure_ap_text (3474995108398156258) -->
+    <skip />
+    <!-- no translation found for wifi_tether_configure_subtext (1927454307836232128) -->
+    <skip />
+    <!-- no translation found for wifi_tether_configure_ssid_default (8467525402622138547) -->
+    <skip />
+    <!-- no translation found for sound_settings_title (8735891486683305886) -->
+    <skip />
+    <!-- no translation found for display_settings_title (2378894265964357591) -->
+    <skip />
+    <!-- no translation found for sound_settings (5007659014828162881) -->
+    <skip />
+    <!-- no translation found for silent_mode_title (3181479108593217704) -->
+    <skip />
+    <!-- outdated translation 9081534746589616108 -->     <string name="silent_mode_summary" msgid="3309650676072917899">"Alle klanke, behalwe media en alarms, is stilgemaak"</string>
+    <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"Alle klanke, behalwe media, word stilgemaak"</string>
+    <!-- no translation found for ringtone_title (7037881886694206550) -->
+    <skip />
+    <string name="ringtone_summary" msgid="2630023412632683493"></string>
+    <!-- no translation found for all_volume_title (8741571721868253103) -->
+    <skip />
+    <!-- no translation found for ring_volume_title (7938706566797464165) -->
+    <skip />
+    <string name="ring_volume_summary" msgid="7055497624193116879"></string>
+    <!-- no translation found for vibrate_in_silent_title (3897968069156767036) -->
+    <skip />
+    <!-- no translation found for vibrate_in_silent_summary (3312600513070076281) -->
+    <skip />
+    <!-- no translation found for vibrate_title (6045820877942801599) -->
+    <skip />
+    <!-- no translation found for vibrate_summary (7378130397830790458) -->
+    <skip />
+    <!-- no translation found for notification_sound_title (6316316069880531693) -->
+    <skip />
+    <string name="notification_sound_summary" msgid="2953599929394109819"></string>
+    <!-- no translation found for notification_pulse_title (1247988024534030629) -->
+    <skip />
+    <!-- no translation found for notification_pulse_summary (6899220780534617152) -->
+    <skip />
+    <!-- outdated translation 6144314834963494752 -->     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Inkomendeoproep-volume"</string>
+    <!-- outdated translation 3363351773121138717 -->     <string name="notification_volume_title" msgid="2012640760341080408">"Kennisgewing-volume"</string>
+    <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Gebruik inkomendeoproep-volume vir kennisgewings"</string>
+    <!-- no translation found for notification_sound_dialog_title (7057274209079144726) -->
+    <skip />
+    <!-- no translation found for media_volume_title (3576565767317118106) -->
+    <skip />
+    <!-- no translation found for media_volume_summary (5363248930648849974) -->
+    <skip />
+    <!-- no translation found for alarm_volume_title (2285597478377758706) -->
+    <skip />
+    <!-- no translation found for dock_settings_summary (455802113668982481) -->
+    <skip />
+    <!-- no translation found for dtmf_tone_enable_title (1453831168789523185) -->
+    <skip />
+    <!-- no translation found for dtmf_tone_enable_summary_on (3028201873989887327) -->
+    <skip />
+    <!-- no translation found for dtmf_tone_enable_summary_off (7791065951268525678) -->
+    <skip />
+    <!-- no translation found for sound_effects_enable_title (3197313718929122833) -->
+    <skip />
+    <!-- no translation found for sound_effects_enable_summary_on (6154141289879491329) -->
+    <skip />
+    <!-- no translation found for sound_effects_enable_summary_off (3447739581759560125) -->
+    <skip />
+    <!-- no translation found for lock_sounds_enable_title (1575990840389107141) -->
+    <skip />
+    <!-- no translation found for lock_sounds_enable_summary_on (145741024028391473) -->
+    <skip />
+    <!-- no translation found for lock_sounds_enable_summary_off (8481243116223542804) -->
+    <skip />
+    <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"Fisiese terugvoer"</string>
+    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"Vibreer wanneer skiksleutels gedruk word en by sekere UI-interaksies"</string>
+    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Vibreer wanneer skiksleutels gedruk word en by sekere UI-interaksies"</string>
+    <!-- no translation found for audio_record_proc_title (4271091199976457534) -->
+    <skip />
+    <!-- no translation found for audio_record_proc_summary (8113628457499616498) -->
+    <skip />
+    <!-- no translation found for dock_settings (1820107306693002541) -->
+    <skip />
+    <!-- no translation found for dock_settings_title (9161438664257429372) -->
+    <skip />
+    <!-- no translation found for dock_audio_settings_title (3324750259959570305) -->
+    <skip />
+    <!-- no translation found for dock_audio_summary_desk (6487784412371139335) -->
+    <skip />
+    <!-- no translation found for dock_audio_summary_car (6740897586006248450) -->
+    <skip />
+    <!-- no translation found for dock_audio_summary_none (8215337394914283607) -->
+    <skip />
+    <!-- no translation found for dock_audio_summary_none (289909253741048784) -->
+    <skip />
+    <!-- no translation found for dock_audio_summary_unknown (4465059868974255693) -->
+    <skip />
+    <!-- no translation found for dock_not_found_title (3290961741828952424) -->
+    <skip />
+    <!-- no translation found for dock_not_found_text (7935403744079168804) -->
+    <skip />
+    <!-- no translation found for dock_not_found_text (3035260358985111855) -->
+    <skip />
+    <!-- no translation found for dock_sounds_enable_title (3659084028644948905) -->
+    <skip />
+    <!-- no translation found for dock_sounds_enable_summary_on (838102386448981339) -->
+    <skip />
+    <!-- no translation found for dock_sounds_enable_summary_on (8491180514199743771) -->
+    <skip />
+    <!-- no translation found for dock_sounds_enable_summary_off (5077843049805652363) -->
+    <skip />
+    <!-- no translation found for dock_sounds_enable_summary_off (3151046599205265919) -->
+    <skip />
+    <string name="sync_settings" msgid="9186125469300013491">"Rekeninge en sinkronisasie"</string>
+    <string name="sync_settings_summary" msgid="2962179505214965667">"Verwyder of voeg rekeninge by en verander rekeninginstellings"</string>
+    <string name="search_settings" msgid="1910951467596035063">"Soek"</string>
+    <string name="search_settings_summary" msgid="9205656546570654169">"Bestuur soekinstellings en geskiedenis"</string>
+    <!-- no translation found for display_settings (5947830029420609057) -->
+    <skip />
+    <string name="animations_title" msgid="1062189037402346023">"Animasie"</string>
+    <string name="animations_summary_on" msgid="8843613112130484436">"Wys animasie as vensters oop en toe gemaak word"</string>
+    <string name="animations_summary_off" msgid="2777026828025551983">"Wys animasie wanneer vensters oop en toe gemaak word"</string>
+    <!-- outdated translation 6183763368844793276 -->     <string name="accelerometer_title" msgid="7854608399547349157">"Oriëntasie"</string>
+    <!-- outdated translation 1133737282813048021 -->     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Verwissel outomaties van oriëntasie wanneer foon draai"</string>
+    <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Verwissel outomaties van oriëntasie wanneer foon draai"</string>
+    <!-- outdated translation 5485489363715740761 -->     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Verwissel outomaties van oriëntasie wanneer foon draai"</string>
+    <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Verwissel outomaties van oriëntasie wanneer foon draai"</string>
+    <!-- no translation found for brightness (2354961343555249270) -->
+    <skip />
+    <string name="brightness_summary" msgid="838917350127550703">"Verstel die helderheid van die skerm"</string>
+    <!-- no translation found for screen_timeout (6962654593018319466) -->
+    <skip />
+    <!-- no translation found for screen_timeout_summary (4471347210332380587) -->
+    <skip />
+    <!-- no translation found for dream_settings_title (6536876013377446805) -->
+    <skip />
+    <!-- no translation found for dream_settings_summary (6809871648071408259) -->
+    <skip />
+    <!-- no translation found for dream_component_title (505229894674572578) -->
+    <skip />
+    <!-- no translation found for dream_timeout_title (1385909618566514628) -->
+    <skip />
+    <!-- no translation found for dream_timeout_summary (6721955887728454226) -->
+    <skip />
+    <!-- no translation found for dream_timeout_zero_summary (2450290346381400092) -->
+    <skip />
+    <!-- no translation found for dream_test (5968002644622194481) -->
+    <skip />
+    <string name="automatic_brightness" msgid="5014143533884135461">"Outomatiese helderheid"</string>
+    <!-- no translation found for title_font_size (4405544325522105222) -->
+    <skip />
+    <!-- no translation found for summary_font_size (7548243392515500554) -->
+    <skip />
+    <!-- no translation found for dialog_title_font_size (4503471078477715461) -->
+    <skip />
+    <!-- no translation found for sim_lock_settings (3392331196873564292) -->
+    <skip />
+    <!-- no translation found for sim_lock_settings_category (5136244267576697004) -->
+    <skip />
+    <!-- no translation found for sim_lock_settings_title (9018585580955414596) -->
+    <skip />
+    <!-- no translation found for sim_pin_toggle (1742123478029451888) -->
+    <skip />
+    <!-- no translation found for sim_lock_on (5058355081270397764) -->
+    <skip />
+    <!-- no translation found for sim_lock_on (2503536505568814324) -->
+    <skip />
+    <!-- no translation found for sim_lock_off (2813800553917012356) -->
+    <skip />
+    <!-- no translation found for sim_lock_off (258981978215428916) -->
+    <skip />
+    <string name="sim_pin_change" msgid="6311414184279932368">"Verander SIM-PIN"</string>
+    <string name="sim_enter_pin" msgid="6608715137008508432">"SIM PIN"</string>
+    <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Sluit SIM-kaart"</string>
+    <string name="sim_disable_sim_lock" msgid="7664729528754784824">"Ontsluit SIM-kaart"</string>
+    <string name="sim_enter_old" msgid="6074196344494634348">"Ou SIM PIN"</string>
+    <string name="sim_enter_new" msgid="8742727032729243562">"Nuwe SIM PIN"</string>
+    <!-- no translation found for sim_reenter_new (3178510434642201544) -->
+    <skip />
+    <string name="sim_change_pin" msgid="7328607264898359112">"SIM PIN"</string>
+    <!-- no translation found for sim_bad_pin (2746201276896134075) -->
+    <skip />
+    <string name="sim_pins_dont_match" msgid="4664611595579163214">"PIN\'e stem nie ooreen nie!"</string>
+    <string name="sim_change_failed" msgid="4823538458798362222">"Kan nie PIN verander nie."\n"Moontlik verkeerde PIN."</string>
+    <!-- no translation found for sim_change_succeeded (8556135413096489627) -->
+    <skip />
+    <string name="sim_lock_failed" msgid="6676748290838006404">"Kan nie SIM-kaart se sluitstatus verander nie."\n"Moontlik \'n verkeerde PIN."</string>
+    <!-- no translation found for sim_enter_ok (6475946836899218919) -->
+    <skip />
+    <!-- no translation found for sim_enter_cancel (6240422158517208036) -->
+    <skip />
+    <!-- no translation found for device_info_settings (1119755927536987178) -->
+    <skip />
+    <!-- no translation found for device_info_settings (475872867864762157) -->
+    <skip />
+    <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Stelselopdaterings"</string>
+    <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
+    <!-- no translation found for firmware_version (4801135784886859972) -->
+    <skip />
+    <!-- no translation found for model_number (3765737700545384794) -->
+    <skip />
+    <!-- no translation found for baseband_version (1848990160763524801) -->
+    <skip />
+    <!-- no translation found for kernel_version (9192574954196167602) -->
+    <skip />
+    <!-- no translation found for build_number (3075795840572241758) -->
+    <skip />
+    <!-- no translation found for device_info_not_available (8062521887156825182) -->
+    <skip />
+    <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
+    <!-- no translation found for device_status (607405385799807324) -->
+    <skip />
+    <!-- outdated translation 2599162787451519618 -->     <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Foonnommer, sein ens."</string>
+    <string name="device_status_summary" product="default" msgid="2599162787451519618">"Foonnommer, sein ens."</string>
+    <!-- outdated translation 6681164315506788024 -->     <string name="storage_settings" msgid="4211799979832404953">"SD-kaart en foonberging"</string>
+    <!-- outdated translation 5379463509034022773 -->     <string name="storage_settings_title" msgid="8746016738388094064">"SD-kaart- en foonberginginstellings"</string>
+    <!-- no translation found for storage_settings_summary (3543813623294870759) -->
+    <skip />
+    <!-- no translation found for storage_settings_summary (9176693537325988610) -->
+    <skip />
+    <!-- outdated translation 5123197324870153205 -->     <string name="status_number" product="tablet" msgid="1138837891091222272">"My foonnommer"</string>
+    <string name="status_number" product="default" msgid="5123197324870153205">"My foonnommer"</string>
+    <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
+    <string name="status_prl_version" msgid="8499039751817386529">"PRL-weergawe"</string>
+    <!-- outdated translation 1751442889111731088 -->     <string name="status_meid_number" msgid="2037549729230058915">"MEID"</string>
+    <string name="status_network_type" msgid="3279383550222116235">"Mobielenetwerk-tipe"</string>
+    <string name="status_data_state" msgid="5503181397066522950">"Mobielenetwerk-status"</string>
+    <!-- no translation found for status_service_state (2323931627519429503) -->
+    <skip />
+    <!-- no translation found for status_signal_strength (3732655254188304547) -->
+    <skip />
+    <!-- no translation found for status_roaming (2638800467430913403) -->
+    <skip />
+    <!-- no translation found for status_operator (2274875196954742087) -->
+    <skip />
+    <!-- no translation found for status_wifi_mac_address (33109409206264790) -->
+    <skip />
+    <!-- no translation found for status_bt_address (4195174192087439720) -->
+    <skip />
+    <!-- no translation found for status_serial_number (2257111183374628137) -->
+    <skip />
+    <!-- no translation found for status_unavailable (7862009036663793314) -->
+    <skip />
+    <!-- no translation found for status_up_time (7294859476816760399) -->
+    <skip />
+    <!-- no translation found for status_awake_time (2393949909051183652) -->
+    <skip />
+    <!-- no translation found for internal_memory (9129595691484260784) -->
+    <skip />
+    <!-- no translation found for sd_memory (2510246194083052841) -->
+    <skip />
+    <!-- no translation found for sd_memory (151871913888051515) -->
+    <skip />
+    <!-- no translation found for memory_available (5052397223077021181) -->
+    <skip />
+    <!-- no translation found for memory_size (6629067715017232195) -->
+    <skip />
+    <!-- no translation found for memory_calculating_size (2188358544203768588) -->
+    <skip />
+    <!-- no translation found for memory_apps_usage (9079237985722858506) -->
+    <skip />
+    <!-- no translation found for memory_media_usage (3738830697707880405) -->
+    <skip />
+    <!-- no translation found for memory_downloads_usage (3755173051677533027) -->
+    <skip />
+    <!-- no translation found for memory_dcim_usage (6679615808140067136) -->
+    <skip />
+    <!-- no translation found for memory_music_usage (4040027367622874108) -->
+    <skip />
+    <!-- no translation found for memory_media_misc_usage (235452944021647124) -->
+    <skip />
+    <!-- outdated translation 6915293408836853020 -->     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Ontheg SD-kaart"</string>
+    <string name="sd_eject" product="default" msgid="6915293408836853020">"Ontheg SD-kaart"</string>
+    <!-- outdated translation 3315557796211542962 -->     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Ontkoppel die SD-kaart vir veilige verwydering"</string>
+    <!-- outdated translation 3315557796211542962 -->     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Ontkoppel die SD-kaart vir veilige verwydering"</string>
+    <!-- no translation found for sd_insert_summary (5264016886409577313) -->
+    <skip />
+    <!-- no translation found for sd_insert_summary (2048640010381803841) -->
+    <skip />
+    <!-- no translation found for sd_mount (8966695015677343116) -->
+    <skip />
+    <!-- no translation found for sd_mount (5940523765187704135) -->
+    <skip />
+    <string name="sd_mount_summary" product="nosdcard" msgid="4673411327373419641"></string>
+    <string name="sd_mount_summary" product="default" msgid="4673411327373419641"></string>
+    <!-- outdated translation 5448738337382712203 -->     <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"Formateer SD-kaart"</string>
+    <!-- outdated translation 5448738337382712203 -->     <string name="sd_format" product="default" msgid="2576054280507119870">"Formateer SD-kaart"</string>
+    <!-- outdated translation 6616491027883134004 -->     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Formateer (vee uit) die SD-kaart"</string>
+    <!-- outdated translation 6616491027883134004 -->     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Formateer (vee uit) die SD-kaart"</string>
+    <!-- no translation found for read_only (6702420168629076340) -->
+    <skip />
+    <!-- no translation found for dlg_confirm_unmount_title (2349876662428231297) -->
+    <skip />
+    <!-- no translation found for dlg_confirm_unmount_title (8612140627310646730) -->
+    <skip />
+    <!-- no translation found for dlg_confirm_unmount_text (3390169455621185223) -->
+    <skip />
+    <!-- no translation found for dlg_confirm_unmount_text (5851214273718817727) -->
+    <skip />
+    <!-- no translation found for dlg_error_unmount_title (7695491947411836733) -->
+    <skip />
+    <!-- no translation found for dlg_error_unmount_title (4004106918266783081) -->
+    <skip />
+    <!-- no translation found for dlg_error_unmount_text (1450864147013376592) -->
+    <skip />
+    <!-- no translation found for dlg_error_unmount_text (9188972789897713180) -->
+    <skip />
+    <!-- no translation found for unmount_inform_text (7120241136790744265) -->
+    <skip />
+    <!-- no translation found for unmount_inform_text (1904212716075458402) -->
+    <skip />
+    <!-- no translation found for sd_ejecting_title (8824572198034365468) -->
+    <skip />
+    <!-- no translation found for sd_ejecting_summary (2028753069184908491) -->
+    <skip />
+    <!-- no translation found for battery_status_title (9159414319574976203) -->
+    <skip />
+    <!-- no translation found for battery_level_title (2965679202786873272) -->
+    <skip />
+    <!-- no translation found for apn_settings (3743170484827528406) -->
+    <skip />
+    <!-- no translation found for apn_edit (1354715499708424718) -->
+    <skip />
+    <!-- no translation found for apn_not_set (7422262558097875757) -->
+    <skip />
+    <!-- no translation found for apn_name (4115580098369824123) -->
+    <skip />
+    <!-- no translation found for apn_apn (2479425126733513353) -->
+    <skip />
+    <!-- no translation found for apn_http_proxy (1826885957243696354) -->
+    <skip />
+    <!-- no translation found for apn_http_port (3763259523984976226) -->
+    <skip />
+    <!-- no translation found for apn_user (455637547356117761) -->
+    <skip />
+    <!-- no translation found for apn_password (5412301994998250968) -->
+    <skip />
+    <!-- no translation found for apn_server (2436185314756372858) -->
+    <skip />
+    <!-- no translation found for apn_mmsc (3670124402105585737) -->
+    <skip />
+    <!-- no translation found for apn_mms_proxy (5374082621073999275) -->
+    <skip />
+    <!-- no translation found for apn_mms_port (4074188088199243040) -->
+    <skip />
+    <!-- no translation found for apn_mcc (4258628382260674636) -->
+    <skip />
+    <!-- no translation found for apn_mnc (8629374076888809874) -->
+    <skip />
+    <string name="apn_auth_type" msgid="6167205395676037015">"Stawingstipe"</string>
+    <string name="apn_auth_type_none" msgid="5069592676845549926">"Geen"</string>
+    <string name="apn_auth_type_pap" msgid="1666934536996033383">"PAP"</string>
+    <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
+    <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP of CHAP"</string>
+    <!-- no translation found for apn_type (469613123902220544) -->
+    <skip />
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
+    <!-- no translation found for menu_delete (6981294422841124659) -->
+    <skip />
+    <!-- no translation found for menu_new (3014205883303921729) -->
+    <skip />
+    <!-- no translation found for menu_save (8109345640668285399) -->
+    <skip />
+    <!-- no translation found for menu_cancel (2194502410474697474) -->
+    <skip />
+    <!-- no translation found for error_title (1319225301794168762) -->
+    <skip />
+    <!-- no translation found for error_name_empty (1498238337687930558) -->
+    <skip />
+    <!-- no translation found for error_apn_empty (1513892291812404310) -->
+    <skip />
+    <!-- no translation found for error_mcc_not3 (4560171714156251661) -->
+    <skip />
+    <!-- no translation found for error_mnc_not23 (8418177072458379439) -->
+    <skip />
+    <string name="restore_default_apn" msgid="2724583218635739913">"Laai verstek APN-instellings terug"</string>
+    <string name="menu_restore" msgid="8260067415075573273">"Stel terug na verstek"</string>
+    <string name="restore_default_apn_completed" msgid="3990449939234957281">"Terugstel van APN- verstek instellings voltooi"</string>
+    <!-- no translation found for master_clear_title (5907939616087039756) -->
+    <skip />
+    <!-- no translation found for master_clear_summary (4036344100254678429) -->
+    <skip />
+    <!-- no translation found for master_clear_summary (4986154238001088492) -->
+    <skip />
+    <!-- unknown placeholder BREAK_10 in master_clear_desc -->
+    <skip />
+    <!-- no translation found for master_clear_desc (590799767511283567) -->
+    <skip />
+    <!-- unknown placeholder BREAK_10 in master_clear_desc -->
+    <skip />
+    <!-- no translation found for master_clear_desc (3251400937758241249) -->
+    <skip />
+    <!-- no translation found for master_clear_accounts (6412857499147999073) -->
+    <skip />
+    <!-- no translation found for master_clear_desc_also_erases_external (1903185203791274237) -->
+    <skip />
+    <!-- no translation found for master_clear_desc_erase_external_storage (4740866328425123395) -->
+    <skip />
+    <!-- no translation found for master_clear_desc_erase_external_storage (7339100478676372901) -->
+    <skip />
+    <!-- no translation found for erase_external_storage (969364037450286809) -->
+    <skip />
+    <!-- no translation found for erase_external_storage (1397239046334307625) -->
+    <skip />
+    <!-- no translation found for erase_external_storage_description (444834593696342279) -->
+    <skip />
+    <!-- no translation found for erase_external_storage_description (46603515218075174) -->
+    <skip />
+    <!-- no translation found for master_clear_button_text (3130786116528304116) -->
+    <skip />
+    <!-- no translation found for master_clear_button_text (7550632653343157971) -->
+    <skip />
+    <string name="master_clear_final_desc" msgid="6917971132484622696">"Vee al jou persoonlike inligting en enige afgelaaide programme uit? Dit is onmoontlik om hierdie handeling ongedaan te maak!"</string>
+    <!-- no translation found for master_clear_final_button_text (5390908019019242910) -->
+    <skip />
+    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Teken jou ontsluitpatroon"</string>
+    <!-- no translation found for master_clear_gesture_explanation (2234954758550554549) -->
+    <skip />
+    <!-- no translation found for master_clear_failed (8655202125010189406) -->
+    <skip />
+    <!-- no translation found for master_clear_confirm_title (4845794266129586839) -->
+    <skip />
+    <!-- outdated translation 4671276096695789895 -->     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Formateer SD-kaart."</string>
+    <!-- outdated translation 4671276096695789895 -->     <string name="media_format_title" product="default" msgid="4427528440306787972">"Formateer SD-kaart."</string>
+    <!-- outdated translation 3805714639375830120 -->     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Vee alle data op die SD-kaart uit"</string>
+    <string name="media_format_summary" product="default" msgid="3805714639375830120">"Vee alle data op die SD-kaart uit"</string>
+    <!-- outdated translation 1142563222357820834 -->     <string name="media_format_desc" product="nosdcard" msgid="4553860683952763905">"Hierdie handeling sal die SD-kaart in die foon uitvee. Jy sal ALLE data op die kaart verloor!"</string>
+    <!-- outdated translation 1142563222357820834 -->     <string name="media_format_desc" product="default" msgid="1598627584181935513">"Hierdie handeling sal die SD-kaart in die foon uitvee. Jy sal ALLE data op die kaart verloor!"</string>
+    <!-- outdated translation 370856400090190151 -->     <string name="media_format_button_text" product="nosdcard" msgid="6293669371185352810">"Formateer SD-kaart"</string>
+    <!-- outdated translation 370856400090190151 -->     <string name="media_format_button_text" product="default" msgid="6721544380069373626">"Formateer SD-kaart"</string>
+    <!-- outdated translation 1776666694910717198 -->     <string name="media_format_final_desc" product="nosdcard" msgid="8094635533378487255">"Formateer SD-kaart en vee al jou media uit? Handeling kan nie ongedaan gemaak word nie!"</string>
+    <!-- outdated translation 1776666694910717198 -->     <string name="media_format_final_desc" product="default" msgid="9015504991522581434">"Formateer SD-kaart en vee al jou media uit? Handeling kan nie ongedaan gemaak word nie!"</string>
+    <string name="media_format_final_button_text" msgid="4881713344315923175">"Vee alles uit"</string>
+    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Teken jou ontsluitpatroon"</string>
+    <!-- outdated translation 4239529439389660159 -->     <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Jy moet jou ontsluitpatroon teken om \'n SD-kaart se formatering te bevestig."</string>
+    <!-- outdated translation 4239529439389660159 -->     <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Jy moet jou ontsluitpatroon teken om \'n SD-kaart se formatering te bevestig."</string>
+    <!-- no translation found for call_settings_title (5188713413939232801) -->
+    <skip />
+    <!-- no translation found for call_settings_summary (7291195704801002886) -->
+    <skip />
+    <!-- no translation found for tether_settings_title_usb (6688416425801386511) -->
+    <skip />
+    <!-- no translation found for tether_settings_title_wifi (3277144155960302049) -->
+    <skip />
+    <!-- no translation found for tether_settings_title_bluetooth (355855408317564420) -->
+    <skip />
+    <!-- no translation found for tether_settings_title_usb_bluetooth (5355828977109785001) -->
+    <skip />
+    <!-- no translation found for tether_settings_title_all (8356136101061143841) -->
+    <skip />
+    <!-- no translation found for tether_settings_summary_usb (785883365108362248) -->
+    <skip />
+    <!-- no translation found for tether_settings_summary_usb (3562431455625637370) -->
+    <skip />
+    <!-- no translation found for tether_settings_summary_wifi (5474383125137372164) -->
+    <skip />
+    <!-- no translation found for tether_settings_summary_bluetooth (2407506656353819750) -->
+    <skip />
+    <!-- no translation found for tether_settings_summary_usb_wifi (3834674129575844910) -->
+    <skip />
+    <!-- no translation found for tether_settings_summary_usb_wifi (3700323208282018772) -->
+    <skip />
+    <!-- no translation found for tether_settings_summary_usb_bluetooth (1245080236509560839) -->
+    <skip />
+    <!-- no translation found for tether_settings_summary_usb_bluetooth (4008195891276675882) -->
+    <skip />
+    <!-- no translation found for tether_settings_summary_wifi_bluetooth (1924576461932311140) -->
+    <skip />
+    <!-- no translation found for tether_settings_summary_wifi_bluetooth (2753904149495692201) -->
+    <skip />
+    <!-- no translation found for tether_settings_summary_all (6612660164315153427) -->
+    <skip />
+    <!-- no translation found for tether_settings_summary_all (1171769255924636665) -->
+    <skip />
+    <!-- no translation found for usb_title (7483344855356312510) -->
+    <skip />
+    <!-- no translation found for usb_tethering_button_text (585829947108007917) -->
+    <skip />
+    <!-- no translation found for usb_tethering_available_subtext (156779271296152605) -->
+    <skip />
+    <!-- no translation found for usb_tethering_active_subtext (8916210851136467042) -->
+    <skip />
+    <!-- no translation found for usb_tethering_storage_active_subtext (6608933594288072573) -->
+    <skip />
+    <!-- no translation found for usb_tethering_unavailable_subtext (1044622421184007254) -->
+    <skip />
+    <!-- no translation found for usb_tethering_errored_subtext (1377574819427841992) -->
+    <skip />
+    <!-- no translation found for bluetooth_tether_checkbox_text (2379175828878753652) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_available_subtext (8811610320942954709) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_available_subtext (4229220575771946723) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_device_connected_subtext (2730938191906597896) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_device_connected_subtext (1666736165420290466) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_devices_connected_subtext (1180765608259580143) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_devices_connected_subtext (8248942539362173005) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_off_subtext (2093881379028235555) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_off_subtext (706860924389041342) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_errored_subtext (1344187103463073993) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_overflow_error (2222060504731415763) -->
+    <skip />
+    <!-- no translation found for bluetooth_untether_blank (2871192409329334813) -->
+    <skip />
+    <!-- no translation found for tethering_help_button_text (656117495547173630) -->
+    <skip />
+    <!-- no translation found for network_settings_title (7967552516440151852) -->
+    <skip />
+    <!-- no translation found for network_settings_summary (5149750850846813553) -->
+    <skip />
+    <string name="location_title" msgid="1029961368397484576">"My ligging"</string>
+    <!-- no translation found for location_network_based (8815705866861993344) -->
+    <skip />
+    <!-- no translation found for location_networks_disabled (2708968452901433980) -->
+    <skip />
+    <!-- no translation found for location_neighborhood_level (4656658097932515921) -->
+    <skip />
+    <!-- no translation found for location_neighborhood_level_wifi (7457348712272184793) -->
+    <skip />
+    <string name="location_gps" msgid="6296125378829097831">"Gebruik GPS-satelliete"</string>
+    <!-- outdated translation 6460740847018275745 -->     <string name="location_street_level" msgid="7456259025474443314">"Wanneer lokaliseer, doen dit akkuraat tot op straatvlak (ontmerk om battery te spaar)"</string>
+    <!-- no translation found for location_gps_disabled (6632537158777308128) -->
+    <skip />
+    <string name="assisted_gps" msgid="4649317129586736885">"Gebruik bygestane GPS"</string>
+    <string name="assisted_gps_enabled" msgid="8751899609589792803">"Gebruik bediener om GPS by te staan (ontmerk om netwerkgebruik te verminder)"</string>
+    <string name="assisted_gps_disabled" msgid="6982698333968010748">"Gebruik bediener om GPS by te staan (ontmerk om GPS-werkverrigting te verbeter)"</string>
+    <!-- outdated translation 5447030582538504247 -->     <string name="use_location_title" msgid="3659340070401464551">"Gebruik my ligging"</string>
+    <!-- no translation found for use_location_summary_disabled (6518008620918354403) -->
+    <skip />
+    <!-- no translation found for use_location_summary_enabled (8110246289085796179) -->
+    <skip />
+    <!-- no translation found for about_settings (593457295516533765) -->
+    <skip />
+    <!-- no translation found for about_settings (1743378368185371685) -->
+    <skip />
+    <!-- no translation found for about_settings_summary (3371517697156165959) -->
+    <skip />
+    <!-- no translation found for legal_information (5769301644270604095) -->
+    <skip />
+    <!-- no translation found for contributors_title (5917703088825286504) -->
+    <skip />
+    <!-- no translation found for copyright_title (865906688917260647) -->
+    <skip />
+    <!-- no translation found for license_title (1990487604356037871) -->
+    <skip />
+    <!-- no translation found for terms_title (7697580845616764642) -->
+    <skip />
+    <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"Stelseltutoriaal"</string>
+    <!-- outdated translation 3861815254521030201 -->     <string name="system_tutorial_list_item_summary" product="tablet" msgid="3341504384445734067">"Leer hoe om jou foon te gebruik"</string>
+    <string name="system_tutorial_list_item_summary" product="default" msgid="3861815254521030201">"Leer hoe om jou foon te gebruik"</string>
+    <!-- no translation found for settings_license_activity_title (7553683406244228650) -->
+    <skip />
+    <!-- no translation found for settings_license_activity_unavailable (4210539215951487627) -->
+    <skip />
+    <!-- no translation found for settings_license_activity_loading (3337535809093591740) -->
+    <skip />
+    <string name="settings_safetylegal_title" msgid="1289483965535937431">"Veiligheidsinligting"</string>
+    <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Veiligheidsinligting"</string>
+    <!-- no translation found for settings_safetylegal_activity_unreachable (170670055116721810) -->
+    <skip />
+    <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Laai tans…"</string>
+    <!-- no translation found for lockpassword_choose_your_password_header (8624900666929394990) -->
+    <skip />
+    <!-- no translation found for lockpassword_choose_your_pattern_header (6949761069941694050) -->
+    <skip />
+    <!-- no translation found for lockpassword_choose_your_pin_header (7598849519816138302) -->
+    <skip />
+    <!-- no translation found for lockpassword_confirm_your_password_header (6308478184889846633) -->
+    <skip />
+    <!-- no translation found for lockpassword_confirm_your_pattern_header (7543433733032330821) -->
+    <skip />
+    <!-- no translation found for lockpassword_confirm_your_pin_header (49038294648213197) -->
+    <skip />
+    <!-- no translation found for lockpassword_confirm_passwords_dont_match (6850677112663979120) -->
+    <skip />
+    <!-- no translation found for lockpassword_confirm_pins_dont_match (4757532830594400147) -->
+    <skip />
+    <!-- no translation found for lockpassword_choose_lock_generic_header (3811438094903786145) -->
+    <skip />
+    <!-- no translation found for lockpassword_password_set_toast (4875050283108629383) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_set_toast (6011826444725291475) -->
+    <skip />
+    <!-- no translation found for lockpassword_pattern_set_toast (6867259621331406236) -->
+    <skip />
+    <!-- no translation found for lock_settings_title (8943058958424073651) -->
+    <skip />
+    <!-- no translation found for lockpattern_change_lock_pattern_label (5679630792003440352) -->
+    <skip />
+    <!-- no translation found for lockpattern_change_lock_pin_label (266707138486731661) -->
+    <skip />
+    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Bevestig gestoorde patroon"</string>
+    <!-- no translation found for lockpattern_need_to_unlock_wrong (5629093548611791080) -->
+    <skip />
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Teken \'n ontsluitpatroon"</string>
+    <!-- no translation found for lockpattern_recording_intro_footer (1118579101409152113) -->
+    <skip />
+    <!-- no translation found for lockpattern_recording_inprogress (4622772178078818425) -->
+    <skip />
+    <!-- no translation found for lockpattern_recording_incorrect_too_short (3103250430366718996) -->
+    <skip />
+    <!-- no translation found for lockpattern_pattern_entered_header (5012716272001299362) -->
+    <skip />
+    <!-- no translation found for lockpattern_need_to_confirm (5144676887162575050) -->
+    <skip />
+    <!-- no translation found for lockpattern_pattern_confirmed_header (2223856038485537716) -->
+    <skip />
+    <!-- no translation found for lockpattern_confirm_button_text (1128204343957002841) -->
+    <skip />
+    <!-- no translation found for lockpattern_restart_button_text (3337574403350953926) -->
+    <skip />
+    <!-- no translation found for lockpattern_retry_button_text (1949847413862309134) -->
+    <skip />
+    <!-- no translation found for lockpattern_continue_button_text (4723771754714471410) -->
+    <skip />
+    <!-- no translation found for lockpattern_settings_title (3207750489460466680) -->
+    <skip />
+    <!-- no translation found for lockpattern_settings_enable_title (6920616873671115281) -->
+    <skip />
+    <!-- no translation found for lockpattern_settings_enable_summary (1165707416664252167) -->
+    <skip />
+    <!-- no translation found for lockpattern_settings_enable_visible_pattern_title (104851667540971729) -->
+    <skip />
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="972174133075372341">"Gebruik tasbare terugvoer"</string>
+    <!-- no translation found for lockpattern_settings_choose_lock_pattern (1652352830005653447) -->
+    <skip />
+    <!-- no translation found for lockpattern_settings_change_lock_pattern (1123908306116495545) -->
+    <skip />
+    <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Hoe om \'n ontsluitpatroon te teken"</string>
+    <!-- no translation found for lockpattern_too_many_failed_confirmation_attempts_header (819903817323783498) -->
+    <skip />
+    <!-- no translation found for lockpattern_too_many_failed_confirmation_attempts_footer (6759029360597122873) -->
+    <skip />
+    <!-- no translation found for skip_button_label (8680422740354436943) -->
+    <skip />
+    <!-- no translation found for next_button_label (8890792540116568321) -->
+    <skip />
+    <!-- no translation found for lock_title (2909697418179419990) -->
+    <skip />
+    <!-- no translation found for lock_title (4059246467204273930) -->
+    <skip />
+    <!-- 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="default" msgid="9100785646737118042"><font size="17">"Beskerm jou foon teen ongemagtigde gebruik deur \'n persoonlike skermontsluitpatroon te skep. "\n<font height="17">\n</font><b>"1"</b>"  Op die volgende skerm, kyk terwyl \'n voorbeeldpatroon geteken word. "\n<font height="17">\n</font><b>"2"</b>"  Wanneer gereed, teken jou eie persoonlike ontsluitpatroon. Eksperimenteer met verskeie patrone maar verbind ten minste vier kolletjies. "\n<font height="17">\n</font><b>"3"</b>"  Teken jou patroon weer om te bevestig. "\n<font height="17">\n</font><b>"Reg om te begin? Raak \"Volgende\""</b>". "\n<font height="3">\n</font>"Om jou foon onbeskermd te laat, raak \"Kanselleer\"."</font></string>
+    <!-- no translation found for manageapplications_settings_title (5712405848153426706) -->
+    <skip />
+    <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Bestuur en verwyder geïnstalleerde programme"</string>
+    <!-- no translation found for applications_settings (3736173521008476946) -->
+    <skip />
+    <!-- no translation found for applications_settings_summary (2714215108369119717) -->
+    <skip />
+    <!-- no translation found for applications_settings_header (6018266337275422250) -->
+    <skip />
+    <!-- no translation found for install_applications (4872012136210802181) -->
+    <skip />
+    <!-- no translation found for install_unknown_applications (6612824788917283662) -->
+    <skip />
+    <!-- outdated translation 1923717607319933741 -->     <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"Jou foon en persoonlike data is kwesbaarder vir aanvalle deur programme uit onbekende bronne. Jy stem saam dat jy alleen verantwoordelik sal wees vir enige skade aan jou foon of verlies van data wat uit die gebruik van dié programme kan voortspruit."</string>
+    <string name="install_all_warning" product="default" msgid="1923717607319933741">"Jou foon en persoonlike data is kwesbaarder vir aanvalle deur programme uit onbekende bronne. Jy stem saam dat jy alleen verantwoordelik sal wees vir enige skade aan jou foon of verlies van data wat uit die gebruik van dié programme kan voortspruit."</string>
+    <!-- no translation found for advanced_settings (1777249286757067969) -->
+    <skip />
+    <!-- no translation found for advanced_settings_summary (145134386044169043) -->
+    <skip />
+    <!-- no translation found for application_info_label (1150486628158409543) -->
+    <skip />
+    <!-- no translation found for storage_label (8700867073480107253) -->
+    <skip />
+    <!-- no translation found for auto_launch_label (3012617472833815382) -->
+    <skip />
+    <!-- no translation found for screen_compatibility_label (663250687205465394) -->
+    <skip />
+    <!-- no translation found for permissions_label (2605296874922726203) -->
+    <skip />
+    <string name="cache_header_label" msgid="1877197634162461830">"Kasgeheue"</string>
+    <string name="clear_cache_btn_text" msgid="5756314834291116325">"Maak kas skoon"</string>
+    <string name="cache_size_label" msgid="7505481393108282913">"Kasgeheue"</string>
+    <string name="controls_label" msgid="7611113077086853799">"Kontroles"</string>
+    <string name="force_stop" msgid="7435006169872876756">"Dwing stop"</string>
+    <!-- no translation found for total_size_label (1048676419552557254) -->
+    <skip />
+    <!-- no translation found for application_size_label (5055196275624686382) -->
+    <skip />
+    <!-- no translation found for data_size_label (8679376373625710107) -->
+    <skip />
+    <!-- no translation found for external_size_label (4465530017830945766) -->
+    <skip />
+    <!-- no translation found for external_size_label (2107155737635944440) -->
+    <skip />
+    <!-- no translation found for uninstall_text (3644892466144802466) -->
+    <skip />
+    <!-- no translation found for disable_text (6544054052049395202) -->
+    <skip />
+    <!-- no translation found for enable_text (9217362512327828987) -->
+    <skip />
+    <!-- no translation found for clear_user_data_text (5597622864770098388) -->
+    <skip />
+    <string name="app_factory_reset" msgid="6635744722502563022">"Deïnstalleer opdaterings"</string>
+    <!-- no translation found for auto_launch_enable_text (2630656657744196691) -->
+    <skip />
+    <!-- no translation found for auto_launch_disable_text (7800385822185540166) -->
+    <skip />
+    <!-- no translation found for clear_activities (7408923511535174430) -->
+    <skip />
+    <!-- no translation found for screen_compatibility_text (2398570332021220651) -->
+    <skip />
+    <!-- no translation found for ask_compatibility (7225195569089607846) -->
+    <skip />
+    <!-- no translation found for enable_compatibility (3257284255974065538) -->
+    <skip />
+    <!-- no translation found for unknown (1592123443519355854) -->
+    <skip />
+    <!-- outdated translation 8622029358896599842 -->     <string name="sort_order_alpha" msgid="1410278099123670628">"Rangskik"</string>
+    <string name="sort_order_size" msgid="7024513286636502362">"Rangskik volgens grootte"</string>
+    <!-- no translation found for show_running_services (5736278767975544570) -->
+    <skip />
+    <!-- no translation found for show_background_processes (2009840211972293429) -->
+    <skip />
+    <!-- no translation found for manage_space_text (8852711522447794676) -->
+    <skip />
+    <string name="filter" msgid="2018011724373033887">"Filter"</string>
+    <string name="filter_dlg_title" msgid="6507663329723966854">"Kies filteropsies"</string>
+    <string name="filter_apps_all" msgid="5142129378749391876">"Alle"</string>
+    <string name="filter_apps_third_party" msgid="7786348047690140979">"Afgelaai"</string>
+    <string name="filter_apps_running" msgid="7767071454371350486">"Loop tans"</string>
+    <!-- no translation found for filter_apps_onsdcard (4843063154701023349) -->
+    <skip />
+    <!-- no translation found for filter_apps_onsdcard (1477351142334784771) -->
+    <skip />
+    <!-- no translation found for disabled (9206776641295849915) -->
+    <skip />
+    <!-- no translation found for no_applications (5190227407135243904) -->
+    <skip />
+    <!-- no translation found for internal_storage (1584700623164275282) -->
+    <skip />
+    <!-- no translation found for sd_card_storage (2673203150465132465) -->
+    <skip />
+    <!-- no translation found for sd_card_storage (7623513618171928235) -->
+    <skip />
+    <!-- no translation found for recompute_size (7722567982831691718) -->
+    <skip />
+    <!-- no translation found for clear_data_dlg_title (4470209520936375508) -->
+    <skip />
+    <string name="clear_data_dlg_text" msgid="8368035073300828451">"Alle data van hierdie program sal permanent uitgevee word. Dit sluit alle lêers, instellings, rekeninge, databasisse ensovoorts in."</string>
+    <!-- no translation found for dlg_ok (2402639055725653590) -->
+    <skip />
+    <!-- no translation found for dlg_cancel (1674753358972975911) -->
+    <skip />
+    <!-- no translation found for app_not_found_dlg_title (8458335716378083713) -->
+    <skip />
+    <string name="app_not_found_dlg_text" msgid="2980271680333341554">"Die program is nie in die lys geïnstalleerde programme gevind nie."</string>
+    <!-- no translation found for clear_data_failed (581956197586913865) -->
+    <skip />
+    <string name="app_factory_reset_dlg_title" msgid="6116199391150388147">"Deïnstalleer opdaterings"</string>
+    <string name="app_factory_reset_dlg_text" msgid="438395129140568893">"Wil jy alle opdaterings vir hierdie Android-stelselprogram deïnstalleer?"</string>
+    <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Vee data uit"</string>
+    <string name="clear_failed_dlg_text" msgid="7943411157007320290">"Kon nie data vir program uitvee nie"</string>
+    <!-- outdated translation 3116027624526915561 -->     <string name="security_settings_desc" product="tablet" msgid="6158636779728455276">"Hierdie program kan by die volgende op jou foon ingaan:"</string>
+    <string name="security_settings_desc" product="default" msgid="3116027624526915561">"Hierdie program kan by die volgende op jou foon ingaan:"</string>
+    <string name="computing_size" msgid="1599186977475211186">"Bereken tans..."</string>
+    <string name="invalid_size_value" msgid="1901940003700269523">"Kan nie pakkiegrootte bereken nie"</string>
+    <string name="empty_list_msg" msgid="2901049162265094971">"Jy het nie enige derdeparty-programme geïnstalleer nie."</string>
+    <string name="version_text" msgid="9189073826278676425">"weergawe <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
+    <!-- no translation found for move_app (5042838441401731346) -->
+    <skip />
+    <!-- no translation found for move_app_to_internal (2299714147283854957) -->
+    <skip />
+    <!-- no translation found for move_app_to_internal (3895430471913858185) -->
+    <skip />
+    <!-- no translation found for move_app_to_sdcard (4350451696315265420) -->
+    <skip />
+    <!-- no translation found for move_app_to_sdcard (1143379049903056407) -->
+    <skip />
+    <!-- no translation found for moving (6431016143218876491) -->
+    <skip />
+    <!-- no translation found for insufficient_storage (8566913062094452962) -->
+    <skip />
+    <!-- no translation found for does_not_exist (837163572898468245) -->
+    <skip />
+    <!-- no translation found for app_forward_locked (5747805144210389585) -->
+    <skip />
+    <!-- no translation found for invalid_location (4934491353200240499) -->
+    <skip />
+    <!-- no translation found for system_package (1030561474413022831) -->
+    <skip />
+    <!-- no translation found for force_stop_dlg_title (4289453224368188476) -->
+    <skip />
+    <!-- no translation found for force_stop_dlg_text (5157374701213502922) -->
+    <skip />
+    <!-- no translation found for move_app_failed_dlg_title (4337731903265156405) -->
+    <skip />
+    <!-- no translation found for move_app_failed_dlg_text (8824246817947643697) -->
+    <skip />
+    <!-- no translation found for app_install_location_title (2068975150026852168) -->
+    <skip />
+    <!-- no translation found for app_install_location_summary (879753854530300436) -->
+    <skip />
+    <!-- no translation found for storageuse_settings_title (5657014373502630403) -->
+    <skip />
+    <!-- no translation found for storageuse_settings_summary (2556057379120846792) -->
+    <skip />
+    <string name="runningservices_settings_title" msgid="8097287939865165213">"Lopende dienste"</string>
+    <string name="runningservices_settings_summary" msgid="854608995821032748">"Sien en beheer dienste wat tans loop"</string>
+    <string name="service_restarting" msgid="2242747937372354306">"Begin weer"</string>
+    <!-- no translation found for cached (1059590879740175019) -->
+    <skip />
+    <!-- outdated translation 6981216347270280598 -->     <string name="no_running_services" msgid="2059536495597645347">"Geen lopende dienste nie"</string>
+    <!-- outdated translation 8432097226392386802 -->     <string name="service_started_by_app" msgid="6575184738671598131">"Deur program begin: raak om te stop"</string>
+    <!-- no translation found for service_client_name (4037193625611815517) -->
+    <skip />
+    <!-- no translation found for service_background_processes (6844156253576174488) -->
+    <skip />
+    <!-- no translation found for service_foreground_processes (7583975676795574276) -->
+    <skip />
+    <!-- no translation found for memory (6609961111091483458) -->
+    <skip />
+    <!-- no translation found for service_process_name (4098932168654826656) -->
+    <skip />
+    <!-- no translation found for running_processes_item_description_s_s (5790575965282023145) -->
+    <skip />
+    <!-- no translation found for running_processes_item_description_s_p (8019860457123222953) -->
+    <skip />
+    <!-- no translation found for running_processes_item_description_p_s (744424668287252915) -->
+    <skip />
+    <!-- no translation found for running_processes_item_description_p_p (1607384595790852782) -->
+    <skip />
+    <!-- no translation found for runningservicedetails_settings_title (6188692418986988288) -->
+    <skip />
+    <!-- no translation found for no_services (7133900764462288263) -->
+    <skip />
+    <!-- no translation found for runningservicedetails_services_title (391168243725357375) -->
+    <skip />
+    <!-- no translation found for runningservicedetails_processes_title (928115582044655268) -->
+    <skip />
+    <!-- no translation found for service_stop (6369807553277527248) -->
+    <skip />
+    <!-- no translation found for service_manage (1876642087421959194) -->
+    <skip />
+    <!-- no translation found for service_stop_description (3261798282116866961) -->
+    <skip />
+    <!-- no translation found for heavy_weight_stop_description (6855241582643136019) -->
+    <skip />
+    <!-- no translation found for background_process_stop_description (1728354083304746737) -->
+    <skip />
+    <!-- no translation found for service_manage_description (7050092269951613102) -->
+    <skip />
+    <!-- no translation found for main_running_process_description (929204645380391397) -->
+    <skip />
+    <!-- no translation found for process_service_in_use_description (8993335064403217080) -->
+    <skip />
+    <!-- no translation found for process_provider_in_use_description (5586603325677678940) -->
+    <skip />
+    <!-- no translation found for runningservicedetails_stop_dlg_title (4253292537154337233) -->
+    <skip />
+    <!-- no translation found for runningservicedetails_stop_dlg_text (5420033091144016389) -->
+    <skip />
+    <!-- no translation found for runningservicedetails_stop_dlg_text (6929716497425738387) -->
+    <skip />
+    <!-- outdated translation 502219872342167227 -->     <string name="language_settings" msgid="5292716747264442359">"Taal en sleutelbord"</string>
+    <!-- outdated translation 3455826933385341107 -->     <string name="language_keyboard_settings_title" msgid="243220021717425813">"Taal- en sleutelbordinstellings"</string>
+    <!-- no translation found for language_settings_category (2288258489940617043) -->
+    <skip />
+    <!-- no translation found for keyboard_settings_category (7060453865544070642) -->
+    <skip />
+    <!-- outdated translation 2138384312336494991 -->     <string name="phone_language" msgid="1165758957501090679">"Kies locale"</string>
+    <string name="phone_language_summary" msgid="3871309445655554211"></string>
+    <!-- no translation found for auto_replace (6199184757891937822) -->
+    <skip />
+    <!-- no translation found for auto_replace_summary (370288728200084466) -->
+    <skip />
+    <!-- no translation found for auto_caps (6379232078052591265) -->
+    <skip />
+    <!-- no translation found for auto_caps_summary (6358102538315261466) -->
+    <skip />
+    <!-- no translation found for auto_punctuate (4595367243950425833) -->
+    <skip />
+    <string name="hardkeyboard_category" msgid="5957168411305769899">"Fisiese sleutelbordinstellings"</string>
+    <!-- no translation found for auto_punctuate_summary (4372126865670574837) -->
+    <skip />
+    <!-- no translation found for show_password (2198798062604049206) -->
+    <skip />
+    <!-- no translation found for show_password_summary (3806709974395178121) -->
+    <skip />
+    <string name="ime_security_warning" msgid="812267421486877917">"Die invoermetode kan dalk alle teks wat jy invoer, versamel, insluitende persoonlike data soos wagwoorde en kredietkaartnommers. Dit kom van die program <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Wil jy dié invoermetode gebruik?"</string>
+    <!-- no translation found for pointer_settings_category (6090176550039035130) -->
+    <skip />
+    <!-- no translation found for pointer_speed (1221342330217861616) -->
+    <skip />
+    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Gebruikerwoordeboek"</string>
+    <!-- no translation found for user_dict_single_settings_title (5454855286173849284) -->
+    <skip />
+    <!-- no translation found for user_dict_multiple_settings_title (326583195525296750) -->
+    <skip />
+    <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
+    <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Voeg by"</string>
+    <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Voeg by woordeboek"</string>
+    <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Redigeer woord"</string>
+    <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Redigeer"</string>
+    <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Vee uit"</string>
+    <!-- outdated translation 6209268025109242806 -->     <string name="user_dict_settings_empty_text" product="tablet" msgid="1766522102636921529">"Jy het geen woorde in die gebruikerswoordeboek nie. Jy kan \'n woord deur die kieslys byvoeg."</string>
+    <string name="user_dict_settings_empty_text" product="default" msgid="6209268025109242806">"Jy het geen woorde in die gebruikerswoordeboek nie. Jy kan \'n woord deur die kieslys byvoeg."</string>
+    <!-- no translation found for user_dict_settings_all_languages (7713910347678213719) -->
+    <skip />
+    <!-- no translation found for testing (6584352735303604146) -->
+    <skip />
+    <!-- no translation found for testing_phone_info (193561832258534798) -->
+    <skip />
+    <!-- no translation found for testing_phone_info (8656693364332840056) -->
+    <skip />
+    <!-- no translation found for testing_battery_info (3497865525976497848) -->
+    <skip />
+    <!-- no translation found for quick_launch_title (7904609846945905306) -->
+    <skip />
+    <!-- no translation found for quick_launch_summary (3453825712466417452) -->
+    <skip />
+    <!-- no translation found for quick_launch_assign_application (4521368464929956350) -->
+    <skip />
+    <!-- no translation found for quick_launch_no_shortcut (5998005833838278693) -->
+    <skip />
+    <!-- no translation found for quick_launch_shortcut (5090405067413522300) -->
+    <skip />
+    <!-- no translation found for quick_launch_clear_dialog_title (5546543501250320220) -->
+    <skip />
+    <!-- no translation found for quick_launch_clear_dialog_message (3921015601470260722) -->
+    <skip />
+    <!-- no translation found for quick_launch_clear_ok_button (2634568926597586716) -->
+    <skip />
+    <!-- no translation found for quick_launch_clear_cancel_button (1892854652197747064) -->
+    <skip />
+    <!-- no translation found for quick_launch_display_mode_applications (3748789806447639039) -->
+    <skip />
+    <!-- no translation found for quick_launch_display_mode_shortcuts (4177934019174169042) -->
+    <skip />
+    <string name="input_methods_settings_title" msgid="6800066636850553887">"Teksinvoer"</string>
+    <!-- no translation found for input_method (5434026103176856164) -->
+    <skip />
+    <!-- no translation found for current_input_method (2146807723398303917) -->
+    <skip />
+    <!-- no translation found for input_method_selector (4311213129681430709) -->
+    <skip />
+    <!-- no translation found for input_method_selector_show_automatically_title (1001612945471546158) -->
+    <skip />
+    <!-- no translation found for input_method_selector_always_show_title (3891824124222371634) -->
+    <skip />
+    <!-- no translation found for input_method_selector_always_hide_title (7699647095118680424) -->
+    <skip />
+    <!-- no translation found for configure_input_method (7773992829158322455) -->
+    <skip />
+    <!-- no translation found for input_method_settings (5801295625486269553) -->
+    <skip />
+    <!-- no translation found for active_input_method_subtypes (3596398805424733238) -->
+    <skip />
+    <!-- no translation found for use_system_language_to_select_input_method_subtypes (3346751753141428573) -->
+    <skip />
+    <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> instellings"</string>
+    <!-- no translation found for input_methods_and_subtype_enabler_title (4018402267502337338) -->
+    <skip />
+    <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Skermsleutelbord-instellings"</string>
+    <!-- outdated translation 8169889453770863227 -->     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Toestelsleutelbord"</string>
+    <!-- outdated translation 6404687907454621637 -->     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Ingeboude sleutelbordinstellings"</string>
+    <!-- no translation found for development_settings_title (6719732334835420989) -->
+    <skip />
+    <string name="development_settings_summary" msgid="2151320488701538355">"Stel opsies vir programontwikkeling"</string>
+    <!-- no translation found for enable_adb (7982306934419797485) -->
+    <skip />
+    <!-- no translation found for enable_adb_summary (4881186971746056635) -->
+    <skip />
+    <!-- no translation found for keep_screen_on (1146389631208760344) -->
+    <skip />
+    <!-- no translation found for keep_screen_on_summary (2173114350754293009) -->
+    <skip />
+    <string name="allow_mock_location" msgid="2787962564578664888">"Laat skynliggings toe"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Laat skynliggings toe"</string>
+    <string name="adb_warning_title" msgid="6234463310896563253">"Laat USB-ontfouting toe?"</string>
+    <string name="adb_warning_message" msgid="5352555112049663033">"USB-ontfouting is net vir ontwikkelingsdoeleindes bedoel. Dit kan gebruik word om data te kopieer tussen jou rekenaar en jou toestel, programme op jou toestel te installeer sonder kennisgewings, en om loglêerdata te lees."</string>
+    <string name="gadget_picker_title" msgid="98374951396755811">"Kies apparaat"</string>
+    <string name="widget_picker_title" msgid="9130684134213467557">"Kies legstuk"</string>
+    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>d <xliff:g id="HOURS">%2$d</xliff:g>h <xliff:g id="MINUTES">%3$d</xliff:g>m <xliff:g id="SECONDS">%4$d</xliff:g>s"</string>
+    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>h <xliff:g id="MINUTES">%2$d</xliff:g>m <xliff:g id="SECONDS">%3$d</xliff:g>s"</string>
+    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>m <xliff:g id="SECONDS">%2$d</xliff:g>s"</string>
+    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>s"</string>
+    <string name="usage_stats_label" msgid="5890846333487083609">"Gebruikstatistieke"</string>
+    <string name="testing_usage_stats" msgid="7823048598893937339">"Gebruikstatistieke"</string>
+    <string name="display_order_text" msgid="8592776965827565271">"Rangskik volgens:"</string>
+    <string name="app_name_label" msgid="2000949925256858308">"Program"</string>
+    <string name="launch_count_label" msgid="4019444833263957024">"Tel"</string>
+    <string name="usage_time_label" msgid="295954901452833058">"Gebruikstyd"</string>
+    <string name="accessibility_settings" msgid="3975902491934816215">"Toeganklikheid"</string>
+    <string name="accessibility_settings_title" msgid="2130492524656204459">"Toeganklikheidsinstellings"</string>
+    <string name="accessibility_settings_summary" msgid="8185181964847149507">"Bestuur toegankliheidsopsies"</string>
+    <string name="toggle_accessibility_title" msgid="650839277066574497">"Toeganklikheid"</string>
+    <string name="accessibility_services_category" msgid="8127851026323672607">"Toeganklikheidsdienste"</string>
+    <string name="no_accessibility_services_summary" msgid="694578333333808159">"Geen geïnstalleerde toeganklikheidsdienste nie."</string>
+    <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Die toeganklikheidsdiens kan dalk alle teks wat jy invoer, insluitend persoonlike data, kredietkaartnommers (maar nie wagwoorde nie) versamel. Dit kan ook dalk jou gebruikerskoppelvlakhandelinge log. Dit kom van die program <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Wil jy hierdie toeganklikheidsdiens gebruik?"</string>
+    <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Deaktiveer toeganklikheid?"</string>
+    <!-- no translation found for accessibility_service_no_apps_title (898893674114288531) -->
+    <skip />
+    <!-- no translation found for accessibility_service_no_apps_message (2663371323410332529) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_category (8649951751131431904) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_enabled (6927896081016611012) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_enabled_summary (3629525134901617621) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_security_warning (1113600871264359828) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_security_warning (9078893361741942109) -->
+    <skip />
+    <!-- no translation found for accessibility_power_button_category (8545885236482339928) -->
+    <skip />
+    <!-- no translation found for accessibility_power_button_ends_call (7698764194501089533) -->
+    <skip />
+    <!-- no translation found for accessibility_power_button_ends_call_summary (8878097632186291462) -->
+    <skip />
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <skip />
+    <!-- no translation found for touchscreen_gestures_category (3109869155350859625) -->
+    <skip />
+    <!-- no translation found for long_press_timeout_selector_title (1396876537252863044) -->
+    <skip />
+    <!-- no translation found for long_press_timeout_selector_summary (2261114502740278996) -->
+    <skip />
+    <string name="power_usage_summary_title" msgid="5180282911164282324">"Batterygebruik"</string>
+    <string name="power_usage_summary" msgid="7237084831082848168">"Wat het die battery gebruik"</string>
+    <!-- no translation found for power_usage_not_available (3583407442633768046) -->
+    <skip />
+    <string name="battery_since_unplugged" msgid="338073389740738437">"Batterygebruik sedert uitgeprop"</string>
+    <string name="battery_since_reset" msgid="7464546661121187045">"Batterygebruik sedert terugstelling"</string>
+    <!-- no translation found for battery_stats_on_battery (4970762168505236033) -->
+    <skip />
+    <string name="battery_stats_duration" msgid="7464501326709469282">"<xliff:g id="TIME">%1$s</xliff:g> sedert uitgeprop"</string>
+    <!-- no translation found for battery_stats_charging_label (4223311142875178785) -->
+    <skip />
+    <!-- no translation found for battery_stats_screen_on_label (7150221809877509708) -->
+    <skip />
+    <!-- no translation found for battery_stats_gps_on_label (1193657533641951256) -->
+    <skip />
+    <!-- no translation found for battery_stats_wifi_running_label (3093545080361658269) -->
+    <skip />
+    <!-- no translation found for battery_stats_wake_lock_label (1908942681902324095) -->
+    <skip />
+    <!-- no translation found for battery_stats_phone_signal_label (4137799310329041341) -->
+    <skip />
+    <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
+    <skip />
+    <string name="awake" msgid="387122265874485088">"Toestel se wakkertyd"</string>
+    <!-- outdated translation 4630925382578609056 -->     <string name="wifi_on_time" msgid="6310209835617490616">"WiFi-intyds"</string>
+    <!-- outdated translation 4478515071957280711 -->     <string name="bluetooth_on_time" msgid="6157799524996162271">"WiFi-intyds"</string>
+    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
+    <!-- no translation found for history_details_title (3608240585315506067) -->
+    <skip />
+    <!-- outdated translation 7564809986329021063 -->     <string name="details_title" msgid="3792801565213935385">"Batterygebruikdetails"</string>
+    <string name="details_subtitle" msgid="32593908269911734">"Gebruik details"</string>
+    <string name="controls_subtitle" msgid="390468421138288702">"Verstel kraggebruik"</string>
+    <string name="packages_subtitle" msgid="4736416171658062768">"Ingeslote pakkette"</string>
+    <!-- outdated translation 2353149143338929583 -->     <string name="power_screen" msgid="3023346080675904613">"Wys"</string>
+    <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
+    <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
+    <string name="power_cell" msgid="6596471490976003056">"Selgereedheid"</string>
+    <string name="power_phone" msgid="5392641106474567277">"Stemoproepe"</string>
+    <!-- outdated translation 9055659695602194990 -->     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Foon ledig"</string>
+    <string name="power_idle" product="default" msgid="9055659695602194990">"Foon ledig"</string>
+    <string name="usage_type_cpu" msgid="715162150698338714">"CPU-totaal"</string>
+    <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU-voorgrond"</string>
+    <!-- no translation found for usage_type_wake_lock (5125438890233677880) -->
+    <skip />
+    <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
+    <!-- no translation found for usage_type_wifi_running (8234997940652067049) -->
+    <skip />
+    <!-- outdated translation 9108247984998041853 -->     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Foon"</string>
+    <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Foon"</string>
+    <string name="usage_type_data_send" msgid="2857401966985425427">"Data gestuur"</string>
+    <string name="usage_type_data_recv" msgid="7251090882025234185">"Data ontvang"</string>
+    <string name="usage_type_audio" msgid="6957269406840886290">"Oudio"</string>
+    <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
+    <string name="usage_type_on_time" msgid="3351200096173733159">"Tyd aan"</string>
+    <string name="usage_type_no_coverage" msgid="3797004252954385053">"Tyd sonder \'n sein"</string>
+    <string name="battery_action_stop" msgid="649958863744041872">"Dwing stop"</string>
+    <string name="battery_action_app_details" msgid="3275013531871113681">"Programinligting"</string>
+    <string name="battery_action_app_settings" msgid="350562653472577250">"Programinstellings"</string>
+    <!-- outdated translation 5302763261448580102 -->     <string name="battery_action_display" msgid="7338551244519110831">"Vertooninstellings"</string>
+    <!-- outdated translation 5452076674659927993 -->     <string name="battery_action_wifi" msgid="2272741639606146903">"WiFi-instellings"</string>
+    <string name="battery_action_bluetooth" msgid="8374789049507723142">"Bluetooth-instellings"</string>
+    <string name="battery_desc_voice" msgid="8980322055722959211">"Battery gebruik deur stemoproepe"</string>
+    <!-- outdated translation 3009080001948091424 -->     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Battery gebruik wanneer foon ledig is"</string>
+    <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Battery gebruik wanneer foon ledig is"</string>
+    <string name="battery_desc_radio" msgid="5479196477223185367">"Battery deur selradio gebruik"</string>
+    <string name="battery_sugg_radio" msgid="8211336978326295047">"Skakel oor na vliegtuigmodus om krag te spaar in areas met geen seldekking nie"</string>
+    <string name="battery_desc_display" msgid="5432795282958076557">"Battery gebruik deur skerm en ruglig"</string>
+    <string name="battery_sugg_display" msgid="3370202402045141760">"Verminder die skermhelderheid en/of skermuittelling"</string>
+    <string name="battery_desc_wifi" msgid="1702486494565080431">"Battery deur Wi-Fi gebruik"</string>
+    <string name="battery_sugg_wifi" msgid="7542345142282261691">"Skakel Wi-Fi af wanneer dit nie gebruik word nie of waar dit nie beskikbaar is nie"</string>
+    <string name="battery_desc_bluetooth" msgid="7535520658674621902">"Battery deur Bluetooth gebruik"</string>
+    <string name="battery_sugg_bluetooth_basic" msgid="817276933922157788">"Skakel Bluetooth af as jy dit nie gebruik nie"</string>
+    <string name="battery_sugg_bluetooth_headset" msgid="8214816222115517479">"Probeer koppel aan \'n ander bluetooth-toestel"</string>
+    <!-- outdated translation 8123202939321333639 -->     <string name="battery_desc_apps" msgid="6665712811746233450">"Battery word deur programme gebruik wanneer dit loop"</string>
+    <string name="battery_sugg_apps_info" msgid="6065882899391322442">"Stop of deïnstalleer die program"</string>
+    <!-- outdated translation 4145005297393800223 -->     <string name="battery_sugg_apps_gps" msgid="4545056413090932541">"Skakel GPS af as jy dit nie gebruik nie"</string>
+    <string name="battery_sugg_apps_settings" msgid="8021302847272481168">"Die program kan dalk instellings bied om batterygebruik te verminder"</string>
+    <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> sedert uitgeprop is"</string>
+    <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Sedert laas uitgeprop vir <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
+    <string name="menu_stats_total" msgid="8973377864854807854">"Gebruikstotale"</string>
+    <string name="menu_stats_refresh" msgid="1676215433344981075">"Herlaai"</string>
+    <string name="process_kernel_label" msgid="3916858646836739323">"Android-bedryfstelsel"</string>
+    <string name="process_mediaserver_label" msgid="6500382062945689285">"Mediabediener"</string>
+    <!-- no translation found for voice_input_output_settings (1336135218350444783) -->
+    <skip />
+    <!-- no translation found for voice_input_output_settings_title (2442850635048676991) -->
+    <skip />
+    <!-- no translation found for voice_search_settings_title (2775469246913196536) -->
+    <skip />
+    <!-- no translation found for keyboard_settings_title (5080115226780201234) -->
+    <skip />
+    <!-- no translation found for voice_input_category (1589318440824204736) -->
+    <skip />
+    <!-- no translation found for voice_output_category (2624538587784986229) -->
+    <skip />
+    <!-- no translation found for recognizer_title (3231385184559054457) -->
+    <skip />
+    <!-- no translation found for recognizer_settings_title (6038598099039717232) -->
+    <skip />
+    <!-- no translation found for recognizer_settings_summary (4472287934134546902) -->
+    <skip />
+    <!-- outdated translation 3348626948015962987 -->     <string name="tts_settings" msgid="8186971894801348327">"Teks-na-spraak"</string>
+    <string name="tts_settings_title" msgid="4182348653053000933">"Teks-na-spraak-instellings"</string>
+    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Gebruik altyd my instellings"</string>
+    <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"Verstek instellings hier onder oorheers programinstellings"</string>
+    <string name="tts_default_settings_section" msgid="5787915620218907443">"Verstek instellings"</string>
+    <!-- no translation found for tts_default_synth_title (29467896463371992) -->
+    <skip />
+    <!-- no translation found for tts_default_synth_summary (6482936537135251690) -->
+    <skip />
+    <string name="tts_default_rate_title" msgid="6030550998379310088">"Spraaktempo"</string>
+    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Spoed waarteen die teks gepraat word"</string>
+    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Toonhoogte"</string>
+    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Affekteer die klank van die gesproke teks"</string>
+    <string name="tts_default_lang_title" msgid="8018087612299820556">"Taal"</string>
+    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Stel die taalspesifieke stem vir gesproke teks"</string>
+    <string name="tts_play_example_title" msgid="7094780383253097230">"Luister na \'n voorbeeld"</string>
+    <string name="tts_play_example_summary" msgid="8029071615047894486">"Speel \'n kort demonstrasie van spraaksintese"</string>
+    <string name="tts_install_data_title" msgid="4264378440508149986">"Installeer stemdata"</string>
+    <string name="tts_install_data_summary" msgid="5742135732511822589">"Installeer die stemdata vereis vir spraaksintese"</string>
+    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Stemme vereis vir spraaksintese is reeds behoorlik geïnstalleer"</string>
+    <string name="tts_demo" msgid="405357591189935876">"Dit is \'n voorbeeld van spraaksintese."</string>
+    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Jou instellings het verander. Hierdie is \'n voorbeeld van hoe dit klink."</string>
+    <!-- no translation found for tts_engine_error (5513288178403066867) -->
+    <skip />
+    <!-- no translation found for tts_engine_error_config (5820525416624637313) -->
+    <skip />
+    <!-- no translation found for tts_engine_error_reselect (3071453963296013376) -->
+    <skip />
+    <!-- no translation found for tts_engine_security_warning (8786238102020223650) -->
+    <skip />
+    <!-- no translation found for tts_engines_section (7515470972378742429) -->
+    <skip />
+    <!-- no translation found for tts_engine_name_settings (4974538563074395920) -->
+    <skip />
+    <!-- no translation found for tts_engine_name_is_enabled_summary (4909484006804022115) -->
+    <skip />
+    <!-- no translation found for tts_engine_name_is_disabled_summary (7644198182255168200) -->
+    <skip />
+    <!-- no translation found for pico_languages_and_voices (4611320375917773238) -->
+    <skip />
+    <!-- no translation found for pico_installed (2452546687858267414) -->
+    <skip />
+    <!-- no translation found for pico_not_installed (6266845418419994311) -->
+    <skip />
+    <!-- no translation found for pico_voice_summary_female (8047327176247727492) -->
+    <skip />
+    <!-- no translation found for pico_voice_summary_male (8331266854058577610) -->
+    <skip />
+    <!-- no translation found for tts_notif_engine_install_title (7000346872482649034) -->
+    <skip />
+    <!-- no translation found for tts_notif_engine_install_message (5304661142202662693) -->
+    <skip />
+    <string name="gadget_title" msgid="7455548605888590466">"Kragbeheer"</string>
+    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Opdateer Wi-Fi-instelling"</string>
+    <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Werk Bluetooth-instelling by"</string>
+    <string name="vpn_settings_activity_title" msgid="7276864950701612579">"VPN-instellings"</string>
+    <string name="vpn_connect_to" msgid="2541409082892684362">"Koppel aan <xliff:g id="NAME">%s</xliff:g>"</string>
+    <string name="vpn_username_colon" msgid="7854930370861306247">"Gebruikernaam:"</string>
+    <string name="vpn_password_colon" msgid="5716278710848606626">"Wagwoord:"</string>
+    <string name="vpn_a_username" msgid="6664733641993968692">"\'n gebruikernaam"</string>
+    <string name="vpn_a_password" msgid="1537213632501483753">"\'n wagwoord"</string>
+    <string name="vpn_save_username" msgid="1408415289165970790">"Onthou gebruikernaam"</string>
+    <string name="vpn_connect_button" msgid="1699007212602470655">"Koppel"</string>
+    <string name="vpn_yes_button" msgid="8034531001149843119">"Ja"</string>
+    <string name="vpn_no_button" msgid="7620339571187119107">"Nee"</string>
+    <string name="vpn_back_button" msgid="192036339792734970">"Terug"</string>
+    <string name="vpn_mistake_button" msgid="1683383660912491270">"Nee"</string>
+    <string name="vpn_menu_done" msgid="93528279226907926">"Stoor"</string>
+    <string name="vpn_menu_cancel" msgid="7234451214611202868">"Kanselleer"</string>
+    <string name="vpn_menu_revert" msgid="4407762442281467659">"Laai terug"</string>
+    <string name="vpn_menu_connect" msgid="1089399414463784218">"Koppel aan netwerk"</string>
+    <string name="vpn_menu_disconnect" msgid="8254492450022562235">"Ontkoppel van netwerk"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"Redigeer netwerk"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"Vee netwerk uit"</string>
+    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"Jy moet <xliff:g id="CODE">%s</xliff:g> invoer."</string>
+    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"Jy moet <xliff:g id="OPTION">%s</xliff:g> kies."</string>
+    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"Die VPN-naam \'<xliff:g id="NAME">%s</xliff:g>\' bestaan reeds. Kry \'n ander naam."</string>
+    <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"Is jy seker jy wil hierdie VPN uitvee?"</string>
+    <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"Is jy seker jy wil nie hierdie profiel skep nie?"</string>
+    <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"Is jy seker jy wil ontslae raak van die veranderinge aan die profiel?"</string>
+    <string name="vpn_confirm_reconnect" msgid="5748535476278674296">"Kan nie aan netwerk koppel nie. Wil jy weer probeer?"</string>
+    <string name="vpn_reconnect_from_lost" msgid="2442844155623372118">"Verbinding is verlore. Wil jy weer koppel?"</string>
+    <string name="vpn_unknown_server_dialog_msg" msgid="3080742299823671319">"Bedienernaam kan nie opgelos word nie. Wil jy jou bedienernaaminstelling kontroleer?"</string>
+    <string name="vpn_challenge_error_dialog_msg" msgid="6174901754230038601">"Betwis fout. Wil jy jou geheim-instelling kontroleer?"</string>
+    <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"Een of meer geheime ontbreek in hierdie VPN-opstelling. Wil jy jou geheim-instelling kontroleer?"</string>
+    <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"Die gebruikernaam of wagwoord wat jy ingevoer het is verkeerd. Wil jy weer probeer?"</string>
+    <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"Bediener het afgelui. Die gebruikernaam of wagwoord wat jy ingevoer het kan verkeerd wees. Wil jy weer probeer?"</string>
+    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"Bediener het afgelui. Dit is moontlik dat jy agter \'n brandmuur is wat verhoed dat jy aan die bediener koppel. Wil jy weer probeer?"</string>
+    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"Bedieneronderhandeling het misluk. Die bediener stem dalk nie saam met jou enkripsie-opsie nie. Wil jy jou enkripsie-instellings kontroleer?"</string>
+    <string name="vpn_type_title" msgid="6392933604218676224">"Voeg VPN by"</string>
+    <string name="vpn_add_new_vpn" msgid="5438260689052714550">"Voeg VPN by"</string>
+    <!-- no translation found for vpn_details_title (418806440938510331) -->
+    <skip />
+    <string name="vpn_edit_title_add" msgid="2121313217989682890">"Voeg <xliff:g id="NAME">%s</xliff:g> VPN by"</string>
+    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"<xliff:g id="NAME">%s</xliff:g> details"</string>
+    <string name="vpns" msgid="3148141862835492816">"VPN\'s"</string>
+    <string name="vpn_connecting" msgid="8039521381692090116">"Koppel tans..."</string>
+    <string name="vpn_disconnecting" msgid="7748050200708257066">"Ontkoppel tans..."</string>
+    <string name="vpn_connected" msgid="7641723116362845781">"Gekoppel"</string>
+    <string name="vpn_connect_hint" msgid="7442898962925875181">"Koppel aan netwerk"</string>
+    <string name="vpn_name" msgid="1550918148476193076">"VPN-naam"</string>
+    <string name="vpn_a_name" msgid="8445736942405283509">"\'n VPN-naam"</string>
+    <string name="vpn_profile_added" msgid="9061017910337129840">"\'<xliff:g id="NAME">%s</xliff:g>\' is bygevoeg"</string>
+    <string name="vpn_profile_replaced" msgid="587435576816273815">"Veranderinge word gemaak aan \'<xliff:g id="NAME">%s</xliff:g>\'"</string>
+    <string name="vpn_user_certificate_title" msgid="6812545893924071742">"Stel gebruikersertifikaat in"</string>
+    <string name="vpn_user_certificate" msgid="949322691686938888">"Gebruikersertifikaat"</string>
+    <string name="vpn_a_user_certificate" msgid="8943983437956898649">"\'n gebruikersertifikaat"</string>
+    <string name="vpn_ca_certificate_title" msgid="7846466160795589985">"Stel CA-sertifikaat"</string>
+    <string name="vpn_ca_certificate" msgid="465085144064264742">"Sertifikaatoutoriteit- (CA) sertifikaat"</string>
+    <string name="vpn_a_ca_certificate" msgid="3374242520974884295">"\'n CA-sertifikaat"</string>
+    <string name="vpn_l2tp_secret_string_title" msgid="5039677186748940987">"Stel L2TP-geheim"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"L2TP-geheim"</string>
+    <string name="vpn_a_l2tp_secret" msgid="6612042930810981845">"\'n L2TP-geheim"</string>
+    <string name="vpn_pptp_encryption_title" msgid="2236795167467896499">"enkripsie"</string>
+    <string name="vpn_pptp_encryption" msgid="2602329949737259686">"PPTP-enkripsie"</string>
+    <string name="vpn_ipsec_presharedkey_title" msgid="2184060087690539175">"Stel IPSec voorafgedeelde sleutel"</string>
+    <string name="vpn_ipsec_presharedkey" msgid="5434316521616673741">"IPSec voorafgedeelde sleutel"</string>
+    <string name="vpn_a_ipsec_presharedkey" msgid="1255301923217898418">"\'n IPSec voorafgedeelde sleutel"</string>
+    <string name="vpn_vpn_server_title" msgid="8897005887420358913">"Stel VPN-bediener"</string>
+    <string name="vpn_vpn_server" msgid="1141754908824209260">"VPN-bediener"</string>
+    <string name="vpn_a_vpn_server" msgid="5960906152125045853">"\'n VPN-bediener"</string>
+    <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"VPN-bedienernaam"</string>
+    <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"DNS-soekdomeine"</string>
+    <string name="vpn_dns_search_list" msgid="4230034234026605360">"DNS-soekdomeine"</string>
+    <string name="vpn_field_is_set" msgid="7137320847812992243">"<xliff:g id="VALUE">%s</xliff:g> is gestel"</string>
+    <string name="vpn_field_not_set" msgid="2972519243515893804">"<xliff:g id="VALUE">%s</xliff:g> nie gestel nie"</string>
+    <string name="vpn_field_not_set_optional" msgid="8840557698252556791">"<xliff:g id="VALUE">%s</xliff:g> nie gestel nie (opsioneel)"</string>
+    <string name="vpn_enable_field" msgid="3700967675854517191">"Aktiveer <xliff:g id="OPTION">%s</xliff:g>"</string>
+    <string name="vpn_disable_field" msgid="6905658811179634005">"Deaktiveer <xliff:g id="OPTION">%s</xliff:g>"</string>
+    <string name="vpn_is_enabled" msgid="1266304230417098877">"<xliff:g id="OPTION">%s</xliff:g> is geaktiveer"</string>
+    <string name="vpn_is_disabled" msgid="2013622485867806167">"<xliff:g id="OPTION">%s</xliff:g> is gedeaktiveer"</string>
+    <string name="vpn_settings_title" msgid="7327468307909556719">"VPN-instellings"</string>
+    <string name="vpn_settings_summary" msgid="8849924181594963972">"Stel op en bestuur virtuele private netwerke (VPN\'e)"</string>
+    <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(onveranderd)"</string>
+    <string name="vpn_secret_not_set" msgid="1037792636371641845">"(nie gestel nie)"</string>
+    <!-- no translation found for credentials_title (4446234003860769883) -->
+    <skip />
+    <!-- no translation found for credentials_install (466093273825150847) -->
+    <skip />
+    <!-- no translation found for credentials_install (953914549998062317) -->
+    <skip />
+    <!-- no translation found for credentials_install_summary (4220422806818210676) -->
+    <skip />
+    <!-- no translation found for credentials_install_summary (5737658257407822713) -->
+    <skip />
+    <!-- outdated translation 9170150870552453457 -->     <string name="credentials_reset" msgid="3239382277144980418">"Vee berging uit"</string>
+    <!-- outdated translation 1530388094693731636 -->     <string name="credentials_reset_summary" msgid="3369361230171260282">"Vee eiebewysberging van alle inhoud uit en stel die wagwoord terug"</string>
+    <string name="credentials_unlock" msgid="1463040326264133844">"Voer wagwoord in"</string>
+    <!-- outdated translation 594679530407918031 -->     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Voer die eiebewysberging-wagwoord in."</string>
+    <string name="credentials_old_password" msgid="7553393815538684028">"Huidige wagwoord:"</string>
+    <!-- outdated translation 819990295796804516 -->     <string name="credentials_reset_hint" msgid="1566409057833618877">"Is jy seker jy wil alle eiebewyse uitvee en die eiebewysberging-wagwoord teruglaai?"</string>
+    <string name="credentials_password_too_short" msgid="7502749986405522663">"Die wagwoord moet ten minste 8 karakters bevat."</string>
+    <!-- outdated translation 7525192410790152041 -->     <string name="credentials_wrong_password" msgid="2541932597104054807">"Voer asseblief die korrekte wagwoord in."</string>
+    <!-- outdated translation 6392481296673345268 -->     <string name="credentials_reset_warning" msgid="5320653011511797600">"Voer asseblief die korrekte wagwoord in. Jy het nog een kans om die korrekte wagwoord in te voer voordat die eiebewysberging uitgevee word."</string>
+    <!-- no translation found for credentials_reset_warning_plural (6514085665301095279) -->
+    <skip />
+    <!-- outdated translation 7700309135582200849 -->     <string name="credentials_erased" msgid="2907836028586342969">"Die eiebewysberging is uitgevee."</string>
+    <!-- no translation found for credentials_not_erased (397954733557821269) -->
+    <skip />
+    <string name="credentials_enabled" msgid="7588607413349978930">"Eiebewysberging is geaktiveer."</string>
+    <!-- no translation found for credentials_configure_lock_screen_hint (6816970208840577219) -->
+    <skip />
+    <string name="emergency_tone_title" msgid="1055954530111587114">"Noodtoon"</string>
+    <string name="emergency_tone_summary" msgid="722259232924572153">"Stel gedrag wanneer \'n noodoproep gemaak word"</string>
+    <string name="privacy_settings" msgid="9206631214140954954">"Privaatheid"</string>
+    <string name="privacy_settings_title" msgid="1987089301293213705">"Privaatheidsinstellings"</string>
+    <!-- no translation found for backup_section_title (8856083167469467588) -->
+    <skip />
+    <string name="personal_data_section_title" msgid="7815209034443782061">"Persoonlike data"</string>
+    <!-- no translation found for backup_data_title (1239105919852668016) -->
+    <skip />
+    <!-- no translation found for backup_data_summary (6515285107793232815) -->
+    <skip />
+    <!-- no translation found for backup_configure_account_title (3790872965773196615) -->
+    <skip />
+    <!-- no translation found for backup_configure_account_default_summary (2436933224764745553) -->
+    <skip />
+    <!-- no translation found for auto_restore_title (5397528966329126506) -->
+    <skip />
+    <!-- no translation found for auto_restore_summary (83177150536734378) -->
+    <skip />
+    <!-- outdated translation 6028429904055779443 -->     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Instellingsrugsteuning"</string>
+    <!-- outdated translation 9096433810456900531 -->     <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Is jy seker jy wil die rugsteuning van jou instellings stop en alle kopieë op Google-bedieners uitvee?"</string>
+    <!-- no translation found for device_admin_settings_title (1335557832906433309) -->
+    <skip />
+    <!-- no translation found for active_device_admin_msg (6930903262612422111) -->
+    <skip />
+    <!-- no translation found for remove_device_admin (3596845261596451437) -->
+    <skip />
+    <!-- no translation found for select_device_admin_msg (2645509057946368094) -->
+    <skip />
+    <!-- no translation found for no_device_admins (702695100241728775) -->
+    <skip />
+    <!-- no translation found for add_device_admin_msg (6246742476064507965) -->
+    <skip />
+    <!-- no translation found for add_device_admin (7133327675884827091) -->
+    <skip />
+    <!-- no translation found for device_admin_add_title (7705551449705676363) -->
+    <skip />
+    <!-- no translation found for device_admin_warning (1149471041373876923) -->
+    <skip />
+    <!-- no translation found for device_admin_status (7169948053970923035) -->
+    <skip />
+    <!-- no translation found for untitled_apn (1230060359198685513) -->
+    <skip />
+    <!-- no translation found for sound_category_sound_title (1488759370067953996) -->
+    <skip />
+    <!-- no translation found for sound_category_calls_title (3688531959256239012) -->
+    <skip />
+    <!-- no translation found for sound_category_notification_title (3502115998790286943) -->
+    <skip />
+    <!-- no translation found for sound_category_feedback_title (4399742321363475393) -->
+    <skip />
+    <!-- no translation found for wifi_setup_title (661074868726906436) -->
+    <skip />
+    <!-- no translation found for wifi_setup_title_editing_network (7304321031985059969) -->
+    <skip />
+    <!-- no translation found for wifi_setup_title_connecting_network (2408378435027118687) -->
+    <skip />
+    <!-- no translation found for wifi_setup_title_connected_network (209755856836003839) -->
+    <skip />
+    <!-- no translation found for wifi_setup_title_add_network (6932651000151032301) -->
+    <skip />
+    <!-- no translation found for wifi_setup_not_connected (6997432604664057052) -->
+    <skip />
+    <!-- no translation found for wifi_setup_add_network (5939624680150051807) -->
+    <skip />
+    <!-- no translation found for wifi_setup_refresh_list (3411615711486911064) -->
+    <skip />
+    <!-- no translation found for wifi_setup_skip (6661541841684895522) -->
+    <skip />
+    <!-- no translation found for wifi_setup_next (3388694784447820477) -->
+    <skip />
+    <!-- no translation found for wifi_setup_back (144777383739164044) -->
+    <skip />
+    <!-- no translation found for wifi_setup_detail (2336990478140503605) -->
+    <skip />
+    <!-- no translation found for wifi_setup_connect (7954456989590237049) -->
+    <skip />
+    <!-- no translation found for wifi_setup_forget (2562847595567347526) -->
+    <skip />
+    <!-- no translation found for wifi_setup_save (3659235094218508211) -->
+    <skip />
+    <!-- no translation found for wifi_setup_cancel (3185216020264410239) -->
+    <skip />
+    <!-- no translation found for wifi_setup_status_scanning (7424598483871053657) -->
+    <skip />
+    <!-- no translation found for wifi_setup_status_select_network (7519563569903137003) -->
+    <skip />
+    <!-- no translation found for wifi_setup_status_existing_network (6394925174802598186) -->
+    <skip />
+    <!-- no translation found for wifi_setup_status_unsecured_network (8143046977328718252) -->
+    <skip />
+    <!-- no translation found for wifi_setup_status_edit_network (6582036394332822032) -->
+    <skip />
+    <!-- no translation found for wifi_setup_status_new_network (7468952850452301083) -->
+    <skip />
+    <!-- no translation found for wifi_setup_status_connecting (2594117697215042584) -->
+    <skip />
+    <!-- no translation found for wifi_setup_status_proceed_to_next (9071951312604559022) -->
+    <skip />
+    <!-- no translation found for wifi_setup_status_eap_not_supported (3196386445567501484) -->
+    <skip />
+    <!-- no translation found for wifi_setup_eap_not_supported (683540356393542939) -->
+    <skip />
+    <!-- no translation found for wifi_setup_description_connecting (1884664966455980182) -->
+    <skip />
+    <!-- no translation found for wifi_setup_description_connected (5235991893829582459) -->
+    <skip />
+    <!-- no translation found for account_sync_settings_title (4578227872921044660) -->
+    <skip />
+    <!-- no translation found for sync_is_failing (1591561768344128377) -->
+    <skip />
+    <!-- no translation found for add_account_label (7811707265834013767) -->
+    <skip />
+    <!-- no translation found for header_general_sync_settings (3487451896424238469) -->
+    <skip />
+    <!-- no translation found for background_data (5779592891375473817) -->
+    <skip />
+    <!-- no translation found for background_data_summary (3630389249212620467) -->
+    <skip />
+    <!-- no translation found for background_data_dialog_title (745974259246047425) -->
+    <skip />
+    <!-- no translation found for background_data_dialog_message (9155730118215371308) -->
+    <skip />
+    <!-- no translation found for sync_automatically (7558810110682562376) -->
+    <skip />
+    <!-- no translation found for sync_automatically_summary (6662623174608419931) -->
+    <skip />
+    <!-- no translation found for header_manage_accounts (6869002423884539607) -->
+    <skip />
+    <!-- no translation found for sync_enabled (4551148952179416813) -->
+    <skip />
+    <!-- no translation found for sync_disabled (8511659877596511991) -->
+    <skip />
+    <!-- no translation found for sync_error (5060969083117872149) -->
+    <skip />
+    <!-- no translation found for settings_backup (2274732978260797031) -->
+    <skip />
+    <!-- no translation found for settings_backup_summary (7916877705938054035) -->
+    <skip />
+    <!-- no translation found for sync_menu_sync_now (6154608350395805683) -->
+    <skip />
+    <!-- no translation found for sync_menu_sync_cancel (8292379009626966949) -->
+    <skip />
+    <!-- no translation found for sync_one_time_sync (6766593624598183090) -->
+    <skip />
+    <!-- no translation found for sync_gmail (714886122098006477) -->
+    <skip />
+    <!-- no translation found for sync_calendar (9056527206714733735) -->
+    <skip />
+    <!-- no translation found for sync_contacts (9174914394377828043) -->
+    <skip />
+    <!-- no translation found for sync_plug (5952575609349860569) -->
+    <skip />
+    <!-- no translation found for header_application_sync_settings (5514539555293976035) -->
+    <skip />
+    <!-- no translation found for header_data_and_synchronization (5165024023936509896) -->
+    <skip />
+    <!-- no translation found for preference_change_password_title (8955581790270130056) -->
+    <skip />
+    <!-- no translation found for header_account_settings (5382475087121880626) -->
+    <skip />
+    <!-- no translation found for remove_account_label (5921986026504804119) -->
+    <skip />
+    <!-- no translation found for header_add_an_account (756108499532023798) -->
+    <skip />
+    <!-- no translation found for finish_button_label (481587707657751116) -->
+    <skip />
+    <!-- no translation found for really_remove_account_title (6574643117748564960) -->
+    <skip />
+    <!-- no translation found for really_remove_account_message (4448645571715719563) -->
+    <skip />
+    <!-- no translation found for really_remove_account_message (1005751790899989319) -->
+    <skip />
+    <!-- no translation found for remove_account_failed (1093911989149396624) -->
+    <skip />
+    <!-- no translation found for remove_account_failed (9174390193652391412) -->
+    <skip />
+    <!-- no translation found for provider_label (7724593781904508866) -->
+    <skip />
+    <!-- no translation found for sync_item_title (1931551540462877488) -->
+    <skip />
+    <!-- no translation found for cant_sync_dialog_title (7185199796123573317) -->
+    <skip />
+    <!-- no translation found for cant_sync_dialog_message (2372359241135295930) -->
+    <skip />
+    <!-- no translation found for enter_password (3268224850821675915) -->
+    <skip />
+    <!-- no translation found for try_again (5904121494468643129) -->
+    <skip />
+    <!-- no translation found for service_busy (225227519012409130) -->
+    <skip />
+    <!-- no translation found for delete (4219243412325163003) -->
+    <skip />
+    <!-- no translation found for misc_files (6298643430106707497) -->
+    <skip />
+    <!-- no translation found for misc_files_selected_count (4647048020823912088) -->
+    <skip />
+    <!-- no translation found for misc_files_selected_count_bytes (2876232009069114352) -->
+    <skip />
+    <!-- no translation found for select_all (6783085295161532497) -->
+    <skip />
+    <!-- no translation found for hdcp_checking_title (8605478913544273282) -->
+    <skip />
+    <!-- no translation found for hdcp_checking_dialog_title (5141305530923283) -->
+    <skip />
+</resources>
diff --git a/res/values-am-nokeys/strings.xml b/res/values-am-nokeys/strings.xml
new file mode 100644
index 0000000..26b226d
--- /dev/null
+++ b/res/values-am-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="6616938758022986257">"ትግበራዎች አዸራጅ"</string>
+</resources>
diff --git a/res/values-am/arrays.xml b/res/values-am/arrays.xml
new file mode 100644
index 0000000..0267ca7
--- /dev/null
+++ b/res/values-am/arrays.xml
@@ -0,0 +1,205 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2007 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="5296756001147094692">"አሜሪካ"</item>
+    <item msgid="3005562397632768392">"አውሮፓ"</item>
+    <item msgid="5696915123093701218">"አፍሪካ"</item>
+    <item msgid="4439789052790868249">"እስያ"</item>
+    <item msgid="956915953069815961">"አውስትራሊያ"</item>
+    <item msgid="5345178126174698955">"ፓስፊክ"</item>
+    <item msgid="8392017019801393511">"ሁሉም"</item>
+  </string-array>
+  <string-array name="animations_entries">
+    <item msgid="207790005475613429">"ምንም እነማዎች የሉም"</item>
+    <item msgid="6291186755504776720">"ጥቂት እነማዎች"</item>
+    <item msgid="3856065399819979491">"ሁሉም እነማዎች"</item>
+  </string-array>
+  <string-array name="animations_summaries">
+    <item msgid="4569165952409350897">"ምንም የመስኮት እነማዎች አይታዩም"</item>
+    <item msgid="4460915688877708508">"ጥቂት እነማ መስኮቶችታይተዋል።"</item>
+    <item msgid="488968798204105119">"ሁሉም የዊንዶው እነማዎች ይታያሉ"</item>
+  </string-array>
+    <!-- no translation found for screen_timeout_entries:6 (6864027152847611413) -->
+    <!-- no translation found for dream_timeout_entries:0 (3149294732238283185) -->
+    <!-- no translation found for dream_timeout_entries:1 (2194151041885903260) -->
+    <!-- no translation found for dream_timeout_entries:2 (5892295237131074341) -->
+    <!-- no translation found for dream_timeout_entries:3 (3538441365970038213) -->
+    <!-- no translation found for dream_timeout_entries:4 (412343871668955639) -->
+    <!-- no translation found for dream_timeout_entries:5 (5076853889688991690) -->
+    <!-- no translation found for dream_timeout_entries:6 (1903860996174927898) -->
+    <!-- no translation found for dream_timeout_entries:7 (6415509612413178727) -->
+    <!-- no translation found for lock_after_timeout_entries:6 (49888496216106852) -->
+    <!-- no translation found for lock_after_timeout_entries:7 (9002737361305019353) -->
+    <!-- no translation found for lock_after_timeout_entries:8 (4322676235684793329) -->
+    <!-- no translation found for entries_font_size:0 (2722636506084795405) -->
+    <!-- no translation found for entries_font_size:1 (383133849547816572) -->
+    <!-- no translation found for entries_font_size:2 (6490061470416867723) -->
+    <!-- no translation found for entries_font_size:3 (3579015730662088893) -->
+    <!-- no translation found for entries_font_size:4 (1678068858001018666) -->
+    <!-- no translation found for entries_font_size:5 (490158884605093126) -->
+    <!-- no translation found for entries_font_size:6 (2123802548987439763) -->
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"በጣም ቀርፋፋ"</item>
+    <item msgid="2361722960903353554">"አዘግይ"</item>
+    <item msgid="1145554631248513562">"መደበኛ"</item>
+    <item msgid="7553665153391107454">"ፈጣን"</item>
+    <item msgid="2538100882620724753">"በጣም ፈጣን"</item>
+  </string-array>
+  <string-array name="tts_pitch_entries">
+    <item msgid="7526050907652687351">"በጣም ዝቅተኛ"</item>
+    <item msgid="2692137425242433765">"ዝቅ ያለ"</item>
+    <item msgid="3332408460740717754">"መደበኛ"</item>
+    <item msgid="4907380534957572531">"ከፍ ያለ"</item>
+    <item msgid="4699640516390840297">"በጣም ከፍተኛ"</item>
+  </string-array>
+  <string-array name="tts_lang_entries">
+    <item msgid="478030717868306353">"የአሜሪካዊያን እንግሊዘኛ"</item>
+    <item msgid="5192284521396794598">"የእንግሊዞችእንግሊዘኛ"</item>
+    <item msgid="3000262452051711991">"ፈረንሳይኛ"</item>
+    <item msgid="9214080387341763401">"ጀርመን"</item>
+    <item msgid="5972100016440094433">"ጣልያንኛ"</item>
+    <item msgid="5811378076054402537">"ስፓኒሽ"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"በመቃኘት ላይ....."</item>
+    <item msgid="8513729475867537913">"በማገናኘት ላይ…"</item>
+    <item msgid="515055375277271756">"በማረጋገጥ ላይ...."</item>
+    <item msgid="1943354004029184381">"የIP አድራሻ በማግኘት ላይ..."</item>
+    <item msgid="4221763391123233270">"ተገናኝቷል"</item>
+    <item msgid="624838831631122137">"ታግዷል"</item>
+    <item msgid="7979680559596111948">"በማለያየት ላይ...."</item>
+    <item msgid="1634960474403853625">"ተለያየ"</item>
+    <item msgid="746097431216080650">"አልተሳካም"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"በመቃኘት ላይ....."</item>
+    <item msgid="355508996603873860">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> በማያያዝ ላይ..."</item>
+    <item msgid="554971459996405634">"በ<xliff:g id="NETWORK_NAME">%1$s</xliff:g> በማረጋገጥ ላይ..."</item>
+    <item msgid="7928343808033020343">" ከ<xliff:g id="NETWORK_NAME">%1$s</xliff:g> የIP አድራሻ በማግኘት ላይ..."</item>
+    <item msgid="8937994881315223448">"ለ<xliff:g id="NETWORK_NAME">%1$s</xliff:g> የተገናኘ"</item>
+    <item msgid="1330262655415760617">"ታግዷል"</item>
+    <item msgid="7698638434317271902">"ከ<xliff:g id="NETWORK_NAME">%1$s</xliff:g> በማለያየት ላይ...."</item>
+    <item msgid="197508606402264311">"ተለያየ"</item>
+    <item msgid="8578370891960825148">"አልተሳካም"</item>
+  </string-array>
+  <string-array name="wifi_security">
+    <item msgid="1435933968767043814">"ክፈት"</item>
+    <item msgid="6318432659048829665">"WEP"</item>
+    <item msgid="2966395706508338179">"WPA/WPA2 PSK"</item>
+    <item msgid="9098390198768443435">"802.1x EAP"</item>
+  </string-array>
+  <string-array name="wifi_eap_method">
+    <item msgid="1160193392455075561">"PEAP"</item>
+    <item msgid="7981731051382306293">"TLS"</item>
+    <item msgid="2892994535305020162">"TTLS"</item>
+  </string-array>
+    <!-- no translation found for bluetooth_visibility_timeout_entries:0 (1106621950288502195) -->
+    <!-- no translation found for bluetooth_visibility_timeout_entries:1 (5780349442819375570) -->
+    <!-- no translation found for bluetooth_visibility_timeout_entries:2 (1166466894270177580) -->
+    <!-- no translation found for bluetooth_visibility_timeout_entries:3 (9032073376232198148) -->
+  <string-array name="wifi_signal">
+    <item msgid="2245412278046491293">"ደካማ"</item>
+    <item msgid="5615082285463430971">"አግባብ"</item>
+    <item msgid="3565079809875324621">"ጥሩ"</item>
+    <item msgid="5702329417707689835">"እጅግ በጣም ጥሩ"</item>
+  </string-array>
+  <string-array name="wifi_sleep_policy_entries">
+    <!-- outdated translation 3804733751095821976 -->     <item msgid="643915340724070374">"ማያ ሲጠፋ"</item>
+    <item msgid="1549288661423279207">"ሲሰካ በፍፁም"</item>
+    <!-- outdated translation 1986753720941888596 -->     <item msgid="6592896328877671197">"በፍፁም"</item>
+  </string-array>
+    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:0 (2659922042905569057) -->
+    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:1 (8137861573803398334) -->
+    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:2 (5996547094658157629) -->
+    <!-- no translation found for wifi_frequency_band_entries:0 (624340809384223320) -->
+    <!-- no translation found for wifi_frequency_band_entries:1 (6670588712989942178) -->
+    <!-- no translation found for wifi_frequency_band_entries:2 (2715516524973207876) -->
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="9077371706468756228">"ጊዜ አጠቃቀም"</item>
+    <item msgid="1908750532762193304">"ቆጠራ ጀምር"</item>
+    <item msgid="1213951670006606353">"መተግበሪያ ስም"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="8615575908717909498">"PEAP"</item>
+    <item msgid="8667872640594311615">"TLS"</item>
+    <item msgid="7182812872984827322">"TTLS"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="1818786254010764570">"የለም"</item>
+    <item msgid="6189918678874123056">"PAP"</item>
+    <item msgid="1524112260493662517">"MSCHAP"</item>
+    <item msgid="5923246669412752932">"MSCHAPV2"</item>
+    <item msgid="8651992560135239389">"GTC"</item>
+  </string-array>
+    <!-- no translation found for wifi_network_setup:2 (7131487972018976724) -->
+    <!-- no translation found for wifi_network_setup:3 (4809199848225172977) -->
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"DHCP"</item>
+    <item msgid="628395202971532382">"አይለወጤ"</item>
+  </string-array>
+    <!-- no translation found for wifi_proxy_settings:0 (4473276491748503377) -->
+    <!-- no translation found for wifi_proxy_settings:1 (8673874894887358090) -->
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"ውጪ"</item>
+    <item msgid="3165868966179561687">"አንቃ"</item>
+    <item msgid="6038758039030476855">"አንዝር"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="3856896061242872146">"አንዱም"</item>
+    <item msgid="5756844015743664882">"PAP"</item>
+    <item msgid="535934025797984365">"CHAP"</item>
+    <item msgid="8383098660619805783">"PAP ወይም CHAP"</item>
+  </string-array>
+    <!-- no translation found for apn_protocol_entries:0 (4852355456199302715) -->
+    <!-- no translation found for apn_protocol_entries:1 (4394161344888484571) -->
+    <!-- no translation found for apn_protocol_entries:2 (8084938354605535381) -->
+  <string-array name="app_install_location_entries">
+    <item msgid="8151497958991952759">"የውስጥ መሣሪያ ማከማቻ"</item>
+    <item msgid="3738430123799803530">"ተወጋጅ SD ካርድ"</item>
+    <item msgid="4498124044785815005">"ስርዓቱ ይወስን"</item>
+  </string-array>
+  <string-array name="vibrate_entries">
+    <item msgid="3388952299521009213">"ዘወትር"</item>
+    <item msgid="6293147072807231256">"በፍፁም"</item>
+    <item msgid="1276641209451816572">"በፀጥታ ሁነታ ውስጥ ብቻ"</item>
+    <item msgid="8418930333779132418">"በፀጥታ ሁነታ ውስጥ ሳይሆን ብቻ"</item>
+  </string-array>
+    <!-- no translation found for long_press_timeout_selector_titles:0 (3511504869290423954) -->
+    <!-- no translation found for long_press_timeout_selector_titles:1 (2560532955514699713) -->
+    <!-- no translation found for long_press_timeout_selector_titles:2 (2372711992605524591) -->
+    <!-- no translation found for hdcp_checking_titles:0 (441827799230089869) -->
+    <!-- no translation found for hdcp_checking_titles:1 (6042769699089883931) -->
+    <!-- no translation found for hdcp_checking_titles:2 (9174900380056846820) -->
+    <!-- no translation found for hdcp_checking_summaries:0 (505558545611516707) -->
+    <!-- no translation found for hdcp_checking_summaries:1 (3878793616631049349) -->
+    <!-- no translation found for hdcp_checking_summaries:2 (45075631231212732) -->
+</resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
new file mode 100644
index 0000000..b3b60ad
--- /dev/null
+++ b/res/values-am/strings.xml
@@ -0,0 +1,2090 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="yes" msgid="4676390750360727396">"አዎ"</string>
+    <string name="no" msgid="6731231425810196216">"አይ"</string>
+    <!-- no translation found for device_info_default (7847265875578739287) -->
+    <skip />
+    <!-- no translation found for turn_on_radio (8706561489788373676) -->
+    <skip />
+    <!-- no translation found for turn_off_radio (1820294552893884115) -->
+    <skip />
+    <!-- no translation found for radioInfo_menu_viewADN (8743377494429930831) -->
+    <skip />
+    <!-- no translation found for radioInfo_menu_viewFDN (7934301566925610318) -->
+    <skip />
+    <!-- no translation found for radioInfo_menu_viewSDN (7130280686244955669) -->
+    <skip />
+    <!-- no translation found for radioInfo_menu_getPDP (560610293888406317) -->
+    <skip />
+    <!-- no translation found for radioInfo_service_in (1915416319177520020) -->
+    <skip />
+    <!-- no translation found for radioInfo_service_out (5238736759641916278) -->
+    <skip />
+    <!-- no translation found for radioInfo_service_emergency (2485604591272668370) -->
+    <skip />
+    <!-- no translation found for radioInfo_service_off (1434084741785525415) -->
+    <skip />
+    <!-- no translation found for radioInfo_roaming_in (9045363884600341051) -->
+    <skip />
+    <!-- no translation found for radioInfo_roaming_not (2851853244069662307) -->
+    <skip />
+    <!-- no translation found for radioInfo_phone_idle (7489244938838742820) -->
+    <skip />
+    <!-- no translation found for radioInfo_phone_ringing (4883724645684297895) -->
+    <skip />
+    <!-- no translation found for radioInfo_phone_offhook (4174402846862780998) -->
+    <skip />
+    <!-- no translation found for radioInfo_data_disconnected (1959735267890719418) -->
+    <skip />
+    <!-- no translation found for radioInfo_data_connecting (8404571440697917823) -->
+    <skip />
+    <!-- no translation found for radioInfo_data_connected (7074301157399238697) -->
+    <skip />
+    <!-- no translation found for radioInfo_data_suspended (5315325487890334196) -->
+    <skip />
+    <!-- no translation found for radioInfo_unknown (737385314432468266) -->
+    <skip />
+    <!-- no translation found for radioInfo_display_packets (8654359809877290639) -->
+    <skip />
+    <!-- no translation found for radioInfo_display_bytes (4018206969492931883) -->
+    <skip />
+    <!-- no translation found for radioInfo_display_dbm (3621221793699882781) -->
+    <skip />
+    <!-- no translation found for radioInfo_display_asu (1422248392727818082) -->
+    <skip />
+    <!-- no translation found for radioInfo_lac (8415219164758307156) -->
+    <skip />
+    <!-- no translation found for radioInfo_cid (4362599198392643138) -->
+    <skip />
+    <!-- no translation found for sdcard_unmount (6325292633327972272) -->
+    <skip />
+    <!-- no translation found for sdcard_unmount (3364184561355611897) -->
+    <skip />
+    <!-- outdated translation 362497552060004057 -->     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"የSD ካርድ ቅርፀት"</string>
+    <!-- outdated translation 362497552060004057 -->     <string name="sdcard_format" product="default" msgid="6713185532039187532">"የSD ካርድ ቅርፀት"</string>
+    <!-- no translation found for small_font (2295331917424072635) -->
+    <skip />
+    <!-- no translation found for medium_font (2068475425515133701) -->
+    <skip />
+    <!-- no translation found for large_font (599055175160971446) -->
+    <skip />
+    <!-- no translation found for font_size_save (3450855718056759095) -->
+    <skip />
+    <!-- no translation found for sdcard_setting (8281011784066476192) -->
+    <skip />
+    <!-- no translation found for sdcard_setting (5922637503871474866) -->
+    <skip />
+    <!-- no translation found for battery_info_status_label (8109155295509700309) -->
+    <skip />
+    <string name="battery_info_power_label" msgid="7465140230991349382">"የኃይል ሶኬት፡"</string>
+    <!-- no translation found for battery_info_scale_label (3649763192389778437) -->
+    <skip />
+    <!-- no translation found for battery_info_level_label (8706526709307788737) -->
+    <skip />
+    <!-- no translation found for battery_info_health_label (6416051542741886958) -->
+    <skip />
+    <!-- no translation found for battery_info_technology_label (788304533220748681) -->
+    <skip />
+    <!-- no translation found for battery_info_voltage_label (8971764146757637863) -->
+    <skip />
+    <!-- no translation found for battery_info_voltage_units (8658490792208288107) -->
+    <skip />
+    <!-- no translation found for battery_info_temperature_label (1968383098818648037) -->
+    <skip />
+    <!-- no translation found for battery_info_temperature_units (9098950587249987550) -->
+    <skip />
+    <!-- no translation found for battery_info_uptime (5548545143573527992) -->
+    <skip />
+    <!-- no translation found for battery_info_awake_battery (2557725975486185849) -->
+    <skip />
+    <!-- no translation found for battery_info_awake_plugged (176716874713478188) -->
+    <skip />
+    <!-- no translation found for battery_info_screen_on (376277447175613889) -->
+    <skip />
+    <!-- no translation found for battery_info_status_unknown (196130600938058547) -->
+    <skip />
+    <!-- no translation found for battery_info_status_charging (1705179948350365604) -->
+    <skip />
+    <!-- no translation found for battery_info_status_charging_ac (5874340256342956252) -->
+    <skip />
+    <!-- no translation found for battery_info_status_charging_usb (4059070156126770959) -->
+    <skip />
+    <!-- no translation found for battery_info_status_discharging (6222697503392774475) -->
+    <skip />
+    <!-- no translation found for battery_info_status_not_charging (2820070506621483576) -->
+    <skip />
+    <!-- no translation found for battery_info_status_full (2824614753861462808) -->
+    <skip />
+    <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>
+    <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
+    <string name="battery_info_power_unknown" msgid="7344115502868899881">"ያልታወቀ"</string>
+    <!-- no translation found for battery_info_health_unknown (5664295556921944255) -->
+    <skip />
+    <!-- no translation found for battery_info_health_good (8070356565806711806) -->
+    <skip />
+    <!-- no translation found for battery_info_health_overheat (8442959549291368806) -->
+    <skip />
+    <!-- no translation found for battery_info_health_dead (1725917445762829059) -->
+    <skip />
+    <!-- no translation found for battery_info_health_over_voltage (2420269351664490121) -->
+    <skip />
+    <!-- no translation found for battery_info_health_unspecified_failure (6347021103185471590) -->
+    <skip />
+    <!-- no translation found for battery_info_health_cold (3835692786176707318) -->
+    <skip />
+    <!-- no translation found for bluetooth (5549625000628014477) -->
+    <skip />
+    <!-- no translation found for bluetooth_visibility (2930835434091839916) -->
+    <skip />
+    <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"በ<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>ሰከንዶች የሚገኝ....."</string>
+    <!-- no translation found for bluetooth_is_discoverable_always (8573385118329733931) -->
+    <skip />
+    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"መሳሪያው መገኘት የሚችል አድርግ"</string>
+    <!-- no translation found for bluetooth_visibility_timeout (6634508002347847278) -->
+    <skip />
+    <!-- no translation found for bluetooth_visibility_timeout_summary (6483353842671501585) -->
+    <skip />
+    <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"በድምፅ መደወያ ቆልፍ"</string>
+    <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"ማያው ሲቆለፍ የብሉቱዝ ደዋዩ እንዳይጠቀምበት ተከላከል።"</string>
+    <!-- no translation found for bluetooth_devices (1886018064039454227) -->
+    <skip />
+    <!-- no translation found for bluetooth_device_name (8415828355207423800) -->
+    <skip />
+    <!-- no translation found for bluetooth_name_not_set (2653752006416027426) -->
+    <skip />
+    <!-- no translation found for bluetooth_scan_for_devices (9214184305566815727) -->
+    <skip />
+    <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ይለያያል።"</string>
+    <!-- no translation found for bluetooth_connected (6038755206916626419) -->
+    <skip />
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"ተለያይቷል"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"በመለያየት ላይ..."</string>
+    <!-- no translation found for bluetooth_connecting (8555009514614320497) -->
+    <skip />
+    <string name="bluetooth_unknown" msgid="644716244548801421"></string>
+    <!-- no translation found for bluetooth_not_connected (3389882907500605937) -->
+    <skip />
+    <!-- no translation found for bluetooth_pairing (1426882272690346242) -->
+    <skip />
+    <string name="bluetooth_paired" msgid="1247541089000057726">"ተጣምርዋል ነገር ግን አልተያያዘም"</string>
+    <!-- no translation found for bluetooth_device (6873461446424952003) -->
+    <skip />
+    <!-- no translation found for progress_scanning (3760897655335759141) -->
+    <skip />
+    <!-- no translation found for bluetooth_notif_ticker (4726721390078512173) -->
+    <skip />
+    <string name="bluetooth_notif_title" msgid="2485175521845371514">"ማጣመሪያ ጥየቃ"</string>
+    <!-- no translation found for bluetooth_notif_message (618099089987569242) -->
+    <skip />
+    <!-- no translation found for bluetooth_show_received_files_title (816172853268536399) -->
+    <skip />
+    <!-- no translation found for bluetooth_show_received_files_summary (7322193220909480775) -->
+    <skip />
+    <string name="device_picker" msgid="8721012448931226323">"የብሉቱዝ መሣሪያ መራጭ"</string>
+    <string name="bluetooth_permission_request" msgid="1523129741266262748">"የብሉቱዝ ፈቃድ ጥየቃ"</string>
+    <!-- outdated translation 2342558978033892004 -->     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"በስልክዎ ላይ ያለ ትግበራ ብሉቱዝዎ እንዲበራ ፈቃድ እየጠየቀ ነው። ይህን ለማድረግ ይፈልጋሉ?"</string>
+    <!-- no translation found for bluetooth_ask_discovery (5950965604673262829) -->
+    <skip />
+    <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"በስልክዎ ላይ ያለ ትግበራ ብሉቱዝዎ በሌላ ብሉቱዝ እንዲገኝለ<xliff:g id="TIMEOUT">%1$d</xliff:g> ሰከንዶች እንዲበራ ፈቃድ እየጠየቀ ነው።ይህን ለማድረግ ይፈልጋሉ?"</string>
+    <!-- no translation found for bluetooth_ask_lasting_discovery (1680661751413856600) -->
+    <skip />
+    <!-- no translation found for bluetooth_ask_lasting_discovery (3413855805411554871) -->
+    <skip />
+    <!-- no translation found for bluetooth_ask_enablement_and_discovery (5716077575971497298) -->
+    <skip />
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"በስልክዎ ላይ ያለ ትግበራ ብሉቱዝዎ በሌላ ብሉቱዝ እንዲገኝለ<xliff:g id="TIMEOUT">%1$d</xliff:g>ሰከንዶች እንዲበራ ፈቃድ እየጠየቀ ነው።ይህን ለማድረግ ይፈልጋሉ?"</string>
+    <!-- no translation found for bluetooth_ask_enablement_and_lasting_discovery (6132824454823539873) -->
+    <skip />
+    <!-- no translation found for bluetooth_ask_enablement_and_lasting_discovery (7471195931669103553) -->
+    <skip />
+    <string name="bluetooth_turning_on" msgid="3107102168379705771">"ብሉቱዝ በመብራት ላይ...."</string>
+    <!-- no translation found for bluetooth_auto_connect (8013003320667198460) -->
+    <skip />
+    <!-- no translation found for date_and_time (4114084177056654663) -->
+    <skip />
+    <string name="date_time_12_hour_sample" msgid="3259617262618020574">"ከሰዓት በኃላ1:00"</string>
+    <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
+    <!-- no translation found for choose_timezone (7762866468013985022) -->
+    <skip />
+    <string name="normal_date_format" msgid="1982904221918374153">"መደበኛ (<xliff:g id="DATE">%s</xliff:g>)"</string>
+    <!-- no translation found for display_preview_label (1127597250917274792) -->
+    <skip />
+    <!-- no translation found for display_font_size_label (8941851418397475389) -->
+    <skip />
+    <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
+    <skip />
+    <string name="intent_sender_sendbroadcast_text" msgid="1415735148895872715">" ይላኩ <xliff:g id="BROADCAST">broadcast</xliff:g>"</string>
+    <string name="intent_sender_action_label" msgid="616458370005452389">"<xliff:g id="ACTION">Action</xliff:g>:"</string>
+    <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"ጀምር <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
+    <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
+    <string name="intent_sender_account_label" msgid="465210404475603404">"መለያ:"</string>
+    <!-- no translation found for proxy_settings_title (5912878565897294401) -->
+    <skip />
+    <string name="proxy_settings_summary" msgid="7898928000758321486">"ሁሉንም የHTTP እጅ አዙር እና መነጠያ ዝርዝሮች አዘጋጅ"</string>
+    <!-- no translation found for proxy_clear_text (5555400754952012657) -->
+    <skip />
+    <!-- no translation found for proxy_port_label (5655276502233453400) -->
+    <skip />
+    <!-- outdated translation 204409815790850313 -->     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"ምንም እጅ አዙር ለ"</string>
+    <!-- no translation found for proxy_exclusionlist_hint (6084099226687226948) -->
+    <skip />
+    <!-- no translation found for proxy_defaultView_text (6387985519141433291) -->
+    <skip />
+    <string name="proxy_action_text" msgid="2957063145357903951">"ተከናውኗል"</string>
+    <!-- no translation found for proxy_hostname_label (8490171412999373362) -->
+    <skip />
+    <!-- no translation found for proxy_hostname_hint (2076157057003936176) -->
+    <skip />
+    <!-- no translation found for proxy_error (8926675299638611451) -->
+    <skip />
+    <!-- no translation found for proxy_error_dismiss (4993171795485460060) -->
+    <skip />
+    <!-- no translation found for proxy_error_invalid_host (9120776460063182119) -->
+    <skip />
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"እርስዎ የተየቧቸው ከቁጥር የማይገቡ ዝርዝሮች በትክክል አልተቀረፁም። እባክዎ በነጠላ ሰረዝ የተለዩትን ከቁጥር የማይገቡ ጎራ ዝርዝሮችን ያስገቡ።"</string>
+    <!-- no translation found for proxy_error_empty_port (3525734169948795417) -->
+    <skip />
+    <!-- no translation found for proxy_error_empty_host_set_port (2451694104858226781) -->
+    <skip />
+    <!-- no translation found for proxy_error_invalid_port (1816315605424943626) -->
+    <skip />
+    <!-- no translation found for proxy_warning_limited_support (7442676587591460854) -->
+    <skip />
+    <!-- no translation found for radio_info_signal_location_label (16475158265551708) -->
+    <skip />
+    <!-- no translation found for radio_info_neighboring_location_label (2385625674055934880) -->
+    <skip />
+    <!-- no translation found for radio_info_data_attempts_label (1731106244577323381) -->
+    <skip />
+    <!-- no translation found for radio_info_gprs_service_label (2331818110375395364) -->
+    <skip />
+    <!-- no translation found for radio_info_roaming_label (6141505430275138647) -->
+    <skip />
+    <!-- no translation found for radio_info_imei_label (1220524224732944192) -->
+    <skip />
+    <!-- no translation found for radio_info_call_redirect_label (1654674226961476872) -->
+    <skip />
+    <!-- no translation found for radio_info_ppp_resets_label (3241667824729310546) -->
+    <skip />
+    <!-- no translation found for radio_info_gsm_disconnects_label (1683069665736339820) -->
+    <skip />
+    <!-- no translation found for radio_info_current_network_label (3256402602440102610) -->
+    <skip />
+    <!-- no translation found for radio_info_data_successes_label (4417894113689054945) -->
+    <skip />
+    <!-- no translation found for radio_info_ppp_received_label (3345184342444878849) -->
+    <skip />
+    <!-- no translation found for radio_info_gsm_service_label (2082332114596916985) -->
+    <skip />
+    <!-- no translation found for radio_info_signal_strength_label (1931937920896925766) -->
+    <skip />
+    <!-- no translation found for radio_info_call_status_label (4896238900685510883) -->
+    <skip />
+    <!-- no translation found for radio_info_ppp_sent_label (5009102250704375687) -->
+    <skip />
+    <!-- no translation found for radio_info_radio_resets_label (9211343458143291617) -->
+    <skip />
+    <!-- no translation found for radio_info_message_waiting_label (6981842420058672207) -->
+    <skip />
+    <!-- no translation found for radio_info_phone_number_label (7192944627907412169) -->
+    <skip />
+    <!-- no translation found for radio_info_band_mode_label (441469694142042022) -->
+    <skip />
+    <!-- no translation found for radio_info_network_type_label (3706382548257257987) -->
+    <skip />
+    <!-- no translation found for radio_info_set_perferred_label (9039200405863503267) -->
+    <skip />
+    <!-- no translation found for radio_info_ping_ipaddr (498747917793263530) -->
+    <skip />
+    <!-- no translation found for radio_info_ping_hostname (3054888474808217853) -->
+    <skip />
+    <!-- no translation found for radio_info_http_client_test (5733604021077701555) -->
+    <skip />
+    <!-- no translation found for ping_test_label (7255376471490860631) -->
+    <skip />
+    <!-- no translation found for radio_info_smsc_label (6399460520126501354) -->
+    <skip />
+    <!-- no translation found for radio_info_smsc_update_label (7258686760358791539) -->
+    <skip />
+    <!-- no translation found for radio_info_smsc_refresh_label (6902302130315125102) -->
+    <skip />
+    <string name="radio_info_toggle_dns_check_label" msgid="8292252930563286858">" የDNS አመልክት ያዝ"</string>
+    <string name="oem_radio_info_label" msgid="6163141792477958941">"OEM-የተወሰነ መረጃ/ቅንብሮች"</string>
+    <!-- no translation found for band_mode_title (954174198903776205) -->
+    <skip />
+    <!-- no translation found for band_mode_loading (548764766363847336) -->
+    <skip />
+    <!-- no translation found for band_mode_set (5730560180249458484) -->
+    <skip />
+    <!-- no translation found for band_mode_failed (1495968863884716379) -->
+    <skip />
+    <!-- no translation found for band_mode_succeeded (2701016190055887575) -->
+    <skip />
+    <!-- no translation found for sdcard_changes_instructions (1364712901180556244) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_screen_mass_storage_text (3741220147296482474) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_total_bytes_label (9184160745785062144) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_not_present_status (2902787003418172125) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_not_present_status (6666688653496819947) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_available_bytes_label (763232429899373001) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_mass_storage_status (2736378870889777857) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_mass_storage_status (4786433969313661655) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_unmounted_status (7503300818792750913) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_unmounted_status (3812022095683863087) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_bad_removal_status (7761390725880773697) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_bad_removal_status (5145797653495907970) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_used_bytes_label (8820289486001170836) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_scanning_status (7503429447676219564) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_scanning_status (2763464949274455656) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_read_only_status (3771783090621312312) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_read_only_status (5706115860484118911) -->
+    <skip />
+    <string name="skip_label" msgid="47510779345218297">"ዝለል"</string>
+    <!-- no translation found for next_label (4693520878012668114) -->
+    <skip />
+    <string name="language_picker_title" msgid="5349877711342869319">"ቋንቋ"</string>
+    <!-- no translation found for activity_picker_label (4910700713930693329) -->
+    <skip />
+    <!-- no translation found for device_info_label (6551553813651711205) -->
+    <skip />
+    <!-- no translation found for battery_info_label (4132685016148679403) -->
+    <skip />
+    <!-- no translation found for display_label (8074070940506840792) -->
+    <skip />
+    <!-- no translation found for phone_info_label (7820855350955963628) -->
+    <skip />
+    <!-- no translation found for phone_info_label (2127552523124277664) -->
+    <skip />
+    <!-- no translation found for sd_card_settings_label (8101475181301178428) -->
+    <skip />
+    <!-- no translation found for sd_card_settings_label (5743100901106177102) -->
+    <skip />
+    <!-- no translation found for proxy_settings_label (3271174136184391743) -->
+    <skip />
+    <!-- no translation found for cancel (6859253417269739139) -->
+    <skip />
+    <!-- no translation found for settings_label (1626402585530130914) -->
+    <skip />
+    <string name="settings_label_launcher" msgid="8344735489639482340">"ቅንብሮች"</string>
+    <!-- outdated translation 3672145147925639262 -->     <string name="settings_shortcut" msgid="8597387747077828217">"ቅንብሮች"</string>
+    <!-- no translation found for airplane_mode (8837269988154128601) -->
+    <skip />
+    <string name="airplane_mode_summary" msgid="3154817401368780988">"ሁሉም ገመድ አልባ ግኑኙነቶችን አታንቃ"</string>
+    <!-- no translation found for airplane_mode_turning_on (8871739222526957255) -->
+    <skip />
+    <!-- no translation found for airplane_mode_turning_off (3393168549611505996) -->
+    <skip />
+    <string name="radio_controls_title" msgid="5868688473587168882">"የገመድ አልባ &amp; አውታረ መረቦች"</string>
+    <!-- outdated translation 149274247949769551 -->     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"ገመድ አልባ&amp; አውታረመረብ ቅንብሮች"</string>
+    <string name="radio_controls_summary" msgid="2998818677094465517">"Wi-Fi፣ብሉቱዝ፣አውሮፕላን ሁነታ፣የተንቀሳቃሽ አውታረመረቦች፣&amp; VPNs አዸራጅ"</string>
+    <!-- no translation found for roaming (3596055926335478572) -->
+    <skip />
+    <!-- no translation found for roaming_enable (3737380951525303961) -->
+    <skip />
+    <!-- no translation found for roaming_disable (1295279574370898378) -->
+    <skip />
+    <!-- no translation found for roaming_reenable_message (9141007271031717369) -->
+    <skip />
+    <!-- no translation found for roaming_turn_it_on_button (4387601818162120589) -->
+    <skip />
+    <!-- no translation found for roaming_warning (1269870211689178511) -->
+    <skip />
+    <!-- no translation found for roaming_reenable_title (7626425894611573131) -->
+    <skip />
+    <!-- no translation found for networks (6333316876545927039) -->
+    <skip />
+    <!-- no translation found for sum_carrier_select (6648929373316748020) -->
+    <skip />
+    <!-- no translation found for date_and_time_settings_title (3350640463596716780) -->
+    <skip />
+    <!-- no translation found for date_and_time_settings_title_setup_wizard (2391530758339384324) -->
+    <skip />
+    <!-- no translation found for date_and_time_settings_summary (2435705040205950381) -->
+    <skip />
+    <string name="date_time_auto" msgid="7076906458515908345">"ራስ ሰር ቀን &amp; ሰዓት"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"በአውታረ መረብ የቀረበ ሰዓት ተጠቀም"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"በአውታረ መረብ የቀረበ ሰዓት ተጠቀም"</string>
+    <string name="zone_auto" msgid="334783869352026648">"ራስ ሰር ሰዓት ሰቅ"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"በአውታረ መረብ የቀረበ የሰዓት ሰቅ ተጠቀም"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"በአውታረ መረብ የቀረበ የሰዓት ሰቅ ተጠቀም"</string>
+    <!-- no translation found for date_time_24hour (1193032284921000063) -->
+    <skip />
+    <!-- no translation found for date_time_set_time (5716856602742530696) -->
+    <skip />
+    <string name="date_time_set_timezone" msgid="5045627174274377814">"የሰዓት ሰቅ"</string>
+    <!-- no translation found for date_time_set_date (7021491668550232105) -->
+    <skip />
+    <!-- no translation found for date_time_date_format (436706100255870967) -->
+    <skip />
+    <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"በፊደል ተራ ለይ"</string>
+    <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"በሰዓት ሰቅ ለይ"</string>
+    <!-- no translation found for date_picker_title (1338210036394128512) -->
+    <skip />
+    <!-- no translation found for time_picker_title (483460752287255019) -->
+    <skip />
+    <!-- no translation found for lock_after_timeout (940509402681580537) -->
+    <skip />
+    <!-- no translation found for lock_after_timeout_summary (4726009794344934278) -->
+    <skip />
+    <!-- no translation found for show_owner_info_on_lockscreen_label (5074906168357568434) -->
+    <skip />
+    <!-- no translation found for owner_info_settings_title (2723190010708381889) -->
+    <skip />
+    <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
+    <!-- no translation found for owner_info_settings_edit_text_hint (2382525043173672857) -->
+    <skip />
+    <string name="security_settings_title" msgid="5168491784222013179">"የሥፍራ&amp; ደህንነት"</string>
+    <string name="location_security_settings_title" msgid="4624434296446625554">"የሥፍራ&amp; ደህንነት ቅንብሮች"</string>
+    <string name="security_settings_summary" msgid="967393342537986570">"የኔን ስፍራ፣ማያ ክፈት፣SIM ካርድ ሽንጉር፣ መረጃ ማከማቻ ሽንጉር አዘጋጅ።"</string>
+    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"የኔን ስፍራ፣ማያ ክፈት፣ መረጃ ማከማቻ ሽንጉር አዘጋጅ።"</string>
+    <!-- no translation found for security_passwords_title (2930627259125138363) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
+    <skip />
+    <!-- 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_desc (2150571569618349332) -->
+    <skip />
+    <!-- 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_low_charge_text (5920622844033087792) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_dialog_need_password_title (4058971800557767) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_dialog_need_password_message (17076329416977176) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (2496639211575162172) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (3248595818246515395) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_setup_description (5317479293244660361) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_setup_description (8166730416836285875) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_cooldown (685210918307862395) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_enter_password (1492603008983893532) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_title (1166918236711686187) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (1075638996134310507) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (3394708817932222518) -->
+    <skip />
+    <!-- outdated translation 3973555216065628262 -->     <string name="lock_settings_picker_title" msgid="8665454308380158195">"ማያ ክፈት ጥበቃ"</string>
+    <!-- outdated translation 1129684221223017902 -->     <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>
+    <!-- no translation found for unlock_set_unlock_launch_picker_enable_summary (4791110798817242301) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_off_title (1613932765246180079) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_off_summary (2791013557563587655) -->
+    <skip />
+    <!-- outdated translation 3760684669884671990 -->     <string name="unlock_set_unlock_none_title" msgid="7560817055143323842">"አንዱም"</string>
+    <!-- outdated translation 2658550480388272618 -->     <string name="unlock_set_unlock_none_summary" msgid="2609139908913114644">"የማያ መክፈቻ ጥበቃ አቦዝን"</string>
+    <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"ስርዓተ ጥለት"</string>
+    <!-- outdated translation 3018395214738645405 -->     <string name="unlock_set_unlock_pattern_summary" msgid="8467282436608077882">"ማያ ለመክፈት ስርዓተ ጥለት ሳል"</string>
+    <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
+    <!-- outdated translation 4131169672844263316 -->     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"ማያ ለመክፈት የቁጥር PIN አስገባ"</string>
+    <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">" የይለፍ ቃል፡"</string>
+    <!-- outdated translation 4623254789833899286 -->     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"ማያ ለመክፈት የይለፍ ቃል አስገባ"</string>
+    <!-- outdated translation 736557879526940324 -->     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"በሩቅ የስልክ አስተዳዳሪ አልነቃም"</string>
+    <!-- no translation found for unlock_set_unlock_mode_off (378729687629105388) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_mode_none (7137296704741184239) -->
+    <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_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>
+    <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"የመክፈቻ ይለፍ ቃል አስወግድ"</string>
+    <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"መክፈቻ ስርዓት ጥለት ለውጥ"</string>
+    <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"መክፈቻ PIN ለውጥ"</string>
+    <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"መክፈቻ ይለፍ ቃል ለውጥ"</string>
+    <string name="lockpassword_password_too_short" msgid="7328975683669256660">"የይለፍ ቃል ቢያንስ %d ቁምፊዎች መሆን አለበት"</string>
+    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN ቢያንስ %d ቁምፊዎች መሆን አለበት"</string>
+    <string name="lockpassword_press_continue" msgid="122706614386757182">"ሲያልቅ ቀጥል ንካ"</string>
+    <string name="lockpassword_continue_label" msgid="4602203784934526940">"ቀጥል"</string>
+    <!-- no translation found for lockpassword_password_too_long (5487426077939378487) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_long (6382649850551200693) -->
+    <skip />
+    <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"PIN ከ0-9 አሀዞች ብቻ መያዝ አለበት"</string>
+    <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"መሣሪያ አስተዳዳሪ የቅርብ PIN መጠቀም አይፈቅዱም"</string>
+    <string name="lockpassword_illegal_character" msgid="6204396794254688549">"የይለፍ ቃል ህገ ወጥ ቁምፊ ይዟል"</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"የይለፍ ቃል ቢያንስ 1 ፊደል መያዝ አለበት"</string>
+    <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"የይለፍ ቃል ቢያንስ 1 አሀዝ መያዝ አለበት"</string>
+    <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"የይለፍ ቃል ቢያንስ 1 ወኪል መያዝ አለበት"</string>
+  <plurals name="lockpassword_password_requires_letters">
+    <item quantity="one" msgid="1462968118065694590">"የይለፍ ቃል ቢያንስ 1 ፊደል መያዝ አለበት"</item>
+    <item quantity="other" msgid="7278096339907683541">"የይለፍ ቃል ቢያንስ %d ፊደሎች መያዝ አለበት"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_lowercase">
+    <item quantity="one" msgid="2048653993044269649">"የይለፍ ቃል ቢያንስ 1 ትንሽ ፊደል መያዝ አለበት"</item>
+    <item quantity="other" msgid="588499075580432178">"የይለፍ ቃል ቢያንስ %d  ትንሽ ፊደሎች መያዝ አለበት"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_uppercase">
+    <item quantity="one" msgid="7677454174080582601">"የይለፍ ቃል ቢያንስ 1 ከፍ ያለ ፊደል መያዝ አለበት"</item>
+    <item quantity="other" msgid="2183090598541826806">"የይለፍ ቃል ቢያንስ %d ከፍ ያሉ ፊደሎች መያዝ አለበት"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_numeric">
+    <item quantity="one" msgid="8585088032818933985">"የይለፍ ቃል ቢያንስ 1 ቁጥር አሀዝ መያዝ አለበት"</item>
+    <item quantity="other" msgid="995673409754935278">"የይለፍ ቃል ቢያንስ %d ቁጥሮች አሀዞች መያዝ አለበት"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_symbols">
+    <item quantity="one" msgid="3930886641317826293">"የይለፍ ቃል ቢያንስ 1 ልዩ ወኪል መያዝ አለበት"</item>
+    <item quantity="other" msgid="3047460862484105274">"የይለፍ ቃል ቢያንስ %d ልዩ ወኪሎች መያዝ አለበት"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_nonletter">
+    <item quantity="one" msgid="1716355580615489062">"የይለፍ ቃል ቢያንስ 1 ፊደል ያልሆነ ቁምፊ መያዝ አለበት"</item>
+    <item quantity="other" msgid="5574191164708145973">"የይለፍ ቃል ቢያንስ %d ፊደል ያልሆኑ ቁምፊዎች መያዝ አለበት"</item>
+  </plurals>
+    <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"መሣሪያ አስተዳዳሪ የቅርብ ይለፍቃል መጠቀም አይፈቅዱም"</string>
+    <string name="lockpassword_ok_label" msgid="313822574062553672">"እሺ"</string>
+    <string name="lockpassword_cancel_label" msgid="8818529276331121899">"ይቅር"</string>
+    <!-- no translation found for lockpattern_tutorial_cancel_label (6431583477570493261) -->
+    <skip />
+    <!-- no translation found for lockpattern_tutorial_continue_label (3559793618653400434) -->
+    <skip />
+    <string name="device_admin_title" msgid="3562216873644263804">"መሣሪያ አስተዳደር"</string>
+    <!-- outdated translation 3864120111085199551 -->     <string name="manage_device_admin" msgid="5059296715271077278">"የመሣሪያ አስተዳዳሪዎች ምረጥ"</string>
+    <!-- outdated translation 915390201809231575 -->     <string name="manage_device_admin_summary" msgid="7672709110988761075">"የመሳሪያ አስተዳደሮችን አክል ወይም አስወግድ"</string>
+    <!-- no translation found for bluetooth_quick_toggle_title (1037056952714061893) -->
+    <skip />
+    <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">" ብሉቱዝ አብራ"</string>
+    <!-- no translation found for bluetooth_settings (2725796451253089609) -->
+    <skip />
+    <!-- no translation found for bluetooth_settings_title (2824020086246268296) -->
+    <skip />
+    <!-- no translation found for bluetooth_settings_summary (2091062709530570462) -->
+    <skip />
+    <string name="bluetooth_pairing_request" msgid="6385750334766370310">"የብሉቱዝ ማጣመሪያ ጥየቃ"</string>
+    <!-- no translation found for bluetooth_enter_pin_msg (1499285355129256289) -->
+    <skip />
+    <!-- no translation found for bluetooth_enter_passkey_msg (8301499416158195044) -->
+    <skip />
+    <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"ከ\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" ጋር ለማያያዝ፣ የይለፍቁልፉን፡<xliff:g id="PASSKEY">%2$s</xliff:g> እያሳየእንደሆነ አረጋግጥ።"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1076613564387784476">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n" ለማጣመር ይፈልጋል።"</string>
+    <!-- no translation found for bluetooth_display_passkey_pin_msg (9139892462102104755) -->
+    <skip />
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"አጣምር"</string>
+    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"አታጣምር"</string>
+    <string name="bluetooth_remote_device" msgid="2406662802908395389">"የብሉቱዝ መሣሪያ"</string>
+    <string name="bluetooth_error_title" msgid="538287072376677166">"ትኩረት"</string>
+    <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"ከ<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ጋር ለመገናኘት ችግር ነበር።"</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="6065697229258906937">"PIN  ወይም ይለፍቁልፉትክክል ስላልሆነከ<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ጋር ማጣመር ችግር ነበር።"</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="6688215193824686741">"ከ<xliff:g id="DEVICE_NAME">%1$s</xliff:g>ጋር ተያያዥነት መመስረት አልተቻለም።"</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"ማጣመር በ<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ተገፍቷል።"</string>
+    <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"ከ<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ለማገናኘት ችግር ነበር።"</string>
+    <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"መሣሪያዎችን ቃኝ"</string>
+    <!-- no translation found for bluetooth_preference_find_nearby_title (5087410003465463318) -->
+    <skip />
+    <!-- no translation found for bluetooth_preference_device_settings (907776049862799122) -->
+    <skip />
+    <!-- no translation found for bluetooth_preference_paired_devices (1970524193086791964) -->
+    <skip />
+    <!-- no translation found for bluetooth_preference_found_devices (3133019331974936204) -->
+    <skip />
+    <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"አያይዝ"</string>
+    <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"አለያይ"</string>
+    <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"አጣምር&amp;  አያይዝ"</string>
+    <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"አታጣምር"</string>
+    <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"አለያይ &amp; አልተጣመረም"</string>
+    <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"አማራጮች…"</string>
+    <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"ወደ..... አያይዝ"</string>
+    <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"ማህደረመረጃ"</string>
+    <!-- outdated translation 1874975688666658946 -->     <string name="bluetooth_profile_headset" msgid="81844079120986198">"ስልክ"</string>
+    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"አዛውር"</string>
+    <string name="bluetooth_profile_hid" msgid="3000858580917633478">"ግቤት መሣሪያ"</string>
+    <!-- outdated translation 4225813400648547154 -->     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"መሰካት"</string>
+    <!-- no translation found for bluetooth_disconnect_a2dp_profile (3524648279150937177) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_headset_profile (8635908811168780720) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_hid_profile (3282295189719352075) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_pan_user_profile (8037627994382458698) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_pan_nap_profile (5455448395850929200) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_pan_nap_profile (5266851881175033601) -->
+    <skip />
+    <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>አማራጮች"</string>
+    <!-- no translation found for bluetooth_device_advanced_device_actions_title (3793430949811946844) -->
+    <skip />
+    <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"አያይዝ"</string>
+    <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"ወደ ብሉቱዝ መሳሪያ አያይዝ"</string>
+    <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"መገለጫ"</string>
+    <!-- no translation found for bluetooth_device_advanced_rename_device (350508394033808532) -->
+    <skip />
+    <!-- no translation found for bluetooth_device_advanced_enable_opp_title (8222550640371627365) -->
+    <skip />
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"ወደ ሚዲያ አውዲዮ ተያይዟል"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"ወደ ስልክ አውዲዮ ተያይዟል"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"ወደ ፋይል ዝውውር አገልጋይ ተያይዟል"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"ከፋይል ዝውውር አገልጋይ ጋር አልተያያዘም"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"ወደ ግቤት መሣሪያ ተያይዟል"</string>
+    <!-- no translation found for bluetooth_pan_user_profile_summary_connected (4602294638909590612) -->
+    <skip />
+    <!-- no translation found for bluetooth_pan_nap_profile_summary_connected (1561383706411975199) -->
+    <skip />
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"ለማህደረመረጃ ድምፅተጠቀም"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"ለስልክ ድምፅ ተጠቀም"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"ለፋይል ዝውውር ተጠቀም"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"ለውፅአት ተጠቀም"</string>
+    <!-- no translation found for bluetooth_pan_profile_summary_use_for (5664884523822068653) -->
+    <skip />
+    <string name="bluetooth_dock_settings" msgid="3218335822716052885">"ቅንብሮች ትከል"</string>
+    <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"ለድምፅ ትከል ተጠቀም"</string>
+    <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"እንደ ተናጋሪ ስልክ"</string>
+    <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"ለሙዚቃ እና ማህደረ መረጃ"</string>
+    <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"ቅንብሮች አስታውስ"</string>
+    <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
+    <!-- no translation found for nfc_quick_toggle_summary (1988408027741447231) -->
+    <skip />
+    <!-- no translation found for nfc_toggle_error (2233172102497535522) -->
+    <!-- no translation found for nfc_toggle_error (8998642457947607263) -->
+    <skip />
+    <!-- no translation found for wifi_quick_toggle_title (874495178395350104) -->
+    <skip />
+    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Wi-Fi አብራ"</string>
+    <!-- no translation found for wifi_settings (4746946030627213196) -->
+    <skip />
+    <!-- no translation found for wifi_settings_category (2810363951104753710) -->
+    <skip />
+    <!-- no translation found for wifi_settings_summary (668767638556052820) -->
+    <skip />
+    <!-- no translation found for wifi_starting (6710266609710860129) -->
+    <skip />
+    <!-- no translation found for wifi_stopping (5952909472548218348) -->
+    <skip />
+    <!-- no translation found for wifi_error (3207971103917128179) -->
+    <skip />
+    <string name="wifi_in_airplane_mode" msgid="7618393787965366655">"አውሮፕላን ሁነታ"</string>
+    <string name="wifi_fail_to_scan" msgid="6194542252808587669">"አውታረመረቦችን ለመቃኘት አልተቻለም"</string>
+    <!-- no translation found for wifi_notify_open_networks (3755768188029653293) -->
+    <skip />
+    <!-- no translation found for wifi_notify_open_networks_summary (3038290727701553612) -->
+    <skip />
+    <!-- outdated translation 1367731352485585528 -->     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"የWiFi አንቀላፋ ፖሊሲ"</string>
+    <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"ከWi-Fi  ወደ ተንቀሳቃሽ ውሂብ መቼ እንደሚቀየርግለፅ"</string>
+    <!-- no translation found for wifi_setting_sleep_policy_summary_wifi_only (5025244230722670496) -->
+    <skip />
+    <!-- outdated translation 5103670439972135148 -->     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"የእንቅለፍ ፖሊሲውን ማቀናበር ችግር ነበር።"</string>
+    <string name="wifi_add_network" msgid="1671334951296205616">"Wi-Fi  አውታረ መረብ አክል"</string>
+    <!-- no translation found for wifi_add_network_summary (6345544206968025811) -->
+    <skip />
+    <!-- no translation found for wifi_access_points (2664629396767022441) -->
+    <skip />
+    <string name="wifi_menu_scan" msgid="1470911530412095868">"ቃኝ"</string>
+    <!-- no translation found for wifi_menu_advanced (7522252991919573664) -->
+    <skip />
+    <string name="wifi_menu_connect" msgid="4996220309848349408">"ወደ አውታረ መረብ አያይዝ"</string>
+    <string name="wifi_menu_forget" msgid="8736964302477327114">"አውታረ መረብ እርሳ"</string>
+    <string name="wifi_menu_modify" msgid="2068554918652440105">"አውታረ መረብ ቀይር"</string>
+    <string name="wifi_network_setup" msgid="7974851890019344870">"አውታረ መረብ መጫኛ"</string>
+    <string name="wifi_wps_pin" msgid="5471842298708321115">"pin ከመድረሻ ነጥብ አስገባ"</string>
+    <!-- no translation found for wifi_wps_setup_title (150518971269252336) -->
+    <skip />
+    <!-- no translation found for wifi_wps_pin_output (8682102965680650853) -->
+    <skip />
+    <!-- no translation found for wifi_wps_in_progress (2776555137392461525) -->
+    <skip />
+    <!-- no translation found for wifi_wps_failed (2277409652621482331) -->
+    <skip />
+    <string name="wifi_ssid" msgid="641393708309146745">"አውታረ መረብ SSID"</string>
+    <!-- no translation found for wifi_security (6603611185592956936) -->
+    <skip />
+    <string name="wifi_signal" msgid="5514120261628065287">"የሲግናል ጥንካሬ"</string>
+    <!-- no translation found for wifi_status (4824568012414605414) -->
+    <skip />
+    <string name="wifi_speed" msgid="3526198708812322037">"ፍጥነት አገናኝ"</string>
+    <!-- no translation found for wifi_ip_address (1440054061044402918) -->
+    <skip />
+    <string name="wifi_eap_method" msgid="8529436133640730382">"EAP ሜተድ"</string>
+    <string name="please_select_phase2" msgid="5231074529772044898">"ክፍል 2  ማረጋገጥ"</string>
+    <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA ምስክር"</string>
+    <string name="wifi_eap_user_cert" msgid="1291089413368160789">"የተጠቃሚ ምስክር"</string>
+    <string name="wifi_eap_identity" msgid="4359453783379679103">"መታወቂያ"</string>
+    <string name="wifi_eap_anonymous" msgid="2989469344116577955">"ስም አልባ መታወቂያ"</string>
+    <string name="wifi_password" msgid="5948219759936151048">" የይለፍ ቃል፡"</string>
+    <string name="wifi_show_password" msgid="6461249871236968884">"የይለፍ ቃል አሳይ"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"IP ቅንብሮች"</string>
+    <string name="wifi_unchanged" msgid="3410422020930397102">"(ያልተለወጠ)"</string>
+    <string name="wifi_unspecified" msgid="5431501214192991253">" (ያልተገለፀ)"</string>
+    <string name="wifi_remembered" msgid="8426719916135950136">"የሚታወስ"</string>
+    <string name="wifi_disabled" msgid="2104752038187543712">"ቦዝኗል"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"በክልል ውስጥ የለም"</string>
+    <!-- no translation found for wifi_open_with_wps (2606968531452521147) -->
+    <skip />
+    <string name="wifi_secured" msgid="6759903183748011566">"በ<xliff:g id="WIFI_SECURITY">%1$s</xliff:g> ጥብቅ"</string>
+    <string name="wifi_secured_with_wps" msgid="1822538701086256007">"በ <xliff:g id="WIFI_SECURITY">%1$s</xliff:g> (WPS አለ) የሚጠበቅ"</string>
+    <string name="wifi_secured_with_status" msgid="6489317496506267302">"<xliff:g id="WIFI_STATUS">%2$s</xliff:g>፣ በ<xliff:g id="WIFI_SECURITY">%1$s</xliff:g>  የተጠበቀ"</string>
+    <string name="wifi_connect" msgid="1076622875777072845">"አያይዝ"</string>
+    <string name="wifi_forget" msgid="8168174695608386644">"እርሳ"</string>
+    <string name="wifi_save" msgid="3331121567988522826">"አስቀምጥ"</string>
+    <string name="wifi_cancel" msgid="6763568902542968964">"ይቅር"</string>
+    <!-- no translation found for wifi_wps_overlap_error (6820987241637459748) -->
+    <skip />
+    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"የላቀ"</string>
+    <!-- no translation found for wifi_setting_frequency_band_title (7493768705046080060) -->
+    <skip />
+    <!-- no translation found for wifi_setting_frequency_band_summary (3250740757118009784) -->
+    <skip />
+    <!-- no translation found for wifi_setting_frequency_band_error (837281974489794378) -->
+    <skip />
+    <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC አድራሻ"</string>
+    <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP አድራሻ"</string>
+    <!-- no translation found for wifi_ip_settings_titlebar (4345739031248760326) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_menu_save (7296724066102908366) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_menu_cancel (6582567330136502340) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_ip_address (6387653152103405443) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_gateway (6383012465511093067) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_dns (3428867750550854065) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_network_prefix_length (8145730615716855433) -->
+    <skip />
+    <!-- no translation found for wifi_dns1 (7344118050720080045) -->
+    <skip />
+    <!-- no translation found for wifi_dns2 (1368601006824882659) -->
+    <skip />
+    <!-- no translation found for wifi_gateway (163914742461092086) -->
+    <skip />
+    <!-- no translation found for wifi_network_prefix_length (3028785234245085998) -->
+    <skip />
+    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">" ተጓጓዥ Wi-Fi ድረስ ነጥብ"</string>
+    <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"ተጓጓዥ ድረስ ነጥቦች<xliff:g id="NETWORK_SSID">%1$s</xliff:g> ገባሪ"</string>
+    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">" ተጓጓዥ Wi-Fi ድረስ ነጥብ ስህተት"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="3474995108398156258">"Wi-Fi ድረስ ነጥብ አዋቅር"</string>
+    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> ተጓጓዥ Wi-Fi ድረስ ነጥብ"</string>
+    <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Android ድረስ ነጥብ"</string>
+    <string name="sound_settings_title" msgid="8735891486683305886">"ድምፅ"</string>
+    <!-- outdated translation 1708697328627382561 -->     <string name="display_settings_title" msgid="2378894265964357591">"አሳይ"</string>
+    <!-- no translation found for sound_settings (5007659014828162881) -->
+    <skip />
+    <!-- no translation found for silent_mode_title (3181479108593217704) -->
+    <skip />
+    <string name="silent_mode_summary" msgid="3309650676072917899">"ከማህደረመረጃ &amp; ማንቂያዎች በስተቀር ሁሉንም ድምፆች ፀጥ አድርግ"</string>
+    <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"ከማህደረመረጃ በስተቀር ሁሉም ድምፆች ድምፅአልባናቸው።"</string>
+    <!-- no translation found for ringtone_title (7037881886694206550) -->
+    <skip />
+    <string name="ringtone_summary" msgid="2630023412632683493"></string>
+    <string name="all_volume_title" msgid="8741571721868253103">"ድምፅ"</string>
+    <!-- no translation found for ring_volume_title (7938706566797464165) -->
+    <skip />
+    <string name="ring_volume_summary" msgid="7055497624193116879"></string>
+    <string name="vibrate_in_silent_title" msgid="3897968069156767036">"ፀጥ ሲል ንዘር"</string>
+    <string name="vibrate_in_silent_summary" msgid="3312600513070076281">"በፀጥታ ሁነታ ውስጥ የንዘረት ግብረ ምላሽ ፍቀድ"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"ንዘር"</string>
+    <string name="vibrate_summary" msgid="7378130397830790458">"ለጥሪዎች እና ማሳወቂያዎች የንዝረት ግብረ ምላሽ"</string>
+    <!-- no translation found for notification_sound_title (6316316069880531693) -->
+    <skip />
+    <string name="notification_sound_summary" msgid="2953599929394109819"></string>
+    <string name="notification_pulse_title" msgid="1247988024534030629">"የማሳወቂያ ብርሃን አሳይ"</string>
+    <string name="notification_pulse_summary" msgid="6899220780534617152">"ለአዲስ ማሳወቂያዎች የምርዋጽ ብርሃን በተደጋጋሚ አሳይ"</string>
+    <string name="incoming_call_volume_title" msgid="8073714801365904099">"የስልክ ጥሪ ድምፅ"</string>
+    <string name="notification_volume_title" msgid="2012640760341080408">"ማሳወቂያ"</string>
+    <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"ለማሳወቂያዎች የገቢ ጥሪ ድምፅን ተጠቀም"</string>
+    <!-- no translation found for notification_sound_dialog_title (7057274209079144726) -->
+    <skip />
+    <string name="media_volume_title" msgid="3576565767317118106">"ማህደረ መረጃ"</string>
+    <!-- no translation found for media_volume_summary (5363248930648849974) -->
+    <skip />
+    <string name="alarm_volume_title" msgid="2285597478377758706">"ማንቂያ ደውል"</string>
+    <string name="dock_settings_summary" msgid="455802113668982481">"የድምፅ ቅንብሮች ለተያያዘው ትከል"</string>
+    <!-- no translation found for dtmf_tone_enable_title (1453831168789523185) -->
+    <skip />
+    <!-- no translation found for dtmf_tone_enable_summary_on (3028201873989887327) -->
+    <skip />
+    <!-- no translation found for dtmf_tone_enable_summary_off (7791065951268525678) -->
+    <skip />
+    <!-- no translation found for sound_effects_enable_title (3197313718929122833) -->
+    <skip />
+    <!-- no translation found for sound_effects_enable_summary_on (6154141289879491329) -->
+    <skip />
+    <!-- no translation found for sound_effects_enable_summary_off (3447739581759560125) -->
+    <skip />
+    <string name="lock_sounds_enable_title" msgid="1575990840389107141">"ማያ ቆልፍ ድምፆች"</string>
+    <string name="lock_sounds_enable_summary_on" msgid="145741024028391473">"ማያው ሲቆለፍ እና ሲከፈት በድምፅ አጫውት"</string>
+    <string name="lock_sounds_enable_summary_off" msgid="8481243116223542804">"ማያው ሲቆለፍ እና ሲከፈት በድምፅ አጫውት"</string>
+    <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"ሃፕቲክ መልሰህ መግብ"</string>
+    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"ለስላሳ ቁልፎች እናየተወሰኑ UI  በየነገፆች ጫን ሲደረግ ንዘር"</string>
+    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"ለስላሳ ቁልፎች እናየተወሰኑ UI  በየነገፆች ጫን ሲደረግ ንዘር"</string>
+    <string name="audio_record_proc_title" msgid="4271091199976457534">"ጫጫታ መቀነሻ"</string>
+    <string name="audio_record_proc_summary" msgid="8113628457499616498">"ሲናገሩ ወይም ሲቀዱ የዳራ ጫጫታ ዋጥ"</string>
+    <string name="dock_settings" msgid="1820107306693002541">"ትከል"</string>
+    <string name="dock_settings_title" msgid="9161438664257429372">" ቅንብሮችን ትከል"</string>
+    <string name="dock_audio_settings_title" msgid="3324750259959570305">"ኦዲዮ"</string>
+    <string name="dock_audio_summary_desk" msgid="6487784412371139335">"ለአባሪ ዴስክቶፕ ትከል ቅንብሮች"</string>
+    <string name="dock_audio_summary_car" msgid="6740897586006248450">"ለአባሪ መኪና ትከል ቅንብሮች"</string>
+    <!-- outdated translation 289909253741048784 -->     <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"ስልክ አልተተከለም"</string>
+    <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"ስልክ አልተተከለም"</string>
+    <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"ለአባሪ ትከል ቅንብሮች"</string>
+    <string name="dock_not_found_title" msgid="3290961741828952424">"ትከል አልተገኘም"</string>
+    <!-- outdated translation 3035260358985111855 -->     <string name="dock_not_found_text" product="tablet" msgid="7935403744079168804">"የድምፅ ትከል ለማዋቀር ስልኩ መተከል አለበት።"</string>
+    <string name="dock_not_found_text" product="default" msgid="3035260358985111855">"የድምፅ ትከል ለማዋቀር ስልኩ መተከል አለበት።"</string>
+    <string name="dock_sounds_enable_title" msgid="3659084028644948905">"ማስገቢያ ድምፅ ትከል"</string>
+    <!-- outdated translation 8491180514199743771 -->     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"ስልክ ከትከል ሲከት ወይም ሲያስወግድ በድምፅ አጫውት"</string>
+    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"ስልክ ከትከል ሲከት ወይም ሲያስወግድ በድምፅ አጫውት"</string>
+    <!-- outdated translation 3151046599205265919 -->     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"ስልኩን ከትከል ስታስገባ ወይም ስታስወግድ ዘፈን አታጫውት"</string>
+    <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"ስልኩን ከትከል ስታስገባ ወይም ስታስወግድ ዘፈን አታጫውት"</string>
+    <string name="sync_settings" msgid="9186125469300013491">"መለያዎች &amp; አሳምር"</string>
+    <string name="sync_settings_summary" msgid="2962179505214965667">"መለያዎች አክል ወይም አስወግድ እና የመለያ ቅንብሮችን ለውጥ"</string>
+    <string name="search_settings" msgid="1910951467596035063">"ፍለጋ"</string>
+    <string name="search_settings_summary" msgid="9205656546570654169">"የፍለጋ ታሪክእና ቅንብሮችንአደራጅ"</string>
+    <!-- no translation found for display_settings (5947830029420609057) -->
+    <skip />
+    <string name="animations_title" msgid="1062189037402346023">"ምሥሎችን የማንቀሣቀስ ቴክኖሎጂ (አኒሜሽን)"</string>
+    <string name="animations_summary_on" msgid="8843613112130484436">" &amp; ስትከፍት ዊንዶ ውዝ ስትዘጋእነማ አሳይ"</string>
+    <string name="animations_summary_off" msgid="2777026828025551983">" &amp; ስትከፍት ዊንዶ ውዝ ስትዘጋእነማ አሳይ"</string>
+    <string name="accelerometer_title" msgid="7854608399547349157">"ማያ በራስ ሰር አሽከርክር"</string>
+    <!-- outdated translation 1133737282813048021 -->     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"ስልክ ስታሽከረክር በራስሰር ገፅ አቀማመጡን ቀይር"</string>
+    <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"ስልክ ስታሽከረክር በራስሰር ገፅ አቀማመጡን ቀይር"</string>
+    <!-- outdated translation 5485489363715740761 -->     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"ስልክ ስታሽከረክር በራስሰር ገፅ አቀማመጡን ቀይር"</string>
+    <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"ስልክ ስታሽከረክር በራስሰር ገፅ አቀማመጡን ቀይር"</string>
+    <!-- no translation found for brightness (2354961343555249270) -->
+    <skip />
+    <string name="brightness_summary" msgid="838917350127550703">"የማያ ብሩህነት አስተካክል"</string>
+    <!-- no translation found for screen_timeout (6962654593018319466) -->
+    <skip />
+    <!-- no translation found for screen_timeout_summary (4471347210332380587) -->
+    <skip />
+    <!-- no translation found for dream_settings_title (6536876013377446805) -->
+    <skip />
+    <!-- no translation found for dream_settings_summary (6809871648071408259) -->
+    <skip />
+    <!-- no translation found for dream_component_title (505229894674572578) -->
+    <skip />
+    <!-- no translation found for dream_timeout_title (1385909618566514628) -->
+    <skip />
+    <!-- no translation found for dream_timeout_summary (6721955887728454226) -->
+    <skip />
+    <!-- no translation found for dream_timeout_zero_summary (2450290346381400092) -->
+    <skip />
+    <!-- no translation found for dream_test (5968002644622194481) -->
+    <skip />
+    <string name="automatic_brightness" msgid="5014143533884135461">"ራስ ሰርብሩህነት"</string>
+    <!-- no translation found for title_font_size (4405544325522105222) -->
+    <skip />
+    <!-- no translation found for summary_font_size (7548243392515500554) -->
+    <skip />
+    <!-- no translation found for dialog_title_font_size (4503471078477715461) -->
+    <skip />
+    <!-- no translation found for sim_lock_settings (3392331196873564292) -->
+    <skip />
+    <!-- no translation found for sim_lock_settings_category (5136244267576697004) -->
+    <skip />
+    <!-- no translation found for sim_lock_settings_title (9018585580955414596) -->
+    <skip />
+    <!-- no translation found for sim_pin_toggle (1742123478029451888) -->
+    <skip />
+    <!-- no translation found for sim_lock_on (5058355081270397764) -->
+    <skip />
+    <!-- no translation found for sim_lock_on (2503536505568814324) -->
+    <skip />
+    <!-- no translation found for sim_lock_off (2813800553917012356) -->
+    <skip />
+    <!-- no translation found for sim_lock_off (258981978215428916) -->
+    <skip />
+    <string name="sim_pin_change" msgid="6311414184279932368">"SIM PIN ለውጥ"</string>
+    <string name="sim_enter_pin" msgid="6608715137008508432">"SIM PIN"</string>
+    <string name="sim_enable_sim_lock" msgid="4517742794997166918">"SIM ካርድ ሸንጉር"</string>
+    <string name="sim_disable_sim_lock" msgid="7664729528754784824">"SIM ካርድ ክፈት"</string>
+    <string name="sim_enter_old" msgid="6074196344494634348">"የድሮSIM PIN"</string>
+    <string name="sim_enter_new" msgid="8742727032729243562">"አዲስ SIM PIN"</string>
+    <!-- no translation found for sim_reenter_new (3178510434642201544) -->
+    <skip />
+    <string name="sim_change_pin" msgid="7328607264898359112">"SIM PIN"</string>
+    <!-- no translation found for sim_bad_pin (2746201276896134075) -->
+    <skip />
+    <string name="sim_pins_dont_match" msgid="4664611595579163214">"PINኦች አይመሳሰሉም!"</string>
+    <string name="sim_change_failed" msgid="4823538458798362222">"PIN  ለመለወጥ አልተቻለም።"\n" የተሳሳተPIN  ይሆናል።"</string>
+    <!-- no translation found for sim_change_succeeded (8556135413096489627) -->
+    <skip />
+    <string name="sim_lock_failed" msgid="6676748290838006404">"የSIM ካርድን ቆልፍ ሁኔታ ለመለወጥ አልተቻለም።"\n" የተሳሳተPIN  ይሆናል።"</string>
+    <!-- no translation found for sim_enter_ok (6475946836899218919) -->
+    <skip />
+    <!-- no translation found for sim_enter_cancel (6240422158517208036) -->
+    <skip />
+    <!-- no translation found for device_info_settings (1119755927536987178) -->
+    <skip />
+    <!-- no translation found for device_info_settings (475872867864762157) -->
+    <skip />
+    <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"የሥርዓት ዝመናዎች"</string>
+    <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
+    <string name="firmware_version" msgid="4801135784886859972">"Android ሥሪት"</string>
+    <!-- no translation found for model_number (3765737700545384794) -->
+    <skip />
+    <!-- no translation found for baseband_version (1848990160763524801) -->
+    <skip />
+    <!-- no translation found for kernel_version (9192574954196167602) -->
+    <skip />
+    <!-- no translation found for build_number (3075795840572241758) -->
+    <skip />
+    <!-- no translation found for device_info_not_available (8062521887156825182) -->
+    <skip />
+    <string name="device_status_activity_title" msgid="1411201799384697904">"ኹናቴ"</string>
+    <!-- no translation found for device_status (607405385799807324) -->
+    <skip />
+    <!-- outdated translation 2599162787451519618 -->     <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"ስልክቁጥር፣ሲግናል፣ወዘተ።"</string>
+    <string name="device_status_summary" product="default" msgid="2599162787451519618">"ስልክቁጥር፣ሲግናል፣ወዘተ።"</string>
+    <string name="storage_settings" msgid="4211799979832404953">"ማከማቻ"</string>
+    <string name="storage_settings_title" msgid="8746016738388094064">"የማቸከማቻ ቅንብሮች"</string>
+    <!-- no translation found for storage_settings_summary (3543813623294870759) -->
+    <skip />
+    <!-- no translation found for storage_settings_summary (9176693537325988610) -->
+    <skip />
+    <!-- outdated translation 5123197324870153205 -->     <string name="status_number" product="tablet" msgid="1138837891091222272">"የኔ ስልክ ቁጥር"</string>
+    <string name="status_number" product="default" msgid="5123197324870153205">"የኔ ስልክ ቁጥር"</string>
+    <string name="status_min_number" msgid="3519504522179420597">"ዝቅተኛ"</string>
+    <string name="status_prl_version" msgid="8499039751817386529">"PRL ሥሪት"</string>
+    <!-- outdated translation 1751442889111731088 -->     <string name="status_meid_number" msgid="2037549729230058915">"MEID"</string>
+    <string name="status_network_type" msgid="3279383550222116235">"የተንቀሳቃሽ አውታረ መረብ አይነት"</string>
+    <string name="status_data_state" msgid="5503181397066522950">"የተንቀሳቃሽ አውታረ መረብክልል"</string>
+    <!-- no translation found for status_service_state (2323931627519429503) -->
+    <skip />
+    <!-- no translation found for status_signal_strength (3732655254188304547) -->
+    <skip />
+    <!-- no translation found for status_roaming (2638800467430913403) -->
+    <skip />
+    <!-- no translation found for status_operator (2274875196954742087) -->
+    <skip />
+    <!-- no translation found for status_wifi_mac_address (33109409206264790) -->
+    <skip />
+    <!-- no translation found for status_bt_address (4195174192087439720) -->
+    <skip />
+    <!-- no translation found for status_serial_number (2257111183374628137) -->
+    <skip />
+    <!-- no translation found for status_unavailable (7862009036663793314) -->
+    <skip />
+    <!-- no translation found for status_up_time (7294859476816760399) -->
+    <skip />
+    <!-- no translation found for status_awake_time (2393949909051183652) -->
+    <skip />
+    <!-- no translation found for internal_memory (9129595691484260784) -->
+    <skip />
+    <!-- no translation found for sd_memory (2510246194083052841) -->
+    <skip />
+    <!-- no translation found for sd_memory (151871913888051515) -->
+    <skip />
+    <!-- no translation found for memory_available (5052397223077021181) -->
+    <skip />
+    <!-- no translation found for memory_size (6629067715017232195) -->
+    <skip />
+    <!-- no translation found for memory_calculating_size (2188358544203768588) -->
+    <skip />
+    <!-- no translation found for memory_apps_usage (9079237985722858506) -->
+    <skip />
+    <!-- no translation found for memory_media_usage (3738830697707880405) -->
+    <skip />
+    <!-- no translation found for memory_downloads_usage (3755173051677533027) -->
+    <skip />
+    <!-- no translation found for memory_dcim_usage (6679615808140067136) -->
+    <skip />
+    <!-- no translation found for memory_music_usage (4040027367622874108) -->
+    <skip />
+    <!-- no translation found for memory_media_misc_usage (235452944021647124) -->
+    <skip />
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"የተጋራ ማከማቻ ንቀል"</string>
+    <string name="sd_eject" product="default" msgid="6915293408836853020">" SD ካርድ ንቀል"</string>
+    <!-- outdated translation 3315557796211542962 -->     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"በሰላም ለማስወገድ SD ካርድ ንቀል"</string>
+    <!-- outdated translation 3315557796211542962 -->     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"በሰላም ለማስወገድ SD ካርድ ንቀል"</string>
+    <!-- outdated translation 2048640010381803841 -->     <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"የSD ካርድ ለመሰካት አስገባ"</string>
+    <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"የSD ካርድ ለመሰካት አስገባ"</string>
+    <!-- outdated translation 5940523765187704135 -->     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"SD ካርድ ሰካ"</string>
+    <string name="sd_mount" product="default" msgid="5940523765187704135">"SD ካርድ ሰካ"</string>
+    <string name="sd_mount_summary" product="nosdcard" msgid="4673411327373419641"></string>
+    <string name="sd_mount_summary" product="default" msgid="4673411327373419641"></string>
+    <!-- outdated translation 5448738337382712203 -->     <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"የSD ካርድ ቅርፀት"</string>
+    <!-- outdated translation 5448738337382712203 -->     <string name="sd_format" product="default" msgid="2576054280507119870">"የSD ካርድ ቅርፀት"</string>
+    <!-- outdated translation 6616491027883134004 -->     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"የSD ካርድ ቅረፅ(አጥፋ)"</string>
+    <!-- outdated translation 6616491027883134004 -->     <string name="sd_format_summary" product="default" msgid="212703692181793109">"የSD ካርድ ቅረፅ(አጥፋ)"</string>
+    <!-- no translation found for read_only (6702420168629076340) -->
+    <skip />
+    <!-- outdated translation 8612140627310646730 -->     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"SD ካርድ ንቀል"</string>
+    <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"SD ካርድ ንቀል"</string>
+    <!-- outdated translation 5851214273718817727 -->     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">" የSD ካርዱን ከነቀሉ አንዳንድ እየተጠቀሙባቸው ያሉ ትግበራዎች ይቆሙ እና SD ካርዱን እስኪሰኩ ላይገኙ ይችላሉ።"</string>
+    <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">" የSD ካርዱን ከነቀሉ አንዳንድ እየተጠቀሙባቸው ያሉ ትግበራዎች ይቆሙ እና SD ካርዱን እስኪሰኩ ላይገኙ ይችላሉ።"</string>
+    <!-- outdated translation 4004106918266783081 -->     <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"ያልተሳካ SD ካርድ ንቀል"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"ያልተሳካ SD ካርድ ንቀል"</string>
+    <!-- outdated translation 9188972789897713180 -->     <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">" SD ካርድ መንቀል አልተቻለም። ትንሽ ቆይተህ እንደገና ሞክር።"</string>
+    <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">" SD ካርድ መንቀል አልተቻለም። ትንሽ ቆይተህ እንደገና ሞክር።"</string>
+    <!-- outdated translation 1904212716075458402 -->     <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"SD ካርድ ይነቀላል።"</string>
+    <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"SD ካርድ ይነቀላል።"</string>
+    <string name="sd_ejecting_title" msgid="8824572198034365468">"በመንቀል ላይ"</string>
+    <string name="sd_ejecting_summary" msgid="2028753069184908491">"ንቀል በሂደት ላይ"</string>
+    <!-- no translation found for battery_status_title (9159414319574976203) -->
+    <skip />
+    <!-- no translation found for battery_level_title (2965679202786873272) -->
+    <skip />
+    <!-- no translation found for apn_settings (3743170484827528406) -->
+    <skip />
+    <!-- no translation found for apn_edit (1354715499708424718) -->
+    <skip />
+    <!-- no translation found for apn_not_set (7422262558097875757) -->
+    <skip />
+    <!-- no translation found for apn_name (4115580098369824123) -->
+    <skip />
+    <!-- no translation found for apn_apn (2479425126733513353) -->
+    <skip />
+    <!-- no translation found for apn_http_proxy (1826885957243696354) -->
+    <skip />
+    <!-- no translation found for apn_http_port (3763259523984976226) -->
+    <skip />
+    <!-- no translation found for apn_user (455637547356117761) -->
+    <skip />
+    <!-- no translation found for apn_password (5412301994998250968) -->
+    <skip />
+    <!-- no translation found for apn_server (2436185314756372858) -->
+    <skip />
+    <!-- no translation found for apn_mmsc (3670124402105585737) -->
+    <skip />
+    <!-- no translation found for apn_mms_proxy (5374082621073999275) -->
+    <skip />
+    <!-- no translation found for apn_mms_port (4074188088199243040) -->
+    <skip />
+    <!-- no translation found for apn_mcc (4258628382260674636) -->
+    <skip />
+    <!-- no translation found for apn_mnc (8629374076888809874) -->
+    <skip />
+    <string name="apn_auth_type" msgid="6167205395676037015">"የማረጋገጫ  አይነት"</string>
+    <string name="apn_auth_type_none" msgid="5069592676845549926">"የለም"</string>
+    <string name="apn_auth_type_pap" msgid="1666934536996033383">"PAP"</string>
+    <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
+    <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP ወይም CHAP"</string>
+    <!-- no translation found for apn_type (469613123902220544) -->
+    <skip />
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
+    <!-- no translation found for menu_delete (6981294422841124659) -->
+    <skip />
+    <!-- no translation found for menu_new (3014205883303921729) -->
+    <skip />
+    <!-- no translation found for menu_save (8109345640668285399) -->
+    <skip />
+    <!-- no translation found for menu_cancel (2194502410474697474) -->
+    <skip />
+    <!-- no translation found for error_title (1319225301794168762) -->
+    <skip />
+    <!-- no translation found for error_name_empty (1498238337687930558) -->
+    <skip />
+    <!-- no translation found for error_apn_empty (1513892291812404310) -->
+    <skip />
+    <!-- no translation found for error_mcc_not3 (4560171714156251661) -->
+    <skip />
+    <!-- no translation found for error_mnc_not23 (8418177072458379439) -->
+    <skip />
+    <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>
+    <!-- no translation found for master_clear_title (5907939616087039756) -->
+    <skip />
+    <!-- no translation found for master_clear_summary (4036344100254678429) -->
+    <skip />
+    <!-- no translation found for master_clear_summary (4986154238001088492) -->
+    <skip />
+    <!-- unknown placeholder BREAK_10 in master_clear_desc -->
+    <skip />
+    <!-- no translation found for master_clear_desc (590799767511283567) -->
+    <skip />
+    <!-- unknown placeholder BREAK_10 in master_clear_desc -->
+    <skip />
+    <!-- no translation found for master_clear_desc (3251400937758241249) -->
+    <skip />
+    <!-- no translation found for master_clear_accounts (6412857499147999073) -->
+    <skip />
+    <!-- no translation found for master_clear_desc_also_erases_external (1903185203791274237) -->
+    <skip />
+    <!-- no translation found for master_clear_desc_erase_external_storage (4740866328425123395) -->
+    <skip />
+    <!-- no translation found for master_clear_desc_erase_external_storage (7339100478676372901) -->
+    <skip />
+    <!-- no translation found for erase_external_storage (969364037450286809) -->
+    <skip />
+    <!-- no translation found for erase_external_storage (1397239046334307625) -->
+    <skip />
+    <!-- no translation found for erase_external_storage_description (444834593696342279) -->
+    <skip />
+    <!-- no translation found for erase_external_storage_description (46603515218075174) -->
+    <skip />
+    <!-- no translation found for master_clear_button_text (3130786116528304116) -->
+    <skip />
+    <!-- no translation found for master_clear_button_text (7550632653343157971) -->
+    <skip />
+    <string name="master_clear_final_desc" msgid="6917971132484622696">"የግል መረጃ እና ማንኛውም የወረዱ ትግበራዎች ሁሉ ይጥፉ? ይህን ርምጃ ለመመለስ አይቻለም!"</string>
+    <!-- no translation found for master_clear_final_button_text (5390908019019242910) -->
+    <skip />
+    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"የራስዎን ቁልፍ መክፈቻ ስርዓተጥለት ይሳሉ"</string>
+    <!-- no translation found for master_clear_gesture_explanation (2234954758550554549) -->
+    <skip />
+    <!-- no translation found for master_clear_failed (8655202125010189406) -->
+    <skip />
+    <!-- no translation found for master_clear_confirm_title (4845794266129586839) -->
+    <skip />
+    <!-- outdated translation 4671276096695789895 -->     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">" SD ካርድ ቅረፅ"</string>
+    <!-- outdated translation 4671276096695789895 -->     <string name="media_format_title" product="default" msgid="4427528440306787972">" SD ካርድ ቅረፅ"</string>
+    <!-- outdated translation 3805714639375830120 -->     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"በSD   ካርድ ላይ ያለ ውሂብ በሙሉ አጥፋ"</string>
+    <string name="media_format_summary" product="default" msgid="3805714639375830120">"በSD   ካርድ ላይ ያለ ውሂብ በሙሉ አጥፋ"</string>
+    <!-- outdated translation 1142563222357820834 -->     <string name="media_format_desc" product="nosdcard" msgid="4553860683952763905">"ይህ ርምጃ በስልኩ ውስጥ ያለውን የSD ካርድ ይደመስሳል።"</string>
+    <!-- outdated translation 1142563222357820834 -->     <string name="media_format_desc" product="default" msgid="1598627584181935513">"ይህ ርምጃ በስልኩ ውስጥ ያለውን የSD ካርድ ይደመስሳል።"</string>
+    <!-- outdated translation 370856400090190151 -->     <string name="media_format_button_text" product="nosdcard" msgid="6293669371185352810">"የSD ካርድ ቅርፀት"</string>
+    <!-- outdated translation 370856400090190151 -->     <string name="media_format_button_text" product="default" msgid="6721544380069373626">"የSD ካርድ ቅርፀት"</string>
+    <!-- outdated translation 1776666694910717198 -->     <string name="media_format_final_desc" product="nosdcard" msgid="8094635533378487255">"የSD ካርድ ቅረፅ፣ ማህደረ መረጃ ሁሉ ይጥፋ? ርምጃው መቀልበስ አይችልም!"</string>
+    <!-- outdated translation 1776666694910717198 -->     <string name="media_format_final_desc" product="default" msgid="9015504991522581434">"የSD ካርድ ቅረፅ፣ ማህደረ መረጃ ሁሉ ይጥፋ? ርምጃው መቀልበስ አይችልም!"</string>
+    <string name="media_format_final_button_text" msgid="4881713344315923175">"ሁሉንም አጥፋ"</string>
+    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"የራስዎን ቁልፍ መክፈቻ ስርዓተጥለት ይሳሉ"</string>
+    <!-- outdated translation 4239529439389660159 -->     <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"የSD ካርድ ቅርፀት ለማረጋገጥ የስርዓተ ጥለት መክፈቻ ዎን መሳል አለብዎ።"</string>
+    <!-- outdated translation 4239529439389660159 -->     <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"የSD ካርድ ቅርፀት ለማረጋገጥ የስርዓተ ጥለት መክፈቻ ዎን መሳል አለብዎ።"</string>
+    <!-- no translation found for call_settings_title (5188713413939232801) -->
+    <skip />
+    <!-- no translation found for call_settings_summary (7291195704801002886) -->
+    <skip />
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB መሰካት"</string>
+    <string name="tether_settings_title_wifi" msgid="3277144155960302049">"ተጓጓዥ ድረስ ነጥቦች"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"ብሉቱዝ ማያያዝ"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"መሰካት"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"&amp; ተጓጓዥ ድረስ ነጥብ"</string>
+    <!-- outdated translation 3562431455625637370 -->     <string name="tether_settings_summary_usb" product="tablet" msgid="785883365108362248">"በUSB በኩል የተንቀሳቃሽ ስልክዎን ውሂብ ማያያዣ ያጋሩ"</string>
+    <string name="tether_settings_summary_usb" product="default" msgid="3562431455625637370">"በUSB በኩል የተንቀሳቃሽ ስልክዎን ውሂብ ማያያዣ ያጋሩ"</string>
+    <!-- outdated translation 4690912027002467246 -->     <string name="tether_settings_summary_wifi" msgid="5474383125137372164">"እንደ ተጓጓዥ Wi-Fi ድረስ ነጥብ የተንቀሳቃሽ ስልክዎን ውሂብ ማያያዣ ያጋሩ"</string>
+    <!-- no translation found for tether_settings_summary_bluetooth (2407506656353819750) -->
+    <skip />
+    <!-- outdated translation 3700323208282018772 -->     <string name="tether_settings_summary_usb_wifi" product="tablet" msgid="3834674129575844910">"በUSB ወይም እንደ ተጓጓዥ Wi-Fi ድረስ ነጥብ በኩል የተንቀሳቃሽ ስልክዎን ውሂብ ማያያዣ ያጋሩ"</string>
+    <string name="tether_settings_summary_usb_wifi" product="default" msgid="3700323208282018772">"በUSB ወይም እንደ ተጓጓዥ Wi-Fi ድረስ ነጥብ በኩል የተንቀሳቃሽ ስልክዎን ውሂብ ማያያዣ ያጋሩ"</string>
+    <!-- outdated translation 4008195891276675882 -->     <string name="tether_settings_summary_usb_bluetooth" product="tablet" msgid="1245080236509560839">"በUSB ወይም ብሉቱዝ በኩል የተንቀሳቃሽ ስልክዎን ውሂብ ማያያዣ ያጋሩ"</string>
+    <string name="tether_settings_summary_usb_bluetooth" product="default" msgid="4008195891276675882">"በUSB ወይም ብሉቱዝ በኩል የተንቀሳቃሽ ስልክዎን ውሂብ ማያያዣ ያጋሩ"</string>
+    <!-- outdated translation 2753904149495692201 -->     <string name="tether_settings_summary_wifi_bluetooth" product="tablet" msgid="1924576461932311140">"በUSB ወይም እንደ ተጓጓዥ Wi-Fi ድረስ ነጥብ በኩል የተንቀሳቃሽ ስልክዎን ውሂብ ማያያዣ ያጋሩ"</string>
+    <string name="tether_settings_summary_wifi_bluetooth" product="default" msgid="2753904149495692201">"በUSB ወይም እንደ ተጓጓዥ Wi-Fi ድረስ ነጥብ በኩል የተንቀሳቃሽ ስልክዎን ውሂብ ማያያዣ ያጋሩ"</string>
+    <!-- outdated translation 1171769255924636665 -->     <string name="tether_settings_summary_all" product="tablet" msgid="6612660164315153427">"በUSB፣Wi-Fi ወይም ብሉቱዝ በኩል የተንቀሳቃሽ ስልክዎን ውሂብ ማያያዣ ያጋሩ"</string>
+    <string name="tether_settings_summary_all" product="default" msgid="1171769255924636665">"በUSB፣Wi-Fi ወይም ብሉቱዝ በኩል የተንቀሳቃሽ ስልክዎን ውሂብ ማያያዣ ያጋሩ"</string>
+    <string name="usb_title" msgid="7483344855356312510">"USB"</string>
+    <string name="usb_tethering_button_text" msgid="585829947108007917">"USB መሰካት"</string>
+    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB ተያይዟል፣ ለማያያዝ ተመልከት"</string>
+    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"የተያያዘ"</string>
+    <string name="usb_tethering_storage_active_subtext" msgid="6608933594288072573">"የUSB ማከማቻ ጥቅም ላይ ሲሆን ማያያዝ አይቻልም።"</string>
+    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB አልተያያዘም"</string>
+    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB የመሰካት ስህተት"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"ብሉቱዝ ማያያዝ"</string>
+    <!-- outdated translation 3317112145693933963 -->     <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"ብሉቱዝ ማያያዝ በርቷል ነገር ግን አልተያያዘም"</string>
+    <!-- outdated translation 3317112145693933963 -->     <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"ብሉቱዝ ማያያዝ በርቷል ነገር ግን አልተያያዘም"</string>
+    <!-- no translation found for bluetooth_tethering_device_connected_subtext (2730938191906597896) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_device_connected_subtext (1666736165420290466) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_devices_connected_subtext (1180765608259580143) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_devices_connected_subtext (8248942539362173005) -->
+    <skip />
+    <!-- outdated translation 1798863866978968964 -->     <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"ብሉቱዝ ማያያዝ ጠፍቷል"</string>
+    <!-- outdated translation 1798863866978968964 -->     <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"ብሉቱዝ ማያያዝ ጠፍቷል"</string>
+    <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"ብሉቱዝ የማያያዝ ስህተት"</string>
+    <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"ከ<xliff:g id="MAXCONNECTION">%1$d</xliff:g> መሣሪያዎች በላይ ማያያዝ አይቻልም።"</string>
+    <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> አይያያዝም።"</string>
+    <string name="tethering_help_button_text" msgid="656117495547173630">"እገዛ"</string>
+    <!-- no translation found for network_settings_title (7967552516440151852) -->
+    <skip />
+    <!-- no translation found for network_settings_summary (5149750850846813553) -->
+    <skip />
+    <string name="location_title" msgid="1029961368397484576">"የኔ ሥፍራ"</string>
+    <!-- no translation found for location_network_based (8815705866861993344) -->
+    <skip />
+    <!-- no translation found for location_networks_disabled (2708968452901433980) -->
+    <skip />
+    <!-- no translation found for location_neighborhood_level (4656658097932515921) -->
+    <skip />
+    <!-- no translation found for location_neighborhood_level_wifi (7457348712272184793) -->
+    <skip />
+    <string name="location_gps" msgid="6296125378829097831">"የGPS ሰው ሰራሽ መንኮራኮሮች ተጠቀም"</string>
+    <string name="location_street_level" msgid="7456259025474443314">"ስታመለክት፣ በጎዳናው ደረጃ ትክክለኛ"</string>
+    <!-- no translation found for location_gps_disabled (6632537158777308128) -->
+    <skip />
+    <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 5447030582538504247 -->     <string name="use_location_title" msgid="3659340070401464551">"የኔን ስፍራ ተጠቀም"</string>
+    <!-- no translation found for use_location_summary_disabled (6518008620918354403) -->
+    <skip />
+    <!-- no translation found for use_location_summary_enabled (8110246289085796179) -->
+    <skip />
+    <!-- no translation found for about_settings (593457295516533765) -->
+    <skip />
+    <!-- no translation found for about_settings (1743378368185371685) -->
+    <skip />
+    <!-- no translation found for about_settings_summary (3371517697156165959) -->
+    <skip />
+    <!-- no translation found for legal_information (5769301644270604095) -->
+    <skip />
+    <!-- no translation found for contributors_title (5917703088825286504) -->
+    <skip />
+    <!-- no translation found for copyright_title (865906688917260647) -->
+    <skip />
+    <!-- no translation found for license_title (1990487604356037871) -->
+    <skip />
+    <!-- no translation found for terms_title (7697580845616764642) -->
+    <skip />
+    <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"የስርዓት አጋዥ ስልጠና"</string>
+    <!-- outdated translation 3861815254521030201 -->     <string name="system_tutorial_list_item_summary" product="tablet" msgid="3341504384445734067">"ስልክዎን እንዴት እንደሚጠቀሙ  ይረዱ"</string>
+    <string name="system_tutorial_list_item_summary" product="default" msgid="3861815254521030201">"ስልክዎን እንዴት እንደሚጠቀሙ  ይረዱ"</string>
+    <!-- no translation found for settings_license_activity_title (7553683406244228650) -->
+    <skip />
+    <!-- no translation found for settings_license_activity_unavailable (4210539215951487627) -->
+    <skip />
+    <!-- no translation found for settings_license_activity_loading (3337535809093591740) -->
+    <skip />
+    <string name="settings_safetylegal_title" msgid="1289483965535937431">"የደህንነት መረጃ"</string>
+    <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"የደህንነት መረጃ"</string>
+    <!-- no translation found for settings_safetylegal_activity_unreachable (170670055116721810) -->
+    <skip />
+    <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"በማስገባት ላይ..."</string>
+    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"የይለፍ ቃለዎን ይምረጡ"</string>
+    <!-- no translation found for lockpassword_choose_your_pattern_header (6949761069941694050) -->
+    <skip />
+    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"PINዎን ይምረጡ"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"የይለፍ ቃልዎን ያረጋግጡ"</string>
+    <!-- no translation found for lockpassword_confirm_your_pattern_header (7543433733032330821) -->
+    <skip />
+    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"PINዎንያረጋግጡ"</string>
+    <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"የይለፍ ቃላት አይዛመዱም"</string>
+    <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"PINኦች አይዛመዱም"</string>
+    <!-- no translation found for lockpassword_choose_lock_generic_header (3811438094903786145) -->
+    <skip />
+    <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"የይለፍ ቃል ተዘጋጅቷል"</string>
+    <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN አልተዘጋጀም ነበር"</string>
+    <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"ስርዓተ ጥለት ተዘጋጅቷል"</string>
+    <!-- outdated translation 975088518210629938 -->     <string name="lock_settings_title" msgid="8943058958424073651">"ማያ"</string>
+    <!-- no translation found for lockpattern_change_lock_pattern_label (5679630792003440352) -->
+    <skip />
+    <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"መክፈቻ PIN ለውጥ"</string>
+    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"የተቀመጠ ስርዓተ ጥለት አረጋግጥ"</string>
+    <!-- no translation found for lockpattern_need_to_unlock_wrong (5629093548611791080) -->
+    <skip />
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"የመክፈቻ ስርዓተ ንጥል ሳል"</string>
+    <!-- no translation found for lockpattern_recording_intro_footer (1118579101409152113) -->
+    <skip />
+    <!-- no translation found for lockpattern_recording_inprogress (4622772178078818425) -->
+    <skip />
+    <!-- no translation found for lockpattern_recording_incorrect_too_short (3103250430366718996) -->
+    <skip />
+    <!-- no translation found for lockpattern_pattern_entered_header (5012716272001299362) -->
+    <skip />
+    <!-- no translation found for lockpattern_need_to_confirm (5144676887162575050) -->
+    <skip />
+    <!-- no translation found for lockpattern_pattern_confirmed_header (2223856038485537716) -->
+    <skip />
+    <!-- no translation found for lockpattern_confirm_button_text (1128204343957002841) -->
+    <skip />
+    <!-- no translation found for lockpattern_restart_button_text (3337574403350953926) -->
+    <skip />
+    <!-- no translation found for lockpattern_retry_button_text (1949847413862309134) -->
+    <skip />
+    <!-- no translation found for lockpattern_continue_button_text (4723771754714471410) -->
+    <skip />
+    <!-- no translation found for lockpattern_settings_title (3207750489460466680) -->
+    <skip />
+    <!-- no translation found for lockpattern_settings_enable_title (6920616873671115281) -->
+    <skip />
+    <!-- no translation found for lockpattern_settings_enable_summary (1165707416664252167) -->
+    <skip />
+    <!-- no translation found for lockpattern_settings_enable_visible_pattern_title (104851667540971729) -->
+    <skip />
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="972174133075372341">"ተጨባጭ  መልሰህ መግብ ተጠቀም"</string>
+    <!-- no translation found for lockpattern_settings_choose_lock_pattern (1652352830005653447) -->
+    <skip />
+    <!-- no translation found for lockpattern_settings_change_lock_pattern (1123908306116495545) -->
+    <skip />
+    <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"የመክፈቻ ስርዓተ ንጥል እንዴት ይሳላል"</string>
+    <!-- no translation found for lockpattern_too_many_failed_confirmation_attempts_header (819903817323783498) -->
+    <skip />
+    <!-- no translation found for lockpattern_too_many_failed_confirmation_attempts_footer (6759029360597122873) -->
+    <skip />
+    <!-- no translation found for skip_button_label (8680422740354436943) -->
+    <skip />
+    <!-- no translation found for next_button_label (8890792540116568321) -->
+    <skip />
+    <!-- no translation found for lock_title (2909697418179419990) -->
+    <skip />
+    <!-- no translation found for lock_title (4059246467204273930) -->
+    <skip />
+    <!-- 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="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>
+    <!-- no translation found for manageapplications_settings_title (5712405848153426706) -->
+    <skip />
+    <string name="manageapplications_settings_summary" msgid="6097117021500651232">"የተጫኑ ትግበራዎች አዸራጅእና አስወግድ"</string>
+    <!-- no translation found for applications_settings (3736173521008476946) -->
+    <skip />
+    <!-- no translation found for applications_settings_summary (2714215108369119717) -->
+    <skip />
+    <!-- no translation found for applications_settings_header (6018266337275422250) -->
+    <skip />
+    <!-- no translation found for install_applications (4872012136210802181) -->
+    <skip />
+    <string name="install_unknown_applications" msgid="6612824788917283662">"ገበያ ነክ ያልሆኑ ትግበራዎችን ለመጫን ፍቀድ።"</string>
+    <!-- outdated translation 1923717607319933741 -->     <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"ስልክዎ እና የግል ውሂብዎ ካልታወቁ ምንጮች በመተግበሪያ ለማጥቃት የበለጠ የተጋለጡ ናቸው።እነዚህን መተግበሪያዎች በመጠቀም ለሚደርሰው ማንኛውም የውሂብ መጥፋት ወይም የስልክዎ መጎዳት ሙሉ ኃላፊነቱን እንደሚወስዱ ይስማማሉ።"</string>
+    <string name="install_all_warning" product="default" msgid="1923717607319933741">"ስልክዎ እና የግል ውሂብዎ ካልታወቁ ምንጮች በመተግበሪያ ለማጥቃት የበለጠ የተጋለጡ ናቸው።እነዚህን መተግበሪያዎች በመጠቀም ለሚደርሰው ማንኛውም የውሂብ መጥፋት ወይም የስልክዎ መጎዳት ሙሉ ኃላፊነቱን እንደሚወስዱ ይስማማሉ።"</string>
+    <!-- no translation found for advanced_settings (1777249286757067969) -->
+    <skip />
+    <!-- no translation found for advanced_settings_summary (145134386044169043) -->
+    <skip />
+    <!-- no translation found for application_info_label (1150486628158409543) -->
+    <skip />
+    <!-- no translation found for storage_label (8700867073480107253) -->
+    <skip />
+    <!-- no translation found for auto_launch_label (3012617472833815382) -->
+    <skip />
+    <!-- no translation found for screen_compatibility_label (663250687205465394) -->
+    <skip />
+    <!-- no translation found for permissions_label (2605296874922726203) -->
+    <skip />
+    <string name="cache_header_label" msgid="1877197634162461830">"መሸጎጫ"</string>
+    <string name="clear_cache_btn_text" msgid="5756314834291116325">"መሸጎጫ አጥራ"</string>
+    <string name="cache_size_label" msgid="7505481393108282913">"መሸጎጫ"</string>
+    <string name="controls_label" msgid="7611113077086853799">"ይቆጣጠራል"</string>
+    <string name="force_stop" msgid="7435006169872876756">"በኃይል ማቆም"</string>
+    <!-- no translation found for total_size_label (1048676419552557254) -->
+    <skip />
+    <!-- no translation found for application_size_label (5055196275624686382) -->
+    <skip />
+    <!-- no translation found for data_size_label (8679376373625710107) -->
+    <skip />
+    <!-- no translation found for external_size_label (4465530017830945766) -->
+    <skip />
+    <!-- no translation found for external_size_label (2107155737635944440) -->
+    <skip />
+    <!-- no translation found for uninstall_text (3644892466144802466) -->
+    <skip />
+    <string name="disable_text" msgid="6544054052049395202">"አታቦዝን"</string>
+    <string name="enable_text" msgid="9217362512327828987">"አንቃ"</string>
+    <!-- no translation found for clear_user_data_text (5597622864770098388) -->
+    <skip />
+    <string name="app_factory_reset" msgid="6635744722502563022">"አዘምኖች አትጫን"</string>
+    <!-- no translation found for auto_launch_enable_text (2630656657744196691) -->
+    <skip />
+    <!-- no translation found for auto_launch_disable_text (7800385822185540166) -->
+    <skip />
+    <!-- no translation found for clear_activities (7408923511535174430) -->
+    <skip />
+    <!-- no translation found for screen_compatibility_text (2398570332021220651) -->
+    <skip />
+    <!-- no translation found for ask_compatibility (7225195569089607846) -->
+    <skip />
+    <!-- no translation found for enable_compatibility (3257284255974065538) -->
+    <skip />
+    <!-- no translation found for unknown (1592123443519355854) -->
+    <skip />
+    <string name="sort_order_alpha" msgid="1410278099123670628">"በስም ለይ"</string>
+    <string name="sort_order_size" msgid="7024513286636502362">"በመጠን ለይ"</string>
+    <!-- no translation found for show_running_services (5736278767975544570) -->
+    <skip />
+    <!-- no translation found for show_background_processes (2009840211972293429) -->
+    <skip />
+    <!-- no translation found for manage_space_text (8852711522447794676) -->
+    <skip />
+    <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_running" msgid="7767071454371350486">"አሂድ"</string>
+    <!-- outdated translation 1477351142334784771 -->     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"በSD ካርድ ላይ"</string>
+    <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"በSD ካርድ ላይ"</string>
+    <string name="disabled" msgid="9206776641295849915">"ቦዝኗል"</string>
+    <string name="no_applications" msgid="5190227407135243904">"ምንም ትግበራዎች የሉም።"</string>
+    <!-- no translation found for internal_storage (1584700623164275282) -->
+    <skip />
+    <!-- no translation found for sd_card_storage (2673203150465132465) -->
+    <skip />
+    <!-- no translation found for sd_card_storage (7623513618171928235) -->
+    <skip />
+    <!-- no translation found for recompute_size (7722567982831691718) -->
+    <skip />
+    <!-- no translation found for clear_data_dlg_title (4470209520936375508) -->
+    <skip />
+    <string name="clear_data_dlg_text" msgid="8368035073300828451">"የእነዚህ የትግበራ ውሂቦች ሁሉ በቋሚነት ይሰረዛሉ።እነዚህም የሚያካትቱት ፋይሎችን፣ቅንብሮችን፣መለያዎችን፣የውሂብ ጎታዎች እና የመሣሠሉት።"</string>
+    <!-- no translation found for dlg_ok (2402639055725653590) -->
+    <skip />
+    <!-- no translation found for dlg_cancel (1674753358972975911) -->
+    <skip />
+    <!-- no translation found for app_not_found_dlg_title (8458335716378083713) -->
+    <skip />
+    <string name="app_not_found_dlg_text" msgid="2980271680333341554">"መተግበሪያው በተጫኑ ትግበራዎች ዝርዝር ውስጥ አልተገኘም።"</string>
+    <!-- no translation found for clear_data_failed (581956197586913865) -->
+    <skip />
+    <string name="app_factory_reset_dlg_title" msgid="6116199391150388147">"አዘምኖች አትጫን"</string>
+    <string name="app_factory_reset_dlg_text" msgid="438395129140568893">"ሁሉንም ማዘመኛዎች ወደዚህ Android ስርዓተ ትግበራ ላለመጫን ይፈልጋሉ?"</string>
+    <string name="clear_failed_dlg_title" msgid="2387060805294783175">"ውሂብ አጥራ"</string>
+    <string name="clear_failed_dlg_text" msgid="7943411157007320290">"ውሂብ ለትግበራ ማጥራት አልተሳካም"</string>
+    <!-- outdated translation 3116027624526915561 -->     <string name="security_settings_desc" product="tablet" msgid="6158636779728455276">"ይህትግበራ ስልክዎ ላይ የሚከተለውን፡ መድረስ ይችላል።"</string>
+    <string name="security_settings_desc" product="default" msgid="3116027624526915561">"ይህትግበራ ስልክዎ ላይ የሚከተለውን፡ መድረስ ይችላል።"</string>
+    <string name="computing_size" msgid="1599186977475211186">"በማስላት ላይ..."</string>
+    <string name="invalid_size_value" msgid="1901940003700269523">"የአካታች መጠንን ለማስላት አልተቻለም።"</string>
+    <string name="empty_list_msg" msgid="2901049162265094971">"የተጫኑ የማንኛውም ሦስተኛ ወገን ትግበራዎ የልዎትም።"</string>
+    <string name="version_text" msgid="9189073826278676425">"ሥሪት<xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
+    <string name="move_app" msgid="5042838441401731346">"አንቀሳቅስ"</string>
+    <!-- outdated translation 3895430471913858185 -->     <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"ወደ ስልክ አንቀሳቅስ"</string>
+    <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"ወደ ስልክ አንቀሳቅስ"</string>
+    <!-- outdated translation 1143379049903056407 -->     <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"ወደ SD ካርድ አንቀሳቅስ"</string>
+    <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"ወደ SD ካርድ አንቀሳቅስ"</string>
+    <string name="moving" msgid="6431016143218876491">"በማንቀሳቀስ ላይ"</string>
+    <string name="insufficient_storage" msgid="8566913062094452962">"የቀረ በቂ ማከማቻ የለም።"</string>
+    <string name="does_not_exist" msgid="837163572898468245">"ትግበራው የለም።"</string>
+    <string name="app_forward_locked" msgid="5747805144210389585">"ትግበራው ቅጂ-ጥብቅ ነው።"</string>
+    <string name="invalid_location" msgid="4934491353200240499">"የተጠቀሰው ጫን ስፍራ ትክክል አይደለም።"</string>
+    <string name="system_package" msgid="1030561474413022831">"በውጪ ማህደረ መረጃ ላይ የስርዓት ማዘመኛዎች መጫን አይችሉም።"</string>
+    <string name="force_stop_dlg_title" msgid="4289453224368188476">"በኃይል አቁም"</string>
+    <string name="force_stop_dlg_text" msgid="5157374701213502922">"ትግበራን በኃይል ማቆም  እርግጠኛ ነዎት?"</string>
+    <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"ትግበራ አንቀሳቅስ"</string>
+    <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"ትግበራ ለማንቀሳቀስ አልተሳካም። <xliff:g id="REASON">%1$s</xliff:g>"</string>
+    <string name="app_install_location_title" msgid="2068975150026852168">"የሚመረጥ ጭነት ሥፍራ"</string>
+    <string name="app_install_location_summary" msgid="879753854530300436">"ለአዲስ ትግበራዎች ተመራጭ መጫኛ ሥፍራዎችን ለውጥ።"</string>
+    <string name="storageuse_settings_title" msgid="5657014373502630403">"የማከማቻ ጥቅም"</string>
+    <string name="storageuse_settings_summary" msgid="2556057379120846792">"ትግበራዎች የተጠቀሙበትን ማከማቻ እይ"</string>
+    <string name="runningservices_settings_title" msgid="8097287939865165213">"አሂድ አገልግሎቶች"</string>
+    <string name="runningservices_settings_summary" msgid="854608995821032748">"በአሁኑጊዜ እየሄዱ ያሉ አገልግሎቶችን ተቆጣጠር እና እይ"</string>
+    <string name="service_restarting" msgid="2242747937372354306">"ዳግም በማስጀመር ላይ"</string>
+    <!-- no translation found for cached (1059590879740175019) -->
+    <skip />
+    <string name="no_running_services" msgid="2059536495597645347">"ምንም እየሄደ አይደለም።"</string>
+    <string name="service_started_by_app" msgid="6575184738671598131">"በትግበራ የተጀመረ።"</string>
+    <!-- no translation found for service_client_name (4037193625611815517) -->
+    <skip />
+    <!-- no translation found for service_background_processes (6844156253576174488) -->
+    <skip />
+    <!-- no translation found for service_foreground_processes (7583975676795574276) -->
+    <skip />
+    <!-- no translation found for memory (6609961111091483458) -->
+    <skip />
+    <!-- no translation found for service_process_name (4098932168654826656) -->
+    <skip />
+    <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g>ሂደት እና <xliff:g id="NUMSERVICES">%2$d</xliff:g>አገልግሎት"</string>
+    <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g>ሂደት እና <xliff:g id="NUMSERVICES">%2$d</xliff:g>አገልግሎቶች"</string>
+    <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g>ሂደት እና  <xliff:g id="NUMSERVICES">%2$d</xliff:g> አገልግሎት"</string>
+    <string name="running_processes_item_description_p_p" msgid="1607384595790852782">"<xliff:g id="NUMPROCESS">%1$d</xliff:g>ሂደቶች እና <xliff:g id="NUMSERVICES">%2$d</xliff:g> አገልግሎቶች"</string>
+    <string name="runningservicedetails_settings_title" msgid="6188692418986988288">"ሂያጅ ትግበራ"</string>
+    <string name="no_services" msgid="7133900764462288263">"ገባሪ የለም"</string>
+    <string name="runningservicedetails_services_title" msgid="391168243725357375">"አገልግሎቶች"</string>
+    <string name="runningservicedetails_processes_title" msgid="928115582044655268">"ሂደቶች"</string>
+    <string name="service_stop" msgid="6369807553277527248">"ቁም"</string>
+    <string name="service_manage" msgid="1876642087421959194">"ቅንብሮች"</string>
+    <string name="service_stop_description" msgid="3261798282116866961">"ይህ አገልግሎት በትግበራው ተጀምሯል። ማቆም ትግበራውን ለመሰናከል ሊያደርሰው ይችላል።"</string>
+    <string name="heavy_weight_stop_description" msgid="6855241582643136019">"ይህ ትግበራ በሰላም መቆም አይችልም። ይህን ማድረጉ አንዳንድ የአሁን ስራዎን ሊያጠፋ ይችላል።"</string>
+    <!-- no translation found for background_process_stop_description (1728354083304746737) -->
+    <skip />
+    <string name="service_manage_description" msgid="7050092269951613102">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>፡ በአሁን ጊዜ ጥቅም ላይ ነው። ለመቆጣጠር ቅንብሮችን ንካ።"</string>
+    <string name="main_running_process_description" msgid="929204645380391397">"በጥቅም ላይ ያለ ዋና ሂደት"</string>
+    <string name="process_service_in_use_description" msgid="8993335064403217080">"<xliff:g id="COMP_NAME">%1$s</xliff:g> አገልግሎት ጥቅም ላይ ነው።"</string>
+    <string name="process_provider_in_use_description" msgid="5586603325677678940">"<xliff:g id="COMP_NAME">%1$s</xliff:g> አቅራቢ አገልግሎት ላይ ነው።"</string>
+    <!-- no translation found for runningservicedetails_stop_dlg_title (4253292537154337233) -->
+    <skip />
+    <!-- no translation found for runningservicedetails_stop_dlg_text (5420033091144016389) -->
+    <skip />
+    <!-- no translation found for runningservicedetails_stop_dlg_text (6929716497425738387) -->
+    <skip />
+    <!-- outdated translation 502219872342167227 -->     <string name="language_settings" msgid="5292716747264442359">"የቋንቋ &amp;  ቁልፍሰሌዳ"</string>
+    <!-- outdated translation 3455826933385341107 -->     <string name="language_keyboard_settings_title" msgid="243220021717425813">"የቋንቋ &amp;  ቁልፍሰሌዳ ቅንብሮች"</string>
+    <string name="language_settings_category" msgid="2288258489940617043">"የቋንቋ ቅንብሮች"</string>
+    <string name="keyboard_settings_category" msgid="7060453865544070642">"የቁልፍ ሰሌዳ ቅንብሮች"</string>
+    <!-- outdated translation 2138384312336494991 -->     <string name="phone_language" msgid="1165758957501090679">"የአካባቢውን ሁኔታ ምረጥ"</string>
+    <string name="phone_language_summary" msgid="3871309445655554211"></string>
+    <!-- no translation found for auto_replace (6199184757891937822) -->
+    <skip />
+    <!-- no translation found for auto_replace_summary (370288728200084466) -->
+    <skip />
+    <!-- no translation found for auto_caps (6379232078052591265) -->
+    <skip />
+    <!-- no translation found for auto_caps_summary (6358102538315261466) -->
+    <skip />
+    <!-- no translation found for auto_punctuate (4595367243950425833) -->
+    <skip />
+    <string name="hardkeyboard_category" msgid="5957168411305769899">"አካላዊ ቁልፍሰሌዳ ቅንብሮች"</string>
+    <!-- no translation found for auto_punctuate_summary (4372126865670574837) -->
+    <skip />
+    <!-- no translation found for show_password (2198798062604049206) -->
+    <skip />
+    <!-- no translation found for show_password_summary (3806709974395178121) -->
+    <skip />
+    <string name="ime_security_warning" msgid="812267421486877917">"ይህ ግቤት ሜተድ እርስዎ የሚተይቡትን ፅሁፍ ሁሉ፣ እንደይለፍ ቃል እና የዱቤ ካርድ ጨምሮ የግል ውሂብ  ምናልባት መሰብሰብ ይችላል።ከትግበራው ይመጣል።<xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g> ይህን ግቤት ሜተድ ይጠቀም?"</string>
+    <!-- no translation found for pointer_settings_category (6090176550039035130) -->
+    <skip />
+    <!-- no translation found for pointer_speed (1221342330217861616) -->
+    <skip />
+    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"የተጠቃሚ መዝገበ ቃላት"</string>
+    <!-- no translation found for user_dict_single_settings_title (5454855286173849284) -->
+    <skip />
+    <!-- no translation found for user_dict_multiple_settings_title (326583195525296750) -->
+    <skip />
+    <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
+    <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"አክል"</string>
+    <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"ወደ መዝገበ ቃላት አክል"</string>
+    <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"ቃሉን አርትዕ"</string>
+    <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"አርትእ"</string>
+    <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"ሰርዝ"</string>
+    <!-- outdated translation 6209268025109242806 -->     <string name="user_dict_settings_empty_text" product="tablet" msgid="1766522102636921529">"በተጠቃሚ መዝገበ ቃላት ውስጥ ማንኛውም ቃላቶች የልዎትም። በምናሌ በኩል ቃል ማከል ይችላሉ።"</string>
+    <string name="user_dict_settings_empty_text" product="default" msgid="6209268025109242806">"በተጠቃሚ መዝገበ ቃላት ውስጥ ማንኛውም ቃላቶች የልዎትም። በምናሌ በኩል ቃል ማከል ይችላሉ።"</string>
+    <!-- no translation found for user_dict_settings_all_languages (7713910347678213719) -->
+    <skip />
+    <!-- no translation found for testing (6584352735303604146) -->
+    <skip />
+    <!-- no translation found for testing_phone_info (193561832258534798) -->
+    <skip />
+    <!-- no translation found for testing_phone_info (8656693364332840056) -->
+    <skip />
+    <!-- no translation found for testing_battery_info (3497865525976497848) -->
+    <skip />
+    <!-- no translation found for quick_launch_title (7904609846945905306) -->
+    <skip />
+    <!-- no translation found for quick_launch_summary (3453825712466417452) -->
+    <skip />
+    <!-- no translation found for quick_launch_assign_application (4521368464929956350) -->
+    <skip />
+    <!-- no translation found for quick_launch_no_shortcut (5998005833838278693) -->
+    <skip />
+    <!-- no translation found for quick_launch_shortcut (5090405067413522300) -->
+    <skip />
+    <!-- no translation found for quick_launch_clear_dialog_title (5546543501250320220) -->
+    <skip />
+    <!-- no translation found for quick_launch_clear_dialog_message (3921015601470260722) -->
+    <skip />
+    <!-- no translation found for quick_launch_clear_ok_button (2634568926597586716) -->
+    <skip />
+    <!-- no translation found for quick_launch_clear_cancel_button (1892854652197747064) -->
+    <skip />
+    <!-- no translation found for quick_launch_display_mode_applications (3748789806447639039) -->
+    <skip />
+    <!-- no translation found for quick_launch_display_mode_shortcuts (4177934019174169042) -->
+    <skip />
+    <string name="input_methods_settings_title" msgid="6800066636850553887">"ፅሁፍ ግቤት"</string>
+    <string name="input_method" msgid="5434026103176856164">"የግቤት ሜተድ"</string>
+    <!-- no translation found for current_input_method (2146807723398303917) -->
+    <skip />
+    <!-- no translation found for input_method_selector (4311213129681430709) -->
+    <skip />
+    <!-- no translation found for input_method_selector_show_automatically_title (1001612945471546158) -->
+    <skip />
+    <!-- no translation found for input_method_selector_always_show_title (3891824124222371634) -->
+    <skip />
+    <!-- no translation found for input_method_selector_always_hide_title (7699647095118680424) -->
+    <skip />
+    <!-- no translation found for configure_input_method (7773992829158322455) -->
+    <skip />
+    <!-- no translation found for input_method_settings (5801295625486269553) -->
+    <skip />
+    <!-- no translation found for active_input_method_subtypes (3596398805424733238) -->
+    <skip />
+    <!-- no translation found for use_system_language_to_select_input_method_subtypes (3346751753141428573) -->
+    <skip />
+    <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g>ቅንብሮች"</string>
+    <!-- no translation found for input_methods_and_subtype_enabler_title (4018402267502337338) -->
+    <skip />
+    <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"በማያ ላይ ቁልፍሰሌዳ ቅንብሮች"</string>
+    <!-- outdated translation 5274990495405941804 -->     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"አብሮገነብ ቁልፍሰሌዳ"</string>
+    <!-- outdated translation 7990296351888096836 -->     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"አብሮገነብ፣ የቁልፍሰሌዳ ቅንብሮች"</string>
+    <!-- no translation found for development_settings_title (6719732334835420989) -->
+    <skip />
+    <string name="development_settings_summary" msgid="2151320488701538355">"ለትግበራ ግንባታ አማራጮች አዘጋጅ"</string>
+    <!-- no translation found for enable_adb (7982306934419797485) -->
+    <skip />
+    <!-- no translation found for enable_adb_summary (4881186971746056635) -->
+    <skip />
+    <!-- no translation found for keep_screen_on (1146389631208760344) -->
+    <skip />
+    <!-- no translation found for keep_screen_on_summary (2173114350754293009) -->
+    <skip />
+    <string name="allow_mock_location" msgid="2787962564578664888">"አስቂኝ ሥፍራዎችን ፍቀድ"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"አስቂኝ ሥፍራዎችን ፍቀድ"</string>
+    <string name="adb_warning_title" msgid="6234463310896563253">"የUSB ማረሚያ ይፈቀድ?"</string>
+    <string name="adb_warning_message" msgid="5352555112049663033">"የUSB አድስ ለግንባታ አላማ ብቻ የታሰበ ነው። ከኮምፒዩተርዎ ወደ መሳሪያዎ ውሂብ ለመገልበጥ፣መሣሪያዎ ላይ ያለ ማሳወቂያ ትግበራዎችን መጫን፣ እና ማስታወሻ ውሂብ ማንበብ ለመጠቀም ይቻላል።"</string>
+    <string name="gadget_picker_title" msgid="98374951396755811">"መሣሪያ ምረጥ"</string>
+    <string name="widget_picker_title" msgid="9130684134213467557">"ፍርግም ምረጥ"</string>
+    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>ቀኖች<xliff:g id="HOURS">%2$d</xliff:g>ሰዓታት<xliff:g id="MINUTES">%3$d</xliff:g> ደቂቃዎች<xliff:g id="SECONDS">%4$d</xliff:g> ሰከንዶች"</string>
+    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>ሰዓታት<xliff:g id="MINUTES">%2$d</xliff:g>ደቂቃዎች<xliff:g id="SECONDS">%3$d</xliff:g>ሰከንዶች"</string>
+    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>ደቂቃ <xliff:g id="SECONDS">%2$d</xliff:g>ሰከንድ"</string>
+    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> ሰከንድ"</string>
+    <string name="usage_stats_label" msgid="5890846333487083609">"የአጠቃቀም ስታስቲክስ"</string>
+    <string name="testing_usage_stats" msgid="7823048598893937339">"የአጠቃቀም ስታስቲክስ"</string>
+    <string name="display_order_text" msgid="8592776965827565271">"ለይ በ:"</string>
+    <string name="app_name_label" msgid="2000949925256858308">"ትግበራ"</string>
+    <string name="launch_count_label" msgid="4019444833263957024">"ቁጠር"</string>
+    <string name="usage_time_label" msgid="295954901452833058">"ጊዜ አጠቃቀም"</string>
+    <string name="accessibility_settings" msgid="3975902491934816215">"ተደራሽነት"</string>
+    <string name="accessibility_settings_title" msgid="2130492524656204459">"ተደራሽነት ቅንብሮች"</string>
+    <string name="accessibility_settings_summary" msgid="8185181964847149507">"የተደራሽነት አማራጮችን አዸራጅ"</string>
+    <string name="toggle_accessibility_title" msgid="650839277066574497">"ተደራሽነት"</string>
+    <string name="accessibility_services_category" msgid="8127851026323672607">"ተደራሽነት አገልግሎቶች"</string>
+    <string name="no_accessibility_services_summary" msgid="694578333333808159">"ምንም የተጫኑ የተደራሽነት አገልግሎቶች የሉም።"</string>
+    <string name="accessibility_service_security_warning" msgid="4066258132331302670">"ይህ የተደራሽነት አገልግሎት መተየብ የቻሉትን ፅሁፍ ሁሉ የይለፍ ቃልን ሳይጨምር የግል የዱቤ ካርድ ቁጥርውሂብ አካቶ ለመሰብሰብ ይችላል።የተጠቃሚ ገፅታ ተግባቦቶች እንዲሁ ማስታወሻይይዛሉ።ከ<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> ትግበራ የመጣ ነው። ይህን ተደራሽነትአገልግሎት ይጠቀም?"</string>
+    <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"ተደራሽነትአታስችል?"</string>
+    <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"ምንም ተደራሽነት የተያያዘ ትግበራዎች አልተገኙም"</string>
+    <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"ምንም የተጫነ ተደራሽነት የተያያዘ ትግበራዎች የልዎትም። "\n\n"ለመሣሪያዎ ከAndroid Market  ማያ አንባቢ ማውረድ ይችላሉ። የማያ ማንበቢያውን ለመጫን "\n\n"እሺ  ጠቅ ያድርጉ።"</string>
+    <string name="accessibility_script_injection_category" msgid="8649951751131431904">"ተደራሽነት ስክሪፕት"</string>
+    <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"ተያያዥነት ስክሪፕቶች አውርድ"</string>
+    <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"ትግበራዎች የተያያዥነት ስክሪፕቶች ከGoogle እንዲያወርዱ ፍቀድ"</string>
+    <!-- outdated translation 9078893361741942109 -->     <string name="accessibility_script_injection_security_warning" product="tablet" msgid="1113600871264359828">"አንዳንድ ትግበራዎች ይዘታቸው የበለጠ ተደራሽ ለማድረግ Google ወደ እርስዎ ስልክ ስክሪፕቶች እንዲያወርድ ሊጠይቁ ይችላሉ። Google የተደራሽነት ስክሪፕቶችን ስልክዎ ላይ እንዲያውርድ እርግጠኛ ነዎት ይፈልጋሉ?"</string>
+    <string name="accessibility_script_injection_security_warning" product="default" msgid="9078893361741942109">"አንዳንድ ትግበራዎች ይዘታቸው የበለጠ ተደራሽ ለማድረግ Google ወደ እርስዎ ስልክ ስክሪፕቶች እንዲያወርድ ሊጠይቁ ይችላሉ። Google የተደራሽነት ስክሪፕቶችን ስልክዎ ላይ እንዲያውርድ እርግጠኛ ነዎት ይፈልጋሉ?"</string>
+    <string name="accessibility_power_button_category" msgid="8545885236482339928">"የኃይል አዝራር"</string>
+    <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"የኃይል ማስነሻ አዝራር ጥሪ"</string>
+    <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"በጥሪ ጊዜ፣ ማብሪያ/ማጥፊያ መጫን ማያን ከማጥፋት ይልቅ ጥሪው ያበቃል"</string>
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <skip />
+    <!-- no translation found for touchscreen_gestures_category (3109869155350859625) -->
+    <skip />
+    <!-- no translation found for long_press_timeout_selector_title (1396876537252863044) -->
+    <skip />
+    <!-- no translation found for long_press_timeout_selector_summary (2261114502740278996) -->
+    <skip />
+    <string name="power_usage_summary_title" msgid="5180282911164282324">"የባትሪ ጥቅም"</string>
+    <string name="power_usage_summary" msgid="7237084831082848168">"ባትሪውን ምን እየተጠቀመበት ነበር"</string>
+    <!-- no translation found for power_usage_not_available (3583407442633768046) -->
+    <skip />
+    <string name="battery_since_unplugged" msgid="338073389740738437">"ከተነቀለ ጀምሮ የባትሪ ጥቅም"</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>
+    <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"ማያ በርቷል"</string>
+    <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS በርቷል"</string>
+    <!-- no translation found for battery_stats_wifi_running_label (3093545080361658269) -->
+    <skip />
+    <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"ነቃ"</string>
+    <!-- outdated translation 6822042940376636775 -->     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"የስልክ ማመልከት"</string>
+    <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
+    <skip />
+    <string name="awake" msgid="387122265874485088">"የመሣሪያማንቂያ ሰዓት"</string>
+    <!-- outdated translation 4630925382578609056 -->     <string name="wifi_on_time" msgid="6310209835617490616">"WiFi በጊዜ"</string>
+    <!-- outdated translation 4478515071957280711 -->     <string name="bluetooth_on_time" msgid="6157799524996162271">"WiFi በጊዜ"</string>
+    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
+    <!-- no translation found for history_details_title (3608240585315506067) -->
+    <skip />
+    <!-- outdated translation 7564809986329021063 -->     <string name="details_title" msgid="3792801565213935385">"የባትሪ ጥቅም ዝርዝሮች"</string>
+    <string name="details_subtitle" msgid="32593908269911734">"ዝርዝሮችን ተጠቀም"</string>
+    <string name="controls_subtitle" msgid="390468421138288702">"የኃይል አጠቃቀም አስተካክል"</string>
+    <string name="packages_subtitle" msgid="4736416171658062768">"የታከሉ አካታቾች"</string>
+    <!-- outdated translation 2353149143338929583 -->     <string name="power_screen" msgid="3023346080675904613">"አሳይ"</string>
+    <string name="power_wifi" msgid="2382791137776486974">"WiFi"</string>
+    <string name="power_bluetooth" msgid="4373329044379008289">"ብሉቱዝ"</string>
+    <string name="power_cell" msgid="6596471490976003056">"የስልክ ተጠባበቅ"</string>
+    <string name="power_phone" msgid="5392641106474567277">"የድምፅ ጥሪዎች"</string>
+    <!-- outdated translation 9055659695602194990 -->     <string name="power_idle" product="tablet" msgid="4612478572401640759">"ስልክ ሥራ ፈታ"</string>
+    <string name="power_idle" product="default" msgid="9055659695602194990">"ስልክ ሥራ ፈታ"</string>
+    <string name="usage_type_cpu" msgid="715162150698338714">"CPU ጠቅላላ"</string>
+    <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ቅድመ ገፅ"</string>
+    <string name="usage_type_wake_lock" msgid="5125438890233677880">"ነቃ በል"</string>
+    <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
+    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi ማስኬድ"</string>
+    <!-- outdated translation 9108247984998041853 -->     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"ስልክ"</string>
+    <string name="usage_type_phone" product="default" msgid="9108247984998041853">"ስልክ"</string>
+    <string name="usage_type_data_send" msgid="2857401966985425427">"ውሂብ ተልኳል"</string>
+    <string name="usage_type_data_recv" msgid="7251090882025234185">"ውሂብ ተቀብሏል"</string>
+    <string name="usage_type_audio" msgid="6957269406840886290">"ኦዲዮ"</string>
+    <string name="usage_type_video" msgid="4295357792078579944">"ቪዲዮ"</string>
+    <string name="usage_type_on_time" msgid="3351200096173733159">"በሰዓቱ"</string>
+    <string name="usage_type_no_coverage" msgid="3797004252954385053">"ጊዜ ያለሲግናል"</string>
+    <string name="battery_action_stop" msgid="649958863744041872">"በኃይል ማቆም"</string>
+    <string name="battery_action_app_details" msgid="3275013531871113681">"ትግበራ መረጃ"</string>
+    <string name="battery_action_app_settings" msgid="350562653472577250">"ትግበራ  ቅንብሮች"</string>
+    <!-- outdated translation 5302763261448580102 -->     <string name="battery_action_display" msgid="7338551244519110831">"የማሳያ ቅንብሮች"</string>
+    <!-- outdated translation 5452076674659927993 -->     <string name="battery_action_wifi" msgid="2272741639606146903">"የWiFi ቅንብሮች"</string>
+    <string name="battery_action_bluetooth" msgid="8374789049507723142">"የብሉቱዝ ቅንብሮች"</string>
+    <string name="battery_desc_voice" msgid="8980322055722959211">"የድምፅ ጥሪዎች የተጠቀሙበት ባትሪመጠን"</string>
+    <!-- outdated translation 3009080001948091424 -->     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"ስልክ ሲቦዝን የተጠቀመበት ባትሪ መጠን"</string>
+    <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"ስልክ ሲቦዝን የተጠቀመበት ባትሪ መጠን"</string>
+    <string name="battery_desc_radio" msgid="5479196477223185367">"የስልክ ሬዲዮ የተጠቀመበት ባትሪመጠን"</string>
+    <string name="battery_sugg_radio" msgid="8211336978326295047">"ምንም የአውታረመረብ ሽፋን የሌለበትአካባቢ ኃይል ለመቆጠብ ወደ አውሮፕላን ሁነታ ቀይር"</string>
+    <string name="battery_desc_display" msgid="5432795282958076557">"በማሳያ እና የኋላብርሃንየተጠቀመበት ባትሪመጠን"</string>
+    <string name="battery_sugg_display" msgid="3370202402045141760">"የማያን ብሩህነት እና/ወይም የማያማብቂያጊዜቀንስ"</string>
+    <string name="battery_desc_wifi" msgid="1702486494565080431">"Wi-Fi  የተጠቀመበት ባትሪመጠን"</string>
+    <string name="battery_sugg_wifi" msgid="7542345142282261691">"ሳትጠቀምበት ወይም በሌለበት ቦታ Wi-Fi ን  አጥፋ"</string>
+    <string name="battery_desc_bluetooth" msgid="7535520658674621902">"ብሉቱዝየተጠቀመበት ባትሪመጠን"</string>
+    <string name="battery_sugg_bluetooth_basic" msgid="817276933922157788">"ሳትጠቀምበት ብሉቱዝን  አጥፋ"</string>
+    <string name="battery_sugg_bluetooth_headset" msgid="8214816222115517479">"ወደ ተለየ የብሉቱዝ መሣሪያ ለማያያዝ ሞክር"</string>
+    <string name="battery_desc_apps" msgid="6665712811746233450">"ባትሪ በትግበራ ተጠቅሟል"</string>
+    <string name="battery_sugg_apps_info" msgid="6065882899391322442">"ትግበራውን አትጫንወይም አቁም"</string>
+    <string name="battery_sugg_apps_gps" msgid="4545056413090932541">"ትግበራ እሱን ከመጠቀም ለመከላከል GPSን በእጅ ተቆጣጠር።"</string>
+    <string name="battery_sugg_apps_settings" msgid="8021302847272481168">"ትግበራው የባትሪ ጥቅም ለመቀነስ ቅንብሮቸን ሊያቀርብ ይችላል"</string>
+    <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g>ከተነቀለ ጀምሮ"</string>
+    <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"በመጨረሻ ለ<xliff:g id="UNPLUGGED">%1$s</xliff:g>  አልተሰካም"</string>
+    <string name="menu_stats_total" msgid="8973377864854807854">"ጠቅላላ አጠቃቀም"</string>
+    <string name="menu_stats_refresh" msgid="1676215433344981075">"አድስ"</string>
+    <string name="process_kernel_label" msgid="3916858646836739323">"Android  ስርዓተ ክወና"</string>
+    <string name="process_mediaserver_label" msgid="6500382062945689285">"ማህደረመረጃአገልጋይ"</string>
+    <string name="voice_input_output_settings" msgid="1336135218350444783">"የድምፅ ግቤት &amp; ውፅአት"</string>
+    <string name="voice_input_output_settings_title" msgid="2442850635048676991">"የድምፅ ግቤት &amp; ውፅአት ቅንብሮች"</string>
+    <string name="voice_search_settings_title" msgid="2775469246913196536">"የድምፅ ፍለጋ"</string>
+    <string name="keyboard_settings_title" msgid="5080115226780201234">"የAndroid ቁልፍ ሰሌዳ"</string>
+    <string name="voice_input_category" msgid="1589318440824204736">"የድምፅ ግቤት"</string>
+    <string name="voice_output_category" msgid="2624538587784986229">"የድምፅ ውፅአት"</string>
+    <string name="recognizer_title" msgid="3231385184559054457">"የድምፅ መለያ"</string>
+    <string name="recognizer_settings_title" msgid="6038598099039717232">"የድምፅ መለያ ቅንብሮች"</string>
+    <string name="recognizer_settings_summary" msgid="4472287934134546902">"የ \"<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\" ቅንብሮች"</string>
+    <string name="tts_settings" msgid="8186971894801348327">"ፅሁፍ-ወደ-ንግግር ቅንብሮች"</string>
+    <string name="tts_settings_title" msgid="4182348653053000933">"ፅሁፍን ወደ ንግግር ቅንብሮች"</string>
+    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"ሁልጊዜም የኔን ቅንብሮች ተጠቀም"</string>
+    <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"ከስር ያሉ ነባሪ ቅንብሮች የትግበራ ቅንብሮችን ያግዳሉ"</string>
+    <string name="tts_default_settings_section" msgid="5787915620218907443">"ነባሪ ቅንብሮች"</string>
+    <string name="tts_default_synth_title" msgid="29467896463371992">"ነባሪ አንቀሳቃሽ"</string>
+    <string name="tts_default_synth_summary" msgid="6482936537135251690">"የንግግር ልምምድ አንቀሳቃሹን ለሚነገር ፅሁፍ ለመጠቀም ያዘጋጃል።"</string>
+    <string name="tts_default_rate_title" msgid="6030550998379310088">" የንግግር ደረጃ"</string>
+    <string name="tts_default_rate_summary" msgid="4061815292287182801">"የተነገረበትን ፅሁፍ አፍጥን"</string>
+    <string name="tts_default_pitch_title" msgid="6135942113172488671">"ቅላፄ"</string>
+    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"የሚነገረው ፅሁፍ ድምፅ ላይ ተፅዕኖ ያሳድራል"</string>
+    <string name="tts_default_lang_title" msgid="8018087612299820556">"ቋንቋ"</string>
+    <string name="tts_default_lang_summary" msgid="5219362163902707785">"ለሚነገረው ፅሁፍ ቋንቋ-ተኮር ድምፅ አዘጋጅ"</string>
+    <string name="tts_play_example_title" msgid="7094780383253097230">"ምሳሌውን አዳምጥ"</string>
+    <string name="tts_play_example_summary" msgid="8029071615047894486">"አጭር የንግግር ልምምድ ማሳያ አጫውት"</string>
+    <string name="tts_install_data_title" msgid="4264378440508149986">"የድምፅ ውሂብ ጫን"</string>
+    <string name="tts_install_data_summary" msgid="5742135732511822589">"ለንግግር ልምምድ የሚጠየቀውን የድምፅ ውሂብ ጫን"</string>
+    <string name="tts_data_installed_summary" msgid="9162111552859972809">"ለንግግር ልምምድ የሚጠየቁ ድምፆች አስቀድመው በአግባቡ ተጭነዋል"</string>
+    <string name="tts_demo" msgid="405357591189935876">"ይህ የንግግር ልምምድ ምሳሌ ነው።"</string>
+    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"ቅንብሮችዎተለውጠዋል።ይህ ምንድምፅእንደሚያወጡ ምሳሌነው።"</string>
+    <string name="tts_engine_error" msgid="5513288178403066867">"የመረጡት አንቀሳቃሽ ለማስሄድ አልቻለም"</string>
+    <string name="tts_engine_error_config" msgid="5820525416624637313">"አዋቅር"</string>
+    <string name="tts_engine_error_reselect" msgid="3071453963296013376">"ሌላ አንቀሳቃሽ ምረጥ"</string>
+    <string name="tts_engine_security_warning" msgid="8786238102020223650">"ይህ የንግግር ልምምድ አንቀሳቃሽ የሚነገረውን ፅሁፍ ሁሉ  እንደ ይለፍ ቃል እና የዱቤ ካርድ ቁጥሮች፣ የግል ውሂብ ጨምሮ ለመሰብሰብ ይችል ይሆናል።  ከ <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> አንቀሳቃሽ ይመጣል። የዚህን የንግግር ልምምድ አንቀሳቃሽ አጠቃቀም ይንቃ?"</string>
+    <string name="tts_engines_section" msgid="7515470972378742429">"አንቀሳቃሾች"</string>
+    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>ቅንብሮች"</string>
+    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> ተችሏል"</string>
+    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> ቦዝኗል"</string>
+    <string name="pico_languages_and_voices" msgid="4611320375917773238">"ቋንቋዎች እና ድምፆች"</string>
+    <string name="pico_installed" msgid="2452546687858267414">"ተጭኗል"</string>
+    <string name="pico_not_installed" msgid="6266845418419994311">"አልተጫነም"</string>
+    <string name="pico_voice_summary_female" msgid="8047327176247727492">"ሴት"</string>
+    <string name="pico_voice_summary_male" msgid="8331266854058577610">"ወንድ"</string>
+    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"የንግግር ልምምድ አንቀሳቃሽ ተጭኗል"</string>
+    <string name="tts_notif_engine_install_message" msgid="5304661142202662693">"አዲስ አንቀሳቃሽ ከመጠቀምህ በፊት አንቃ"</string>
+    <string name="gadget_title" msgid="7455548605888590466">"የኃይል መቆጣጠሪያ"</string>
+    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"የWi-Fi ቅንብር ማዘመን"</string>
+    <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"የብሉቱዝቅንብር ማዘመን"</string>
+    <string name="vpn_settings_activity_title" msgid="7276864950701612579">"የVPN ቅንብሮች"</string>
+    <string name="vpn_connect_to" msgid="2541409082892684362">"ወደ <xliff:g id="NAME">%s</xliff:g> አያይዝ"</string>
+    <string name="vpn_username_colon" msgid="7854930370861306247">"የተጠቃሚው ስም፡"</string>
+    <string name="vpn_password_colon" msgid="5716278710848606626">"የይለፍ ቃል፡"</string>
+    <string name="vpn_a_username" msgid="6664733641993968692">"የተጠቃሚ ስም"</string>
+    <string name="vpn_a_password" msgid="1537213632501483753">"ይለፍ ቃል"</string>
+    <string name="vpn_save_username" msgid="1408415289165970790">"ተጠቃሚ ስም አስታውስ"</string>
+    <string name="vpn_connect_button" msgid="1699007212602470655">"አያይዝ"</string>
+    <string name="vpn_yes_button" msgid="8034531001149843119">"አዎ"</string>
+    <string name="vpn_no_button" msgid="7620339571187119107">"አይ"</string>
+    <string name="vpn_back_button" msgid="192036339792734970">"ተመለስ"</string>
+    <string name="vpn_mistake_button" msgid="1683383660912491270">"አይ"</string>
+    <string name="vpn_menu_done" msgid="93528279226907926">"አስቀምጥ"</string>
+    <string name="vpn_menu_cancel" msgid="7234451214611202868">"ይቅር"</string>
+    <string name="vpn_menu_revert" msgid="4407762442281467659">"አድህር"</string>
+    <string name="vpn_menu_connect" msgid="1089399414463784218">"ወደ አውታረ መረብ አያይዝ"</string>
+    <string name="vpn_menu_disconnect" msgid="8254492450022562235">"ከአውታረ መረብ አለያይ"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"አውታረ መረብ አርትዕ"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"አውታረ መረብ ሰርዝ"</string>
+    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"<xliff:g id="CODE">%s</xliff:g> ማስገባት አለብዎ።"</string>
+    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"<xliff:g id="OPTION">%s</xliff:g> መምረጥ አለብዎት።"</string>
+    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"የVPN <xliff:g id="NAME">%s</xliff:g>\'  ስም አስቀድሞ አለ። ሌላ ስም አግኝ።"</string>
+    <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"ይህን  VPN ለመሰረዝ በእርግጥ ይፈልጋሉ?"</string>
+    <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"እርግጠኛ ነዎትይህን መገለጫ መፍጠር አይፈልጉም?"</string>
+    <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"እርግጠኛ ነዎትለዚህ መገለጫ የተደረገውን ለውጥ ማስወገድ ይፈልጋሉ?"</string>
+    <string name="vpn_confirm_reconnect" msgid="5748535476278674296">"ወደ አውታረ መረቡ ለማያያዝ አልተቻለም። እንደገና ለመሞከር ይፈልጋሉ?"</string>
+    <string name="vpn_reconnect_from_lost" msgid="2442844155623372118">"ተያያዥነት ተቋርጣል። እንደገና ለማያያዝ ይፈልጋሉ?"</string>
+    <string name="vpn_unknown_server_dialog_msg" msgid="3080742299823671319">"የአገል ጋይ ስም መወሰን አይቻለም። የአገልጋይ ስምዎን ቅንብርለማመልከት ይፈልጋሉ?"</string>
+    <string name="vpn_challenge_error_dialog_msg" msgid="6174901754230038601">"ስህተት ይገዳደሩ። የሚስጥር ቅንብሮች ለመመልከት ይፈልጋሉ?"</string>
+    <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"በዚህ VPN  ውቅር አንድ ወይም የበለጠ ?ሚስጥሮች ጠፍተዋል። የሚስጥር ቅንብሮችዎን ለመመልከት ይፈልጋሉ?"</string>
+    <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"ያስገቡት የተጠቃሚ ስም ወይም ይለፍ ቃል ትክክል አይደለም። እንደገና መሞከር ይፈልጋሉ?"</string>
+    <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"አገልጋዩ ዘግቷል። ያስገቡት የተጠቃሚ ስም ወይም ይለፍ ቃል ትክክል ላይሆን ይችላል። እንደገና ለመሞከር ይፈ ልጋሉ?"</string>
+    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"አገልጋዩ ዘግቷል። ከአገልጋዩ ጋር እንዳይያያዙ ከኬላ ጀርባ ሊሆኑ ይችላሉ። እንደገና ለመሞከር ይፈ ልጋሉ?"</string>
+    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"የአገልጋይ ስምምነት አልተሳካም። አገልጋዩ ከእርስዎ ማሰባጠሪያ አማራጭ ጋር ላይስማማ ይችል ይሆናል።የማሰባጠሪያ ቅንብር ለመመልከት ይፈልጋሉ?"</string>
+    <string name="vpn_type_title" msgid="6392933604218676224">"VPN  ያክሉ"</string>
+    <string name="vpn_add_new_vpn" msgid="5438260689052714550">"VPN  ያክሉ"</string>
+    <!-- no translation found for vpn_details_title (418806440938510331) -->
+    <skip />
+    <string name="vpn_edit_title_add" msgid="2121313217989682890">"<xliff:g id="NAME">%s</xliff:g> VPN አክል"</string>
+    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"<xliff:g id="NAME">%s</xliff:g> ዝርዝሮች"</string>
+    <string name="vpns" msgid="3148141862835492816">"VPNኦች"</string>
+    <string name="vpn_connecting" msgid="8039521381692090116">"በማገናኘት ላይ..."</string>
+    <string name="vpn_disconnecting" msgid="7748050200708257066">"በመለያየት ላይ..."</string>
+    <string name="vpn_connected" msgid="7641723116362845781">"ተገናኝቷል"</string>
+    <string name="vpn_connect_hint" msgid="7442898962925875181">"ወደ አውታረ መረብ አያይዝ"</string>
+    <string name="vpn_name" msgid="1550918148476193076">"VPN ስም"</string>
+    <string name="vpn_a_name" msgid="8445736942405283509">"የVPN ስም"</string>
+    <string name="vpn_profile_added" msgid="9061017910337129840">"\'<xliff:g id="NAME">%s</xliff:g>\' ታክሏል"</string>
+    <string name="vpn_profile_replaced" msgid="587435576816273815">"\'<xliff:g id="NAME">%s</xliff:g>\' ለውጦች ተደርገዋል"</string>
+    <string name="vpn_user_certificate_title" msgid="6812545893924071742">"የተጠቃሚ ምስክር አዘጋጅ"</string>
+    <string name="vpn_user_certificate" msgid="949322691686938888">"የተጠቃሚ ምስክር"</string>
+    <string name="vpn_a_user_certificate" msgid="8943983437956898649">"የተጠቃሚ  ምስክር"</string>
+    <string name="vpn_ca_certificate_title" msgid="7846466160795589985">"CA ምስክር አዘጋጅ"</string>
+    <string name="vpn_ca_certificate" msgid="465085144064264742">"ምስክር ባለስልጣን(CA) ምስክር"</string>
+    <string name="vpn_a_ca_certificate" msgid="3374242520974884295">"CA ምስክር"</string>
+    <string name="vpn_l2tp_secret_string_title" msgid="5039677186748940987">" L2TP ሚስጥር አዘጋጅ"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"L2TP ሚስጥር"</string>
+    <string name="vpn_a_l2tp_secret" msgid="6612042930810981845">"የL2TP ሚስጥር"</string>
+    <string name="vpn_pptp_encryption_title" msgid="2236795167467896499">"ማመስጠር"</string>
+    <string name="vpn_pptp_encryption" msgid="2602329949737259686">"የPPTP ማመሳጠር"</string>
+    <string name="vpn_ipsec_presharedkey_title" msgid="2184060087690539175">"IPSec  ቀድሞ- የተጋራቁልፍ አዘጋጅ"</string>
+    <string name="vpn_ipsec_presharedkey" msgid="5434316521616673741">"IPSec  ቀድሞ- የተጋራቁልፍ"</string>
+    <string name="vpn_a_ipsec_presharedkey" msgid="1255301923217898418">"IPSec  ቅድመ- አጋሪ ቁልፍ"</string>
+    <string name="vpn_vpn_server_title" msgid="8897005887420358913">"VPN አገልጋይ አዘጋጅ"</string>
+    <string name="vpn_vpn_server" msgid="1141754908824209260">"VPN አገልጋይ"</string>
+    <string name="vpn_a_vpn_server" msgid="5960906152125045853">"የVPN አገልጋይ"</string>
+    <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"VPN አገልጋይ ስም"</string>
+    <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"DNS ፍለጋ ጎራዎች"</string>
+    <string name="vpn_dns_search_list" msgid="4230034234026605360">"DNS ፍለጋ ጎራዎች"</string>
+    <string name="vpn_field_is_set" msgid="7137320847812992243">"<xliff:g id="VALUE">%s</xliff:g> ተዘጋጅቷል"</string>
+    <string name="vpn_field_not_set" msgid="2972519243515893804">"<xliff:g id="VALUE">%s</xliff:g> አልተዘጋጀም"</string>
+    <string name="vpn_field_not_set_optional" msgid="8840557698252556791">"<xliff:g id="VALUE">%s</xliff:g> አልተዘጀም(አማራጭ)"</string>
+    <string name="vpn_enable_field" msgid="3700967675854517191">"አስችል <xliff:g id="OPTION">%s</xliff:g>"</string>
+    <string name="vpn_disable_field" msgid="6905658811179634005">"አታስችል <xliff:g id="OPTION">%s</xliff:g>"</string>
+    <string name="vpn_is_enabled" msgid="1266304230417098877">"<xliff:g id="OPTION">%s</xliff:g>ነቅቷል"</string>
+    <string name="vpn_is_disabled" msgid="2013622485867806167">"<xliff:g id="OPTION">%s</xliff:g> አልነቃም"</string>
+    <string name="vpn_settings_title" msgid="7327468307909556719">"የVPN ቅንብሮች"</string>
+    <string name="vpn_settings_summary" msgid="8849924181594963972">"&amp; አዘጋጅ(VPNs) አደራጅ"</string>
+    <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(አልተለወጠም)"</string>
+    <string name="vpn_secret_not_set" msgid="1037792636371641845">"(አልተዘጋጀም)"</string>
+    <!-- no translation found for credentials_title (4446234003860769883) -->
+    <skip />
+    <!-- no translation found for credentials_install (466093273825150847) -->
+    <skip />
+    <!-- no translation found for credentials_install (953914549998062317) -->
+    <skip />
+    <!-- no translation found for credentials_install_summary (4220422806818210676) -->
+    <skip />
+    <!-- no translation found for credentials_install_summary (5737658257407822713) -->
+    <skip />
+    <!-- outdated translation 9170150870552453457 -->     <string name="credentials_reset" msgid="3239382277144980418">"ማከማቻ አጥራ"</string>
+    <!-- outdated translation 1530388094693731636 -->     <string name="credentials_reset_summary" msgid="3369361230171260282">"የሁሉም ይዘቶች የመረጃ ማከማቻአጥራ እና የይለፍ ቃሉን ዳግም አስጀመር።"</string>
+    <string name="credentials_unlock" msgid="1463040326264133844">"የይለፍ ቃል አስገባ"</string>
+    <!-- outdated translation 594679530407918031 -->     <string name="credentials_unlock_hint" msgid="5889551635843338639">"የመረጃ ማከማቻ ይለፍቃል አስገባ።"</string>
+    <string name="credentials_old_password" msgid="7553393815538684028">"የአሁኑ ይለፍ ቃል፡"</string>
+    <!-- outdated translation 819990295796804516 -->     <string name="credentials_reset_hint" msgid="1566409057833618877">"ሁሉም መረጃ ለመሰረዝ መፈለግዎን እና የመረጃ ማከማቻ ይለፍቃሉን ዳግም ለማስጀመር እርግጠኛ ነዎት?"</string>
+    <string name="credentials_password_too_short" msgid="7502749986405522663">"የይለፍ ቃሉ ቢያንስ 8 ቁምፊዎች አሉት።"</string>
+    <!-- outdated translation 7525192410790152041 -->     <string name="credentials_wrong_password" msgid="2541932597104054807">"እባክዎ ትክክለኛውን ይለፍቃል ያስገቡ።"</string>
+    <!-- outdated translation 6392481296673345268 -->     <string name="credentials_reset_warning" msgid="5320653011511797600">"እባክዎ ትክከለኛውን የይለፍ ቃል ያስገቡ። የመረጃ ማከማቻው ከመጥፋቱ በፊት ትክክለኛውን የይለፍ ቃል ለማስገባት አንድ ተጨማሪ ሙከራ አለዎ።"</string>
+    <!-- no translation found for credentials_reset_warning_plural (6514085665301095279) -->
+    <skip />
+    <!-- outdated translation 7700309135582200849 -->     <string name="credentials_erased" msgid="2907836028586342969">"የመረጃው ማከማቻ ጠፍቷል"</string>
+    <!-- no translation found for credentials_not_erased (397954733557821269) -->
+    <skip />
+    <string name="credentials_enabled" msgid="7588607413349978930">"የመረጃ ማከማቻ ነቅቷል።"</string>
+    <!-- no translation found for credentials_configure_lock_screen_hint (6816970208840577219) -->
+    <skip />
+    <string name="emergency_tone_title" msgid="1055954530111587114">"የአደጋ ጊዜ ድምፅ"</string>
+    <string name="emergency_tone_summary" msgid="722259232924572153">"የአደጋጊዜ ጥሪ ሲደረግ ባህሪ አዘጋጅ"</string>
+    <string name="privacy_settings" msgid="9206631214140954954">"ብሕትውነት"</string>
+    <string name="privacy_settings_title" msgid="1987089301293213705">"የብሕትውነት ቅንብሮች"</string>
+    <string name="backup_section_title" msgid="8856083167469467588">"አስጠብቅ እና እነበረበት መልስ"</string>
+    <string name="personal_data_section_title" msgid="7815209034443782061">"የግል ውሂብ"</string>
+    <string name="backup_data_title" msgid="1239105919852668016">"ውሂቤን መጠባበቂያ"</string>
+    <!-- outdated translation 5662190190240860035 -->     <string name="backup_data_summary" msgid="6515285107793232815">"ቅንብሮቼን እና ሌላ የትግበራ ውሂብ አስጠብቅ"</string>
+    <!-- no translation found for backup_configure_account_title (3790872965773196615) -->
+    <skip />
+    <!-- no translation found for backup_configure_account_default_summary (2436933224764745553) -->
+    <skip />
+    <string name="auto_restore_title" msgid="5397528966329126506">"ራስ ሰር ነበረበት መልስ"</string>
+    <!-- outdated translation 6867766474057290177 -->     <string name="auto_restore_summary" msgid="83177150536734378">"ትግበራ ድጋሚ ከጫንኩ፣ ሌላ ውሂብ ወይም መጠባበቂያ ቅንብሮች እነበረበት መልስ።"</string>
+    <string name="backup_erase_dialog_title" msgid="3438255037256586237">"መጠባበቂያ"</string>
+    <!-- outdated translation 2948090854996352245 -->     <string name="backup_erase_dialog_message" msgid="7766283133557587608">"ቅንብሮችዎን እና የትግበራ ውሂብዎን መጠባበቂያ ለማቆም እና ሁሉንም ቅጂዎች ከGoogle አገልጋይ ላይ ለማጥፋት በእርግጥ ይፈልጋሉ?"</string>
+    <string name="device_admin_settings_title" msgid="1335557832906433309">"መሣሪያ አስተዳደር ቅንብሮች"</string>
+    <string name="active_device_admin_msg" msgid="6930903262612422111">"የመሳሪያ አስተዳደር"</string>
+    <string name="remove_device_admin" msgid="3596845261596451437">"አቦዝን"</string>
+    <string name="select_device_admin_msg" msgid="2645509057946368094">"መሣሪያ አስተዳዳሪዎች"</string>
+    <string name="no_device_admins" msgid="702695100241728775">"የመሣሪያ አስተዳዳሪዎች የሉም"</string>
+    <string name="add_device_admin_msg" msgid="6246742476064507965">"የመሣሪያ አስተዳዳሪ ይግበር?"</string>
+    <string name="add_device_admin" msgid="7133327675884827091">"አግብር"</string>
+    <string name="device_admin_add_title" msgid="7705551449705676363">"የመሳሪያ አስተዳደር"</string>
+    <string name="device_admin_warning" msgid="1149471041373876923">"ይህን አስተዳዳሪ ማግበር <xliff:g id="APP_NAME">%1$s</xliff:g> ትግበራን የሚከተሉትን ክንውኖች ለማከናወን ይፈቅዳል።"</string>
+    <string name="device_admin_status" msgid="7169948053970923035">"ይህ አስተዳዳሪ ንቁ እና የሚከተሉትን ክንውኖች ለማካሄድ <xliff:g id="APP_NAME">%1$s</xliff:g> ትግበራን ይፈቅዳል።"</string>
+    <string name="untitled_apn" msgid="1230060359198685513">"ርዕስ አልባ"</string>
+    <string name="sound_category_sound_title" msgid="1488759370067953996">"አጠቃላይ"</string>
+    <string name="sound_category_calls_title" msgid="3688531959256239012">"ገቢ ጥሪዎች"</string>
+    <string name="sound_category_notification_title" msgid="3502115998790286943">"ማሳወቂያዎች"</string>
+    <string name="sound_category_feedback_title" msgid="4399742321363475393">"ግብረ ምላሽ"</string>
+    <!-- no translation found for wifi_setup_title (661074868726906436) -->
+    <skip />
+    <!-- no translation found for wifi_setup_title_editing_network (7304321031985059969) -->
+    <skip />
+    <!-- no translation found for wifi_setup_title_connecting_network (2408378435027118687) -->
+    <skip />
+    <!-- no translation found for wifi_setup_title_connected_network (209755856836003839) -->
+    <skip />
+    <!-- no translation found for wifi_setup_title_add_network (6932651000151032301) -->
+    <skip />
+    <string name="wifi_setup_not_connected" msgid="6997432604664057052">"አልተያያዘም"</string>
+    <string name="wifi_setup_add_network" msgid="5939624680150051807">"አውታረ መረብ አክል"</string>
+    <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"ዝርዝር አድስ"</string>
+    <string name="wifi_setup_skip" msgid="6661541841684895522">"ዝለል"</string>
+    <string name="wifi_setup_next" msgid="3388694784447820477">"ቀጥሎ"</string>
+    <!-- no translation found for wifi_setup_back (144777383739164044) -->
+    <skip />
+    <!-- no translation found for wifi_setup_detail (2336990478140503605) -->
+    <skip />
+    <!-- no translation found for wifi_setup_connect (7954456989590237049) -->
+    <skip />
+    <!-- no translation found for wifi_setup_forget (2562847595567347526) -->
+    <skip />
+    <!-- no translation found for wifi_setup_save (3659235094218508211) -->
+    <skip />
+    <!-- no translation found for wifi_setup_cancel (3185216020264410239) -->
+    <skip />
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"አውታረ መረቦች በመቃኘት ላይ....."</string>
+    <!-- no translation found for wifi_setup_status_select_network (7519563569903137003) -->
+    <skip />
+    <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"ካለው አውታረ መረብ ጋር አያይዝ"</string>
+    <!-- no translation found for wifi_setup_status_unsecured_network (8143046977328718252) -->
+    <skip />
+    <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"የአውታረ መረብ ውቅረት አስገባ"</string>
+    <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"ወደ አዲስ አውታረ መረብ አያይዝ"</string>
+    <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"በማገናኘት ላይ..."</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"ወደ ሚቀጥለው ደረጃ ቀጥል"</string>
+    <!-- no translation found for wifi_setup_status_eap_not_supported (3196386445567501484) -->
+    <skip />
+    <!-- no translation found for wifi_setup_eap_not_supported (683540356393542939) -->
+    <skip />
+    <!-- no translation found for wifi_setup_description_connecting (1884664966455980182) -->
+    <skip />
+    <!-- no translation found for wifi_setup_description_connected (5235991893829582459) -->
+    <skip />
+    <!-- no translation found for account_sync_settings_title (4578227872921044660) -->
+    <skip />
+    <!-- no translation found for sync_is_failing (1591561768344128377) -->
+    <skip />
+    <string name="add_account_label" msgid="7811707265834013767">"መለያ አክል"</string>
+    <string name="header_general_sync_settings" msgid="3487451896424238469">"አጠቃላይ አሳምር ቅንብሮች"</string>
+    <string name="background_data" msgid="5779592891375473817">"ዳራ ውሂብ"</string>
+    <string name="background_data_summary" msgid="3630389249212620467">"ትግበራዎች ማሳመር፣ መላክ፣ እና ውሂብ በማንኛውም ሰዓት መቀበል ይችላሉ።"</string>
+    <string name="background_data_dialog_title" msgid="745974259246047425">"ትኩረት"</string>
+    <string name="background_data_dialog_message" msgid="9155730118215371308">"የዳራ ውሂብ አለማንቃት የባትሪ ህይወት ያረዝማል የውሂብ ጥቅምን ያሳንሳል። አንዳንድ ትግበራዎች የዳራ ውሂብ ተያያዥን ሊጠቀሙ ይችላሉ።"</string>
+    <!-- no translation found for sync_automatically (7558810110682562376) -->
+    <skip />
+    <string name="sync_automatically_summary" msgid="6662623174608419931">"ትግበራዎች ውሂብ በራስ ሰር ያሳምራሉ"</string>
+    <string name="header_manage_accounts" msgid="6869002423884539607">"መለያዎች አደራጅ"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"አሳምር በርቷል"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"አሳምር ጠፍቷል"</string>
+    <string name="sync_error" msgid="5060969083117872149">"የአሳምር ስህተት"</string>
+    <!-- no translation found for settings_backup (2274732978260797031) -->
+    <skip />
+    <!-- no translation found for settings_backup_summary (7916877705938054035) -->
+    <skip />
+    <!-- no translation found for sync_menu_sync_now (6154608350395805683) -->
+    <skip />
+    <!-- no translation found for sync_menu_sync_cancel (8292379009626966949) -->
+    <skip />
+    <!-- no translation found for sync_one_time_sync (6766593624598183090) -->
+    <skip />
+    <!-- no translation found for sync_gmail (714886122098006477) -->
+    <skip />
+    <!-- no translation found for sync_calendar (9056527206714733735) -->
+    <skip />
+    <!-- no translation found for sync_contacts (9174914394377828043) -->
+    <skip />
+    <!-- no translation found for sync_plug (5952575609349860569) -->
+    <skip />
+    <!-- no translation found for header_application_sync_settings (5514539555293976035) -->
+    <skip />
+    <!-- no translation found for header_data_and_synchronization (5165024023936509896) -->
+    <skip />
+    <!-- no translation found for preference_change_password_title (8955581790270130056) -->
+    <skip />
+    <!-- no translation found for header_account_settings (5382475087121880626) -->
+    <skip />
+    <!-- no translation found for remove_account_label (5921986026504804119) -->
+    <skip />
+    <!-- no translation found for header_add_an_account (756108499532023798) -->
+    <skip />
+    <!-- no translation found for finish_button_label (481587707657751116) -->
+    <skip />
+    <!-- no translation found for really_remove_account_title (6574643117748564960) -->
+    <skip />
+    <!-- no translation found for really_remove_account_message (4448645571715719563) -->
+    <skip />
+    <!-- no translation found for really_remove_account_message (1005751790899989319) -->
+    <skip />
+    <!-- no translation found for remove_account_failed (1093911989149396624) -->
+    <skip />
+    <!-- no translation found for remove_account_failed (9174390193652391412) -->
+    <skip />
+    <!-- no translation found for provider_label (7724593781904508866) -->
+    <skip />
+    <!-- no translation found for sync_item_title (1931551540462877488) -->
+    <skip />
+    <!-- no translation found for cant_sync_dialog_title (7185199796123573317) -->
+    <skip />
+    <!-- no translation found for cant_sync_dialog_message (2372359241135295930) -->
+    <skip />
+    <!-- no translation found for enter_password (3268224850821675915) -->
+    <skip />
+    <!-- no translation found for try_again (5904121494468643129) -->
+    <skip />
+    <!-- no translation found for service_busy (225227519012409130) -->
+    <skip />
+    <!-- no translation found for delete (4219243412325163003) -->
+    <skip />
+    <!-- no translation found for misc_files (6298643430106707497) -->
+    <skip />
+    <!-- no translation found for misc_files_selected_count (4647048020823912088) -->
+    <skip />
+    <!-- no translation found for misc_files_selected_count_bytes (2876232009069114352) -->
+    <skip />
+    <!-- no translation found for select_all (6783085295161532497) -->
+    <skip />
+    <!-- no translation found for hdcp_checking_title (8605478913544273282) -->
+    <skip />
+    <!-- no translation found for hdcp_checking_dialog_title (5141305530923283) -->
+    <skip />
+</resources>
diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml
index 24d04ca..b336709 100644
--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml
@@ -48,6 +48,16 @@
     <item msgid="2314124409517439288">"10 دقائق"</item>
     <item msgid="6864027152847611413">"30 دقيقة"</item>
   </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="3149294732238283185">"مطلقًا"</item>
+    <item msgid="2194151041885903260">"15 ثانية"</item>
+    <item msgid="5892295237131074341">"30 ثانية"</item>
+    <item msgid="3538441365970038213">"دقيقة واحدة"</item>
+    <item msgid="412343871668955639">"دقيقتان"</item>
+    <item msgid="5076853889688991690">"5 دقائق"</item>
+    <item msgid="1903860996174927898">"10 دقائق"</item>
+    <item msgid="6415509612413178727">"30 دقيقة"</item>
+  </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"فورًا"</item>
     <item msgid="6736512735606834431">"5 ثوانٍ"</item>
@@ -59,6 +69,22 @@
     <item msgid="9002737361305019353">"10 دقائق"</item>
     <item msgid="4322676235684793329">"30 دقيقة"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"صغير جدًا"</item>
+    <item msgid="383133849547816572">"صغير جدًا"</item>
+    <item msgid="6490061470416867723">"صغير"</item>
+    <item msgid="3579015730662088893">"عادي"</item>
+    <item msgid="1678068858001018666">"كبير"</item>
+    <item msgid="490158884605093126">"كبير جدًا"</item>
+    <item msgid="2123802548987439763">"كبير جدًا"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"بطيء للغاية"</item>
     <item msgid="2361722960903353554">"بطيء"</item>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 3d9937b..b1f8361 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -316,7 +316,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"طلب رقم تعريف شخصي رقمي لإلغاء تأمين الشاشة"</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_disabled_summary" msgid="8563103042330816018">"معطل بواسطة المشرف أو سياسة التشفير"</string>
+    <!-- outdated translation 5962903914511361952 -->     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"معطل بواسطة مشرف جهاز التحكم عن بعد"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"إيقاف"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7137296704741184239">"بدون تأمين"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"محمي باستخدام نقش"</string>
@@ -460,6 +460,7 @@
     <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"تحديد وقت الفصل من Wi-Fi."</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"حدثت مشكلة أثناء تغيير الإعدادات"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"إضافة شبكة Wi-Fi"</string>
+    <string name="wifi_add_network_summary" msgid="6345544206968025811">"تهيئة شبكة لا تتيح البث"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"شبكات Wi-Fi"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"فحص"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"متقدم"</string>
@@ -598,7 +599,17 @@
     <string name="brightness_summary" msgid="838917350127550703">"ضبط سطوع الشاشة"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"المهلة"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"يتم إغلاق الشاشة تلقائيًا بعد <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android Dreams"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"شاشات التوقف وتحولات الخمول الأخرى"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"الحلم المحدد"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"وقت التنشيط"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"بعد انقضاء مدة <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> من الخمول"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"مطلقًا"</string>
+    <string name="dream_test" msgid="5968002644622194481">"جرِّب بنفسك."</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"سطوع تلقائي"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"حجم الخط"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"الحجم الإجمالي للخطوط"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"تحديد حجم الخط"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"إعدادات تأمين بطاقة SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"إعداد تأمين بطاقة SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"تأمين بطاقة SIM"</string>
@@ -644,7 +655,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"رقم هاتفي"</string>
     <string name="status_min_number" msgid="3519504522179420597">"دقيقة"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"إصدار PRL"</string>
-    <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
+    <string name="status_meid_number" msgid="2037549729230058915">"IMEI / MEID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"نوع شبكة الجوال"</string>
     <string name="status_data_state" msgid="5503181397066522950">"حالة شبكة الجوال"</string>
     <string name="status_service_state" msgid="2323931627519429503">"حالة الخدمة"</string>
@@ -740,7 +751,7 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"تم تسجيل دخولك حاليًا في الحسابات التالية:"\n</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"الموسيقى"</li>\n<li>"الصور"</li>\n<li>"بيانات المستخدم الأخرى"</li></string>
     <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@7d29f3b5)  -->
+    <!-- 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@5122cdb6)  -->
     <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>
@@ -893,9 +904,12 @@
     <string name="install_unknown_applications" msgid="6612824788917283662">"السماح بتثبيت تطبيقات خلاف تطبيقات السوق Market"</string>
     <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"إن الجهاز اللوحي وبياناتك الشخصية معرضان لتهديد كبير من تطبيقات من مصادر غير معروفة. أنت توافق على أنك المسؤول الوحيد عن أي ضرر يحدث للجهاز اللوحي أو فقدان للبيانات الذي قد ينتج عن استخدام هذه التطبيقات."</string>
     <string name="install_all_warning" product="default" msgid="1923717607319933741">"تكون بيانات هاتفك وبياناتك الشخصية أكثر عرضة للهجوم من خلال التطبيقات مجهولة المصادر. أنت توافق على أنك المسؤول الوحيد عن أي ضرر لهاتفك أو أي فقدان للبيانات ينتج عن استخدام هذه التطبيقات."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"الإعدادات المتقدمة"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"تمكين المزيد من خيارات الإعدادات."</string>
     <string name="application_info_label" msgid="1150486628158409543">"معلومات التطبيق"</string>
     <string name="storage_label" msgid="8700867073480107253">"التخزين"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"تشغيل بشكل افتراضي"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"توافق الشاشة"</string>
     <string name="permissions_label" msgid="2605296874922726203">"الأذونات"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"ذاكرة التخزين المؤقت"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"محو ذاكرة التخزين المؤقت"</string>
@@ -915,6 +929,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"لقد حددت تشغيل هذا التطبيق بشكل افتراضي لبعض الإجراءات."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"لم يتم تعيين إعدادات افتراضية."</string>
     <string name="clear_activities" msgid="7408923511535174430">"محو الإعدادات الافتراضية"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"ربما لم يتم تصميم هذا التطبيق ليلائم شاشتك، يمكنك التحكم في كيفية ضبطه ليلائم شاشتك هنا."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"السؤال عند الإطلاق"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"مقياس التطبيق"</string>
     <string name="unknown" msgid="1592123443519355854">"غير معروف"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"تصنيف بحسب الاسم"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"تصنيف بحسب الحجم"</string>
@@ -1019,8 +1036,13 @@
     <string name="show_password" msgid="2198798062604049206">"كلمات مرور مرئية"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"عرض كلمة المرور أثناء الكتابة"</string>
     <string name="ime_security_warning" msgid="812267421486877917">"يمكن أن تكون طريقة الإرسال هذه قادرة على جمع كل النص الذي كتبته، بما في ذلك البيانات الشخصية مثل كلمات المرور وأرقام بطاقات الائتمان. يتم إحضار ذلك من التطبيق <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. هل تريد استخدام طريقة الإرسال هذه؟"</string>
+    <!-- no translation found for pointer_settings_category (6090176550039035130) -->
+    <skip />
+    <!-- no translation found for pointer_speed (1221342330217861616) -->
+    <skip />
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"قاموس المستخدم"</string>
-    <string name="user_dict_settings_title" msgid="8357027437499042191">"قاموس المستخدم"</string>
+    <string name="user_dict_single_settings_title" msgid="5454855286173849284">"قاموس المستخدم"</string>
+    <string name="user_dict_multiple_settings_title" msgid="326583195525296750">"إدارة قواميس المستخدم"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"إضافة"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"إضافة إلى القاموس"</string>
@@ -1029,6 +1051,7 @@
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"حذف"</string>
     <string name="user_dict_settings_empty_text" product="tablet" msgid="1766522102636921529">"ليس لديك أي كلمات في قاموس المستخدم. يمكنك إضافة كلمة من خلال لمس الزر \"إضافة\" ( + )."</string>
     <string name="user_dict_settings_empty_text" product="default" msgid="6209268025109242806">"ليست لديك أي كلمات في قاموس المستخدم. يمكنك إضافة كلمة من خلال القائمة."</string>
+    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"جميع اللغات"</string>
     <string name="testing" msgid="6584352735303604146">"الاختبار"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"معلومات الجهاز اللوحي"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"معلومات الهاتف"</string>
@@ -1100,6 +1123,8 @@
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"زر الطاقة"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"زر الطاقة ينهي الاتصال"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"أثناء الاتصال، سيؤدي الضغط على زر الطاقة إلى إنهاء الاتصال بدلاً من إيقاف الشاشة"</string>
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <skip />
     <string name="touchscreen_gestures_category" msgid="3109869155350859625">"إيماءات الشاشة التي تعمل باللمس"</string>
     <string name="long_press_timeout_selector_title" msgid="1396876537252863044">"مهلة اللمس مع الاستمرار"</string>
     <string name="long_press_timeout_selector_summary" msgid="2261114502740278996">"مهلة إلى أن يتم تفسير اللمس كلمس مع الاستمرار"</string>
@@ -1302,30 +1327,26 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(لم يتم التغيير)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(لم يتم التعيين)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"تخزين بيانات الاعتماد"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"استخدام بيانات الاعتماد الآمنة"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"السماح للتطبيقات بالوصول إلى الشهادات الآمنة وبيانات الاعتماد الأخرى"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"التثبيت من وحدة تخزين"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"التثبيت من بطاقة SD"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"تثبيت الشهادات من وحدة تخزين"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"تثبيت الشهادات من بطاقة SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"تعيين كلمة المرور"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"تعيين كلمة مرور لتخزين بيانات الاعتماد أو تغييرها"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"محو بيانات الاعتماد"</string>
-    <string name="credentials_reset_summary" msgid="3810369467217453606">"إزالة جميع المحتويات وإعادة تعيين كلمة المرور"</string>
+    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3369361230171260282">"مسح جميع المحتويات من تخزين بيانات الاعتماد وإعادة تعيين كلمة المرور"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"إدخال كلمة المرور"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"أدخل كلمة المرور تخزين بيانات الاعتماد."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"تعيين كلمة المرور لتخزين بيانات الاعتماد. يجب أن تكون 8 أحرف على الأقل."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"كلمة المرور الحالية:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"كلمة المرور الجديدة:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"تأكيد كلمة المرور الجديدة:"</string>
-    <string name="credentials_reset_hint" msgid="2336340927894094814">"ستتم إزالة كل المحتويات، وإعادة تعيين كلمة المرور. هل تريد بالتأكيد إجراء ذلك؟"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"كلمتا المرور غير متطابقتين."</string>
+    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="1566409057833618877">"هل تريد بالتأكيد حذف جميع بيانات الاعتماد وإعادة تعيين كلمة مرور تخزين بيانات الاعتماد؟"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"يجب أن تحتوي كلمة المرور على 8 أحرف على الأقل."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"كلمة مرور غير صحيحة."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"كلمة مرور غير صحيحة. بقي لديك محاولة واحدة أخرى قبل مسح تخزين بيانات الاعتماد."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"كلمة مرور غير صحيحة. بقي لديك <xliff:g id="NUMBER">%1$d</xliff:g> من المحاولات قبل مسح تخزين بيانات الاعتماد."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"تم مسح تخزين بيانات الاعتماد."</string>
+    <!-- no translation found for credentials_not_erased (397954733557821269) -->
+    <skip />
     <string name="credentials_enabled" msgid="7588607413349978930">"تم تمكين تخزين بيانات الاعتماد."</string>
+    <!-- no translation found for credentials_configure_lock_screen_hint (6816970208840577219) -->
+    <skip />
     <string name="emergency_tone_title" msgid="1055954530111587114">"نغمة الطوارئ"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"تعيين السلوك عند إجراء اتصال بالطوارئ"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"الخصوصية"</string>
diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml
index 084eb86..e331be6 100644
--- a/res/values-bg/arrays.xml
+++ b/res/values-bg/arrays.xml
@@ -48,6 +48,16 @@
     <item msgid="2314124409517439288">"10 минути"</item>
     <item msgid="6864027152847611413">"30 минути"</item>
   </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="3149294732238283185">"Никога"</item>
+    <item msgid="2194151041885903260">"15 секунди"</item>
+    <item msgid="5892295237131074341">"30 секунди"</item>
+    <item msgid="3538441365970038213">"1 минута"</item>
+    <item msgid="412343871668955639">"2 минути"</item>
+    <item msgid="5076853889688991690">"5 минути"</item>
+    <item msgid="1903860996174927898">"10 минути"</item>
+    <item msgid="6415509612413178727">"30 минути"</item>
+  </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"незабавно"</item>
     <item msgid="6736512735606834431">"5 секунди"</item>
@@ -59,6 +69,22 @@
     <item msgid="9002737361305019353">"10 минути"</item>
     <item msgid="4322676235684793329">"30 минути"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Извънредно малък"</item>
+    <item msgid="383133849547816572">"Много малък"</item>
+    <item msgid="6490061470416867723">"Малък"</item>
+    <item msgid="3579015730662088893">"Нормален"</item>
+    <item msgid="1678068858001018666">"Голям"</item>
+    <item msgid="490158884605093126">"Много голям"</item>
+    <item msgid="2123802548987439763">"Извънредно голям"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Много бавна"</item>
     <item msgid="2361722960903353554">"Бавна"</item>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 0b5dbb0..bc81350 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -316,7 +316,7 @@
     <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_disabled_summary" msgid="8563103042330816018">"Деактивирано от админ. или правилата за шифроване"</string>
+    <!-- outdated translation 5962903914511361952 -->     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Деактивирано от отдалечен администратор на устройството"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Изкл."</string>
     <string name="unlock_set_unlock_mode_none" msgid="7137296704741184239">"Без защита"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Защитено с фигура"</string>
@@ -460,6 +460,7 @@
     <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Посочване на времето за прекратяване на връзката с Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Възникна проблем при промяна на настройката"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Добавете Wi-Fi мрежа"</string>
+    <string name="wifi_add_network_summary" msgid="6345544206968025811">"Конфигуриране на мрежа, неизлъчваща SSID"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi мрежи"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Сканиране"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Разширени"</string>
@@ -598,7 +599,17 @@
     <string name="brightness_summary" msgid="838917350127550703">"Наглася яркостта на екрана"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Време за изчакване"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Екранът се изключва автоматично след <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Сънища в Android"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Скрийнсейвъри и други залъгалки при неактивност"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Избран сън"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Кога да се активира"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"След <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> неактивност"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Никога"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Пробвайте!"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Автоматична яркост"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Размер на шрифта"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Общ размер на шрифтовете"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Избор на размер на шрифта"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Настройки за заключването на SIM картата"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Настройване на заключването на SIM картата"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Заключване на SIM картата"</string>
@@ -644,7 +655,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"Моят телефонен номер"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"PRL версия"</string>
-    <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
+    <string name="status_meid_number" msgid="2037549729230058915">"IMEI / MEID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"Тип мобилна мрежа"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Състояние на мобилната мрежа"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Състояние на услуга"</string>
@@ -893,9 +904,12 @@
     <string name="install_unknown_applications" msgid="6612824788917283662">"Разрешаване на инсталирането на приложения не от Market"</string>
     <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"Данните на таблета ви и личната ви информация са по-уязвими на атака от приложения от неизвестни източници. Приемате, че вие носите цялата отговорност в случай на повреда на таблета ви или при загуба на данни вследствие използването на такива приложения."</string>
     <string name="install_all_warning" product="default" msgid="1923717607319933741">"Телефонът и личните ви данни са по уязвими на атаки от приложения от неизвестни източници. Съгласявате се, че носите цялата отговорност в случай на повреда на телефона или загуба на данни, вследствие на използването на такива приложения."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Разширени настройки"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Да се активират още опции за настройки."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Информация за приложение"</string>
     <string name="storage_label" msgid="8700867073480107253">"Хранилище"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Стартиране по подразбиране"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Съвместимост на екрана"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Разрешения"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Кеш"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Изчистване на кеша"</string>
@@ -915,6 +929,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Избрахте да стартирате това приложение по подразбиране за някои действия."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Не са зададени стандартни."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Изчистване на стандартни"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Възможно е това приложение да не е създадено за екрана ви. Можете да контролирате оттук как то се настройва към него."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Да се пита при стартиране"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Мащабиране на приложението"</string>
     <string name="unknown" msgid="1592123443519355854">"Неизвестно"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Сортиране по име"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Сортиране по размер"</string>
@@ -1019,8 +1036,13 @@
     <string name="show_password" msgid="2198798062604049206">"Видими пароли"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Показване на паролата при писане"</string>
     <string name="ime_security_warning" msgid="812267421486877917">"Този метод на въвеждане може да събира целия въведен от вас текст, включително лични данни като пароли и номера на кредитни карти. Той произлиза от приложението <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Искате ли да го използвате?"</string>
+    <!-- no translation found for pointer_settings_category (6090176550039035130) -->
+    <skip />
+    <!-- no translation found for pointer_speed (1221342330217861616) -->
+    <skip />
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Потребителски речник"</string>
-    <string name="user_dict_settings_title" msgid="8357027437499042191">"Потребителски речник"</string>
+    <string name="user_dict_single_settings_title" msgid="5454855286173849284">"Потребителски речник"</string>
+    <string name="user_dict_multiple_settings_title" msgid="326583195525296750">"Управление на потребителските речници"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Добавяне"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Добавяне в речника"</string>
@@ -1029,6 +1051,7 @@
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Изтриване"</string>
     <string name="user_dict_settings_empty_text" product="tablet" msgid="1766522102636921529">"Нямате думи в потребителския речник. Можете да добавите, като докоснете бутона за добавяне (+)."</string>
     <string name="user_dict_settings_empty_text" product="default" msgid="6209268025109242806">"Нямате думи в потребителския речник. Можете да добавите от менюто."</string>
+    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Всички езици"</string>
     <string name="testing" msgid="6584352735303604146">"Тестване"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Информация за таблета"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Информация за телефон"</string>
@@ -1100,6 +1123,8 @@
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"Бутон за захранване"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"Бутонът за захранване приключва обаждането"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"По време на обаждане, натискането на „Захранване“ го приключва вместо да изключва екрана"</string>
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <skip />
     <string name="touchscreen_gestures_category" msgid="3109869155350859625">"Жестове за сензорния екран"</string>
     <string name="long_press_timeout_selector_title" msgid="1396876537252863044">"Забавяне при докосване и задържане"</string>
     <string name="long_press_timeout_selector_summary" msgid="2261114502740278996">"Забавяне, докато докосването се тълкува като докосване и задържане"</string>
@@ -1302,30 +1327,26 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(непроменени)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(не е зададенo)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Хранилище за идент. данни"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Използване на сигурни идентификационни данни"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Даване на достъп до защитени сертификати и други идентификационни данни"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Инсталиране от хранилището"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Инсталиране от SD картата"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Инсталиране на сертификати от хранилището"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Инсталиране на сертификати от SD картата"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Задаване на парола"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Задаване или промяна на паролата за хранилището за идентификационни данни"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Изчистване на идент. данни"</string>
-    <string name="credentials_reset_summary" msgid="3810369467217453606">"Премахване на цялото съдържание и задаване на нова парола"</string>
+    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3369361230171260282">"Изчиства хранилището от цялото съдържание и му задава нова парола"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Въвеждане на парола"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Въведете паролата за хранилището за идентификационни данни."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Задайте паролата за хранилището за идентификационни данни. Трябва да бъде поне 8 знака."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Текуща парола:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Нова парола:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Потвърждаване на нова парола:"</string>
-    <string name="credentials_reset_hint" msgid="2336340927894094814">"Цялото съдържание ще бъде премахнато и ще бъде зададена нова парола. Наистина ли искате да го направите?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Паролите не си съответстват."</string>
+    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="1566409057833618877">"Наистина ли искате да изтриете всички идентификационни данни и да зададете нова парола за хранилището им?"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Паролата трябва да е поне 8 знака."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Паролата е неправилна."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Паролата е неправилна. Имате още един опит, преди хранилището за идентификационни данни да бъде изтрито."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Паролата е неправилна. Имате още <xliff:g id="NUMBER">%1$d</xliff:g> опита, преди хранилището за идентификационни данни да бъде изтрито."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Хранилище с данни: изтрито."</string>
+    <!-- no translation found for credentials_not_erased (397954733557821269) -->
+    <skip />
     <string name="credentials_enabled" msgid="7588607413349978930">"Хранилището за идентификационни данни е активирано."</string>
+    <!-- no translation found for credentials_configure_lock_screen_hint (6816970208840577219) -->
+    <skip />
     <string name="emergency_tone_title" msgid="1055954530111587114">"Тон за спешност"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Задаване на поведение при спешно обаждане"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"Поверителност"</string>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index f1a69f9..146f9c9 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -48,6 +48,16 @@
     <item msgid="2314124409517439288">"10 minuts"</item>
     <item msgid="6864027152847611413">"30 minuts"</item>
   </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="3149294732238283185">"Mai"</item>
+    <item msgid="2194151041885903260">"15 segons"</item>
+    <item msgid="5892295237131074341">"30 segons"</item>
+    <item msgid="3538441365970038213">"1 minut"</item>
+    <item msgid="412343871668955639">"2 minuts"</item>
+    <item msgid="5076853889688991690">"5 minuts"</item>
+    <item msgid="1903860996174927898">"10 minuts"</item>
+    <item msgid="6415509612413178727">"30 minuts"</item>
+  </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"immediatament"</item>
     <item msgid="6736512735606834431">"5 segons"</item>
@@ -59,6 +69,22 @@
     <item msgid="9002737361305019353">"10 minuts"</item>
     <item msgid="4322676235684793329">"30 minuts"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Extremament petita"</item>
+    <item msgid="383133849547816572">"Molt petita"</item>
+    <item msgid="6490061470416867723">"Petita"</item>
+    <item msgid="3579015730662088893">"Normal"</item>
+    <item msgid="1678068858001018666">"Gran"</item>
+    <item msgid="490158884605093126">"Molt gran"</item>
+    <item msgid="2123802548987439763">"Extremament gran"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Molt lenta"</item>
     <item msgid="2361722960903353554">"Lenta"</item>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 7d49741..45e6677 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -316,7 +316,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"PIN numèric per desbloquejar la pantalla"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Contrasenya"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Contrasenya per desbloquejar la pantalla"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Desactivada per l\'administrador o la política d\'encriptació"</string>
+    <!-- outdated translation 5962903914511361952 -->     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Desactivada per l\'administrador remot del dispositiu"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Desactivat"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7137296704741184239">"No hi ha seguretat"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Assegurada mitjançant patró"</string>
@@ -460,6 +460,7 @@
     <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Especifica quan desconnectar de la Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"S\'ha produït un problema en canviar la configuració"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Afegeix una xarxa Wi-fi"</string>
+    <string name="wifi_add_network_summary" msgid="6345544206968025811">"Configura una xarxa de no difusió"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Xarxes Wi-fi"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Cerca"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avançat"</string>
@@ -598,7 +599,17 @@
     <string name="brightness_summary" msgid="838917350127550703">"Ajusta la brillantor de la pantalla"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Temps d\'espera esgotat"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"La pantalla es desactiva automàticament després de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Somnis d\'Android"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Estalvis de pantalla i altres diversions per a la inactivitat"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Somni seleccionat"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Moment de l\'activació"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"Després de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'estat inactiu"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Mai"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Prova-ho"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brillantor automàtica"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Mida del tipus de lletra"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Mida general dels tipus de lletra"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Selecciona la mida del tipus de lletra"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Configuració de bloqueig de targeta SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Configura el bloqueig de la targeta SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Bloqueig de targeta SIM"</string>
@@ -644,7 +655,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"El meu número de telèfon"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"Versió de PRL"</string>
-    <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
+    <string name="status_meid_number" msgid="2037549729230058915">"IMEI/MEID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"Tipus de xarxa mòbil"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Estat de la xarxa mòbil"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Estat del servei"</string>
@@ -893,9 +904,12 @@
     <string name="install_unknown_applications" msgid="6612824788917283662">"Permet la instal·lació d\'aplicacions que no siguin de Market"</string>
     <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"Les dades personals i les dades de la tauleta són més vulnerables a atacs d\'aplicacions d\'origen desconegut. Acceptes que ets l\'únic responsable de qualsevol dany a la tauleta o bé de pèrdua de dades com a conseqüència d\'utilitzar aquestes aplicacions."</string>
     <string name="install_all_warning" product="default" msgid="1923717607319933741">"El telèfon i les dades personals són més vulnerables a atacs per part d\'aplicacions d\'orígens desconeguts. Accepteu que sou l\'únic responsable dels danys al telèfon o de la pèrdua de dades que puguin resultar de l\'ús d\'aquestes aplicacions."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Configuració avançada"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Activa més opcions de configuració."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Informació de l\'aplicació"</string>
     <string name="storage_label" msgid="8700867073480107253">"Emmagatzematge"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Inicia de manera predeterminada"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Compatibilitat amb la pantalla"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Permisos"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Memòria cau"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Esborra la memòria cau"</string>
@@ -915,6 +929,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Heu seleccionat que aquesta aplicació s\'iniciï de manera predeterminada per a algunes accions."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"No s\'ha definit cap valor predeterminat."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Esborra els valors predeterminats"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"És possible que aquesta aplicació no hagi estat dissenyada per a la teva pantalla; pots controlar com s\'ajusta a la pantalla aquí."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Pregunta-ho en iniciar"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Escala l\'aplicació"</string>
     <string name="unknown" msgid="1592123443519355854">"Desconegut"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Ordena per nom"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Ordena per mida"</string>
@@ -1019,8 +1036,13 @@
     <string name="show_password" msgid="2198798062604049206">"Contrasenyes visibles"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Mostra la contrasenya a mesura que escric"</string>
     <string name="ime_security_warning" msgid="812267421486877917">"Pot ser que aquest mètode d\'entrada pugui recopilar tot el text que escriviu, incloses dades personals, com ara contrasenyes i números de targetes de crèdit. Ve de l\'aplicació <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Voleu utilitzar aquest mètode d\'entrada?"</string>
+    <!-- no translation found for pointer_settings_category (6090176550039035130) -->
+    <skip />
+    <!-- no translation found for pointer_speed (1221342330217861616) -->
+    <skip />
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Diccionari de l\'usuari"</string>
-    <string name="user_dict_settings_title" msgid="8357027437499042191">"Diccionari de l\'usuari"</string>
+    <string name="user_dict_single_settings_title" msgid="5454855286173849284">"Diccionari de l\'usuari"</string>
+    <string name="user_dict_multiple_settings_title" msgid="326583195525296750">"Gestió dels diccionaris de l\'usuari"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Afegeix"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Addició al diccionari"</string>
@@ -1029,6 +1051,7 @@
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Suprimeix"</string>
     <string name="user_dict_settings_empty_text" product="tablet" msgid="1766522102636921529">"No tens cap paraula al diccionari de l\'usuari. Pots afegir una paraula si toques el botó Afegeix ( + )."</string>
     <string name="user_dict_settings_empty_text" product="default" msgid="6209268025109242806">"No teniu cap paraula al diccionari de l\'usuari. Podeu afegir una paraula mitjançant el menú."</string>
+    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Tots els idiomes"</string>
     <string name="testing" msgid="6584352735303604146">"Proves"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Informació de la tauleta"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Informació del telèfon"</string>
@@ -1100,6 +1123,8 @@
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"Botó d\'engegada"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"El botó d\'engegada finalitza la trucada"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"Durant una trucada, si es prem el botó d\'engegada, es finalitza la trucada en comptes d\'apagar-se la pantalla"</string>
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <skip />
     <string name="touchscreen_gestures_category" msgid="3109869155350859625">"Gestos de la pantalla tàctil"</string>
     <string name="long_press_timeout_selector_title" msgid="1396876537252863044">"Retard de Toca i mantén premut"</string>
     <string name="long_press_timeout_selector_summary" msgid="2261114502740278996">"Retard fins que un toc s\'interpreta com a Toca i mantén premut"</string>
@@ -1302,30 +1327,26 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(sense canvis)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(sense definir)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Emmagatzematge de credencials"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Utilitza credencials segures"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Permet a les aplicacions accedir als certificats segurs i a altres credencials"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Instal·la des de l\'emmagatzematge"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Instal·la des de la targeta SD"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Instal·la els certificats des de l\'emmagatzematge"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Instal·la els certificats des de la targeta SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Defineix la contrasenya"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Estableix o canvia la contrasenya per a l\'emmagatzematge de credencials"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Esborra les credencials"</string>
-    <string name="credentials_reset_summary" msgid="3810369467217453606">"Elimina tot el contingut i restableix la contrasenya"</string>
+    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3369361230171260282">"Esborra tot el contingut de l\'emmagatzematge de credencials i restableix-ne la contrasenya"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Introduïu la contrasenya"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Introdueix la contrasenya per a l\'emmagatzematge de credencials."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Estableix la contrasenya per a l\'emmagatzematge de credencials. Ha de tenir com a mínim vuit caràcters."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Contrasenya actual:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Contrasenya nova:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Confirmeu la contrasenya nova:"</string>
-    <string name="credentials_reset_hint" msgid="2336340927894094814">"S\'eliminarà tot el contingut i es restablirà la contrasenya. N\'estàs segur?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Les contrasenyes no coincideixen."</string>
+    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="1566409057833618877">"Estàs segur que vols suprimir totes les credencials i restablir la contrasenya d\'emmagatzematge de credencials?"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"La contrasenya ha de tenir almenys 8 caràcters."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"La contrasenya no és correcta."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Contrasenya incorrecta. Tens una oportunitat més abans que no s\'esborri l\'emmagatzematge de credencials."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Contrasenya incorrecta. Tens <xliff:g id="NUMBER">%1$d</xliff:g> oportunitats més abans que no s\'esborri l\'emmagatzematge de credencials."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Emmag. credencials esborrat."</string>
+    <!-- no translation found for credentials_not_erased (397954733557821269) -->
+    <skip />
     <string name="credentials_enabled" msgid="7588607413349978930">"L\'emmagatzematge de credencials està activat."</string>
+    <!-- no translation found for credentials_configure_lock_screen_hint (6816970208840577219) -->
+    <skip />
     <string name="emergency_tone_title" msgid="1055954530111587114">"To d\'emergència"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Defineix el comportament quan es fa una trucada d\'emergència"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"Privadesa"</string>
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index 2beb22a..f20751e 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -48,6 +48,16 @@
     <item msgid="2314124409517439288">"10 minut"</item>
     <item msgid="6864027152847611413">"30 minut"</item>
   </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="3149294732238283185">"Nikdy"</item>
+    <item msgid="2194151041885903260">"15 sekund"</item>
+    <item msgid="5892295237131074341">"30 sekund"</item>
+    <item msgid="3538441365970038213">"1 minuta"</item>
+    <item msgid="412343871668955639">"2 minuty"</item>
+    <item msgid="5076853889688991690">"5 minut"</item>
+    <item msgid="1903860996174927898">"10 minut"</item>
+    <item msgid="6415509612413178727">"30 minut"</item>
+  </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"okamžitě"</item>
     <item msgid="6736512735606834431">"5 sekund"</item>
@@ -59,6 +69,22 @@
     <item msgid="9002737361305019353">"10 minut"</item>
     <item msgid="4322676235684793329">"30 minut"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Mimořádně malé"</item>
+    <item msgid="383133849547816572">"Velmi malé"</item>
+    <item msgid="6490061470416867723">"Malé"</item>
+    <item msgid="3579015730662088893">"Normální"</item>
+    <item msgid="1678068858001018666">"Velké"</item>
+    <item msgid="490158884605093126">"Velmi velké"</item>
+    <item msgid="2123802548987439763">"Mimořádně velké"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Velmi pomalá"</item>
     <item msgid="2361722960903353554">"Pomalá"</item>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index d6a5600..4ab0a1f 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -316,7 +316,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Odemknutí obrazovky vyžaduje číselný kód PIN"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Heslo"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Odemknutí obrazovky vyžaduje heslo"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Zakázáno správcem nebo zásadou šifrování"</string>
+    <!-- outdated translation 5962903914511361952 -->     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Deaktivováno vzdáleným správcem zařízení"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Vypnuto"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7137296704741184239">"Žádné zabezpečení"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Zabezpečeno pomocí gesta"</string>
@@ -460,6 +460,7 @@
     <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Určete, kdy se má zařízení odpojit ze sítě Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Při změně nastavení se vyskytl problém"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Přidat síť WiFi"</string>
+    <string name="wifi_add_network_summary" msgid="6345544206968025811">"Konfigurace sítě bez všesměrného vysílání"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Sítě WiFi"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Vyhledávání"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Pokročilé"</string>
@@ -598,7 +599,17 @@
     <string name="brightness_summary" msgid="838917350127550703">"Nastavení jasu displeje"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Časový limit"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Obrazovka se automaticky vypne po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>."</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Sny Android"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Spořiče obrazovky a další akce při nečinnosti"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Vybraný sen"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Časový limit"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"Po nečinnosti: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Nikdy"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Vyzkoušet"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatický jas"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Velikost písma"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Celková velikost písma"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Vybrat velikost písma"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Nastavení zámku karty SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Nastavení zámku karty SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Zámek karty SIM"</string>
@@ -644,7 +655,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"Moje telefonní číslo"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"Verze PRL"</string>
-    <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
+    <string name="status_meid_number" msgid="2037549729230058915">"IMEI / MEID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"Typ mobilní sítě"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Stav mobilní sítě"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Stav služby"</string>
@@ -893,9 +904,12 @@
     <string name="install_unknown_applications" msgid="6612824788917283662">"Povoluje instalaci aplikací, které nepocházejí ze služby Market."</string>
     <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"Tablet a osobní údaje jsou zranitelnější vůči útoku aplikací z neznámých zdrojů. Souhlasíte s tím, že jste výhradně odpovědní za případné škody na tabletu a ztráty dat způsobené používáním těchto aplikací."</string>
     <string name="install_all_warning" product="default" msgid="1923717607319933741">"Váš telefon a osobní údaje jsou zranitelnější vůči útoku aplikací z neznámých zdrojů. Vyjadřujete souhlas, že nesete osobní odpovědnost za jakékoli škody způsobené na vašem telefonu nebo za ztrátu dat v důsledku používání těchto aplikací."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Upřesnit nastavení"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Povolit další možnosti nastavení."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Informace o aplikaci"</string>
     <string name="storage_label" msgid="8700867073480107253">"Úložiště"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Spouštět jako výchozí"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Kompatibilita s obrazovkou"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Oprávnění"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Mezipaměť"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Vymazat mezipaměť"</string>
@@ -915,6 +929,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Aplikace byla nastavena, aby se pro některé akce spouštěla jako výchozí."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Není výchozí pro žádné akce."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Vymazat výchozí nastavení"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Tato aplikace nejspíš není určena pro vaši obrazovku. Zde můžete nastavit, jak se aplikace obrazovce přizpůsobí."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Dotázat se při spuštění"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Upravit velikost aplikace"</string>
     <string name="unknown" msgid="1592123443519355854">"Neznámé"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Seřadit dle jména"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Řadit podle velikosti"</string>
@@ -1019,8 +1036,13 @@
     <string name="show_password" msgid="2198798062604049206">"Zobrazování hesel"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Zadávané heslo je zobrazováno"</string>
     <string name="ime_security_warning" msgid="812267421486877917">"Prostřednictvím této metody zadávání dat lze shromažďovat zadaný text včetně osobních údajů, jako jsou hesla a čísla kreditních karet. Metoda je součástí aplikace <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Chcete tuto metodu zadávání dat použít?"</string>
+    <!-- no translation found for pointer_settings_category (6090176550039035130) -->
+    <skip />
+    <!-- no translation found for pointer_speed (1221342330217861616) -->
+    <skip />
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Uživatelský slovník"</string>
-    <string name="user_dict_settings_title" msgid="8357027437499042191">"Uživatelský slovník"</string>
+    <string name="user_dict_single_settings_title" msgid="5454855286173849284">"Uživatelský slovník"</string>
+    <string name="user_dict_multiple_settings_title" msgid="326583195525296750">"Spravovat uživatelské slovníky"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Přidat"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Přidat do slovníku"</string>
@@ -1029,6 +1051,7 @@
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Smazat"</string>
     <string name="user_dict_settings_empty_text" product="tablet" msgid="1766522102636921529">"V uživatelském slovníku nejsou žádná slova. Slovo můžete přidat stisknutím tlačítka Přidat (+)."</string>
     <string name="user_dict_settings_empty_text" product="default" msgid="6209268025109242806">"V uživatelském slovníku nejsou žádná slova. Slovo můžete přidat pomocí nabídky."</string>
+    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Všechny jazyky"</string>
     <string name="testing" msgid="6584352735303604146">"Testování"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Informace o tabletu"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Info o telefonu"</string>
@@ -1100,6 +1123,8 @@
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"Tlačítko Napájení"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"Tlačítko Napájení ukončuje hovor"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"Stisknutí tlačítka Napájení během hovoru ukončí hovor místo vypnutí obrazovky"</string>
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <skip />
     <string name="touchscreen_gestures_category" msgid="3109869155350859625">"Gesta dotykové obrazovky"</string>
     <string name="long_press_timeout_selector_title" msgid="1396876537252863044">"Prodleva dotyku a podržení"</string>
     <string name="long_press_timeout_selector_summary" msgid="2261114502740278996">"Prodleva, po které je dotyk považován za podržení"</string>
@@ -1302,30 +1327,26 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(nezměněno)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(není nastaveno)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Úložiště pověření"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Použít zabezpečená pověření"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Povolit aplikacím přístup k zabezpečeným certifikátům a dalším pověřením"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Instalovat z úložiště"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Instalace z karty SD"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Nainstalovat certifikáty z úložiště"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Nainstalovat certifikáty z karty SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Nastavit heslo"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Nastavit nebo změnit heslo pro úložiště pověření"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Vymazat pověření"</string>
-    <string name="credentials_reset_summary" msgid="3810369467217453606">"Odebrat veškerý obsah a obnovit heslo"</string>
+    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3369361230171260282">"Vymazat veškerý obsah úložiště pověření a resetovat heslo"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Zadejte heslo"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Zadejte heslo pro úložiště pověření."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Nastavit heslo pro úložiště pověření (nejméně 8 znaků)."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Aktuální heslo:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Nové heslo:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Potvrďte nové heslo:"</string>
-    <string name="credentials_reset_hint" msgid="2336340927894094814">"Veškerý obsah bude odstraněn a heslo bude obnoveno. Opravdu chcete akci provést?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Hesla se neshodují."</string>
+    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="1566409057833618877">"Opravdu chcete smazat veškerá pověření a resetovat heslo úložiště pověření?"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Heslo musí mít alespoň 8 znaků."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Nesprávné heslo."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Nesprávné heslo. Zbývá vám jeden pokus, než bude úložiště pověření smazáno."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Nesprávné heslo. Počet zbývajících pokusů, než bude úložiště pověření smazáno: <xliff:g id="NUMBER">%1$d</xliff:g>"</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Úložiště pověření je vymazáno."</string>
+    <!-- no translation found for credentials_not_erased (397954733557821269) -->
+    <skip />
     <string name="credentials_enabled" msgid="7588607413349978930">"Úložiště pověření je aktivováno."</string>
+    <!-- no translation found for credentials_configure_lock_screen_hint (6816970208840577219) -->
+    <skip />
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tísňové vyzvánění"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Nastavit chování při tísňovém volání"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"Ochrana osobních údajů"</string>
diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
index 7e162d5..6dcbfa1 100644
--- a/res/values-da/arrays.xml
+++ b/res/values-da/arrays.xml
@@ -48,6 +48,16 @@
     <item msgid="2314124409517439288">"10 minutter"</item>
     <item msgid="6864027152847611413">"30 minutter"</item>
   </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="3149294732238283185">"Aldrig"</item>
+    <item msgid="2194151041885903260">"15 sekunder"</item>
+    <item msgid="5892295237131074341">"30 sekunder"</item>
+    <item msgid="3538441365970038213">"1 minut"</item>
+    <item msgid="412343871668955639">"2 minutter"</item>
+    <item msgid="5076853889688991690">"5 minutter"</item>
+    <item msgid="1903860996174927898">"10 minutter"</item>
+    <item msgid="6415509612413178727">"30 minutter"</item>
+  </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"med det samme"</item>
     <item msgid="6736512735606834431">"5 sekunder"</item>
@@ -59,6 +69,22 @@
     <item msgid="9002737361305019353">"10 minutter"</item>
     <item msgid="4322676235684793329">"30 minutter"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Meget lille"</item>
+    <item msgid="383133849547816572">"Ekstra lille"</item>
+    <item msgid="6490061470416867723">"Lille"</item>
+    <item msgid="3579015730662088893">"Normal"</item>
+    <item msgid="1678068858001018666">"Stor"</item>
+    <item msgid="490158884605093126">"Ekstra stor"</item>
+    <item msgid="2123802548987439763">"Meget stor"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Meget langsom"</item>
     <item msgid="2361722960903353554">"Langsom"</item>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 43aeae3..8a06519 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -316,7 +316,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Kræv en numerisk PIN-kode for at låse skærmen op"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Adgangskode"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Kræv en adgangskode for at låse skærmen op"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Deaktiveret af administrator/krypteringspolitik"</string>
+    <!-- outdated translation 5962903914511361952 -->     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Deaktiveret af fjernadministrator"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Fra"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7137296704741184239">"Ingen sikkerhed"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Sikret med mønster"</string>
@@ -460,6 +460,7 @@
     <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Angiv, hvornår forbindelsen til Wi-Fi skal afbrydes"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Der opstod et problem ved ændring af indstillingen"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Tilføj Wi-Fi-netværk"</string>
+    <string name="wifi_add_network_summary" msgid="6345544206968025811">"Konfigurer et netværk, der ikke er til udsendelse"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi-netværk"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Scan"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avanceret"</string>
@@ -598,7 +599,17 @@
     <string name="brightness_summary" msgid="838917350127550703">"Juster skærmens lysstyrke"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Timeout"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Skærmen slukker automatisk efter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android Dreams"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Pauseskærme og andre afledninger ved inaktivitet"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Valgt drøm"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Hvornår der skal aktiveres"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"Efter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inaktivitet"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Aldrig"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Prøv det!"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatisk lysstyrke"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Skrifttypestørrelse"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Samlede skrifttypestørrelser"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Vælg skrifttypestørrelse"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Indstillinger for lås af SIM-kort"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Konfigurer låsning af SIM-kort"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM-kortlås"</string>
@@ -644,7 +655,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"Mit telefonnummer"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"PRL-version"</string>
-    <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
+    <string name="status_meid_number" msgid="2037549729230058915">"IMEI/MEID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"Mobilnetværk"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Tilstand for mobilnetværk"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Tjenestetilstand"</string>
@@ -893,9 +904,12 @@
     <string name="install_unknown_applications" msgid="6612824788917283662">"Tillad installation af programmer, der ikke stammer fra Marked"</string>
     <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"Din tabletcomputer og dine personlige oplysninger er mere sårbare over for angreb af programmer fra ukendte kilder. Du accepterer, at du alene er ansvarlig for skader på din tabletcomputer eller tab af data, der kan skyldes brug af disse programmer."</string>
     <string name="install_all_warning" product="default" msgid="1923717607319933741">"Din telefon og dine personlige oplysninger er mere sårbare over for angreb af programmer fra ukendte kilder. Du accepterer, at du alene er ansvarlig for skader på din telefon eller tab af data, der kan skyldes brug af disse programmer."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Avancerede indstillinger"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Aktiver flere indstillinger."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Programoplysninger"</string>
     <string name="storage_label" msgid="8700867073480107253">"Lagring"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Start som standard"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Skærmkompatibilitet"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Tilladelser"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Cache"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Ryd cache"</string>
@@ -915,6 +929,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Du har valgt at starte dette program som standard for nogle handlinger."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Der er ikke angivet nogen standarder."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Ryd standarder"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Denne applikation er muligvis ikke beregnet til din skærm. Du kan kontrollere, hvordan den tilpasser sig din skærm her."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Spørg, når der startes"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Skaler applikationen"</string>
     <string name="unknown" msgid="1592123443519355854">"Ukendte"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Sorter efter navn"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Sorter efter størrelse"</string>
@@ -1019,8 +1036,13 @@
     <string name="show_password" msgid="2198798062604049206">"Synlig adgangskode"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Vis adgangskoden under indtastning"</string>
     <string name="ime_security_warning" msgid="812267421486877917">"Denne indtastningsmetode vil muligvis være i stand til at indsamle al den tekst, du indtaster, herunder personlige data som adgangskoder og kreditkortnumre. Den kommer fra programmet <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Vil du bruge denne indtastningsmetode?"</string>
+    <!-- no translation found for pointer_settings_category (6090176550039035130) -->
+    <skip />
+    <!-- no translation found for pointer_speed (1221342330217861616) -->
+    <skip />
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Brugerordbog"</string>
-    <string name="user_dict_settings_title" msgid="8357027437499042191">"Brugerordbog"</string>
+    <string name="user_dict_single_settings_title" msgid="5454855286173849284">"Brugerordbog"</string>
+    <string name="user_dict_multiple_settings_title" msgid="326583195525296750">"Administrer brugerordbøger"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Tilføj"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Føj til ordbog"</string>
@@ -1029,6 +1051,7 @@
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Slet"</string>
     <string name="user_dict_settings_empty_text" product="tablet" msgid="1766522102636921529">"Du har ikke nogen ord i brugerordbogen. Du kan tilføje et ord ved at trykke på Tilføj (+)."</string>
     <string name="user_dict_settings_empty_text" product="default" msgid="6209268025109242806">"Du har ikke nogen ord i brugerordbogen. Du kan tilføje et ord gennem menuen."</string>
+    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Alle sprog"</string>
     <string name="testing" msgid="6584352735303604146">"Tester"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Oplysninger om tabletcomputer"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Telefonoplysninger"</string>
@@ -1100,6 +1123,8 @@
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"Afbryderknap"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"Afbryderknappen afslutter opkaldet"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"Hvis du trykker på Sluk under et opkald, afsluttes opkaldet i stedet for at slukke skærmen"</string>
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <skip />
     <string name="touchscreen_gestures_category" msgid="3109869155350859625">"Berøringsskærmbevægelser"</string>
     <string name="long_press_timeout_selector_title" msgid="1396876537252863044">"Tryk og hold udsættelse nede"</string>
     <string name="long_press_timeout_selector_summary" msgid="2261114502740278996">"Udsæt, indtil et tryk tolkes som et tryk, og hold nede"</string>
@@ -1302,30 +1327,26 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(uændret)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(ikke indstillet)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Oplysningslagring"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Brug sikre oplysninger"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Giv programmer adgang til sikre certifikater og andre oplysninger"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Installer fra lager"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Installer fra SD-kort"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Installer certifikater fra lager"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Installer certifikater fra SD-kortet"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Angiv adgangskode"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Indstil eller skift adgangskoden for oplysningslagring"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Ryd oplysninger"</string>
-    <string name="credentials_reset_summary" msgid="3810369467217453606">"Fjern alt indhold, og nulstil adgangskoden"</string>
+    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3369361230171260282">"Slet al indhold på loginlageret, og nulstil adgangskoden"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Indtast adgangskode"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Indtast adgangskoden for oplysningslagring."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Indstil adgangskode for oplysningslagring. Den skal være på mindst otte tegn."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Nuværende adgangskode:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Ny adgangskode:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Bekræft ny adgangskode:"</string>
-    <string name="credentials_reset_hint" msgid="2336340927894094814">"Alt indholdet vil blive slettet, og adgangskoden vil blive nulstillet. Er du sikker på, at du vil gøre det?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Adgangskoderne stemmer ikke overens."</string>
+    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="1566409057833618877">"Er du sikker på, at du vil slette alle oplysninger og nulstille adgangskoden til loginlager?"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Adgangskoden skal indeholde mindst 8 tegn."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Ugyldig adgangskode."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Forkert adgangskode. Du har ét forsøg mere, inden oplysningslagringen slettes."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Forkert adgangskode. Du har <xliff:g id="NUMBER">%1$d</xliff:g> forsøg mere, inden oplysningslagringen slettes."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Oplysningslagring er slettet."</string>
+    <!-- no translation found for credentials_not_erased (397954733557821269) -->
+    <skip />
     <string name="credentials_enabled" msgid="7588607413349978930">"Oplysningslagring er aktiveret."</string>
+    <!-- no translation found for credentials_configure_lock_screen_hint (6816970208840577219) -->
+    <skip />
     <string name="emergency_tone_title" msgid="1055954530111587114">"Nødtone"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Angiv adfærd ved nødopkald"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"Fortrolighed"</string>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index 1aeef8e..be22585 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -48,6 +48,16 @@
     <item msgid="2314124409517439288">"10 Minuten"</item>
     <item msgid="6864027152847611413">"30 Minuten"</item>
   </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="3149294732238283185">"Nie"</item>
+    <item msgid="2194151041885903260">"15 Sekunden"</item>
+    <item msgid="5892295237131074341">"30 Sekunden"</item>
+    <item msgid="3538441365970038213">"1 Minute"</item>
+    <item msgid="412343871668955639">"2 Minuten"</item>
+    <item msgid="5076853889688991690">"5 Minuten"</item>
+    <item msgid="1903860996174927898">"10 Minuten"</item>
+    <item msgid="6415509612413178727">"30 Minuten"</item>
+  </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"sofort"</item>
     <item msgid="6736512735606834431">"5 Sekunden"</item>
@@ -59,6 +69,22 @@
     <item msgid="9002737361305019353">"10 Minuten"</item>
     <item msgid="4322676235684793329">"30 Minuten"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Sehr klein"</item>
+    <item msgid="383133849547816572">"Extraklein"</item>
+    <item msgid="6490061470416867723">"Klein"</item>
+    <item msgid="3579015730662088893">"Normal"</item>
+    <item msgid="1678068858001018666">"Groß"</item>
+    <item msgid="490158884605093126">"Extragroß"</item>
+    <item msgid="2123802548987439763">"Sehr groß"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Sehr langsam"</item>
     <item msgid="2361722960903353554">"Langsam"</item>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 1b87a53..504f6c9 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -316,7 +316,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Numerische PIN zur Display-Entsp. erfordern"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Passwort"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Passwort zur Displayentsperrung erfordern"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Vom Admin./per Verschlüsselungsrichtlinie deaktiviert"</string>
+    <!-- outdated translation 5962903914511361952 -->     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Vom Remote-Geräteadministrator deaktiviert"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Aus"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7137296704741184239">"Keine Sicherheit"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Durch Muster geschützt"</string>
@@ -460,6 +460,7 @@
     <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Legen Sie fest, wann die WLAN-Verbindung getrennt werden soll."</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Beim Ändern der Einstellung ist ein Problem aufgetreten."</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"WLAN-Netzwerk hinzufügen"</string>
+    <string name="wifi_add_network_summary" msgid="6345544206968025811">"Broadcastfreies Netzwerk konfigurieren"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"WLAN-Netzwerke"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Scan"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Erweitert"</string>
@@ -598,7 +599,17 @@
     <string name="brightness_summary" msgid="838917350127550703">"Helligkeit des Bildschirms anpassen"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Timeout"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Bildschirm wird nach <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> automatisch abgeschaltet."</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android-Träume"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Bildschirmschoner und andere Unterhaltung bei Nichtaktivität"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Ausgewählter Traum"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Zeitpunkt der Aktivierung"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"Nach <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ohne Aktivität"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Nie"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Probieren Sie es aus!"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatische Helligkeit"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Schriftgröße"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Allgemeine Schriftgröße"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Schriftgröße auswählen"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Einstellungen für SIM-Karten-Sperre"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"SIM-Sperre einrichten"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM-Kartensperre"</string>
@@ -644,7 +655,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"Meine Telefonnummer"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"PRL-Version"</string>
-    <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
+    <string name="status_meid_number" msgid="2037549729230058915">"IMEI/MEID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"Art des Mobilfunknetzes"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Status des Mobilfunknetzes"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Servicestatus"</string>
@@ -893,9 +904,12 @@
     <string name="install_unknown_applications" msgid="6612824788917283662">"Installation von Nicht-Market-Anwendungen zulassen"</string>
     <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"Anwendungen aus unbekannten Quellen können gefährlich für Ihr Tablet und Ihre persönlichen Daten sein. Sie stimmen zu, dass Sie die Verantwortung für alle Schäden an Ihrem Tablet oder jegliche Datenverluste tragen, die aus der Verwendung dieser Anwendungen entstehen können."</string>
     <string name="install_all_warning" product="default" msgid="1923717607319933741">"Anwendungen aus unbekannten Quellen können gefährlich für Ihr Telefon und Ihre persönlichen Daten sein. Sie stimmen zu, dass Sie die Verantwortung für alle Schäden an Ihrem Telefon oder jegliche Datenverluste tragen, die aus der Verwendung dieser Anwendungen entstehen können."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Erweiterte Einstellungen"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Weitere Einstellungsoptionen aktivieren"</string>
     <string name="application_info_label" msgid="1150486628158409543">"Anwendungsinfo"</string>
     <string name="storage_label" msgid="8700867073480107253">"Speicher"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Standardmäßig starten"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Bildschirmkompatibilität"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Berechtigungen"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Cache"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Cache löschen"</string>
@@ -915,6 +929,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Sie haben diese Anwendung für einige Aktionen als Standard festgelegt."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Kein Standard"</string>
     <string name="clear_activities" msgid="7408923511535174430">"Standardeinstellung zurücksetzen"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Möglicherweise ist diese App nicht auf Ihren Bildschirm ausgelegt. Hier können Sie einstellen, wie sie an Ihren Bildschirm angepasst wird."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Beim Start fragen"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"App skalieren"</string>
     <string name="unknown" msgid="1592123443519355854">"Unbekannt"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Nach Namen sortieren"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Nach Größe sortieren"</string>
@@ -1019,8 +1036,13 @@
     <string name="show_password" msgid="2198798062604049206">"Sichtbare Passwörter"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Passwort bei der Eingabe anzeigen"</string>
     <string name="ime_security_warning" msgid="812267421486877917">"Diese Eingabemethode kann den gesamten von Ihnen eingegebenen Text erfassen, einschließlich persönlicher Daten wie Passwörter und Kreditkartennummern. Sie ist Teil der Anwendung <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Möchten diese Eingabemethode verwenden?"</string>
+    <!-- no translation found for pointer_settings_category (6090176550039035130) -->
+    <skip />
+    <!-- no translation found for pointer_speed (1221342330217861616) -->
+    <skip />
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Mein Wörterbuch"</string>
-    <string name="user_dict_settings_title" msgid="8357027437499042191">"Mein Wörterbuch"</string>
+    <string name="user_dict_single_settings_title" msgid="5454855286173849284">"Mein Wörterbuch"</string>
+    <string name="user_dict_multiple_settings_title" msgid="326583195525296750">"Meine Wörterbücher verwalten"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Hinzufügen"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Ins Wörterbuch"</string>
@@ -1029,6 +1051,7 @@
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Löschen"</string>
     <string name="user_dict_settings_empty_text" product="tablet" msgid="1766522102636921529">"Es sind keine Wörter in Ihrem Wörterbuch vorhanden. Sie können durch Berühren der Schaltfläche \"+\" ein Wort hinzufügen."</string>
     <string name="user_dict_settings_empty_text" product="default" msgid="6209268025109242806">"Keine Wörter im Ihrem Wörterbuch vorhanden. Sie können über das Menü ein Wort hinzufügen."</string>
+    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Alle Sprachen"</string>
     <string name="testing" msgid="6584352735303604146">"Test"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Tablet-Informationen"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Telefoninformation"</string>
@@ -1100,6 +1123,8 @@
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"Ein-/Austaste"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"Ein-/Austaste beendet Anruf"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"Das Drücken der Ein-/Austaste während eines Anrufs beendet den Anruf (statt den Bildschirm auszuschalten)"</string>
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <skip />
     <string name="touchscreen_gestures_category" msgid="3109869155350859625">"Touchscreen-Gesten"</string>
     <string name="long_press_timeout_selector_title" msgid="1396876537252863044">"Berühren und Halten-Reaktionszeit"</string>
     <string name="long_press_timeout_selector_summary" msgid="2261114502740278996">"Dauer, bis eine Berührung als Berühren und Halten interpretiert wird"</string>
@@ -1302,30 +1327,26 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(nicht geändert)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(nicht festgelegt)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Anmeldedatenspeicher"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Sichere Anmeldeinfos"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Anwendungen können sichere Zertifikate und Anmeldeinformationen abrufen"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Von Speicher installieren"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Von SD-Karte installieren"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Zertifikate von Speicher installieren"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Zertifikate von SD-Karte installieren"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Passwort festlegen"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Passwort für Anmeldedatenspeicher festlegen oder ändern"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Anmeldedaten löschen"</string>
-    <string name="credentials_reset_summary" msgid="3810369467217453606">"Sämtliche Inhalte entfernen und Passwort zurücksetzen"</string>
+    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3369361230171260282">"Inhalt des Anmeldeinformationsspeichers löschen und Passwort zurücksetzen"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Passwort eingeben"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Geben Sie das Passwort für den Anmeldedatenspeicher ein."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Legen Sie das Passwort für den Anmeldedatenspeicher fest. Dieses muss mindestens acht Zeichen lang sein."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Aktuelles Passwort:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Neues Passwort:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Neues Passwort bestätigen:"</string>
-    <string name="credentials_reset_hint" msgid="2336340927894094814">"Sämtliche Inhalte werden gelöscht und das Passwort wird zurückgesetzt. Möchten Sie wirklich fortfahren?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Die Passwörter stimmen nicht überein."</string>
+    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="1566409057833618877">"Möchten Sie wirklich alle Anmeldeinformationen löschen und das Passwort für den Anmeldeinformationsspeicher zurücksetzen?"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Das Passwort muss mindestens acht Zeichen lang sein."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Falsches Passwort"</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Falsches Passwort. Sie haben noch einen Versuch, bevor Ihr Anmeldedatenspeicher gelöscht wird."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Falsches Passwort. Sie haben noch <xliff:g id="NUMBER">%1$d</xliff:g> Versuche, bevor Ihr Anmeldedatenspeicher gelöscht wird."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Speicher wurde gelöscht."</string>
+    <!-- no translation found for credentials_not_erased (397954733557821269) -->
+    <skip />
     <string name="credentials_enabled" msgid="7588607413349978930">"Der Anmeldeinformationsspeicher ist aktiviert."</string>
+    <!-- no translation found for credentials_configure_lock_screen_hint (6816970208840577219) -->
+    <skip />
     <string name="emergency_tone_title" msgid="1055954530111587114">"Notfallsignal"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Verhalten bei einem Notruf festlegen"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"Datenschutz"</string>
diff --git a/res/values-el/arrays.xml b/res/values-el/arrays.xml
index 910b9d9..86d400f 100644
--- a/res/values-el/arrays.xml
+++ b/res/values-el/arrays.xml
@@ -48,6 +48,16 @@
     <item msgid="2314124409517439288">"10 λεπτά"</item>
     <item msgid="6864027152847611413">"30 λεπτά"</item>
   </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="3149294732238283185">"Ποτέ"</item>
+    <item msgid="2194151041885903260">"15 δευτερόλεπτα"</item>
+    <item msgid="5892295237131074341">"30 δευτερόλεπτα"</item>
+    <item msgid="3538441365970038213">"1 λεπτό"</item>
+    <item msgid="412343871668955639">"2 λεπτά"</item>
+    <item msgid="5076853889688991690">"5 λεπτά"</item>
+    <item msgid="1903860996174927898">"10 λεπτά"</item>
+    <item msgid="6415509612413178727">"30 λεπτά"</item>
+  </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"άμεσα"</item>
     <item msgid="6736512735606834431">"5 δευτερόλεπτα"</item>
@@ -59,6 +69,22 @@
     <item msgid="9002737361305019353">"10 λεπτά"</item>
     <item msgid="4322676235684793329">"30 λεπτά"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Εξαιρετικά μικρό"</item>
+    <item msgid="383133849547816572">"Πολύ μικρό"</item>
+    <item msgid="6490061470416867723">"Μικρό"</item>
+    <item msgid="3579015730662088893">"Κανονικό"</item>
+    <item msgid="1678068858001018666">"Μεγάλο"</item>
+    <item msgid="490158884605093126">"Πολύ μεγάλο"</item>
+    <item msgid="2123802548987439763">"Εξαιρετικά μεγάλο"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Πολύ αργός"</item>
     <item msgid="2361722960903353554">"Αργός"</item>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 729abe5..ee8ecfa 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -316,7 +316,7 @@
     <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_disabled_summary" msgid="8563103042330816018">"Απενεργ. από το διαχειρ. ή την πολιτική κρυπτογρ."</string>
+    <!-- outdated translation 5962903914511361952 -->     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Απενεργοποιήθηκε από τον απομακρυσμένο διαχειριστή"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Απενεργοποίηση"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7137296704741184239">"Χωρίς ασφάλεια"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Έχει ασφαλιστεί με μοτίβο"</string>
@@ -460,6 +460,7 @@
     <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Καθορίστε πότε θα γίνει αποσύνδεση από το Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Προέκυψε κάποιο πρόβλημα κατά την αλλαγή της ρύθμισης"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Προσθήκη δικτύου Wi-Fi"</string>
+    <string name="wifi_add_network_summary" msgid="6345544206968025811">"Διαμόρφωση δικτύου μη μετάδοσης"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Δίκτυα Wi-Fi"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Σάρωση"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Σύνθετα"</string>
@@ -598,7 +599,17 @@
     <string name="brightness_summary" msgid="838917350127550703">"Ρύθμιση της φωτεινότητας της οθόνης"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Λήξη ορίου χρόνου"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Η οθόνη απενεργοποιείται αυτόματα μετά από  <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android Dreams"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Προφύλαξη οθόνης και άλλες μορφές διαφοροποίησης αδράνειας"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Selected dream"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Χρόνος ενεργοποίησης"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"Μετά από <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> σε αδράνεια"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Ποτέ"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Δοκιμάστε το!"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Αυτόματη φωτεινότητα"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Μέγεθος γραμματοσειράς"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Συνολικό μέγεθος γραμματοσειράς"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Επιλέξτε μέγεθος γραμματοσειράς"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Ρυθμίσεις κλειδώματος κάρτας SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Ορισμός κλειδώματος κάρτας SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Κλείδωμα κάρτας SIM"</string>
@@ -644,7 +655,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"Ο τηλεφωνικός αριθμός μου"</string>
     <string name="status_min_number" msgid="3519504522179420597">"ΛΕΠΤΟ"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"Έκδοση PRL"</string>
-    <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
+    <string name="status_meid_number" msgid="2037549729230058915">"IMEI / MEID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"Τύπος δικτύου κινητής τηλεφωνίας"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Κατάστ.δικτ.κιν.τηλ."</string>
     <string name="status_service_state" msgid="2323931627519429503">"Κατάσταση υπηρεσίας"</string>
@@ -893,9 +904,12 @@
     <string name="install_unknown_applications" msgid="6612824788917283662">"Επιτρέπει την εγκατάσταση εφαρμογών που δεν βρίσκονται στο Android Market"</string>
     <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"Το tablet σας και τα προσωπικά δεδομένα σας είναι πιο ευάλωτα σε επιθέσεις από εφαρμογές που προέρχονται από άγνωστες πηγές. Συμφωνείτε ότι είστε οι μοναδικοί υπεύθυνοι για κάθε ζημιά στο tablet ή για απώλεια δεδομένων που ενδέχεται να προκύψει από τη χρήση τέτοιων εφαρμογών."</string>
     <string name="install_all_warning" product="default" msgid="1923717607319933741">"Το τηλέφωνό σας και τα προσωπικά δεδομένα σας είναι ευάλωτα σε επιθέσεις από εφαρμογές που προέρχονται από άγνωστες πηγές. Συμφωνείτε ότι είστε οι μοναδικοί υπεύθυνοι για κάθε ζημιά στο τηλέφωνο ή για απώλεια δεδομένων που ενδέχεται να προκύψουν από τη χρήση τέτοιων εφαρμογών."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Σύνθετες ρυθμίσεις"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Ενεργοποίηση περισσότερων επιλογών ρυθμίσεων."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Πληροφορίες εφαρμογής"</string>
     <string name="storage_label" msgid="8700867073480107253">"Αποθηκευτικός χώρος"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Εκκίνηση από προεπιλογή"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Συμβατότητα οθόνης"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Άδειες"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Προσωρινή μνήμη"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Εκκαθάριση προσωρινής μνήμης"</string>
@@ -915,6 +929,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Επιλέξατε την εκτέλεση αυτής της εφαρμογής από προεπιλογή για ορισμένες ενέργειες."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Δεν έχουν οριστεί προεπιλογές."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Εκκαθάριση προεπιλογών"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Αυτή η εφαρμογή ενδέχεται να μην έχει σχεδιαστεί για την οθόνη σας. Εδώ μπορείτε να ελέγξετε τον τρόπο προσαρμογής της στην οθόνη σας."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Να ερωτώμαι κατά την εκκίνηση"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Scale application"</string>
     <string name="unknown" msgid="1592123443519355854">"Άγνωστο"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Ταξινόμηση κατά όνομα"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Ταξινόμηση με βάση μέγεθος"</string>
@@ -1019,8 +1036,13 @@
     <string name="show_password" msgid="2198798062604049206">"Εμφανιζόμενοι κωδικοί πρόσβασης"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Εμφάνιση κωδικού πρόσβασης κατά την πληκτρολόγηση"</string>
     <string name="ime_security_warning" msgid="812267421486877917">"Η μέθοδος εισόδου ενδέχεται να έχει τη δυνατότητα συλλογής όλων των κειμένων που πληκτρολογείτε, συμπεριλαμβανομένων προσωπικών δεδομένων όπως κωδικοί πρόσβασης και αριθμοί πιστωτικής κάρτας. Προέρχεται από την εφαρμογή <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Να γίνει χρήση αυτής της μεθόδου εισόδου;"</string>
+    <!-- no translation found for pointer_settings_category (6090176550039035130) -->
+    <skip />
+    <!-- no translation found for pointer_speed (1221342330217861616) -->
+    <skip />
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Λεξικό χρήστη"</string>
-    <string name="user_dict_settings_title" msgid="8357027437499042191">"Λεξικό χρήστη"</string>
+    <string name="user_dict_single_settings_title" msgid="5454855286173849284">"Λεξικό χρήστη"</string>
+    <string name="user_dict_multiple_settings_title" msgid="326583195525296750">"Διαχείριση λεξικών χρήστη"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Προσθήκη"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Προσθήκη στο λεξικό"</string>
@@ -1029,6 +1051,7 @@
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Διαγραφή"</string>
     <string name="user_dict_settings_empty_text" product="tablet" msgid="1766522102636921529">"Δεν υπάρχουν λέξεις καταχωρισμένες στο λεξικό χρήστη. Μπορείτε να προσθέσετε μια λέξη πατώντας το κουμπί Προσθήκη ( + )."</string>
     <string name="user_dict_settings_empty_text" product="default" msgid="6209268025109242806">"Δεν υπάρχουν λέξεις καταχωρημένες στο λεξικό χρήστη. Μπορείτε να προσθέσετε μια λέξη μέσω του μενού."</string>
+    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Όλες οι γλώσσες"</string>
     <string name="testing" msgid="6584352735303604146">"Δοκιμή"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Πληροφορίες tablet"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Πληροφορίες τηλεφώνου"</string>
@@ -1100,6 +1123,8 @@
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"Κουμπί λειτουργίας"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"Το κουμπί λειτουργίας τερματίζει τις κλήσεις"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"Κατά τη διάρκεια μιας κλήσης, το πάτημα του κουμπιού λειτουργίας τερματίζει τις κλήσεις αντί να απενεργοποιεί την οθόνη"</string>
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <skip />
     <string name="touchscreen_gestures_category" msgid="3109869155350859625">"Κινήσεις δαχτύλων στην οθόνη αφής"</string>
     <string name="long_press_timeout_selector_title" msgid="1396876537252863044">"Καθυστέρηση παρατεταμένου αγγίγματος"</string>
     <string name="long_press_timeout_selector_summary" msgid="2261114502740278996">"Καθυστέρηση μέχρι ένα άγγιγμα να ερμηνευθεί ως παρατεταμένο άγγιγμα"</string>
@@ -1302,30 +1327,26 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(δεν έγινε αλλαγή)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(δεν ορίστηκε)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Αποθηκ. χώρος διαπιστευτηρίων"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Χρήση ασφαλών διαπιστευτηρίων"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Να επιτρέπεται στις εφαρμογές η πρόσβαση σε ασφαλή πιστοποιητικά και άλλα διαπιστευτήρια"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Εγκατάσταση από συσκευή αποθ."</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Εγκατάσταση από κάρτα SD"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Εγκατάσταση πιστοποιητικών από συσκευή αποθήκευσης"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Εγκατάσταση πιστοποιητικών από την κάρτα SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Ορισμός κωδικού πρόσβασης"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Ορισμός ή αλλαγή του κωδικού πρόσβασης του αποθηκευτικού χώρου διαπιστευτηρίων"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Εκκαθάριση διαπιστευτηρίων"</string>
-    <string name="credentials_reset_summary" msgid="3810369467217453606">"Κατάργηση όλου του περιεχομένου και επαναφορά του κωδικού πρόσβασης"</string>
+    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3369361230171260282">"Εκκαθάριση χώρου αποθήκευσης διαπιστευτηρίων όλων των περιεχομένων και επαναφορά του κωδικού πρόσβασής του"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Εισαγωγή κωδικού πρόσβασης"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Εισαγάγετε τον κωδικό πρόσβασης για τον αποθηκευτικό χώρο διαπιστευτηρίων."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Ορίστε τον κωδικό πρόσβασης για τον αποθηκευτικό χώρο διαπιστευτηρίων. Πρέπει να περιέχει τουλάχιστον 8 χαρακτήρες."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Τρέχον κωδικός πρόσβασης:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Νέος κωδικός πρόσβασης:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Επιβεβαίωση νέου κωδικού πρόσβασης:"</string>
-    <string name="credentials_reset_hint" msgid="2336340927894094814">"Όλο το περιεχόμενο θα διαγραφεί και θα γίνει επαναφορά του κωδικού πρόσβασης. Είστε σίγουροι;"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Οι κωδικοί πρόσβασης δεν συμφωνούν."</string>
+    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="1566409057833618877">"Είστε βέβαιοι ότι θέλετε να διαγράψετε όλα τα διαπιστευτήρια και να επαναφέρετε τον κωδικό πρόσβασης του χώρου αποθήκευσης διαπιστευτηρίων;"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Ο κωδικός πρόσβασης θα πρέπει να αποτελείται από τουλάχιστον 8 χαρακτήρες."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Λανθασμένος κωδικός πρόσβασης."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Λανθασμένος κωδικός πρόσβασης. Έχετε μία ακόμα ευκαιρία πριν διαγραφεί ο αποθηκευτικός χώρος των διαπιστευτηρίων."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Λανθασμένος κωδικός πρόσβασης. Έχετε <xliff:g id="NUMBER">%1$d</xliff:g> ακόμα ευκαιρίες πριν διαγραφεί ο αποθηκευτικός χώρος των διαπιστευτηρίων."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Ο αποθ. χώρος διαπιστ. διαγρ."</string>
+    <!-- no translation found for credentials_not_erased (397954733557821269) -->
+    <skip />
     <string name="credentials_enabled" msgid="7588607413349978930">"Ο χώρος αποθήκευσης διαπιστευτηρίων ενεργοποιήθηκε."</string>
+    <!-- no translation found for credentials_configure_lock_screen_hint (6816970208840577219) -->
+    <skip />
     <string name="emergency_tone_title" msgid="1055954530111587114">"Τόνος επείγουσας ανάγκης"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Ορισμός συμπεριφοράς κατά την πραγματοποίηση κλήσης επείγουσας ανάγκης"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"Απόρρητο"</string>
diff --git a/res/values-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml
index 96e9bc8..81dbaaa 100644
--- a/res/values-en-rGB/arrays.xml
+++ b/res/values-en-rGB/arrays.xml
@@ -48,6 +48,16 @@
     <item msgid="2314124409517439288">"10 minutes"</item>
     <item msgid="6864027152847611413">"30 minutes"</item>
   </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="3149294732238283185">"Never"</item>
+    <item msgid="2194151041885903260">"15 seconds"</item>
+    <item msgid="5892295237131074341">"30 seconds"</item>
+    <item msgid="3538441365970038213">"1 minute"</item>
+    <item msgid="412343871668955639">"2 minutes"</item>
+    <item msgid="5076853889688991690">"5 minutes"</item>
+    <item msgid="1903860996174927898">"10 minutes"</item>
+    <item msgid="6415509612413178727">"30 minutes"</item>
+  </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"immediately"</item>
     <item msgid="6736512735606834431">"5 seconds"</item>
@@ -59,6 +69,22 @@
     <item msgid="9002737361305019353">"10 minutes"</item>
     <item msgid="4322676235684793329">"30 minutes"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Extremely Small"</item>
+    <item msgid="383133849547816572">"Extra-Small"</item>
+    <item msgid="6490061470416867723">"Small"</item>
+    <item msgid="3579015730662088893">"Normal"</item>
+    <item msgid="1678068858001018666">"Large"</item>
+    <item msgid="490158884605093126">"Extra-Large"</item>
+    <item msgid="2123802548987439763">"Extremely Large"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Very slow"</item>
     <item msgid="2361722960903353554">"Slow"</item>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 2f9ab07..ed16aac 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -316,7 +316,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Require a numerical PIN to unlock the screen"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Password"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Require a password to unlock the screen"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Disabled by administrator or encryption policy"</string>
+    <!-- outdated translation 5962903914511361952 -->     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Disabled by remote device administrator"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Off"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7137296704741184239">"No security"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Secured with pattern"</string>
@@ -460,6 +460,7 @@
     <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Specify when to disconnect from Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"There was a problem while changing the setting"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Add WiFi network"</string>
+    <string name="wifi_add_network_summary" msgid="6345544206968025811">"Configure a non-broadcast network"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi networks"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Scan"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Advanced"</string>
@@ -598,7 +599,17 @@
     <string name="brightness_summary" msgid="838917350127550703">"Adjust the brightness of the screen"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Timeout"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Screen turns off automatically after <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android Dreams"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Screen savers and other idle diversions"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Selected dream"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"When to activate"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"After <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> spent idle"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Never"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Try it!"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatic brightness"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Font size"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Overall size of fonts"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Select font size"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM card lock settings"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Set up SIM card lock"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM card lock"</string>
@@ -644,7 +655,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"My phone number"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"PRL Version"</string>
-    <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
+    <string name="status_meid_number" msgid="2037549729230058915">"IMEI/MEID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"Mobile network type"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Mobile network state"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Service status"</string>
@@ -893,9 +904,12 @@
     <string name="install_unknown_applications" msgid="6612824788917283662">"Allow installation of non-Market applications"</string>
     <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"Your tablet and personal data are more vulnerable to attack by applications from unknown sources. You agree that you are solely responsible for any damage to your tablet or loss of data that may result from using these applications."</string>
     <string name="install_all_warning" product="default" msgid="1923717607319933741">"Your phone and personal data are more vulnerable to be attacked by applications from unknown sources. You agree that you are solely responsible for any damage to your phone or loss of data that may result from using these applications."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Advanced settings"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Enable more settings options."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Application info"</string>
     <string name="storage_label" msgid="8700867073480107253">"Storage"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Launch by default"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Screen compatibility"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Permissions"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Cache"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Clear cache"</string>
@@ -915,6 +929,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"You have selected to launch this application by default for some actions."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"No defaults set."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Clear defaults"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"This application may not be designed for your screen; you can control how it adjusts to your screen here."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Ask when launched"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Scale application"</string>
     <string name="unknown" msgid="1592123443519355854">"Unknown"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Sort by name"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Sort by size"</string>
@@ -1019,8 +1036,13 @@
     <string name="show_password" msgid="2198798062604049206">"Visible passwords"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Show password as you type"</string>
     <string name="ime_security_warning" msgid="812267421486877917">"This input method may be able to collect all the text that you type, including personal data like passwords and credit card numbers. It comes from the application <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Use this input method?"</string>
+    <!-- no translation found for pointer_settings_category (6090176550039035130) -->
+    <skip />
+    <!-- no translation found for pointer_speed (1221342330217861616) -->
+    <skip />
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"User dictionary"</string>
-    <string name="user_dict_settings_title" msgid="8357027437499042191">"User dictionary"</string>
+    <string name="user_dict_single_settings_title" msgid="5454855286173849284">"User dictionary"</string>
+    <string name="user_dict_multiple_settings_title" msgid="326583195525296750">"Manage user dictionaries"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Add"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Add to dictionary"</string>
@@ -1029,6 +1051,7 @@
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Delete"</string>
     <string name="user_dict_settings_empty_text" product="tablet" msgid="1766522102636921529">"You do not have any words in the user dictionary. You can add a word by touching the Add ( + ) button."</string>
     <string name="user_dict_settings_empty_text" product="default" msgid="6209268025109242806">"You do not have any words in the user dictionary. You can add a word through the menu."</string>
+    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"All languages"</string>
     <string name="testing" msgid="6584352735303604146">"Testing"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Tablet information"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Phone information"</string>
@@ -1100,6 +1123,8 @@
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"Power button"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"Power button ends call"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"During a call, pressing Power ends call instead of turning off screen"</string>
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <skip />
     <string name="touchscreen_gestures_category" msgid="3109869155350859625">"Touch-screen gestures"</string>
     <string name="long_press_timeout_selector_title" msgid="1396876537252863044">"Touch &amp; hold delay"</string>
     <string name="long_press_timeout_selector_summary" msgid="2261114502740278996">"Delay until a touch is interpreted as a touch &amp; hold"</string>
@@ -1302,30 +1327,26 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(unchanged)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(not set)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Credential storage"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Use secure credentials"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Allow applications to access secure certificates and other credentials"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Install from storage"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Install from SD card"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Install certificates from storage"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Install certificates from SD card"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Set password"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Set or change the password for credential storage"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Clear credentials"</string>
-    <string name="credentials_reset_summary" msgid="3810369467217453606">"Remove all the contents and reset the password"</string>
+    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3369361230171260282">"Clear credential storage of all contents and reset its password"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Enter Password"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Enter the password for credential storage."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Set the password for credential storage. It must have at least 8 characters."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Current password:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"New password:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Confirm new password:"</string>
-    <string name="credentials_reset_hint" msgid="2336340927894094814">"All the contents will be removed and the password will be reset. Are you sure about that?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"passwords do not match."</string>
+    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="1566409057833618877">"Are you sure that you want to delete all credentials and reset the credential storage password?"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"The password must contain at least 8 characters."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Incorrect password."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Incorrect password. You have one more chance before credential storage is erased."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Incorrect password. You have <xliff:g id="NUMBER">%1$d</xliff:g> more chances before credential storage is erased."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Credential storage has been erased."</string>
+    <!-- no translation found for credentials_not_erased (397954733557821269) -->
+    <skip />
     <string name="credentials_enabled" msgid="7588607413349978930">"Credential storage is enabled."</string>
+    <!-- no translation found for credentials_configure_lock_screen_hint (6816970208840577219) -->
+    <skip />
     <string name="emergency_tone_title" msgid="1055954530111587114">"Emergency tone"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Set behaviour when an emergency call is placed"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"Privacy"</string>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index 3a662b0..611896f 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -48,6 +48,16 @@
     <item msgid="2314124409517439288">"10 minutos"</item>
     <item msgid="6864027152847611413">"30 minutos"</item>
   </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="3149294732238283185">"Nunca"</item>
+    <item msgid="2194151041885903260">"15 segundos"</item>
+    <item msgid="5892295237131074341">"30 segundos"</item>
+    <item msgid="3538441365970038213">"1 minuto"</item>
+    <item msgid="412343871668955639">"2 minutos"</item>
+    <item msgid="5076853889688991690">"5 minutos"</item>
+    <item msgid="1903860996174927898">"10 minutos"</item>
+    <item msgid="6415509612413178727">"30 minutos"</item>
+  </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"inmediatamente"</item>
     <item msgid="6736512735606834431">"5 segundos"</item>
@@ -59,6 +69,22 @@
     <item msgid="9002737361305019353">"10 minutos"</item>
     <item msgid="4322676235684793329">"30 minutos"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Extremadamente pequeño"</item>
+    <item msgid="383133849547816572">"Extrapequeño"</item>
+    <item msgid="6490061470416867723">"Pequeño"</item>
+    <item msgid="3579015730662088893">"Normal"</item>
+    <item msgid="1678068858001018666">"Grande"</item>
+    <item msgid="490158884605093126">"Extragrande"</item>
+    <item msgid="2123802548987439763">"Extremadamente grande"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Muy lento"</item>
     <item msgid="2361722960903353554">"Lento"</item>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index b4d851a..0eb72a4 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -316,7 +316,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Requieren un PIN numérico para desbloquear la pantalla"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Contraseña"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Solicitar una contraseña para desbloquear la pantalla"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Desactivado por administrador o política de encriptación"</string>
+    <!-- outdated translation 5962903914511361952 -->     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Inhabilitado por el administrador remoto de la tableta"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Desactivado"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7137296704741184239">"Sin seguridad"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Asegurado con el patrón"</string>
@@ -460,6 +460,7 @@
     <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Especificar cuándo desconectar de Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Hubo un problema mientras se cambiaba la configuración"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Agregar red Wi-Fi"</string>
+    <string name="wifi_add_network_summary" msgid="6345544206968025811">"Configurar una red que no realice emisiones"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Redes Wi-Fi"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Explorar"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avanzado"</string>
@@ -598,7 +599,17 @@
     <string name="brightness_summary" msgid="838917350127550703">"Ajustar el brillo de la pantalla"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Tiempo de espera"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"La pantalla se apaga automáticamente después de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Sueños Android"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Protectores de pantalla y otras diversiones en estado inactivo"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Sueño seleccionado"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Cuándo activar"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"Después de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> en estado inactivo"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Nunca"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Prueba esta opción."</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brillo automático"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Tamaño de fuente"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Tamaño total de la fuente"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Seleccionar tamaño de fuente"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Configuración de bloqueo de la tarjeta SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Conf. bloqueo de tarj. SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Bloqueo de la tarjeta SIM"</string>
@@ -644,7 +655,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"Mi número de teléfono"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"Versión de PRL"</string>
-    <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
+    <string name="status_meid_number" msgid="2037549729230058915">"IMEI/MEID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"Tipo de red de celulares"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Estado de red de celulares"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Estado del servicio"</string>
@@ -893,9 +904,12 @@
     <string name="install_unknown_applications" msgid="6612824788917283662">"Permite la instalación de aplicaciones que no pertenezcan a Market"</string>
     <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"Tu tablet y datos personales son más vulnerables a sufrir ataques de aplicaciones provenientes de fuentes desconocidas. Aceptas que eres el único responsable de cualquier daño que sufra tu tablet o de cualquier pérdida de datos que pueda ocasionar el uso de estas aplicaciones."</string>
     <string name="install_all_warning" product="default" msgid="1923717607319933741">"Tu teléfono y datos personales son más vulnerables a sufrir ataques de aplicaciones provenientes de fuentes desconocidas. Aceptas que eres el único responsable de cualquier daño que sufra tu teléfono o de cualquier pérdida de datos que pueda ocasionar el uso de estas aplicaciones."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Configuración avanzada"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Habilitar más opciones de configuración"</string>
     <string name="application_info_label" msgid="1150486628158409543">"Información de aplicación"</string>
     <string name="storage_label" msgid="8700867073480107253">"Espacio de almacenamiento"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Lanzar de manera predeterminada"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Compatibilidad de la pantalla"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Permisos"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Memoria caché"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Borrar memoria caché"</string>
@@ -915,6 +929,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Has elegido lanzar esta aplicación de manera predeterminada para algunas acciones."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"No hay configuraciones predeterminadas establecidas."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Borrar configuraciones predeterminadas"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Es posible que esta aplicación no haya sido diseñada para tu pantalla. Puedes controlar cómo se ajusta a tu pantalla aquí."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Preguntar cuando se lanza"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Aplicación en escala"</string>
     <string name="unknown" msgid="1592123443519355854">"Desconocido"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Ordenar por nombre"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Ordenar por tamaño"</string>
@@ -1019,8 +1036,13 @@
     <string name="show_password" msgid="2198798062604049206">"Contraseñas visibles"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Mostrar contraseña mientras escribe"</string>
     <string name="ime_security_warning" msgid="812267421486877917">"El método de entrada puede recopilar todo el texto que escribas, incluidos los datos personales como contraseñas y números de tarjetas de crédito. Proviene de la aplicación <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. ¿Deseas utilizar este método de entrada?"</string>
+    <!-- no translation found for pointer_settings_category (6090176550039035130) -->
+    <skip />
+    <!-- no translation found for pointer_speed (1221342330217861616) -->
+    <skip />
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Diccionario del usuario"</string>
-    <string name="user_dict_settings_title" msgid="8357027437499042191">"Diccionario del usuario"</string>
+    <string name="user_dict_single_settings_title" msgid="5454855286173849284">"Diccionario de usuario"</string>
+    <string name="user_dict_multiple_settings_title" msgid="326583195525296750">"Administrar diccionarios de usuario"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Agregar"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Agregar al diccionario"</string>
@@ -1029,6 +1051,7 @@
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Eliminar"</string>
     <string name="user_dict_settings_empty_text" product="tablet" msgid="1766522102636921529">"El diccionario del usuario no contiene ninguna palabra. Puedes agregar una palabra tocando el botón Agregar( + )."</string>
     <string name="user_dict_settings_empty_text" product="default" msgid="6209268025109242806">"El diccionario del usuario no contiene ninguna palabra. Puedes agregar una palabra a través del menú."</string>
+    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Todos los idiomas"</string>
     <string name="testing" msgid="6584352735303604146">"Probando"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Información del tablet"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Información del teléfono"</string>
@@ -1100,6 +1123,8 @@
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"Botón de encendido"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"El botón de encendido finaliza la llamada."</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"Durante una llamada, presionar Power (encender) finaliza la llamada, en lugar de apagar la pantalla."</string>
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <skip />
     <string name="touchscreen_gestures_category" msgid="3109869155350859625">"Gestos de pantalla táctil"</string>
     <string name="long_press_timeout_selector_title" msgid="1396876537252863044">"Retraso entre tocar y mantener presionado"</string>
     <string name="long_press_timeout_selector_summary" msgid="2261114502740278996">"Retraso al interpretar un toque como tocar y mantener presionado"</string>
@@ -1302,30 +1327,26 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(sin cambios)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(no establecido)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Almacenamiento de la credencial"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Usar credenciales seg."</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Permitir a las aplic. acceder a certificados seguros y otras cred."</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Instalar desde almacenamiento"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Instalar desde la tarjeta SD"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Instalar certificados encriptados desde el almacenamiento"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Instalar certificados desde la tarjeta SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Establecer contraseña"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Establecer o cambiar la contraseña para el almacenamiento de la credencial"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Borrar credenciales"</string>
-    <string name="credentials_reset_summary" msgid="3810369467217453606">"Eliminar todos los contenidos y restablecer la contraseña"</string>
+    <!-- outdated translation 4407401234092698607 -->     <string name="credentials_reset_summary" msgid="3369361230171260282">"Eliminar todos los contenidos y restablecer la contraseña"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Ingresar contraseña"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Ingresar la contraseña para el almacenamiento de la credencial."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Establecer la contraseña para el almacenamiento de la credencial. Debe tener al menos 8 caracteres."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Contraseña actual:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Contraseña nueva:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Confirmar contraseña nueva:"</string>
-    <string name="credentials_reset_hint" msgid="2336340927894094814">"Se eliminarán todos los contenidos, y la contraseña se restablecerá. ¿Estás seguro de eso?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Las contraseñas no coinciden."</string>
+    <!-- outdated translation 176255916024372250 -->     <string name="credentials_reset_hint" msgid="1566409057833618877">"Todos los contenidos se eliminarán, y se reestablecerá la contraseña. ¿Estás seguro de eso?"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"La contraseña debe tener 8 caracteres como mínimo."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Contraseña incorrecta."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Contraseña incorrecta. Tienes una oportunidad más antes de que se borre el almacenamiento de la credencial."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Contraseña incorrecta. Tienes <xliff:g id="NUMBER">%1$d</xliff:g> oportunidades más antes de  que se borre el almacenamiento de la credencial."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"El almacenamiento de la credencial se ha borrado."</string>
+    <!-- no translation found for credentials_not_erased (397954733557821269) -->
+    <skip />
     <string name="credentials_enabled" msgid="7588607413349978930">"El almacenamiento de la credencial está activado."</string>
+    <!-- no translation found for credentials_configure_lock_screen_hint (6816970208840577219) -->
+    <skip />
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tono de emergencia"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Establecer el comportamiento cuando se establece una llamada de emergencia"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"Privacidad"</string>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index 0fc04fe..794d14d 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -48,6 +48,16 @@
     <item msgid="2314124409517439288">"10 minutos"</item>
     <item msgid="6864027152847611413">"30 minutos"</item>
   </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="3149294732238283185">"Nunca"</item>
+    <item msgid="2194151041885903260">"15 segundos"</item>
+    <item msgid="5892295237131074341">"30 segundos"</item>
+    <item msgid="3538441365970038213">"1 minuto"</item>
+    <item msgid="412343871668955639">"2 minutos"</item>
+    <item msgid="5076853889688991690">"5 minutos"</item>
+    <item msgid="1903860996174927898">"10 minutos"</item>
+    <item msgid="6415509612413178727">"30 minutos"</item>
+  </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"inmediatamente"</item>
     <item msgid="6736512735606834431">"5 segundos"</item>
@@ -59,6 +69,22 @@
     <item msgid="9002737361305019353">"10 minutos"</item>
     <item msgid="4322676235684793329">"30 minutos"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Pequeñísima"</item>
+    <item msgid="383133849547816572">"Muy pequeña"</item>
+    <item msgid="6490061470416867723">"Pequeña"</item>
+    <item msgid="3579015730662088893">"Normal"</item>
+    <item msgid="1678068858001018666">"Grande"</item>
+    <item msgid="490158884605093126">"Muy grande"</item>
+    <item msgid="2123802548987439763">"Grandísima"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Muy lenta"</item>
     <item msgid="2361722960903353554">"Lenta"</item>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 7e7241f..5af9465 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -316,7 +316,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"PIN numérico para desbloquear la pantalla"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Contraseña"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Contraseña para desbloquear la pantalla"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Inhabilitado por administrador/política encriptación"</string>
+    <!-- outdated translation 5962903914511361952 -->     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Inhabilitado por administrador de dispositivo remoto"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Desactivado"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7137296704741184239">"Sin seguridad"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Protegida con patrón"</string>
@@ -460,6 +460,7 @@
     <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Especificar cuándo desconectarse de una red Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Error al cambiar la configuración"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Añadir red Wi-Fi"</string>
+    <string name="wifi_add_network_summary" msgid="6345544206968025811">"Configurar una red de no difusión"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Redes Wi-Fi"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Buscar"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avanzado"</string>
@@ -598,7 +599,17 @@
     <string name="brightness_summary" msgid="838917350127550703">"Ajustar el brillo de la pantalla"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Tiempo de espera"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"La pantalla se apaga automáticamente después de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>."</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android Dreams"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Salvapantallas y otros elementos divertidos en estado inactivo"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Módulo dream seleccionado"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Cuándo activar"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"Después de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactividad"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Nunca"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Probar"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brillo automático"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Tamaño de fuente"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Tamaño de fuente general"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Seleccionar tamaño de fuente"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Ajustes de bloqueo de tarjeta SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Bloqueo de tarjeta SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Bloqueo de tarjeta SIM"</string>
@@ -644,7 +655,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"Mi número de teléfono"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"Versión de PRL"</string>
-    <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
+    <string name="status_meid_number" msgid="2037549729230058915">"IMEI / MEID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"Tipo de red móvil"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Estado de red móvil"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Estado del servicio"</string>
@@ -694,7 +705,7 @@
     <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"No se puede desactivar la tarjeta SD. Vuelve a intentarlo más tarde."</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"Se desactivará el almacenamiento USB."</string>
     <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"Se desactivará la tarjeta SD."</string>
-    <string name="sd_ejecting_title" msgid="8824572198034365468">"Desmontando"</string>
+    <string name="sd_ejecting_title" msgid="8824572198034365468">"Desactivando"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"La tarjeta SD se está desactivando."</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Estado de la batería"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Nivel de batería"</string>
@@ -893,9 +904,12 @@
     <string name="install_unknown_applications" msgid="6612824788917283662">"Permitir la instalación de aplicaciones distintas de Android Market"</string>
     <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"El tablet y los datos personales son más vulnerables a los ataques de aplicaciones de origen desconocido. El usuario acepta ser el único responsable de cualquier daño en el tablet o pérdida de datos que se pueda derivar del uso de estas aplicaciones."</string>
     <string name="install_all_warning" product="default" msgid="1923717607319933741">"El teléfono y los datos personales son más vulnerables a los ataques de aplicaciones de origen desconocido. El usuario acepta ser el único responsable de cualquier daño en el teléfono o pérdida de datos que se pueda derivar del uso de estas aplicaciones."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Ajustes avanzados"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Habilitar más opciones de configuración"</string>
     <string name="application_info_label" msgid="1150486628158409543">"Información de la aplicación"</string>
     <string name="storage_label" msgid="8700867073480107253">"Almacenamiento"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Ejecutar de forma predeterminada"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Compatibilidad de la pantalla"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Permisos"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Caché"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Borrar caché"</string>
@@ -915,6 +929,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Has elegido ejecutar la aplicación de forma predeterminada para algunas acciones."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"No se han establecido valores predeterminados."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Borrar valores predeterminados"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Es posible que esta aplicación no se haya diseñado para tu pantalla. Aquí puedes controlar cómo se ajusta a la pantalla."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Preguntar al iniciar"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Aplicación de escala"</string>
     <string name="unknown" msgid="1592123443519355854">"Desconocido"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Ordenar por nombre"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Ordenar por tamaño"</string>
@@ -1019,8 +1036,13 @@
     <string name="show_password" msgid="2198798062604049206">"Contraseñas visibles"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Mostrar contraseña mientras se escribe"</string>
     <string name="ime_security_warning" msgid="812267421486877917">"Este método de introducción de texto puede registrar todo lo que escribas, incluidos datos personales, como las contraseñas y los números de las tarjetas de crédito. Procede de la aplicación <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. ¿Deseas utilizar este método de introducción de texto?"</string>
+    <!-- no translation found for pointer_settings_category (6090176550039035130) -->
+    <skip />
+    <!-- no translation found for pointer_speed (1221342330217861616) -->
+    <skip />
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Diccionario del usuario"</string>
-    <string name="user_dict_settings_title" msgid="8357027437499042191">"Diccionario del usuario"</string>
+    <string name="user_dict_single_settings_title" msgid="5454855286173849284">"Diccionario del usuario"</string>
+    <string name="user_dict_multiple_settings_title" msgid="326583195525296750">"Administrar diccionarios del usuario"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Añadir"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Añadir al diccionario"</string>
@@ -1029,6 +1051,7 @@
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Eliminar"</string>
     <string name="user_dict_settings_empty_text" product="tablet" msgid="1766522102636921529">"No tienes ninguna palabra en el diccionario del usuario. Toca el botón Añadir (+) para añadir una palabra."</string>
     <string name="user_dict_settings_empty_text" product="default" msgid="6209268025109242806">"No tienes ninguna palabra en el diccionario del usuario. Puedes añadir una palabra a través del menú."</string>
+    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Todos los idiomas"</string>
     <string name="testing" msgid="6584352735303604146">"Prueba"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Información del tablet"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Información sobre el teléfono"</string>
@@ -1100,6 +1123,8 @@
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"Botón de encendido"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"Colgar"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"La llamada finalizará al pulsar el botón de encendido."</string>
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <skip />
     <string name="touchscreen_gestures_category" msgid="3109869155350859625">"Gestos de la pantalla táctil"</string>
     <string name="long_press_timeout_selector_title" msgid="1396876537252863044">"Retraso de pulsación prolongada"</string>
     <string name="long_press_timeout_selector_summary" msgid="2261114502740278996">"Retrasar hasta que se realice una pulsación prolongada"</string>
@@ -1302,30 +1327,26 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(sin modificar)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(sin definir)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Almacenamiento de credenciales"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Credenciales seguras"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Permitir que las aplicaciones accedan a los certificados seguros y a otras credenciales"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Instalar desde almacenamiento"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Instalar desde la tarjeta SD"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Instalar certificados desde almacenamiento"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Instalar certificados desde la tarjeta SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Establecer contraseña"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Establecer o cambiar la contraseña del almacenamiento de credenciales"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Borrar credenciales"</string>
-    <string name="credentials_reset_summary" msgid="3810369467217453606">"Eliminar todo el contenido y restablecer la contraseña"</string>
+    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3369361230171260282">"Borrar almacenamiento de credenciales de todo el contenido y restablecer su contraseña"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Introducir contraseña"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Introduce la contraseña del almacenamiento de credenciales."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Establece la contraseña del almacenamiento de credenciales (debe tener un mínimo de 8 caracteres)."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Contraseña actual:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Contraseña nueva:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Confirmar contraseña nueva:"</string>
-    <string name="credentials_reset_hint" msgid="2336340927894094814">"Se eliminará todo el contenido y se restablecerá la contraseña. ¿Seguro que quieres continuar?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Las contraseñas no coinciden."</string>
+    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="1566409057833618877">"¿Estás seguro de que quieres eliminar todas las credenciales y restablecer la contraseña de almacenamiento de credenciales?"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"La contraseña debe tener un mínimo de ocho caracteres."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Contraseña incorrecta"</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Contraseña incorrecta. Tienes una oportunidad más antes de que se borre el almacenamiento de credenciales."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Contraseña incorrecta. Tienes <xliff:g id="NUMBER">%1$d</xliff:g> oportunidades más antes de que se borre el almacenamiento de credenciales."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Almacenamiento credenciales borrado"</string>
+    <!-- no translation found for credentials_not_erased (397954733557821269) -->
+    <skip />
     <string name="credentials_enabled" msgid="7588607413349978930">"Almacenamiento de credenciales habilitado"</string>
+    <!-- no translation found for credentials_configure_lock_screen_hint (6816970208840577219) -->
+    <skip />
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tono de emergencia"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Establecer comportamiento al realizar una llamada de emergencia"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"Privacidad"</string>
diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
index bbd7880..a426e90 100644
--- a/res/values-fa/arrays.xml
+++ b/res/values-fa/arrays.xml
@@ -48,6 +48,16 @@
     <item msgid="2314124409517439288">"10 دقیقه"</item>
     <item msgid="6864027152847611413">"30 دقیقه"</item>
   </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="3149294732238283185">"هیچوقت"</item>
+    <item msgid="2194151041885903260">"15 ثانیه"</item>
+    <item msgid="5892295237131074341">"30 ثانیه"</item>
+    <item msgid="3538441365970038213">"1 دقیقه"</item>
+    <item msgid="412343871668955639">"2 دقیقه"</item>
+    <item msgid="5076853889688991690">"5 دقیقه"</item>
+    <item msgid="1903860996174927898">"10 دقیقه"</item>
+    <item msgid="6415509612413178727">"30 دقیقه"</item>
+  </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"بلافاصله"</item>
     <item msgid="6736512735606834431">"5 ثانیه"</item>
@@ -59,6 +69,22 @@
     <item msgid="9002737361305019353">"10 دقیقه"</item>
     <item msgid="4322676235684793329">"30 دقیقه"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"بی نهایت کوچک"</item>
+    <item msgid="383133849547816572">"بسیار کوچک"</item>
+    <item msgid="6490061470416867723">"کوچک"</item>
+    <item msgid="3579015730662088893">"معمولی"</item>
+    <item msgid="1678068858001018666">"بزرگ"</item>
+    <item msgid="490158884605093126">"بسیار بزرگ"</item>
+    <item msgid="2123802548987439763">"بی نهایت بزرگ"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"بسیار آهسته"</item>
     <item msgid="2361722960903353554">"آهسته"</item>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index e612720..bd76dd6 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -316,7 +316,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"برای باز کردن قفل صفحه یک پین عددی لازم است"</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_disabled_summary" msgid="8563103042330816018">"توسط سرپرست سیستم یا خط مشی رمزگذاری غیر فعال شده است"</string>
+    <!-- outdated translation 5962903914511361952 -->     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"از طریق سرپرست دستگاه راه دور غیرفعال شد"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"خاموش"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7137296704741184239">"عدم وجود امنیت"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"ایمن شده با الگو"</string>
@@ -460,6 +460,7 @@
     <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"تعیین زمان قطع اتصال از Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"هنگام تغییر تنظیمات مشکلی رخ داد"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"افزودن شبکه Wi-Fi"</string>
+    <string name="wifi_add_network_summary" msgid="6345544206968025811">"یک شبکه غیر پخشی پیکربندی کنید"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"شبکه های Wi-Fi"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"اسکن"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"پیشرفته"</string>
@@ -598,7 +599,17 @@
     <string name="brightness_summary" msgid="838917350127550703">"تنظیم روشنایی صفحه"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"وقفه زمانی"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"صفحه بعد از <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> به صورت خودکار خاموش می شود"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android Dreams"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"محافظ های صفحه و سایر حالت های عدم استفاده"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"رویای انتخابی"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"چه وقت باید فعال شود"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"پس از <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> عدم استفاده"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"هیچوقت"</string>
+    <string name="dream_test" msgid="5968002644622194481">"امتحان کنید!"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"روشنایی خودکار"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"اندازه قلم"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"اندازه کلی قلم ها"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"انتخاب اندازه قلم"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"تنظیمات قفل سیم کارت"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"تنظیم قفل سیم کارت"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"قفل سیم کارت"</string>
@@ -644,7 +655,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"شماره تلفن من"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"نسخه PRL"</string>
-    <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
+    <string name="status_meid_number" msgid="2037549729230058915">"IMEI / MEID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"نوع شبکه تلفن همراه"</string>
     <string name="status_data_state" msgid="5503181397066522950">"وضعیت شبکه تلفن همراه"</string>
     <string name="status_service_state" msgid="2323931627519429503">"وضعیت سرویس"</string>
@@ -893,9 +904,12 @@
     <string name="install_unknown_applications" msgid="6612824788917283662">"اجازه نصب برنامه های کاربردی غیر بازاری را می دهد"</string>
     <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"امکان حمله به رایانه لوحی و داده های شخصی شما توسط برنامه های مربوط به منابع ناشناس بیشتر است. شما موافقت می کنید که تنها شما مسئول هرگونه آسیب وارد آمده به رایانه لوحی یا از بین رفتن داده ها هستید که ممکن است در پی استفاده از این برنامه ها رخ دهد."</string>
     <string name="install_all_warning" product="default" msgid="1923717607319933741">"امکان حمله به گوشی و داده های شخصی توسط برنامه های مربوط به منابع ناشناس بیشتر است. شما موافقت می کنید که تنها شما مسئول هرگونه آسیب وارد آمده به گوشی یا از بین رفتن داده ها هستید که ممکن است در پی استفاده از این برنامه ها رخ دهد."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"تنظیمات پیشرفته"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"گزینه های تنظیمات بیشتری فعال کنید."</string>
     <string name="application_info_label" msgid="1150486628158409543">"اطلاعات برنامه کاربردی"</string>
     <string name="storage_label" msgid="8700867073480107253">"ذخیره سازی"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"راه اندازی به صورت پیش فرض"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"سازگاری با صفحه نمایش"</string>
     <string name="permissions_label" msgid="2605296874922726203">"مجوزها"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"حافظه پنهان"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"پاک کردن حافظه پنهان"</string>
@@ -915,6 +929,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"شما انتخاب کرده اید که این برنامه به صورت پیش فرض برای چندین عملکرد راه اندازی شود."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"تنظیم پیش فرضی موجود نیست."</string>
     <string name="clear_activities" msgid="7408923511535174430">"پاک کردن پیش فرض ها"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"ممکن است این برنامه برای صفحه شما طراحی نشده باشد، نحوه تنظیم آن برای صفحه را می توانید از این قسمت کنترل کنید."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"هنگام راه اندازی سؤال شود"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"برنامه مقیاس"</string>
     <string name="unknown" msgid="1592123443519355854">"ناشناس"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"مرتب سازی بر اساس نام"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"ترتیب بر اساس اندازه"</string>
@@ -1019,8 +1036,13 @@
     <string name="show_password" msgid="2198798062604049206">"رمزهای ورود قابل مشاهده"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"نمایش رمز ورود همزمان با نوشتن"</string>
     <string name="ime_security_warning" msgid="812267421486877917">"این روش وروی ممکن است بتواند تمام متنی را که می نویسید جمع آوری کند، از جمله اطلاعات شخصی مانند رمز ورود و شماره کارت اعتباری. این موارد توسط برنامه <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g> انجام می شود. از این روش ورودی استفاده می کنید؟"</string>
+    <!-- no translation found for pointer_settings_category (6090176550039035130) -->
+    <skip />
+    <!-- no translation found for pointer_speed (1221342330217861616) -->
+    <skip />
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"فرهنگ لغت کاربر"</string>
-    <string name="user_dict_settings_title" msgid="8357027437499042191">"فرهنگ لغت کاربر"</string>
+    <string name="user_dict_single_settings_title" msgid="5454855286173849284">"فرهنگ لغت کاربر"</string>
+    <string name="user_dict_multiple_settings_title" msgid="326583195525296750">"مدیریت فرهنگ های لغت کاربر"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"افزودن"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"افزودن به فرهنگ لغت"</string>
@@ -1029,6 +1051,7 @@
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"حذف"</string>
     <string name="user_dict_settings_empty_text" product="tablet" msgid="1766522102636921529">"کلمه ای در فرهنگ لغت کاربر شما موجود نیست. می توانید با لمس کردن دکمه افزودن ( + ) یک کلمه را اضافه کنید."</string>
     <string name="user_dict_settings_empty_text" product="default" msgid="6209268025109242806">"هیچ کلمه ای را در فرهنگ لغت کاربر ندارید. از طریق منو می توانید یک کلمه را اضافه کنید."</string>
+    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"همه زبان ها"</string>
     <string name="testing" msgid="6584352735303604146">"تست کردن"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"اطلاعات رایانه لوحی"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"اطلاعات تلفن"</string>
@@ -1100,6 +1123,8 @@
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"دکمه روشن/خاموش"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"دکمه روشن/خاموش به تماس پایان می دهد"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"در حین تماس، بجای خاموش کردن صفحه، با فشار دادن دکمه روشن/خاموش، به تماس پایان داده می شود"</string>
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <skip />
     <string name="touchscreen_gestures_category" msgid="3109869155350859625">"حرکات صفحه لمسی"</string>
     <string name="long_press_timeout_selector_title" msgid="1396876537252863044">"تأخیر لمس کردن و نگه داشتن"</string>
     <string name="long_press_timeout_selector_summary" msgid="2261114502740278996">"تأخیر تا زمانی که یک لمس به عنوان لمس تفسیر شود و نگه داشتن"</string>
@@ -1302,30 +1327,26 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(بدون تغییر)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(تنظیم نشده)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"ذخیره اطلاعات کاربری"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"استفاده از اطلاعات کاربری ایمن"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"به برنامه های کاربردی اجازه می دهد به گواهی های ایمن و دیگر اطلاعات کاربری دسترسی داشته باشد."</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"نصب از حافظه"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"نصب از کارت SD"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"نصب گواهی ها از حافظه"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"نصب مجوزها از کارت SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"تنظیم رمز ورود"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"تنظیم یا تغییر رمز ورود برای ذخیره اطلاعات کاربری"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"پاک کردن اطلاعات کاربری"</string>
-    <string name="credentials_reset_summary" msgid="3810369467217453606">"حذف همه محتواها و بازنشانی رمز ورود"</string>
+    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3369361230171260282">"محل ذخیره اطلاعات کاربری تمام محتواها را پاک کرده و رمز ورود را بازنشانی کنید"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"رمز ورود را وارد کنید"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"رمز ورود را برای حافظه اطلاعات کاربری وارد کنید."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"رمز ورود را برای حافظه اطلاعات کاربری تنظیم کنید. این رمز ورود باید حداقل 8 نویسه داشته باشد."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"رمز ورود فعلی:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"رمز ورود جدید:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"تأیید رمز ورود جدید:"</string>
-    <string name="credentials_reset_hint" msgid="2336340927894094814">"همه محتواها حذف می شود و رمز ورود بازنشانی می شود. آیا مطمئن هستید؟"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"رمزهای ورود مطابقت ندارند."</string>
+    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="1566409057833618877">"مطمئن هستید می خواهید تمام اطلاعات کاربری را حذف کرده و رمز ورود دستگاه ذخیره سازی را بازنشانی کنید؟"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"رمز ورود باید حداقل 8 نویسه داشته باشد."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"رمز ورود نادرست است."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"رمز ورود نادرست است. قبل از پاک کردن حافظه اطلاعات کاربری، یک بار دیگر می توانید رمز خود را وارد کنید."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"رمز ورود نادرست است. قبل از پاک شدن حافظه اطلاعات کاربری، <xliff:g id="NUMBER">%1$d</xliff:g> بار دیگر می توانید رمز ورود را وارد کنید."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"حافظه اطلاعات کاربری پاک شد."</string>
+    <!-- no translation found for credentials_not_erased (397954733557821269) -->
+    <skip />
     <string name="credentials_enabled" msgid="7588607413349978930">"ذخیره سازی اطلاعات کاربری فعال شد."</string>
+    <!-- no translation found for credentials_configure_lock_screen_hint (6816970208840577219) -->
+    <skip />
     <string name="emergency_tone_title" msgid="1055954530111587114">"آهنگ اضطراری"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"واکنش موجود در هنگام برقراری تماس اضطراری را تنظیم کنید"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"رازداری"</string>
diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml
index c6177f8..52c5a20 100644
--- a/res/values-fi/arrays.xml
+++ b/res/values-fi/arrays.xml
@@ -48,6 +48,16 @@
     <item msgid="2314124409517439288">"10 minuuttia"</item>
     <item msgid="6864027152847611413">"30 minuuttia"</item>
   </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="3149294732238283185">"Ei koskaan"</item>
+    <item msgid="2194151041885903260">"15 sekuntia"</item>
+    <item msgid="5892295237131074341">"30 sekuntia"</item>
+    <item msgid="3538441365970038213">"1 minuutti"</item>
+    <item msgid="412343871668955639">"2 minuuttia"</item>
+    <item msgid="5076853889688991690">"5 minuuttia"</item>
+    <item msgid="1903860996174927898">"10 minuuttia"</item>
+    <item msgid="6415509612413178727">"30 minuuttia"</item>
+  </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"heti"</item>
     <item msgid="6736512735606834431">"5 sekuntia"</item>
@@ -59,6 +69,22 @@
     <item msgid="9002737361305019353">"10 minuuttia"</item>
     <item msgid="4322676235684793329">"30 minuuttia"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Pikkuruinen"</item>
+    <item msgid="383133849547816572">"Erittäin pieni"</item>
+    <item msgid="6490061470416867723">"Pieni"</item>
+    <item msgid="3579015730662088893">"Normaali"</item>
+    <item msgid="1678068858001018666">"Suuri"</item>
+    <item msgid="490158884605093126">"Erittäin suuri"</item>
+    <item msgid="2123802548987439763">"Jättikoko"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Hyvin hidas"</item>
     <item msgid="2361722960903353554">"Hidas"</item>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 243c55b..3160009 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -316,7 +316,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Vaadi PIN-koodi ruudun avaamiseen"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Salasana"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Vaadi salasana ruudun avaamiseen"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Järjestelmänvalvojan tai salauskäytännön käytöstä poistama"</string>
+    <!-- outdated translation 5962903914511361952 -->     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Laitteen etäylläpitäjä poisti toiminnon käytöstä"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Ei käytössä"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7137296704741184239">"Ei suojausta"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Suojattu kuviolla"</string>
@@ -460,6 +460,7 @@
     <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Määritä, milloin wifi-yhteys katkaistaan"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Asetuksen vaihtaminen epäonnistui"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Lisää wifi-verkko"</string>
+    <string name="wifi_add_network_summary" msgid="6345544206968025811">"Määritä wifi-verkon asetukset"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wifi-verkot"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Etsi"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Lisäasetukset"</string>
@@ -598,7 +599,17 @@
     <string name="brightness_summary" msgid="838917350127550703">"Säädä näytön kirkkautta"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Aikaraja"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Ruutu sammuu automaattisesti <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> kuluttua"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android Dreams"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Näytönsäästäjät ja muut käyttämättömyysasetukset"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Valittu unelma"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Käyttöönottoaika"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"Kun laite ollut käyttämättä <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Ei koskaan"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Kokeile"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automaattinen kirkkaus"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Kirjasimen koko"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Kirjasimen koko"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Valitse kirjasimen koko"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM-kortin lukitusasetukset"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Ota SIM-kortin lukitus käyttöön"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM-kortin lukitus"</string>
@@ -644,7 +655,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"Oma puhelinnumero"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"PRL-versio"</string>
-    <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
+    <string name="status_meid_number" msgid="2037549729230058915">"IMEI/MEID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"Mobiiliverkon tyyppi"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Mobiiliverkon tila"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Palvelun tila"</string>
@@ -893,9 +904,12 @@
     <string name="install_unknown_applications" msgid="6612824788917283662">"Salli muiden kuin Marketista tulevien sovelluksien asentaminen"</string>
     <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"Tablet-laitteesi ja henkilökohtaiset tietosi ovat herkempiä tuntemattomista lähteistä tulevien sovelluksien hyökkäyksille. Hyväksyt, että olet itse vastuussa näiden sovelluksien seurauksena tablet-laitteellesi koituvista vahingoista tai kadonneista tiedoista."</string>
     <string name="install_all_warning" product="default" msgid="1923717607319933741">"Tuntemattomista lähteistä tulevat sovellukset saattavat herkemmin  kaapata puhelimesi ja henkilötietosi. Hyväksyt, että olet itse vastuussa puhelimellesi aiheutuvista vahingoista tai tietojen katoamisesta, joka saattaa johtua kyseisten sovelluksien käytöstä."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Lisäasetukset"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Ota lisää asetuksia käyttöön."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Sovelluksen tiedot"</string>
     <string name="storage_label" msgid="8700867073480107253">"Tallennustila"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Käynnistä oletuksena"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Ruudun yhteensopivuus"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Käyttöluvat"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Välimuisti"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Tyhjennä välimuisti"</string>
@@ -915,6 +929,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Olet valinnut tämän sovelluksen käynnistymään oletuksena joidenkin toimintojen yhteydessä."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Oletuksia ei asetettu."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Tyhjennä oletukset"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Tätä sovellusta ei välttämättä ole suunniteltu ruudullesi sopivaksi. Voit muuttaa asetuksia täältä."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Kysy käynnistettäessä"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Muuta sovelluksen kokoa"</string>
     <string name="unknown" msgid="1592123443519355854">"Tuntematon"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Lajittele nimen mukaan"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Lajittelu koon mukaan"</string>
@@ -1019,8 +1036,13 @@
     <string name="show_password" msgid="2198798062604049206">"Näkyvät salasanat"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Näytä salasana kirjoittaessasi"</string>
     <string name="ime_security_warning" msgid="812267421486877917">"Tämä syöttötapa saattaa kerätä kaiken kirjoittamasi tekstin, mukaan luettuna henkilökohtaiset tiedot kuten salasanat ja luottokortin numerot. Se on lähtöisin sovelluksesta <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Käytetäänkö tätä syöttötapaa?"</string>
+    <!-- no translation found for pointer_settings_category (6090176550039035130) -->
+    <skip />
+    <!-- no translation found for pointer_speed (1221342330217861616) -->
+    <skip />
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Käyttäjän sanakirja"</string>
-    <string name="user_dict_settings_title" msgid="8357027437499042191">"Käyttäjän sanakirja"</string>
+    <string name="user_dict_single_settings_title" msgid="5454855286173849284">"Käyttäjän sanakirja"</string>
+    <string name="user_dict_multiple_settings_title" msgid="326583195525296750">"Hallinnoi käyttäjän sanakirjoja"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Lisää"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Lisää sanakirjaan"</string>
@@ -1029,6 +1051,7 @@
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Poista"</string>
     <string name="user_dict_settings_empty_text" product="tablet" msgid="1766522102636921529">"Käyttäjäsanakirjassa ei ole yhtään sanaa. Voit lisätä sanan koskettamalla Lisää (+)-painiketta."</string>
     <string name="user_dict_settings_empty_text" product="default" msgid="6209268025109242806">"Käyttäjäsanakirjassa ei ole yhtään sanaa. Voit lisätä sanan valikon kautta."</string>
+    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Kaikki kielet"</string>
     <string name="testing" msgid="6584352735303604146">"Testaus"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Tablet-laitteen tiedot"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Puhelimen tiedot"</string>
@@ -1100,6 +1123,8 @@
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"Virtapainike"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"Virtapainike katkaisee puhelun"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"Virtanäppäimen painaminen puhelun aikana lopettaa puhelun mutta ei sammuta näyttöä"</string>
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <skip />
     <string name="touchscreen_gestures_category" msgid="3109869155350859625">"Kosketusnäytön eleet"</string>
     <string name="long_press_timeout_selector_title" msgid="1396876537252863044">"Pitkäkestoinen kosketus: viive"</string>
     <string name="long_press_timeout_selector_summary" msgid="2261114502740278996">"Viivytä, kunnes kosketus tulkitaan pitkäkestoiseksi."</string>
@@ -1302,30 +1327,26 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(ei muutettu)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(ei asetettu)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Käyttöoikeustietojen tallennus"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Käytä suojattuja käyttöoikeustietoja"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Anna sovelluksien käyttää suojattuja varmenteita ja muita käyttöoikeustietoja"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Asenna tallennustilasta"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Asenna SD-kortilta"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Asenna varmenteet tallennustilasta"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Asenna varmenteet SD-kortilta"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Aseta salasana"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Aseta käyttöoikeustietojen tallennustilan salasana tai vaihda salasanaa"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Tyhjennä käyttöoikeustiedot"</string>
-    <string name="credentials_reset_summary" msgid="3810369467217453606">"Poista kaikki sisältö ja nollaa salasana"</string>
+    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3369361230171260282">"Tyhjennä käyttöoikeustietojen tallennustila kokonaan ja palauta sen salasana"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Anna salasana"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Anna käyttöoikeustietojen tallennustilan salasana."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Aseta salasana käyttöoikeustietojen tallennustilalle. Salasanassa on oltava vähintään 8 merkkiä."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Nykyinen salasana:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Uusi salasana:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Vahvista uusi salasana:"</string>
-    <string name="credentials_reset_hint" msgid="2336340927894094814">"Kaikki sisältö poistetaan ja salasana nollataan. Haluatko jatkaa?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Salasanat eivät täsmää."</string>
+    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="1566409057833618877">"Haluatko varmasti poistaa kaikki käyttöoikeustiedot ja palauttaa käyttöoikeustietojen salasanan?"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Salasanassa täytyy olla vähintään 8 merkkiä."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Virheellinen salasana."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Väärä salasana. Yksi yritys jäljellä, ennen kuin käyttöoikeustietojen tallennustila tyhjennetään."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Väärä salasana. Jäljellä <xliff:g id="NUMBER">%1$d</xliff:g> yritystä, ennen kuin käyttöoikeustietojen tallennustila tyhjennetään."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Käyttöoikeustietojen tallennustila on tyhjennetty."</string>
+    <!-- no translation found for credentials_not_erased (397954733557821269) -->
+    <skip />
     <string name="credentials_enabled" msgid="7588607413349978930">"Käyttöoikeustietojen tallentaminen on käytössä."</string>
+    <!-- no translation found for credentials_configure_lock_screen_hint (6816970208840577219) -->
+    <skip />
     <string name="emergency_tone_title" msgid="1055954530111587114">"Hätäpuhelun ääni"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Aseta toiminta hätäpuhelun tapauksessa"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"Tietosuoja"</string>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index 2a94715..6b5602f 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -48,6 +48,16 @@
     <item msgid="2314124409517439288">"10 minutes"</item>
     <item msgid="6864027152847611413">"30 minutes"</item>
   </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="3149294732238283185">"Jamais"</item>
+    <item msgid="2194151041885903260">"15 secondes"</item>
+    <item msgid="5892295237131074341">"30 secondes"</item>
+    <item msgid="3538441365970038213">"1 minute"</item>
+    <item msgid="412343871668955639">"2 minutes"</item>
+    <item msgid="5076853889688991690">"5 minutes"</item>
+    <item msgid="1903860996174927898">"10 minutes"</item>
+    <item msgid="6415509612413178727">"30 minutes"</item>
+  </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"immédiatement"</item>
     <item msgid="6736512735606834431">"5 secondes"</item>
@@ -59,6 +69,22 @@
     <item msgid="9002737361305019353">"10 minutes"</item>
     <item msgid="4322676235684793329">"30 minutes"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Très petite"</item>
+    <item msgid="383133849547816572">"Très petite"</item>
+    <item msgid="6490061470416867723">"Petite"</item>
+    <item msgid="3579015730662088893">"Normale"</item>
+    <item msgid="1678068858001018666">"Grande"</item>
+    <item msgid="490158884605093126">"Très grande"</item>
+    <item msgid="2123802548987439763">"Très grande"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Très lente"</item>
     <item msgid="2361722960903353554">"Lente"</item>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 61bcdd63..ba3d604 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -276,31 +276,31 @@
     <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>
-    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Cryptage"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Crypter la tablette"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Crypter le téléphone"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Exiger un code PIN ou un mot de passe numérique pour décrypter la tablette à chaque fois qu\'elle est allumée"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Exiger un code PIN ou un mot de passe numérique pour décrypter le téléphone à chaque fois qu\'il est allumé"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Crypté"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Vous pouvez crypter vos comptes, vos paramètres, vos applications téléchargées, ainsi que leurs données, supports et autres fichiers. Une fois votre tablette cryptée, vous devez saisir un code PIN ou un mot de passe numérique pour la décrypter à chaque fois que vous l\'allumez. Vous ne pouvez désencrypter votre tablette qu\'en réinitialisant la configuration usine, ce qui effacera l\'ensemble de vos données."\n\n"Le cryptage peut prendre une heure au minimum. La batterie doit être chargée lors du démarrage du processus et la tablette doit rester branchée jusqu\'à la fin de celui-ci. Si toutefois vous l\'interrompez, vous perdrez certaines de vos données, voire la totalité."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Vous pouvez crypter vos comptes, vos paramètres, vos applications téléchargées, ainsi que leurs données, supports et autres fichiers. Une fois votre téléphone crypté, vous devez saisir un code PIN ou un mot de passe numérique pour le décrypter à chaque fois que vous l\'allumez. Vous ne pouvez désencrypter votre téléphone qu\'en réinitialisant la configuration usine, ce qui effacera l\'ensemble de vos données."\n\n"Le cryptage peut prendre une heure au minimum. La batterie doit être chargée lors du démarrage du processus et le téléphone doit rester branché jusqu\'à la fin de celui-ci. Si toutefois vous l\'interrompez, vous perdrez certaines de vos données, voire la totalité."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Crypter la tablette"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Crypter le téléphone"</string>
+    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Chiffrement"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Chiffrer la tablette"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Chiffrer le téléphone"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Exiger un code PIN ou un mot de passe numérique pour déchiffrer la tablette à chaque fois qu\'elle est allumée"</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Exiger un code PIN ou un mot de passe numérique pour déchiffrer le téléphone à chaque fois qu\'il est allumé"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Chiffré"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Vous pouvez chiffrer vos comptes, vos paramètres, vos applications téléchargées, ainsi que leurs données, supports et autres fichiers. Une fois votre tablette chiffrée, vous devez saisir un code PIN ou un mot de passe numérique pour la déchiffrer à chaque fois que vous l\'allumez. Vous ne pouvez déchiffrer votre tablette qu\'en réinitialisant la configuration usine, ce qui effacera l\'ensemble de vos données."\n\n"Le chiffrement peut prendre une heure au minimum. La batterie doit être chargée lors du démarrage du processus et la tablette doit rester branchée jusqu\'à la fin de celui-ci. Si toutefois vous l\'interrompez, vous perdrez certaines de vos données, voire la totalité."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Vous pouvez chiffrer vos comptes, vos paramètres, vos applications téléchargées, ainsi que leurs données, supports et autres fichiers. Une fois votre téléphone chiffré, vous devez saisir un code PIN ou un mot de passe numérique pour le déchiffrer à chaque fois que vous l\'allumez. Vous ne pouvez déchiffrer votre téléphone qu\'en réinitialisant la configuration usine, ce qui effacera l\'ensemble de vos données."\n\n"Le chiffrement peut prendre une heure au minimum. La batterie doit être chargée lors du démarrage du processus et le téléphone doit rester branché jusqu\'à la fin de celui-ci. Si toutefois vous l\'interrompez, vous perdrez certaines de vos données, voire la totalité."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Chiffrer la tablette"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Chiffrer le téléphone"</string>
     <string name="crypt_keeper_low_charge_text" msgid="5920622844033087792">"Veuillez charger votre batterie, puis réessayer."</string>
     <string name="crypt_keeper_unplugged_text" msgid="3360883915598669748">"Veuillez brancher votre chargeur, puis réessayer."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Aucun code PIN ni mot de passe saisi pour le verrouillage de l\'écran"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Vous devez définir un code PIN ou un mot de passe pour le verrouillage de l\'écran avant de lancer le cryptage."</string>
-    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Valider le cryptage"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Crypter la tablette ? Cette opération est irréversible et toute interruption du processus peut entraîner la perte de données. Le cryptage peut prendre une heure au minimum, au cours de laquelle la tablette sera redémarrée à plusieurs reprises."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Crypter le téléphone ? Cette opération est irréversible et toute interruption du processus peut entraîner la perte de données. Le cryptage peut prendre une heure au minimum, au cours de laquelle le téléphone sera redémarré à plusieurs reprises."</string>
-    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Cryptage en cours"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="5317479293244660361">"Veuillez patienter pendant le cryptage de votre tablette. <xliff:g id="PERCENT">^1</xliff:g> % effectué(s)"</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="8166730416836285875">"Veuillez patienter pendant le cryptage de votre téléphone. <xliff:g id="PERCENT">^1</xliff:g> % effectué(s)"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Vous devez définir un code PIN ou un mot de passe pour le verrouillage de l\'écran avant de lancer le chiffrement."</string>
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Valider le chiffrement"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Chiffrer la tablette ? Cette opération est irréversible et toute interruption du processus peut entraîner la perte de données. Le chiffrement peut prendre une heure au minimum, au cours de laquelle la tablette sera redémarrée à plusieurs reprises."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Chiffrer le téléphone ? Cette opération est irréversible et toute interruption du processus peut entraîner la perte de données. Le chiffrement peut prendre une heure au minimum, au cours de laquelle le téléphone sera redémarré à plusieurs reprises."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Chiffrement en cours"</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="5317479293244660361">"Veuillez patienter pendant le chiffrement de votre tablette. <xliff:g id="PERCENT">^1</xliff:g> % effectué(s)"</string>
+    <string name="crypt_keeper_setup_description" product="default" msgid="8166730416836285875">"Veuillez patienter pendant le chiffrement de votre téléphone. <xliff:g id="PERCENT">^1</xliff:g> % effectué(s)"</string>
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Réessayez dans <xliff:g id="DELAY">^1</xliff:g> secondes."</string>
     <string name="crypt_keeper_enter_password" msgid="1492603008983893532">"Saisissez votre mot de passe"</string>
-    <string name="crypt_keeper_failed_title" msgid="1166918236711686187">"Échec du cryptage"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="1075638996134310507">"Le cryptage a été interrompu et l\'opération ne peut être terminée. Vous devez réinitialiser la configuration usine (ce qui effacera l\'ensemble de vos données) avant de réutiliser votre tablette. Vous pouvez essayer de crypter à nouveau votre tablette, une fois la réinitialisation terminée."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3394708817932222518">"Le cryptage a été interrompu et l\'opération ne peut être terminée. Vous devez réinitialiser la configuration usine (ce qui effacera l\'ensemble de vos données) avant de réutiliser votre téléphone. Vous pouvez essayer de crypter à nouveau votre téléphone, une fois la réinitialisation terminée."</string>
+    <string name="crypt_keeper_failed_title" msgid="1166918236711686187">"Échec du chiffrement"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="1075638996134310507">"Le chiffrement a été interrompu et l\'opération ne peut être terminée. Vous devez réinitialiser la configuration usine (ce qui effacera l\'ensemble de vos données) avant de réutiliser votre tablette. Vous pouvez essayer de chiffrer à nouveau votre tablette, une fois la réinitialisation terminée."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3394708817932222518">"Le chiffrement a été interrompu et l\'opération ne peut être terminée. Vous devez réinitialiser la configuration usine (ce qui effacera l\'ensemble de vos données) avant de réutiliser votre téléphone. Vous pouvez essayer de chiffrer à nouveau votre téléphone, une fois la réinitialisation terminée."</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>
@@ -316,7 +316,7 @@
     <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>
     <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="8563103042330816018">"Désactivé par administrateur ou règles de cryptage"</string>
+    <!-- outdated translation 5962903914511361952 -->     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Désactivé par un administrateur distant"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Désactiver"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7137296704741184239">"Aucune sécurité"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Sécurisé par un schéma"</string>
@@ -460,6 +460,7 @@
     <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Indiquer quand déconnecter du Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Un problème est survenu lors de la modification des paramètres."</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Ajouter un réseau Wi-Fi"</string>
+    <string name="wifi_add_network_summary" msgid="6345544206968025811">"Configurer un réseau de non diffusion"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Réseaux Wi-Fi"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Rechercher"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Options avancées"</string>
@@ -598,7 +599,17 @@
     <string name="brightness_summary" msgid="838917350127550703">"Régler la luminosité de l\'écran"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Délai"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"L\'écran s\'éteint automatiquement au bout de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>."</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android Dreams"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Économiseurs d\'écran et autres options d\'inactivité"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Rêve sélectionné"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Régler le délai d\'activation"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"Après <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'inactivité"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Jamais"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Essayer"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Ajuster automatiquement la luminosité"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Taille de la police"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Taille générale des polices"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Sélectionner une taille de police"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Paramètres de verrouillage de la SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Configurer verrouillage carte SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Verrouillage de la SIM"</string>
@@ -644,7 +655,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"Mon numéro de téléphone"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"Version PRL"</string>
-    <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
+    <string name="status_meid_number" msgid="2037549729230058915">"IMEI/MEID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"Type de réseau mobile"</string>
     <string name="status_data_state" msgid="5503181397066522950">"État du réseau mobile"</string>
     <string name="status_service_state" msgid="2323931627519429503">"État du service"</string>
@@ -893,9 +904,12 @@
     <string name="install_unknown_applications" msgid="6612824788917283662">"Autoriser l\'installation d\'applications ne provenant pas d\'Android Market"</string>
     <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"Votre tablette et vos données personnelles sont plus vulnérables face à des applications provenant de sources inconnues. En cas de dommage causé à votre tablette ou de perte de données découlant de l\'utilisation de telles applications, vous en acceptez l\'entière responsabilité."</string>
     <string name="install_all_warning" product="default" msgid="1923717607319933741">"Votre téléphone et vos données personnelles sont très vulnérables face à des applications provenant de sources inconnues. Vous acceptez d\'être le seul responsable de tout dommage causé à votre téléphone ou de toute perte de données pouvant découler de l\'utilisation de telles applications."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Paramètres avancés"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Activer d\'autres paramètres"</string>
     <string name="application_info_label" msgid="1150486628158409543">"Informations sur l\'application"</string>
     <string name="storage_label" msgid="8700867073480107253">"Stockage"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Lancer par défaut"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Compatibilité de l\'écran"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Autorisations"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Cache"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Vider le cache"</string>
@@ -915,6 +929,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Vous avez choisi de lancer cette application par défaut pour certaines actions."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Aucun paramètre par défaut défini"</string>
     <string name="clear_activities" msgid="7408923511535174430">"Effacer les actions par défaut"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Cette application n\'est peut-être pas adaptée à votre écran. Vous pouvez modifier les paramètres d\'ajustement ici."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Demander au moment du lancement"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Ajuster l\'application"</string>
     <string name="unknown" msgid="1592123443519355854">"Inconnu"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Trier par nom"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Trier par taille"</string>
@@ -1019,8 +1036,13 @@
     <string name="show_password" msgid="2198798062604049206">"Mots de passe visibles"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Afficher le mot de passe lors de la saisie"</string>
     <string name="ime_security_warning" msgid="812267421486877917">"Ce mode de saisie pourrait collecter le texte que vous saisissez, y compris vos données personnelles telles que les mots de passe et les numéros de carte de crédit. Il provient de l\'application <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Voulez-vous vraiment activer ce mode de saisie ?"</string>
+    <!-- no translation found for pointer_settings_category (6090176550039035130) -->
+    <skip />
+    <!-- no translation found for pointer_speed (1221342330217861616) -->
+    <skip />
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Dictionnaire personnel"</string>
-    <string name="user_dict_settings_title" msgid="8357027437499042191">"Dictionnaire personnel"</string>
+    <string name="user_dict_single_settings_title" msgid="5454855286173849284">"Dictionnaire personnel"</string>
+    <string name="user_dict_multiple_settings_title" msgid="326583195525296750">"Gérer les dictionnaires personnels"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Ajouter"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Ajouter au dictionnaire"</string>
@@ -1029,6 +1051,7 @@
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Supprimer"</string>
     <string name="user_dict_settings_empty_text" product="tablet" msgid="1766522102636921529">"Votre dictionnaire personnel ne contient aucun mot. Vous pouvez ajouter un mot en appuyant sur le bouton Ajouter ( + )."</string>
     <string name="user_dict_settings_empty_text" product="default" msgid="6209268025109242806">"Votre dictionnaire personnel ne contient aucun mot. Vous pouvez ajouter un mot via le menu."</string>
+    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Toutes les langues"</string>
     <string name="testing" msgid="6584352735303604146">"Test"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Informations sur la tablette"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Informations sur le téléphone"</string>
@@ -1100,6 +1123,8 @@
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"Bouton MARCHE-ARRÊT"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"Raccrocher pdt un appel"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"Lors d\'un appel, utiliser le bouton MARCHE-ARRÊT pour raccrocher, sans désactiver l\'écran"</string>
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <skip />
     <string name="touchscreen_gestures_category" msgid="3109869155350859625">"Gestes écran tactile"</string>
     <string name="long_press_timeout_selector_title" msgid="1396876537252863044">"Délai de pression prolongée"</string>
     <string name="long_press_timeout_selector_summary" msgid="2261114502740278996">"Délai avant qu\'une pression soit considérée comme une pression prolongée"</string>
@@ -1255,7 +1280,7 @@
     <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"Le nom d\'utilisateur ou le mot de passe entré est incorrect. Voulez-vous réessayer ?"</string>
     <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"Le serveur a raccroché. Le nom d\'utilisateur et le mot de passe que vous avez saisis sont peut-être incorrects. Voulez-vous réessayer ?"</string>
     <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"Le serveur a raccroché. Il est possible que vous soyez protégé par un pare-feu qui empêche toute connexion au serveur. Souhaitez-vous réessayer ?"</string>
-    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"Échec de la négociation avec le serveur. Le serveur n\'est peut-être pas conforme au paramètre de cryptage. Voulez-vous vérifier le paramètre de cryptage ?"</string>
+    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"Échec de la négociation avec le serveur. Le serveur n\'est peut-être pas conforme au paramètre de chiffrement. Voulez-vous vérifier le paramètre de chiffrement ?"</string>
     <string name="vpn_type_title" msgid="6392933604218676224">"Ajouter un VPN"</string>
     <string name="vpn_add_new_vpn" msgid="5438260689052714550">"Ajouter un VPN"</string>
     <string name="vpn_details_title" msgid="418806440938510331">"Informations sur le VPN"</string>
@@ -1279,8 +1304,8 @@
     <string name="vpn_l2tp_secret_string_title" msgid="5039677186748940987">"Définir le secret L2TP"</string>
     <string name="vpn_l2tp_secret" msgid="529359749677142076">"Secret L2TP"</string>
     <string name="vpn_a_l2tp_secret" msgid="6612042930810981845">"un secret L2TP"</string>
-    <string name="vpn_pptp_encryption_title" msgid="2236795167467896499">"cryptage"</string>
-    <string name="vpn_pptp_encryption" msgid="2602329949737259686">"Cryptage PPTP"</string>
+    <string name="vpn_pptp_encryption_title" msgid="2236795167467896499">"chiffrement"</string>
+    <string name="vpn_pptp_encryption" msgid="2602329949737259686">"Chiffrement PPTP"</string>
     <string name="vpn_ipsec_presharedkey_title" msgid="2184060087690539175">"Définir la clé pré-partagée IPSec"</string>
     <string name="vpn_ipsec_presharedkey" msgid="5434316521616673741">"Clé pré-partagée IPSec"</string>
     <string name="vpn_a_ipsec_presharedkey" msgid="1255301923217898418">"une clé pré-partagée IPSec"</string>
@@ -1302,30 +1327,26 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(aucune modification)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(non défini)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Stockage des identifiants"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Identifiants sécurisés"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Autoriser l\'accès des applications aux certificats sécurisés et identifiants"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Installer depuis la mémoire"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Installer depuis la carte SD"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Installer les certificats depuis la mémoire de stockage"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Installer les certificats depuis la carte SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Définir le mot de passe"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Définir ou modifier le mot de passe pour le stockage des identifiants"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Effacer les identifiants"</string>
-    <string name="credentials_reset_summary" msgid="3810369467217453606">"Supprimer l\'ensemble du contenu et réinitialiser le mot de passe"</string>
+    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3369361230171260282">"Effacer le contenu du stockage des identifiants et réinitialiser le mot de passe"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Saisir le mot de passe"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Saisir le mot de passe de stockage des identifiants"</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Définir le mot de passe pour le stockage des identifiants. Il doit comporter au moins huit caractères."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Mot de passe actuel :"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Nouveau mot de passe :"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Confirmer le nouveau mot de passe :"</string>
-    <string name="credentials_reset_hint" msgid="2336340927894094814">"L\'ensemble du contenu sera effacé et le mot de passe réinitialisé. Voulez-vous vraiment continuer ?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Les mots de passe ne concordent pas."</string>
+    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="1566409057833618877">"Voulez-vous vraiment supprimer tous les identifiants et réinitialiser le mot de passe de stockage des identifiants ?"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Le mot de passe doit contenir au moins 8 caractères."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Mot de passe incorrect"</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Mot de passe incorrect. Vous disposez d\'une tentative supplémentaire avant la suppression des identifiants."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Mot de passe incorrect. Vous disposez de <xliff:g id="NUMBER">%1$d</xliff:g> tentatives supplémentaires avant la suppression des identifiants."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Les identifiants sont effacés."</string>
+    <!-- no translation found for credentials_not_erased (397954733557821269) -->
+    <skip />
     <string name="credentials_enabled" msgid="7588607413349978930">"Stockage des identifiants activé"</string>
+    <!-- no translation found for credentials_configure_lock_screen_hint (6816970208840577219) -->
+    <skip />
     <string name="emergency_tone_title" msgid="1055954530111587114">"Sonnerie d\'urgence"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Définir le comportement en cas d\'appel d\'urgence"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"Confidentialité"</string>
@@ -1423,7 +1444,7 @@
     <string name="sync_item_title" msgid="1931551540462877488">"Synchroniser <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
     <string name="cant_sync_dialog_title" msgid="7185199796123573317">"Impossible de procéder à la synchronisation manuelle."</string>
     <string name="cant_sync_dialog_message" msgid="2372359241135295930">"La synchronisation de cet élément est actuellement désactivée. Pour modifier vos préférences, activez temporairement les données en arrière-plan et la synchronisation automatique."</string>
-    <string name="enter_password" msgid="3268224850821675915">"Saisir le mot de passe pour décrypter le stockage"</string>
+    <string name="enter_password" msgid="3268224850821675915">"Saisir le mot de passe pour déchiffrer le stockage"</string>
     <string name="try_again" msgid="5904121494468643129">"Incorrect. Merci de réessayer."</string>
     <string name="service_busy" msgid="225227519012409130">"Service indisponible, réessayez."</string>
     <string name="delete" msgid="4219243412325163003">"Supprimer"</string>
diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml
index 1cfe07f..1245527 100644
--- a/res/values-hr/arrays.xml
+++ b/res/values-hr/arrays.xml
@@ -48,6 +48,16 @@
     <item msgid="2314124409517439288">"10 minuta"</item>
     <item msgid="6864027152847611413">"30 minuta"</item>
   </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="3149294732238283185">"Nikada"</item>
+    <item msgid="2194151041885903260">"15 sekundi"</item>
+    <item msgid="5892295237131074341">"30 sekundi"</item>
+    <item msgid="3538441365970038213">"1 minuta"</item>
+    <item msgid="412343871668955639">"2 minute"</item>
+    <item msgid="5076853889688991690">"5 minuta"</item>
+    <item msgid="1903860996174927898">"10 minuta"</item>
+    <item msgid="6415509612413178727">"30 minuta"</item>
+  </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"odmah"</item>
     <item msgid="6736512735606834431">"5 sekunda"</item>
@@ -59,6 +69,22 @@
     <item msgid="9002737361305019353">"10 minuta"</item>
     <item msgid="4322676235684793329">"30 minuta"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Krajnje malen"</item>
+    <item msgid="383133849547816572">"Izvanredno malen"</item>
+    <item msgid="6490061470416867723">"Malen"</item>
+    <item msgid="3579015730662088893">"Normalan"</item>
+    <item msgid="1678068858001018666">"Velik"</item>
+    <item msgid="490158884605093126">"Izvanredno velik"</item>
+    <item msgid="2123802548987439763">"Krajnje velik"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Jako sporo"</item>
     <item msgid="2361722960903353554">"Sporo"</item>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index d425f23..2192ddb 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -316,7 +316,7 @@
     <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>
     <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="8563103042330816018">"Onemogućio administrator ili pravila enkripcije"</string>
+    <!-- outdated translation 5962903914511361952 -->     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Onemogućio administrator udaljenog uređaja"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Isključeno"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7137296704741184239">"Nema zaštite"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Osigurano uzorkom"</string>
@@ -460,6 +460,7 @@
     <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Odredite kada uređaj treba isključiti s Wi-Fi mreže"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Pojavio se problem s promjenom postavke"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Dodaj Wi-Fi mrežu"</string>
+    <string name="wifi_add_network_summary" msgid="6345544206968025811">"Konfiguracija mreža bez prijenosa"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi mreže"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Skeniraj"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Napredno"</string>
@@ -598,7 +599,17 @@
     <string name="brightness_summary" msgid="838917350127550703">"Podesite svjetlinu zaslona"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Privremeni prekid"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Zaslon se isključuje automatski nakon <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android Dreams"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Čuvari zaslona i ostala ometanja mirovanja"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Odabrani san"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Kada aktivirati"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"Nakon <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> mirovanja"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Nikada"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Isprobajte!"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatska svjetlina"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Veličina fonta"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Opća veličina fonta"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Odabir veličine fonta"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Postavke zaključavanja SIM kartice"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Postavite zaključavanje SIM kartice"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM kartica je zaključana"</string>
@@ -644,7 +655,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"Moj telefonski broj"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"PRL verzija"</string>
-    <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
+    <string name="status_meid_number" msgid="2037549729230058915">"IMEI/MEID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"Vrsta mobilne mreže"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Stanje mobilne mreže"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Stanje usluge"</string>
@@ -893,9 +904,12 @@
     <string name="install_unknown_applications" msgid="6612824788917283662">"Dopusti instalaciju aplikacija koje nisu s tržišta"</string>
     <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"Vaš tabletni uređaj i osobni podaci podložniji su napadima aplikacija s nepoznatih izvora. Slažete se da ste u potpunosti odgovorni za svu štetu nastalu na vašem tabletnom uređaju ili za gubitak podataka do kojeg može doći zbog upotrebe tih aplikacija."</string>
     <string name="install_all_warning" product="default" msgid="1923717607319933741">"Telefon i osobni podaci jače su ugroženi u slučaju upotrebe aplikacija iz nepoznatog izvora. Prihvaćate da ste samo odgovorni za sve štete na telefonu ili za gubitak podataka zbog upotrebe takvih aplikacija."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Napredne postavke"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Omogući više opcija postavki."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Informacije o aplikaciji"</string>
     <string name="storage_label" msgid="8700867073480107253">"Prostor za pohranu"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Pokretanje prema zadanim postavkama"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Kompatibilnost zaslona"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Dozvole"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Predmemorija"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Očisti predmemoriju"</string>
@@ -915,6 +929,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Odabrali ste pokretanje ove aplikacije prema zadanim postavkama za određene radnje."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Nema zadanih postavki."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Izbriši zadane postavke"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Ta aplikacija možda nije dizajnirana za vaš zaslon. Ovdje možete provjeriti kako se prilagođava vašem zaslonu."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Pitaj pri pokretanju"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Prilagodi aplikaciju"</string>
     <string name="unknown" msgid="1592123443519355854">"Nepoznato"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Poredaj prema nazivu"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Poredaj po veličini"</string>
@@ -1019,8 +1036,13 @@
     <string name="show_password" msgid="2198798062604049206">"Vidljive zaporke"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Prikaži zaporku tijekom unosa"</string>
     <string name="ime_security_warning" msgid="812267421486877917">"Ovaj način unosa može imati mogućnost prikupljanja teksta koji unosite, uključujući osobne podatke poput zaporki i brojeva kreditne kartice. To omogućuje aplikacija <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Koristiti taj način unosa?"</string>
+    <!-- no translation found for pointer_settings_category (6090176550039035130) -->
+    <skip />
+    <!-- no translation found for pointer_speed (1221342330217861616) -->
+    <skip />
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Korisnički rječnik"</string>
-    <string name="user_dict_settings_title" msgid="8357027437499042191">"Korisnički rječnik"</string>
+    <string name="user_dict_single_settings_title" msgid="5454855286173849284">"Korisnički rječnik"</string>
+    <string name="user_dict_multiple_settings_title" msgid="326583195525296750">"Upravljanje korisničkim rječnicima"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Dodaj"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Dodaj u rječnik"</string>
@@ -1029,6 +1051,7 @@
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Izbriši"</string>
     <string name="user_dict_settings_empty_text" product="tablet" msgid="1766522102636921529">"Nemate nijednu riječ u korisničkom rječniku. Riječ možete dodati dodirom na gumb Dodaj (+).."</string>
     <string name="user_dict_settings_empty_text" product="default" msgid="6209268025109242806">"Nemate nijednu riječ u korisničkom rječniku. Riječ možete dodati putem izbornika."</string>
+    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Svi jezici"</string>
     <string name="testing" msgid="6584352735303604146">"Testiranje"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Informacije o tabletnom uređaju"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Telefonske informacije"</string>
@@ -1100,6 +1123,8 @@
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"Tipka za uključivanje/isključivanje"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"Tipka za uključivanje/isključivanje/poziv"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"Tijekom poziva pritisnite Napajanje sa završetkom poziva umjesto isključivanja zaslona"</string>
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <skip />
     <string name="touchscreen_gestures_category" msgid="3109869155350859625">"Geste za dodirni zaslon"</string>
     <string name="long_press_timeout_selector_title" msgid="1396876537252863044">"Dodirnite i držite odgodu"</string>
     <string name="long_press_timeout_selector_summary" msgid="2261114502740278996">"Odgoda dok se dodir ne protumači kao dodir i držanje"</string>
@@ -1302,30 +1327,26 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(nepromijenjeno)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(nije postavljeno)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Pohrana vjerodajnica"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Korisnički sigurne vjerodajnice"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Aplikacijama omogući pristup sigurnim certifikatima i drugim vjerodajnicama"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Instaliraj iz memorije"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Instaliraj s kartice SD"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Instaliraj certifikate iz memorije"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Instaliraj certifikate s kartice SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Postavi zaporku"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Postavite ili promijenite zaporku za pohranu vjerodajnica"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Izbriši vjerodajnice"</string>
-    <string name="credentials_reset_summary" msgid="3810369467217453606">"Ukloni sav sadržaj i poništi zaporku"</string>
+    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3369361230171260282">"Isprazni cijeli sadržaj spremnika za vjerodajnice i poništi pripadajuće zaporke"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Unesite zaporku"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Unesite zaporku za pohranu vjerodajnica."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Postavite zaporku za pohranu vjerodajnica. Mora sadržavati najmanje 8 znakova."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Trenutačna zaporka:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Nova zaporka:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Potvrdite novu zaporku:"</string>
-    <string name="credentials_reset_hint" msgid="2336340927894094814">"Sav će sadržaj biti uklonjen, a zaporka će biti poništena. Jeste li sigurni?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Zaporke se ne podudaraju."</string>
+    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="1566409057833618877">"Jeste li sigurni da želite izbrisati sve vjerodajnice i poništiti zaporku za pohranjivanje vjerodajnica?"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Zaporka treba imati barem 8 znakova."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Pogrešna zaporka."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Pogrešna zaporka. Imate još jedan pokušaj prije brisanja pohrane vjerodajnica."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Pogrešna zaporka. Još imate ovoliko pokušaja prije brisanja pohrane vjerodajnica: <xliff:g id="NUMBER">%1$d</xliff:g>."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Pohrana vjerodajnica izbrisana je."</string>
+    <!-- no translation found for credentials_not_erased (397954733557821269) -->
+    <skip />
     <string name="credentials_enabled" msgid="7588607413349978930">"Pohranjivanje vjerodajnica je omogućeno."</string>
+    <!-- no translation found for credentials_configure_lock_screen_hint (6816970208840577219) -->
+    <skip />
     <string name="emergency_tone_title" msgid="1055954530111587114">"Ton hitnog poziva"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Postavite način ponašanja za hitan poziv"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"Privatnost"</string>
diff --git a/res/values-hu/arrays.xml b/res/values-hu/arrays.xml
index a00d7e7..c3fcae1 100644
--- a/res/values-hu/arrays.xml
+++ b/res/values-hu/arrays.xml
@@ -48,6 +48,16 @@
     <item msgid="2314124409517439288">"10 perc"</item>
     <item msgid="6864027152847611413">"30 perc"</item>
   </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="3149294732238283185">"Soha"</item>
+    <item msgid="2194151041885903260">"15 másodperc"</item>
+    <item msgid="5892295237131074341">"30 másodperc"</item>
+    <item msgid="3538441365970038213">"1 perc"</item>
+    <item msgid="412343871668955639">"2 perc"</item>
+    <item msgid="5076853889688991690">"5 perc"</item>
+    <item msgid="1903860996174927898">"10 perc"</item>
+    <item msgid="6415509612413178727">"30 perc"</item>
+  </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"azonnal"</item>
     <item msgid="6736512735606834431">"5 másodperc"</item>
@@ -59,6 +69,22 @@
     <item msgid="9002737361305019353">"10 perc"</item>
     <item msgid="4322676235684793329">"30 perc"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Nagyon kicsi"</item>
+    <item msgid="383133849547816572">"Extra kicsi"</item>
+    <item msgid="6490061470416867723">"Kicsi"</item>
+    <item msgid="3579015730662088893">"Normál"</item>
+    <item msgid="1678068858001018666">"Nagy"</item>
+    <item msgid="490158884605093126">"Extra nagy"</item>
+    <item msgid="2123802548987439763">"Nagyon nagy"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Nagyon lassú"</item>
     <item msgid="2361722960903353554">"Lassú"</item>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index a5deb79..c7efbb4 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -316,7 +316,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Numerikus PIN kell a képernyő feloldásához"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Jelszó"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Jelszó kell a képernyő feloldásához"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Rendszergazda vagy titkosítási irányelv letiltotta"</string>
+    <!-- outdated translation 5962903914511361952 -->     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"A távoli eszköz rendszergazdája kikapcsolta"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Ki"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7137296704741184239">"Nincs védelem"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Mintával biztosítva"</string>
@@ -460,6 +460,7 @@
     <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Adja meg, mikor kapcsolódjon le a Wi-Firől"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Probléma adódott a beállítás megváltoztatásakor"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Wi-Fi hálózat hozzáadása"</string>
+    <string name="wifi_add_network_summary" msgid="6345544206968025811">"Rejtett hálózat beállítása"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi hálózatok"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Keresés"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Speciális"</string>
@@ -598,7 +599,17 @@
     <string name="brightness_summary" msgid="838917350127550703">"A képernyő fényerejének beállítása"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Időtúllépés"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"A képernyő <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> után automatikusan kikapcsol"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android Álmok"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Képernyővédők és más tétlenségi időtöltések"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Kiválasztott álom"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Mikor kell aktiválni"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> tétlenség után"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Soha"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Próbálja ki!"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatikus fényerő"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Betűméret"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Betűtípusok általános mérete"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Betűméret kiválasztása"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM-kártya lezárási beállításai"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"SIM-kártya zárolásának beállítása"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM-kártya zárolása"</string>
@@ -644,7 +655,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"Saját telefonszámom"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"PRL verzió"</string>
-    <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
+    <string name="status_meid_number" msgid="2037549729230058915">"IMEI / MEID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"Mobilhálózat típusa"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Mobilhálózat állapota"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Szolgáltatás állapota"</string>
@@ -893,9 +904,12 @@
     <string name="install_unknown_applications" msgid="6612824788917283662">"Lehetővé teszi a nem a Marketről származó alkalmazások telepítését"</string>
     <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"Táblagépe és személyes adatai sebezhetőbbek az ismeretlen forrásból származó alkalmazásokkal szemben. Tudomásul veszi, hogy egyedül Ön felelős a táblagépében esett összes kárért és adatvesztésért, amelyek ezen alkalmazások használata miatt következnek be."</string>
     <string name="install_all_warning" product="default" msgid="1923717607319933741">"Telefonja és személyes adatai sebezhetőbbek az ismeretlen forrásból származó alkalmazások által végrehajtott támadásokkal szemben. Ön elfogadja azt, hogy kizárólag az Ön felelőssége a telefonban okozott minden olyan kár vagy adatvesztés, amely az ilyen alkalmazások használatából ered."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Speciális beállítások"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"További beállítások engedélyezése."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Alkalmazásadatok"</string>
     <string name="storage_label" msgid="8700867073480107253">"Tárhely"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Elindítás alapértelmezettként"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Képernyő-kompatibilitás"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Engedélyek"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Gyorsítótár"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"A gyorsítótár törlése"</string>
@@ -915,6 +929,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Ezt az alkalmazást választotta ki alapértelmezettként néhány művelethez."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Nincs beállítva alapértelmezettként."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Alapértelmezések törlése"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Ezt az alkalmazást nem biztos, hogy az Ön képernyőjére tervezték. Itt szabályozhatja az alkalmazás megjelenítését."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Kérdezzen rá elindításkor"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Alkalmazás átméretezése"</string>
     <string name="unknown" msgid="1592123443519355854">"Ismeretlen"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Rendezés név szerint"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Rendezés méret szerint"</string>
@@ -1019,8 +1036,13 @@
     <string name="show_password" msgid="2198798062604049206">"Látható jelszavak"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Jelszó megjelenítése gépeléskor"</string>
     <string name="ime_security_warning" msgid="812267421486877917">"Ez a beviteli módszer alkalmas lehet a beírt szövegek -- köztük az olyan személyes adatok, mint a jelszavak és a hitelkártyaszámok -- összegyűjtésére. A(z) <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g> alkalmazás kapcsolta be. Használja ezt a módszert?"</string>
+    <!-- no translation found for pointer_settings_category (6090176550039035130) -->
+    <skip />
+    <!-- no translation found for pointer_speed (1221342330217861616) -->
+    <skip />
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Felhasználói szótár"</string>
-    <string name="user_dict_settings_title" msgid="8357027437499042191">"Felhasználói szótár"</string>
+    <string name="user_dict_single_settings_title" msgid="5454855286173849284">"Felhasználói szótár"</string>
+    <string name="user_dict_multiple_settings_title" msgid="326583195525296750">"Felhasználói szótár kezelése"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Hozzáadás"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Hozzáadás a szótárhoz"</string>
@@ -1029,6 +1051,7 @@
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Törlés"</string>
     <string name="user_dict_settings_empty_text" product="tablet" msgid="1766522102636921529">"Nincsenek szavak a felhasználói szótárban. Új szavakat a Hozzáadás ( + ) gomb megérintésével vehet fel."</string>
     <string name="user_dict_settings_empty_text" product="default" msgid="6209268025109242806">"Nincsenek szavak a felhasználói szótárban. Új szavakat a menüből adhat hozzá."</string>
+    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Minden nyelv"</string>
     <string name="testing" msgid="6584352735303604146">"Tesztelés"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Táblagép adatai"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Telefon adatai"</string>
@@ -1100,6 +1123,8 @@
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"Bekapcsoló gomb"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"A bekapcsoló gomb megszakítja a hívást"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"Hívás során a Kikapcsoló gomb megnyomása a képernyő kikapcsolása helyett a hívásnak vet véget"</string>
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <skip />
     <string name="touchscreen_gestures_category" msgid="3109869155350859625">"Érintőképernyős kézmozdulatok"</string>
     <string name="long_press_timeout_selector_title" msgid="1396876537252863044">"Érintés és tartási késleltetés"</string>
     <string name="long_press_timeout_selector_summary" msgid="2261114502740278996">"A késleltetés, amivel egy érintés úgy kerül értelmezésre, mint egy érintés és tartás"</string>
@@ -1302,30 +1327,26 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(nem változott)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(nincs beállítva)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Hitelesítési adatok tárolója"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Biztonságos hitelesítő adatok használata"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Az alkalmazások hozzáférhetnek a biztonsági tanúsítványokhoz és más hitelesítési adatokhoz"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Telepítés tárhelyről"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Telepítés az SD-kártyáról"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Tanúsítványok telepítése tárhelyről"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Tanúsítványok telepítése az SD-kártyáról"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Jelszó beállítása"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"A hitelesítési adatok tárolója jelszavának beállítása vagy cseréje"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Hitelesítési adatok törlése"</string>
-    <string name="credentials_reset_summary" msgid="3810369467217453606">"Minden tartalom törlése és a jelszó visszaállítása"</string>
+    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3369361230171260282">"A hitelesítési adatok tárolója teljes tartalmának kiürítése és jelszavának visszaállítása"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Jelszó megadása"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Adja meg a hitelesítési adatok tárolójának jelszavát."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Állítsa be a hitelesítési adatok tárolójának jelszavát. Legalább 8 karakter hosszúnak kell lennie."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Jelenlegi jelszó:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Új jelszó:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Új jelszó megerősítése"</string>
-    <string name="credentials_reset_hint" msgid="2336340927894094814">"Minden tartalom eltávolításra kerül, és a jelszó visszaáll. Biztos benne?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"A jelszavak nem egyeznek."</string>
+    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="1566409057833618877">"Biztosan törli az összes hitelesítési adatot és visszaállítja a hitelesítési adatok tárolójának jelszavát?"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"A jelszónak legalább 8 karakter hosszúnak kell lennie."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Helytelen jelszó."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Helytelen jelszó. Már csak egy lehetősége van, mielőtt a hitelesítési adatok tárolója törlődik."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Helytelen jelszó. <xliff:g id="NUMBER">%1$d</xliff:g> további lehetősége van, mielőtt a hitelesítési adatok tárolóját töröljük."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Hit. adatok tárolója üres."</string>
+    <!-- no translation found for credentials_not_erased (397954733557821269) -->
+    <skip />
     <string name="credentials_enabled" msgid="7588607413349978930">"A hitelesítési adatok tárolója engedélyezve van."</string>
+    <!-- no translation found for credentials_configure_lock_screen_hint (6816970208840577219) -->
+    <skip />
     <string name="emergency_tone_title" msgid="1055954530111587114">"Segélyhívás hangja"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Viselkedés beállítása segélyhívás kezdeményezésekor"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"Adatvédelem"</string>
diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
index c29d7f8..673e8c4 100644
--- a/res/values-in/arrays.xml
+++ b/res/values-in/arrays.xml
@@ -48,6 +48,16 @@
     <item msgid="2314124409517439288">"10 menit"</item>
     <item msgid="6864027152847611413">"30 menit"</item>
   </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="3149294732238283185">"Tidak pernah"</item>
+    <item msgid="2194151041885903260">"15 detik"</item>
+    <item msgid="5892295237131074341">"30 detik"</item>
+    <item msgid="3538441365970038213">"1 menit"</item>
+    <item msgid="412343871668955639">"2 menit"</item>
+    <item msgid="5076853889688991690">"5 menit"</item>
+    <item msgid="1903860996174927898">"10 menit"</item>
+    <item msgid="6415509612413178727">"30 menit"</item>
+  </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"segera"</item>
     <item msgid="6736512735606834431">"5 detik"</item>
@@ -59,6 +69,22 @@
     <item msgid="9002737361305019353">"10 menit"</item>
     <item msgid="4322676235684793329">"30 menit"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Amat Sangat Kecil"</item>
+    <item msgid="383133849547816572">"Ekstra Kecil"</item>
+    <item msgid="6490061470416867723">"Kecil"</item>
+    <item msgid="3579015730662088893">"Normal"</item>
+    <item msgid="1678068858001018666">"Besar"</item>
+    <item msgid="490158884605093126">"Ekstra Besar"</item>
+    <item msgid="2123802548987439763">"Amat Sangat Besar"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Sangat lambat"</item>
     <item msgid="2361722960903353554">"Lambat"</item>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 19bcd04..9511674 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -316,7 +316,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Perlu PIN numerik untuk membuka kunci layar"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Sandi"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Membutuhkan sandi untuk membuka kunci layar"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Dinonaktifkan oleh administrator atau kebijakan enkripsi"</string>
+    <!-- outdated translation 5962903914511361952 -->     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Dinonaktifkan oleh administrator perangkat jarak jauh"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Mati"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7137296704741184239">"Tanpa pengamanan"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Diamankan dengan pola"</string>
@@ -460,6 +460,7 @@
     <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Tentukan saat untuk memutus sambungan Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Ada masalah saat mengubah setelan"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Tambahkan jaringan Wi-Fi"</string>
+    <string name="wifi_add_network_summary" msgid="6345544206968025811">"Konfigurasikan jaringan non-siaran"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Jaringan Wi-Fi"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Pindai"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Lanjutan"</string>
@@ -598,7 +599,17 @@
     <string name="brightness_summary" msgid="838917350127550703">"Sesuaikan kecerahan layar"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Waktu tunggu"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Layar mati secara otomatis setelah <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android Dreams"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Tirai layar dan pengalihan menganggur lainnya"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Dream terpilih"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Waktu mengaktifkan"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"Setelah menganggur selama <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Tidak pernah"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Cobalah!"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Kecerahan otomatis"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Ukuran fon"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Ukuran fon keseluruhan"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Pilih ukuran fon"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Setelan kunci kartu SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Siapkan kunci kartu SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Kunci kartu SIM"</string>
@@ -644,7 +655,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"Nomor teleponku"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MENIT"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"Versi PRL"</string>
-    <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
+    <string name="status_meid_number" msgid="2037549729230058915">"IMEI / MEID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"Jenis jaringan seluler"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Kondisi jaringan seluler"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Status layanan"</string>
@@ -893,9 +904,12 @@
     <string name="install_unknown_applications" msgid="6612824788917283662">"Izinkan pemasangan aplikasi non-Market"</string>
     <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"Tablet dan data pribadi Anda lebih rentan terhadap serangan oleh aplikasi dari sumber yang tidak diketahui. Anda setuju untuk bertanggung jawab penuh atas segala kerusakan pada tablet Anda atau kehilangan data yang diakibatkan dari penggunaan aplikasi ini."</string>
     <string name="install_all_warning" product="default" msgid="1923717607319933741">"Ponsel dan data pribadi lebih rentan terhadap serangan oleh aplikasi dari sumber yang tidak diketahui. Anda setuju bahwa Anda sepenuhnya bertanggung jawab atas kerusakan apa pun pada ponsel atau kehilangan data yang mungkin terjadi karena menggunakan aplikasi ini."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Setelan lanjutan"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Aktifkan opsi setelan lainnya."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Info aplikasi"</string>
     <string name="storage_label" msgid="8700867073480107253">"Penyimpanan"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Luncurkan secara bawaan"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Kompatibilitas layar"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Izin"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Tembolok"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Hapus tembolok"</string>
@@ -915,6 +929,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Anda telah memilih meluncurkan aplikasi ini secara bawaan untuk beberapa tindakan."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Tidak ada setelan bawaan."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Hapus bawaan"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Aplikasi ini mungkin tidak didesain untuk layar Anda; Anda dapat mengontrol penyesuaiannya untuk layar di sini."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Tanyakan saat diluncurkan"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Atur skala aplikasi"</string>
     <string name="unknown" msgid="1592123443519355854">"Tidak diketahui"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Sortir menurut nama"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Sortir berdasarkan ukuran"</string>
@@ -1019,8 +1036,13 @@
     <string name="show_password" msgid="2198798062604049206">"Sandi yang tampak"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Tampilkan sandi ketika Anda mengetik"</string>
     <string name="ime_security_warning" msgid="812267421486877917">"Metode masukan ini mungkin dapat mengumpulkan semua teks yang Anda ketikkan, termasuk di antaranya data pribadi seperti sandi dan nomor kartu kredit. Berasal dari <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g> aplikasi. Gunakan metode masukan ini?"</string>
+    <!-- no translation found for pointer_settings_category (6090176550039035130) -->
+    <skip />
+    <!-- no translation found for pointer_speed (1221342330217861616) -->
+    <skip />
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Kamus pengguna"</string>
-    <string name="user_dict_settings_title" msgid="8357027437499042191">"Kamus pengguna"</string>
+    <string name="user_dict_single_settings_title" msgid="5454855286173849284">"Kamus pengguna"</string>
+    <string name="user_dict_multiple_settings_title" msgid="326583195525296750">"Kelola kamus pengguna"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Tambahkan"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Tambahkan ke kamus"</string>
@@ -1029,6 +1051,7 @@
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Hapus"</string>
     <string name="user_dict_settings_empty_text" product="tablet" msgid="1766522102636921529">"Anda tidak menyimpan satu kata pun dalam kamus. Anda dapat menambahkan kata dengan menyentuh tombol Tambahkan ( + )."</string>
     <string name="user_dict_settings_empty_text" product="default" msgid="6209268025109242806">"Anda tidak memiliki kata apa pun dalam kamus. Anda dapat menambahkan kata tertentu melalui menu."</string>
+    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Semua bahasa"</string>
     <string name="testing" msgid="6584352735303604146">"Menguji"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Informasi tablet"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Informasi telepon"</string>
@@ -1100,6 +1123,8 @@
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"Tombol daya"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"Tombol daya mengakhiri panggilan"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"Selama panggilan, menekan tombol daya mengakhiri panggilan dan bukan mematikan layar"</string>
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <skip />
     <string name="touchscreen_gestures_category" msgid="3109869155350859625">"Gestur layar sentuh"</string>
     <string name="long_press_timeout_selector_title" msgid="1396876537252863044">"Tundaan sentuh &amp; tahan"</string>
     <string name="long_press_timeout_selector_summary" msgid="2261114502740278996">"Tunda hingga sentuhan ditafsirkan sebagai sentuh &amp; tahan"</string>
@@ -1302,30 +1327,26 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(tidak diubah)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(tidak disetel)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Penyimpanan kredensial"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Gunakan kredensial aman"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Izinkan aplikasi mengakses sertifikat aman dan kredensial lainnya"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Pasang dari penyimpanan"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Pasang dari kartu SD"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Pasang sertifikat dari penyimpanan"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Pasang sertifikat dari kartu SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Setel sandi"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Setel atau ubah sandi untuk penyimpanan kredensial"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Hapus kredensial"</string>
-    <string name="credentials_reset_summary" msgid="3810369467217453606">"Hapus semua konten dan setel ulang sandi"</string>
+    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3369361230171260282">"Hapus penyimpanan kredensial dari semua konten dan setel ulang sandinya"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Masukkan sandi"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Masukkan sandi untuk penyimpanan kredensial."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Setel sandi untuk penyimpanan kredensial. Gunakan setidaknya 8 karakter."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Sandi saat ini:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Sandi baru:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Konfirmasi sandi baru:"</string>
-    <string name="credentials_reset_hint" msgid="2336340927894094814">"Semua konten akan dihapus dan sandi akan disetel ulang. Yakin dengan hal ini?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Sandi tidak cocok."</string>
+    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="1566409057833618877">"Apakah Anda ingin menghapus semua kredensial dan menyetel ulang sandi penyimpanan kredensial?"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Sandi minimal terdiri dari 8 karakter."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Sandi salah."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Sandi salah. Anda memiliki satu kesempatan lagi sebelum penyimpanan kredensial dihapus."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Sandi salah. Anda memiliki <xliff:g id="NUMBER">%1$d</xliff:g> kesempatan lagi sebelum penyimpanan kredensial dihapus."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Penyimpanan kredensial dihapus."</string>
+    <!-- no translation found for credentials_not_erased (397954733557821269) -->
+    <skip />
     <string name="credentials_enabled" msgid="7588607413349978930">"Penyimpanan kredensial diaktifkan."</string>
+    <!-- no translation found for credentials_configure_lock_screen_hint (6816970208840577219) -->
+    <skip />
     <string name="emergency_tone_title" msgid="1055954530111587114">"Nada darurat"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Setel perilaku ketika panggilan darurat dilakukan"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"Privasi"</string>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index ecef4cf..22ff91e 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -48,6 +48,16 @@
     <item msgid="2314124409517439288">"10 minuti"</item>
     <item msgid="6864027152847611413">"30 minuti"</item>
   </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="3149294732238283185">"Mai"</item>
+    <item msgid="2194151041885903260">"15 secondi"</item>
+    <item msgid="5892295237131074341">"30 secondi"</item>
+    <item msgid="3538441365970038213">"1 minuto"</item>
+    <item msgid="412343871668955639">"2 minuti"</item>
+    <item msgid="5076853889688991690">"5 minuti"</item>
+    <item msgid="1903860996174927898">"10 minuti"</item>
+    <item msgid="6415509612413178727">"30 minuti"</item>
+  </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"immediatamente"</item>
     <item msgid="6736512735606834431">"5 secondi"</item>
@@ -59,6 +69,22 @@
     <item msgid="9002737361305019353">"10 minuti"</item>
     <item msgid="4322676235684793329">"30 minuti"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Estremamente piccole"</item>
+    <item msgid="383133849547816572">"Molto piccole"</item>
+    <item msgid="6490061470416867723">"Piccole"</item>
+    <item msgid="3579015730662088893">"Normali"</item>
+    <item msgid="1678068858001018666">"Grandi"</item>
+    <item msgid="490158884605093126">"Molto grandi"</item>
+    <item msgid="2123802548987439763">"Estremamente grandi"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Molto lenta"</item>
     <item msgid="2361722960903353554">"Lenta"</item>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index a5e5b35..eff2cb0 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -316,7 +316,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Richiedi PIN numerico per sbloccare lo schermo"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Password"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Richiedi password per sbloccare lo schermo"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Disattivata da ammin. o da norma di crittografia"</string>
+    <!-- outdated translation 5962903914511361952 -->     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Disabilitata da amministratore dispositivo remoto"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Off"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7137296704741184239">"Nessuna protezione"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Protetto con sequenza"</string>
@@ -460,6 +460,7 @@
     <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Specifica quando eseguire la disconnessione dalla rete Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Si è verificato un problema durante la modifica dell\'impostazione"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Aggiungi rete Wi-Fi"</string>
+    <string name="wifi_add_network_summary" msgid="6345544206968025811">"Configura una rete non-broadcast"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Reti Wi-Fi"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Scansione"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avanzate"</string>
@@ -598,7 +599,17 @@
     <string name="brightness_summary" msgid="838917350127550703">"Regola la luminosità dello schermo"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Timeout"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Lo schermo si spegne automaticamente dopo <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android Dreams"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Screen saver e altri diversivi inattività"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Sogno selezionato"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Quando attivare"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"Dopo <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> di inattività"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Mai"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Provalo."</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Luminosità automatica"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Dimensioni carattere"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Dimensioni complessive dei caratteri"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Seleziona dimensioni carattere"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Impostazioni blocco SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Impostazioni blocco SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Blocco della SIM"</string>
@@ -644,7 +655,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"Il mio numero di telefono"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"Versione PRL"</string>
-    <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
+    <string name="status_meid_number" msgid="2037549729230058915">"IMEI/MEID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"Tipo di rete cellulare"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Stato rete cellulare"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Stato servizio"</string>
@@ -893,9 +904,12 @@
     <string name="install_unknown_applications" msgid="6612824788917283662">"Consenti l\'installazione di applicazioni non presenti in Market"</string>
     <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"Il tablet e i dati personali sono più vulnerabili agli attacchi da parte di applicazioni di origini sconosciute. L\'utente accetta di essere il solo responsabile degli eventuali danni al tablet o della perdita dei dati che potrebbero derivare dall\'utilizzo di queste applicazioni."</string>
     <string name="install_all_warning" product="default" msgid="1923717607319933741">"Il telefono e i dati personali sono più vulnerabili agli attacchi da parte di applicazioni di origini sconosciute. L\'utente accetta di essere il solo responsabile degli eventuali danni al telefono o della perdita dei dati che potrebbero derivare dall\'utilizzo di queste applicazioni."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Impostazioni avanzate"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Abilita altre opzioni."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Info applicazione"</string>
     <string name="storage_label" msgid="8700867073480107253">"Archiviazione"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Avvia per impostazione predefinita"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Compatibilità schermo"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Autorizzazioni"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Cache"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Cancella cache"</string>
@@ -915,6 +929,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Hai scelto di avviare per impostazione predefinita questa applicazione per alcune azioni."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Nessuna applicazione predefinita impostata."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Cancella predefinite"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Questa applicazione potrebbe non essere stata ideata per il tuo schermo; puoi stabilire come adattarla al tuo schermo qui."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Chiedi all\'avvio"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Scala applicazione"</string>
     <string name="unknown" msgid="1592123443519355854">"Sconosciuta"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Ordina per nome"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Ordina per dimensioni"</string>
@@ -1019,8 +1036,13 @@
     <string name="show_password" msgid="2198798062604049206">"Password visibili"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Mostra la password durante la digitazione"</string>
     <string name="ime_security_warning" msgid="812267421486877917">"Questo metodo di inserimento potrebbe riuscire a raccogliere tutto il testo digitato, compresi i dati personali come password e numeri di carte di credito. Deriva dall\'applicazione <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Utilizzare questo metodo di inserimento?"</string>
+    <!-- no translation found for pointer_settings_category (6090176550039035130) -->
+    <skip />
+    <!-- no translation found for pointer_speed (1221342330217861616) -->
+    <skip />
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Dizionario utente"</string>
-    <string name="user_dict_settings_title" msgid="8357027437499042191">"Dizionario utente"</string>
+    <string name="user_dict_single_settings_title" msgid="5454855286173849284">"Dizionario utente"</string>
+    <string name="user_dict_multiple_settings_title" msgid="326583195525296750">"Gestisci i dizionari utente"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Aggiungi"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Aggiungi al dizionario"</string>
@@ -1029,6 +1051,7 @@
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Elimina"</string>
     <string name="user_dict_settings_empty_text" product="tablet" msgid="1766522102636921529">"Non sono presenti parole nel dizionario utente. Puoi aggiungere una parola toccando il pulsante Aggiungi (+)."</string>
     <string name="user_dict_settings_empty_text" product="default" msgid="6209268025109242806">"Non sono presenti parole nel dizionario utente. Puoi aggiungere una parola mediante il menu."</string>
+    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Tutte le lingue"</string>
     <string name="testing" msgid="6584352735303604146">"Verifica in corso"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Informazioni sul tablet"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Informazioni telefono"</string>
@@ -1100,6 +1123,8 @@
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"Pulsante di accensione"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"Termina chiamata"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"Durante una chiamata, la pressione del pulsante di accensione termina la chiamata invece di spegnere lo schermo"</string>
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <skip />
     <string name="touchscreen_gestures_category" msgid="3109869155350859625">"Gesti touchscreen"</string>
     <string name="long_press_timeout_selector_title" msgid="1396876537252863044">"Ritardo tocco e pressione prolungata"</string>
     <string name="long_press_timeout_selector_summary" msgid="2261114502740278996">"Ritardo per interpretare il tocco come tocco e pressione prolungata"</string>
@@ -1302,30 +1327,26 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(invariato)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(non impostato)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Archivio credenziali"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Usa credenziali protez."</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Consenti accesso applicazioni a certificati protezione e altre credenziali"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Installa da archivio"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Installa da scheda SD"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Installa certificati da archivio"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Installa certificati da scheda SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Imposta password"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Imposta o modifica la password dell\'archivio credenziali"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Cancella credenziali"</string>
-    <string name="credentials_reset_summary" msgid="3810369467217453606">"Rimuovi tutti i contenuti e reimposta la password"</string>
+    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3369361230171260282">"Cancella tutti i contenuti dall\'archivio di credenziali e reimposta la relativa password"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Inserisci password"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Inserisci la password per l\'archivio credenziali."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Imposta la password per l\'archivio credenziali. Deve essere formata da almeno 8 caratteri."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Password attuale:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Nuova password:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Conferma nuova password:"</string>
-    <string name="credentials_reset_hint" msgid="2336340927894094814">"Tutti i contenuti verranno rimossi e la password reimpostata. Procedere?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Le password non corrispondono."</string>
+    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="1566409057833618877">"Eliminare tutte le credenziali e reimpostare la password dell\'archivio di credenziali?"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"La password deve essere formata da almeno 8 caratteri."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Password errata."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Password non corretta. Hai un\'altra possibilità prima che l\'archivio credenziali venga cancellato."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Password non corretta. Hai altre <xliff:g id="NUMBER">%1$d</xliff:g> possibilità prima che l\'archivio credenziali venga cancellato."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Archivio credenziali cancellato"</string>
+    <!-- no translation found for credentials_not_erased (397954733557821269) -->
+    <skip />
     <string name="credentials_enabled" msgid="7588607413349978930">"L\'archivio di credenziali è attivo."</string>
+    <!-- no translation found for credentials_configure_lock_screen_hint (6816970208840577219) -->
+    <skip />
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tono chiamate emergenza"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Imposta il comportamento in caso di chiamata di emergenza"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"Privacy"</string>
diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml
index e58814e..9cf4cbf 100644
--- a/res/values-iw/arrays.xml
+++ b/res/values-iw/arrays.xml
@@ -48,6 +48,16 @@
     <item msgid="2314124409517439288">"10 דקות"</item>
     <item msgid="6864027152847611413">"30 דקות"</item>
   </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="3149294732238283185">"לעולם לא"</item>
+    <item msgid="2194151041885903260">"15 שניות"</item>
+    <item msgid="5892295237131074341">"30 שניות"</item>
+    <item msgid="3538441365970038213">"דקה אחת"</item>
+    <item msgid="412343871668955639">"2 דקות"</item>
+    <item msgid="5076853889688991690">"5 דקות"</item>
+    <item msgid="1903860996174927898">"10 דקות"</item>
+    <item msgid="6415509612413178727">"30 דקות"</item>
+  </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"מיד"</item>
     <item msgid="6736512735606834431">"5 שניות"</item>
@@ -59,6 +69,22 @@
     <item msgid="9002737361305019353">"10 דקות"</item>
     <item msgid="4322676235684793329">"30 דקות"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"קטן מאוד"</item>
+    <item msgid="383133849547816572">"קטן במיוחד"</item>
+    <item msgid="6490061470416867723">"קטן"</item>
+    <item msgid="3579015730662088893">"רגיל"</item>
+    <item msgid="1678068858001018666">"גדול"</item>
+    <item msgid="490158884605093126">"גדול במיוחד"</item>
+    <item msgid="2123802548987439763">"גדול מאוד"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"איטי מאוד"</item>
     <item msgid="2361722960903353554">"לאט"</item>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 9cdf28f..bff65ea 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -316,7 +316,7 @@
     <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_disabled_summary" msgid="8563103042330816018">"מושבת על ידי מנהל המערכת או מדיניות ההצפנה"</string>
+    <!-- outdated translation 5962903914511361952 -->     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"הושבת על ידי מנהל התקן מרוחק"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"כבוי"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7137296704741184239">"אין אבטחה"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"מאובטח עם קו"</string>
@@ -460,6 +460,7 @@
     <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"ציין מתי להתנתק מה-Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"אירעה בעיה בשינוי ההגדרה"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"הוסף רשת Wi-Fi"</string>
+    <string name="wifi_add_network_summary" msgid="6345544206968025811">"הגדר רשת שאינה של שידור"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"רשתות Wi-Fi"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"סרוק"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"מתקדם"</string>
@@ -598,7 +599,17 @@
     <string name="brightness_summary" msgid="838917350127550703">"התאמת בהירות המסך"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"זמן קצוב לתפוגה"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"המסך נכבה אוטומטית לאחר <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android Dreams"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"שומרי מסך והסחות חוסר פעילות אחרות"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"חלום נבחר"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"מתי להפעיל"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"לאחר חוסר פעילות של <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"לעולם לא"</string>
+    <string name="dream_test" msgid="5968002644622194481">"נסה זאת!"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"בהירות אוטומטית"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"גודל גופן"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"גודל כולל של גופנים"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"בחר גודל גופן"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"הגדרות נעילת כרטיס SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"הגדרת נעילת כרטיס SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"נעילת כרטיס SIM"</string>
@@ -644,7 +655,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"מספר הטלפון שלי"</string>
     <string name="status_min_number" msgid="3519504522179420597">"דקות"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"גרסת PRL"</string>
-    <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
+    <string name="status_meid_number" msgid="2037549729230058915">"IMEI / MEID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"סוג רשת להתקנים ניידים"</string>
     <string name="status_data_state" msgid="5503181397066522950">"מצב רשת להתקנים ניידים"</string>
     <string name="status_service_state" msgid="2323931627519429503">"מצב שירות"</string>
@@ -893,9 +904,12 @@
     <string name="install_unknown_applications" msgid="6612824788917283662">"אפשר התקנה של יישומים שאינם מ\'חנות Android\'"</string>
     <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"הטבלט והנתונים האישיים פגיעים יותר למתקפות של יישומים ממקורות לא ידועים. אתה מסכים שאתה האחראי הבלעדי על נזק לטבלט או לאובדן נתונים שעלולים לקרות עקב השימוש ביישומים אלה."</string>
     <string name="install_all_warning" product="default" msgid="1923717607319933741">"הטלפון והנתונים האישיים שלך חשופים יותר למתקפה של יישומים ממקורות לא ידועים. אתה מסכים שאתה האחראי הבלעדי לנזק שייגרם לטלפון או לאובדן נתונים שעלול לקרות עקב השימוש ביישומים אלה."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"הגדרות מתקדמות"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"הפוך עוד אפשרויות הגדרה לפעילות."</string>
     <string name="application_info_label" msgid="1150486628158409543">"מידע על היישום"</string>
     <string name="storage_label" msgid="8700867073480107253">"אחסון"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"הפעל כברירת מחדל"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"תאימות מסך"</string>
     <string name="permissions_label" msgid="2605296874922726203">"אישורים"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"קובץ שמור"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"נקה קובץ שמור"</string>
@@ -915,6 +929,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"בחרת להפעיל יישום זה כברירת מחדל עבור פעולות מסוימות."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"לא הוגדרו ברירות מחדל."</string>
     <string name="clear_activities" msgid="7408923511535174430">"נקה ברירות מחדל"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"ייתכן שיישום זה אינו מיועד למסך שלך; תוכל לשלוט באופן שהוא מתאים למסך שלך כאן."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"שאל בעת ההשקה"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"יישום קנה מידה"</string>
     <string name="unknown" msgid="1592123443519355854">"לא ידוע"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"מיין לפי שם"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"מיין לפי גודל"</string>
@@ -1019,8 +1036,13 @@
     <string name="show_password" msgid="2198798062604049206">"סיסמאות נראות"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"הצגת סיסמה בעת ההקלדה"</string>
     <string name="ime_security_warning" msgid="812267421486877917">"ייתכן ששיטת קלט זו תוכל לאסוף את כל הטקסט שתקליד, כולל נתונים אישיים כגון סיסמאות ומספרי כרטיס אשראי. היא מגיעה מהיישום <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. האם להשתמש בשיטת קלט זו?"</string>
+    <!-- no translation found for pointer_settings_category (6090176550039035130) -->
+    <skip />
+    <!-- no translation found for pointer_speed (1221342330217861616) -->
+    <skip />
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"מילון משתמש"</string>
-    <string name="user_dict_settings_title" msgid="8357027437499042191">"מילון משתמש"</string>
+    <string name="user_dict_single_settings_title" msgid="5454855286173849284">"מילון משתמש"</string>
+    <string name="user_dict_multiple_settings_title" msgid="326583195525296750">"ניהול מילוני משתמש"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"הוסף"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"הוסף למילון"</string>
@@ -1029,6 +1051,7 @@
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"מחק"</string>
     <string name="user_dict_settings_empty_text" product="tablet" msgid="1766522102636921529">"אין לך מילים במילון המשתמש. תוכל להוסיף מילה על ידי נגיעה בלחצן \'הוסף\' (+)."</string>
     <string name="user_dict_settings_empty_text" product="default" msgid="6209268025109242806">"אין לך מילים במילון המשתמש. תוכל להוסיף מילה באמצעות התפריט."</string>
+    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"כל השפות"</string>
     <string name="testing" msgid="6584352735303604146">"בדיקה"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"פרטי טבלט"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"מידע על הטלפון"</string>
@@ -1100,6 +1123,8 @@
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"לחצן הפעלה"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"לחצן ההפעלה מסיים את השיחה"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"במהלך שיחה, לחיצה על לחצן ההפעלה תסיים את השיחה במקום לכבות את המסך"</string>
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <skip />
     <string name="touchscreen_gestures_category" msgid="3109869155350859625">"מחוות של מסך מגע"</string>
     <string name="long_press_timeout_selector_title" msgid="1396876537252863044">"עיכוב של \'גע והחזק\'"</string>
     <string name="long_press_timeout_selector_summary" msgid="2261114502740278996">"עיכוב עד שנגיעה תזוהה כפעולת \'גע והחזק\'"</string>
@@ -1302,30 +1327,26 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(ללא שינוי)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(לא הוגדר)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"אחסון אישורים"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"שימוש באישורים מאובטחים"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"אפשר ליישומים לגשת לאישורים מאובטחים ואישורים אחרים"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"התקן מאמצעי אחסון"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"התקן מכרטיס SD"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"התקן אישורים מאמצעי אחסון"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"התקן אישורים מכרטיס SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"הגדרת סיסמה"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"הגדר או שנה את הסיסמה עבור אחסון האישורים"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"נקה אישורים"</string>
-    <string name="credentials_reset_summary" msgid="3810369467217453606">"הסר את כל התוכן ואפס את הסיסמה"</string>
+    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3369361230171260282">"ניקוי אחסון אישורים מכל התוכן ואיפוס הסיסמה"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"הזן סיסמה"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"הזן את הסיסמה עבור אחסון האישורים."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"הגדר את הסיסמה עבור אחסון האישורים. הסיסמה חייבת להכיל לפחות 8 תווים."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"הסיסמה הנוכחית:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"סיסמה חדשה:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"אשר את הסיסמה החדשה:"</string>
-    <string name="credentials_reset_hint" msgid="2336340927894094814">"כל התוכן יימחק והסיסמה תתאפס. האם אתה בטוח לגבי פעולה זו?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"הסיסמאות לא תואמות."</string>
+    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="1566409057833618877">"האם אתה בטוח שברצונך למחוק את כל האישורים ולאפס את סיסמת אחסון האישורים?"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"אורך הסיסמה חייב להיות 8 תווים לפחות."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"סיסמה שגויה."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"סיסמה שגויה. יש לך עוד ניסיון אחד לפני שאחסון האישורים יימחק."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"סיסמה שגויה. יש לך <xliff:g id="NUMBER">%1$d</xliff:g> ניסיונות נוספים לפני שאחסון האישורים יימחק."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"אחסון האישורים נמחק."</string>
+    <!-- no translation found for credentials_not_erased (397954733557821269) -->
+    <skip />
     <string name="credentials_enabled" msgid="7588607413349978930">"אחסון האישורים מופעל."</string>
+    <!-- no translation found for credentials_configure_lock_screen_hint (6816970208840577219) -->
+    <skip />
     <string name="emergency_tone_title" msgid="1055954530111587114">"צליל חירום"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"הגדר אופן פעולה בעת ביצוע שיחת חירום"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"פרטיות"</string>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index f31dad3..bbd4068 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -48,6 +48,16 @@
     <item msgid="2314124409517439288">"10分"</item>
     <item msgid="6864027152847611413">"30分"</item>
   </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="3149294732238283185">"起動しない"</item>
+    <item msgid="2194151041885903260">"15秒"</item>
+    <item msgid="5892295237131074341">"30秒"</item>
+    <item msgid="3538441365970038213">"1分"</item>
+    <item msgid="412343871668955639">"2分"</item>
+    <item msgid="5076853889688991690">"5分"</item>
+    <item msgid="1903860996174927898">"10分"</item>
+    <item msgid="6415509612413178727">"30分"</item>
+  </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"すぐ"</item>
     <item msgid="6736512735606834431">"5秒"</item>
@@ -59,6 +69,22 @@
     <item msgid="9002737361305019353">"10分"</item>
     <item msgid="4322676235684793329">"30分"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"極小"</item>
+    <item msgid="383133849547816572">"特小"</item>
+    <item msgid="6490061470416867723">"小"</item>
+    <item msgid="3579015730662088893">"中"</item>
+    <item msgid="1678068858001018666">"大"</item>
+    <item msgid="490158884605093126">"特大"</item>
+    <item msgid="2123802548987439763">"極大"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"非常に遅い"</item>
     <item msgid="2361722960903353554">"遅い"</item>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 93cde19..8bc4243 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -316,7 +316,7 @@
     <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_disabled_summary" msgid="8563103042330816018">"管理者または暗号化ポリシーにより無効化"</string>
+    <!-- outdated translation 5962903914511361952 -->     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"リモートの端末管理者が無効にしました"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"OFF"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7137296704741184239">"セキュリティなし"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"パターンで保護されています"</string>
@@ -460,6 +460,7 @@
     <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Wi-Fiから切断するタイミングを指定する"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"設定の変更中に問題が発生しました"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Wi-Fiネットワークを追加"</string>
+    <string name="wifi_add_network_summary" msgid="6345544206968025811">"非ブロードキャストネットワークを設定する"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fiネットワーク"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"スキャン"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"詳細設定"</string>
@@ -598,7 +599,17 @@
     <string name="brightness_summary" msgid="838917350127550703">"画面の明るさを調整する"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"タイムアウト"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"画面を<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>後に自動的にOFFにする"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android Dreams"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"スクリーンセーバーとその他のアイドル状態ツール"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"選択されているスクリーンセーバー"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"起動のタイミング"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"アイドル状態が<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>続いた後"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"起動しない"</string>
+    <string name="dream_test" msgid="5968002644622194481">"再生してみる"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"明るさを自動調整"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"フォントサイズ"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"全体のフォントサイズ"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"フォントサイズの選択"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIMカードロック設定"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"SIMカードロック設定"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIMカードロック"</string>
@@ -644,7 +655,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"電話番号"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"PRLバージョン"</string>
-    <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
+    <string name="status_meid_number" msgid="2037549729230058915">"IMEI/MEID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"モバイルネットワークの種類"</string>
     <string name="status_data_state" msgid="5503181397066522950">"モバイルネットワークの状態"</string>
     <string name="status_service_state" msgid="2323931627519429503">"サービスの状態"</string>
@@ -893,9 +904,12 @@
     <string name="install_unknown_applications" msgid="6612824788917283662">"サードパーティアプリケーションのインストールを許可する"</string>
     <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"提供元不明のアプリケーションからタブレットや個人データが攻撃を受ける可能性が高くなります。このようなアプリケーションの使用により生じる可能性があるタブレットへの損害やデータの損失について、ユーザーご自身が単独で責任を負うことに同意するものとします。"</string>
     <string name="install_all_warning" product="default" msgid="1923717607319933741">"提供元不明のアプリケーションから携帯電話や個人情報データが攻撃を受ける可能性が高くなります。このようなアプリケーションの使用により生じうる携帯電話への損害やデータの損失について、お客様がすべての責任を負うことに同意するものとします。"</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"詳細設定"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"詳細設定オプションを有効にする"</string>
     <string name="application_info_label" msgid="1150486628158409543">"アプリケーション情報"</string>
     <string name="storage_label" msgid="8700867073480107253">"メモリ"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"デフォルトでの起動"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"画面の互換性"</string>
     <string name="permissions_label" msgid="2605296874922726203">"許可"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"キャッシュ"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"キャッシュを消去"</string>
@@ -915,6 +929,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"特定の操作で使用する既定アプリケーションとして設定されています。"</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"設定されていません。"</string>
     <string name="clear_activities" msgid="7408923511535174430">"設定を消去"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"このアプリケーションはお使いの画面用に設計されていない可能性があります。お使いの画面にどのように合わせるかをここで設定できます。"</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"起動時に確認する"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"アプリケーションを拡大/縮小"</string>
     <string name="unknown" msgid="1592123443519355854">"不明"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"名前順"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"サイズ順"</string>
@@ -1019,8 +1036,13 @@
     <string name="show_password" msgid="2198798062604049206">"パスワードを表示"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"パスワード入力時に文字を表示する"</string>
     <string name="ime_security_warning" msgid="812267421486877917">"この入力方法を選択すると、入力する全文字列の収集をアプリケーション（<xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>）に許可することになります。これにはパスワードやクレジットカード番号などの個人情報も含まれます。この入力方法を使用しますか？"</string>
+    <!-- no translation found for pointer_settings_category (6090176550039035130) -->
+    <skip />
+    <!-- no translation found for pointer_speed (1221342330217861616) -->
+    <skip />
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"単語リスト"</string>
-    <string name="user_dict_settings_title" msgid="8357027437499042191">"単語リスト"</string>
+    <string name="user_dict_single_settings_title" msgid="5454855286173849284">"単語リスト"</string>
+    <string name="user_dict_multiple_settings_title" msgid="326583195525296750">"単語リストの管理"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"追加"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"辞書に追加"</string>
@@ -1029,6 +1051,7 @@
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"削除"</string>
     <string name="user_dict_settings_empty_text" product="tablet" msgid="1766522102636921529">"単語リストに登録がありません。追加ボタン[+]をタップすると単語を追加できます。"</string>
     <string name="user_dict_settings_empty_text" product="default" msgid="6209268025109242806">"単語リストに登録がありません。MENUから単語を登録してください。"</string>
+    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"すべての言語"</string>
     <string name="testing" msgid="6584352735303604146">"テスト中"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"タブレット情報"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"携帯電話情報"</string>
@@ -1100,6 +1123,8 @@
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"電源ボタン"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"電源ボタンで通話を終了する"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"画面をOFFにするのではなく電源ボタンを押して通話を終了する"</string>
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <skip />
     <string name="touchscreen_gestures_category" msgid="3109869155350859625">"タッチスクリーンジェスチャー"</string>
     <string name="long_press_timeout_selector_title" msgid="1396876537252863044">"長押しの時間"</string>
     <string name="long_press_timeout_selector_summary" msgid="2261114502740278996">"タップして長押しと判断されるまでの時間"</string>
@@ -1302,30 +1327,26 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"（変更なし）"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"（未設定）"</string>
     <string name="credentials_title" msgid="4446234003860769883">"認証情報ストレージ"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"安全な認証情報の使用"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"安全な証明書と他の認証情報へのアクセスをアプリケーションに許可する"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"ストレージからのインストール"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"SDカードからインストール"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"ストレージから証明書をインストールする"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"証明書をSDカードからインストールする"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"パスワードの設定"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"認証ストレージのパスワードを設定または変更する"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"認証ストレージの消去"</string>
-    <string name="credentials_reset_summary" msgid="3810369467217453606">"すべてのコンテンツを削除してパスワードをリセットする"</string>
+    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3369361230171260282">"認証情報ストレージのすべてのコンテンツを消去してパスワードをリセットする"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"パスワードを入力する"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"認証ストレージのパスワードを入力してください。"</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"認証情報ストレージのパスワードを設定します。パスワードは8文字以上で指定します。"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"現在のパスワード:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"新しいパスワード:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"新しいパスワードの確認:"</string>
-    <string name="credentials_reset_hint" msgid="2336340927894094814">"コンテンツはすべて削除され、パスワードはリセットされます。操作を実行してもよろしいですか？"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"パスワードが一致しません。"</string>
+    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="1566409057833618877">"すべての認証情報を削除して認証情報ストレージパスワードをリセットしてもよろしいですか？"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"パスワードを8文字以上で入力してください。"</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"パスワードが正しくありません。"</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"パスワードが正しくありません。あと1回失敗すると、認証情報ストレージが消去されます。"</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"パスワードが正しくありません。あと<xliff:g id="NUMBER">%1$d</xliff:g>回失敗すると、認証情報ストレージが消去されます。"</string>
     <string name="credentials_erased" msgid="2907836028586342969">"認証情報ストレージを消去"</string>
+    <!-- no translation found for credentials_not_erased (397954733557821269) -->
+    <skip />
     <string name="credentials_enabled" msgid="7588607413349978930">"認証情報ストレージが有効になりました。"</string>
+    <!-- no translation found for credentials_configure_lock_screen_hint (6816970208840577219) -->
+    <skip />
     <string name="emergency_tone_title" msgid="1055954530111587114">"緊急時の音"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"緊急通報時の動作を設定します"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"バックアップと復元"</string>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index 664dd8c..932ecad 100644
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml
@@ -48,6 +48,16 @@
     <item msgid="2314124409517439288">"10분"</item>
     <item msgid="6864027152847611413">"30분"</item>
   </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="3149294732238283185">"사용 안함"</item>
+    <item msgid="2194151041885903260">"15초"</item>
+    <item msgid="5892295237131074341">"30초"</item>
+    <item msgid="3538441365970038213">"1분"</item>
+    <item msgid="412343871668955639">"2분"</item>
+    <item msgid="5076853889688991690">"5분"</item>
+    <item msgid="1903860996174927898">"10분"</item>
+    <item msgid="6415509612413178727">"30분"</item>
+  </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"즉시"</item>
     <item msgid="6736512735606834431">"5초"</item>
@@ -59,6 +69,22 @@
     <item msgid="9002737361305019353">"10분"</item>
     <item msgid="4322676235684793329">"30분"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"매우 작게"</item>
+    <item msgid="383133849547816572">"아주 작게"</item>
+    <item msgid="6490061470416867723">"작게"</item>
+    <item msgid="3579015730662088893">"보통"</item>
+    <item msgid="1678068858001018666">"크게"</item>
+    <item msgid="490158884605093126">"아주 크게"</item>
+    <item msgid="2123802548987439763">"매우 크게"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"매우 느림"</item>
     <item msgid="2361722960903353554">"느림"</item>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 13f0888..0dcbfb8 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -316,7 +316,7 @@
     <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_disabled_summary" msgid="8563103042330816018">"관리자 또는 암호화 정책에 따라 사용 중지됨"</string>
+    <!-- outdated translation 5962903914511361952 -->     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"원격 기기 관리자가 사용 중지함"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"사용 안함"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7137296704741184239">"보안 사용 안함"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"패턴으로 보안"</string>
@@ -460,6 +460,7 @@
     <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"언제 Wi-Fi 연결을 중단할지 설정"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"설정을 변경하는 중 문제가 발생했습니다."</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Wi-Fi 네트워크 추가"</string>
+    <string name="wifi_add_network_summary" msgid="6345544206968025811">"브로드캐스트 미지원 네트워크 구성"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi 네트워크"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"검색"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"고급"</string>
@@ -598,7 +599,17 @@
     <string name="brightness_summary" msgid="838917350127550703">"화면 밝기 조정"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"시간제한"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> 후에 화면이 자동으로 꺼짐"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android Dreams"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"화면 보호기 및 기타 유휴 상태 전환"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"선택한 드림"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"활성화 시기"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> 후 유휴 상태"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"사용 안함"</string>
+    <string name="dream_test" msgid="5968002644622194481">"직접 사용해 보세요!"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"자동 밝기"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"글꼴 크기"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"전체 글꼴 크기"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"글꼴 크기 선택"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM 카드 잠금 설정"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"SIM 카드 잠금 설정"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM 카드 잠금"</string>
@@ -644,7 +655,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"내 휴대전화 번호"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"PRL 버전"</string>
-    <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
+    <string name="status_meid_number" msgid="2037549729230058915">"IMEI/MEID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"모바일 네트워크 유형"</string>
     <string name="status_data_state" msgid="5503181397066522950">"모바일 네트워크 상태"</string>
     <string name="status_service_state" msgid="2323931627519429503">"서비스 상태"</string>
@@ -893,9 +904,12 @@
     <string name="install_unknown_applications" msgid="6612824788917283662">"마켓에 등록되지 않은 애플리케이션 설치 허용"</string>
     <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"태블릿 및 개인 정보는 출처를 알 수 없는 애플리케이션의 공격에 더욱 취약합니다. 사용자는 이러한 애플리케이션을 사용하여 발생할 수 있는 태블릿 손상이나 데이터 손실에 대해 사용자가 단독으로 책임이 있음을 동의합니다."</string>
     <string name="install_all_warning" product="default" msgid="1923717607319933741">"휴대전화 및 개인 정보는 출처를 알 수 없는 애플리케이션의 공격에 더욱 취약합니다. 사용자는 이러한 애플리케이션을 사용하여 발생할 수 있는 휴대전화 손상이나 데이터 손실에 대해 사용자가 단독으로 책임이 있음을 동의합니다."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"고급 설정"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"기타 설정 옵션을 사용하도록 설정합니다."</string>
     <string name="application_info_label" msgid="1150486628158409543">"애플리케이션 정보"</string>
     <string name="storage_label" msgid="8700867073480107253">"저장공간"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"기본으로 실행"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"화면 호환성"</string>
     <string name="permissions_label" msgid="2605296874922726203">"권한"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"캐시"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"캐시 지우기"</string>
@@ -915,6 +929,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"이 애플리케이션을 해당 작업에 대한 기본 프로그램으로 실행하도록 선택했습니다."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"기본값이 설정되지 않았습니다."</string>
     <string name="clear_activities" msgid="7408923511535174430">"기본 작업 지우기"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"이 애플리케이션은 사용 중인 화면에 맞게 개발되지 않았을 수 있습니다. 여기에서 애플리케이션이 화면에 조정되는 방식을 선택할 수 있습니다."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"설치 시 확인"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"애플리케이션 확장"</string>
     <string name="unknown" msgid="1592123443519355854">"알 수 없음"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"이름순 정렬"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"크기순 정렬"</string>
@@ -1019,8 +1036,13 @@
     <string name="show_password" msgid="2198798062604049206">"비밀번호 표시"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"입력 시 비밀번호 표시"</string>
     <string name="ime_security_warning" msgid="812267421486877917">"<xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g> 애플리케이션에서 지원하는 이 입력 방법을 사용하면 비밀번호 및 신용카드 번호와 같은 개인 정보를 비롯하여 입력한 모든 텍스트가 수집될 수 있습니다. 사용하시겠습니까?"</string>
+    <!-- no translation found for pointer_settings_category (6090176550039035130) -->
+    <skip />
+    <!-- no translation found for pointer_speed (1221342330217861616) -->
+    <skip />
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"사용자 사전"</string>
-    <string name="user_dict_settings_title" msgid="8357027437499042191">"사용자 사전"</string>
+    <string name="user_dict_single_settings_title" msgid="5454855286173849284">"사용자 사전"</string>
+    <string name="user_dict_multiple_settings_title" msgid="326583195525296750">"사용자 사전 관리"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"추가"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"사전에 추가"</string>
@@ -1029,6 +1051,7 @@
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"삭제"</string>
     <string name="user_dict_settings_empty_text" product="tablet" msgid="1766522102636921529">"사용자 사전에 단어가 없습니다. 추가( + ) 버튼을 터치하여 단어를 추가할 수 있습니다."</string>
     <string name="user_dict_settings_empty_text" product="default" msgid="6209268025109242806">"사용자 사전에 단어가 없습니다. 메뉴를 통해 단어를 추가할 수 있습니다."</string>
+    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"모든 언어"</string>
     <string name="testing" msgid="6584352735303604146">"테스트 중"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"태블릿 정보"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"휴대전화 정보"</string>
@@ -1100,6 +1123,8 @@
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"전원 버튼"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"전원 버튼으로 통화 종료"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"전화를 거는 동안 전원 버튼을 누르면 화면이 꺼지지 않고 통화가 종료"</string>
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <skip />
     <string name="touchscreen_gestures_category" msgid="3109869155350859625">"터치스크린 동작"</string>
     <string name="long_press_timeout_selector_title" msgid="1396876537252863044">"길게 누르기 지연"</string>
     <string name="long_press_timeout_selector_summary" msgid="2261114502740278996">"터치가 길게 누르기로 해석될 때까지 지연"</string>
@@ -1302,30 +1327,26 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(변경 안함)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(설정 안함)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"자격증명 저장소"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"보안 자격증명 사용"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"애플리케이션이 보안 인증서 및 다른 자격증명에 액세스하도록 허용"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"저장소에서 설치"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"SD 카드에서 설치"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"저장소에서 인증서 설치"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"SD 카드에서 인증서 설치"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"비밀번호 설정"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"자격증명 저장소에 대한 비밀번호 설정 또는 변경"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"자격증명 삭제"</string>
-    <string name="credentials_reset_summary" msgid="3810369467217453606">"콘텐츠를 모두 삭제하고 비밀번호 재설정"</string>
+    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3369361230171260282">"모든 콘텐츠의 자격증명 저장소 삭제 및 비밀번호 재설정"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"비밀번호 입력"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"자격증명 저장소에 대한 비밀번호를 입력하세요."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"자격증명 저장소에 대한 비밀번호를 설정하세요. 8자 이상이어야 합니다."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"현재 비밀번호:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"새 비밀번호:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"새 비밀번호 확인:"</string>
-    <string name="credentials_reset_hint" msgid="2336340927894094814">"콘텐츠가 모두 삭제되고 비밀번호가 재설정됩니다. 계속하시겠습니까?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"비밀번호가 일치하지 않습니다."</string>
+    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="1566409057833618877">"모든 자격증명을 삭제하고 자격증명 저장소 비밀번호를 재설정하시겠습니까?"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"비밀번호는 8자 이상이어야 합니다."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"비밀번호가 잘못되었습니다."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"비밀번호가 잘못되었습니다. 한 번 더 실패하면 자격증명 저장소가 지워집니다."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"비밀번호가 잘못되었습니다. <xliff:g id="NUMBER">%1$d</xliff:g>번 더 실패하면 자격증명 저장소가 지워집니다."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"자격증명 저장소가 삭제되었습니다."</string>
+    <!-- no translation found for credentials_not_erased (397954733557821269) -->
+    <skip />
     <string name="credentials_enabled" msgid="7588607413349978930">"자격증명 저장소를 사용합니다."</string>
+    <!-- no translation found for credentials_configure_lock_screen_hint (6816970208840577219) -->
+    <skip />
     <string name="emergency_tone_title" msgid="1055954530111587114">"긴급 신호음"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"긴급 통화 중 동작 설정"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"개인정보 보호"</string>
diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml
index 88eedf3..1b46bde 100644
--- a/res/values-lt/arrays.xml
+++ b/res/values-lt/arrays.xml
@@ -48,6 +48,16 @@
     <item msgid="2314124409517439288">"10 min."</item>
     <item msgid="6864027152847611413">"30 min."</item>
   </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="3149294732238283185">"Niekada"</item>
+    <item msgid="2194151041885903260">"15 sek."</item>
+    <item msgid="5892295237131074341">"30 sek."</item>
+    <item msgid="3538441365970038213">"1 min."</item>
+    <item msgid="412343871668955639">"2 min."</item>
+    <item msgid="5076853889688991690">"5 min."</item>
+    <item msgid="1903860996174927898">"10 min."</item>
+    <item msgid="6415509612413178727">"30 min."</item>
+  </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"nedelsiant"</item>
     <item msgid="6736512735606834431">"5 sek."</item>
@@ -59,6 +69,22 @@
     <item msgid="9002737361305019353">"10 min."</item>
     <item msgid="4322676235684793329">"30 min."</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Ypač mažas"</item>
+    <item msgid="383133849547816572">"Labai mažas"</item>
+    <item msgid="6490061470416867723">"Mažas"</item>
+    <item msgid="3579015730662088893">"Įprastas"</item>
+    <item msgid="1678068858001018666">"Didelis"</item>
+    <item msgid="490158884605093126">"Labai didelis"</item>
+    <item msgid="2123802548987439763">"Ypač didelis"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Labai lėtas"</item>
     <item msgid="2361722960903353554">"Lėtas"</item>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 26232cc..91b0b5a 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -316,7 +316,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Ekranui atrakinti reikia skaitinio PIN k."</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Slaptažodis"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Ekranui atrakinti reikia slaptažodžio"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Neleidž. administratoriaus arba pagal šifr. polit."</string>
+    <!-- outdated translation 5962903914511361952 -->     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Neleidžia nuotolinio įrenginio administratorius"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Išjungta"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7137296704741184239">"Nesaugoma"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Apsaugota taikant modelį"</string>
@@ -460,6 +460,7 @@
     <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Nurodykite, kada atjungti nuo „Wi-Fi“"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Keičiant nustatymą kilo problemų"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Pridėti „Wi-Fi“ tinklą"</string>
+    <string name="wifi_add_network_summary" msgid="6345544206968025811">"Konfigūruoti ne transliacijoms skirtą tinklą"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"„Wi-Fi“ tinklai"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Nuskaityti"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Išplėstinis"</string>
@@ -598,7 +599,17 @@
     <string name="brightness_summary" msgid="838917350127550703">"Reguliuoti ekrano ryškumą"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Baigėsi laikas"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Ekranas automatiškai išsijungia po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"„Android“ sapnai"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Ekrano užsklandos ir kitos neveikos diversijos"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Pasirinktas sapnas"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Kada aktyvinti"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"Kai <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neatliekama jokių veiksmų"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Niekada"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Išbandykite!"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatinis ryškumas"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Šrifto dydis"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Visas šriftų dydis"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Pasirinkite šrifto dydį"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM kortelės užrakto nustatymai"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Nustatyti SIM kortelės užraktą"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM kortelės užraktas"</string>
@@ -644,7 +655,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"Mano telefono numeris"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN."</string>
     <string name="status_prl_version" msgid="8499039751817386529">"PRL versija"</string>
-    <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
+    <string name="status_meid_number" msgid="2037549729230058915">"IMEI / MEID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"Mobilaus tinklo tipas"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Mobiliojo tinklo būsena"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Paslaugos būsena"</string>
@@ -893,9 +904,12 @@
     <string name="install_unknown_applications" msgid="6612824788917283662">"Leisti įdiegti ne prekyvietės programas"</string>
     <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"Planšetinio kompiuterio ir asmeniniai duomenys yra labiau pažeidžiami ir jiems gali pakenkti nežinomų šaltinių programos. Sutinkate, kad tik patys atsakote už bet kokius planšetinio kompiuterio pažeidimus ar duomenų praradimą, galimą naudojant šias programas."</string>
     <string name="install_all_warning" product="default" msgid="1923717607319933741">"Jūsų telefono ir asmeniniai duomenys labiau pažeidžiami ir gali būti užpulti nežinomų šaltinių programų. Sutinkate, kad esate visiškai atsakingi už telefonui padarytą žalą ar duomenų praradimą, kuris gali būti šių programų naudojimo rezultatas."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Išplėstiniai nustatymai"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Įgalinti daugiau nustatymų parinkčių."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Programos informacija"</string>
     <string name="storage_label" msgid="8700867073480107253">"Saugykla"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Paleisti pagal numatytuosius nustatymus"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Ekrano suderinamumas"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Leidimai"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Talpykla"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Išvalyti talpyklą"</string>
@@ -915,6 +929,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Kai kuriems veiksmams pasirinkote pagal numatytuosius nustatymus paleisti šią programą."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Nenustatyti jokie numatytieji nustatymai."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Išvalyti numatytuosius nustatymus"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Ši programa gali būti nepritaikyta jūsų ekranui; čia galite valdyti jos pritaikymą ekranui."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Paklausti, kai paleidžiama"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Keisti programos mastelį"</string>
     <string name="unknown" msgid="1592123443519355854">"Nežinomas"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Rūšiuoti pagal pavadinimą"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Rūšiuoti pagal dydį"</string>
@@ -1019,8 +1036,13 @@
     <string name="show_password" msgid="2198798062604049206">"Matomi slaptažodžiai"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Rodyti slaptažodį, kai įvedate tekstą"</string>
     <string name="ime_security_warning" msgid="812267421486877917">"Šis įvesties būdas gali rinkti visą įvedamą tekstą, įskaitant asmeninius duomenis, pvz., slaptažodžius ir kredito kortelės numerius. Tai vyksta dėl programos <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Naudoti šį įvesties būdą?"</string>
+    <!-- no translation found for pointer_settings_category (6090176550039035130) -->
+    <skip />
+    <!-- no translation found for pointer_speed (1221342330217861616) -->
+    <skip />
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Naudotojo žodynas"</string>
-    <string name="user_dict_settings_title" msgid="8357027437499042191">"Naudotojo žodynas"</string>
+    <string name="user_dict_single_settings_title" msgid="5454855286173849284">"Naudotojo žodynas"</string>
+    <string name="user_dict_multiple_settings_title" msgid="326583195525296750">"Valdyti naudotojo žodynus"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Pridėti"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Pridėti prie žodyno"</string>
@@ -1029,6 +1051,7 @@
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Ištrinti"</string>
     <string name="user_dict_settings_empty_text" product="tablet" msgid="1766522102636921529">"Neturite jokių žodžių naudotojo žodyne. Žodį galite pridėti paliesdami mygtuką „Pridėti“ (+)."</string>
     <string name="user_dict_settings_empty_text" product="default" msgid="6209268025109242806">"Neturite jokių žodžių naudotojo žodyne. Žodį galite pridėti naudodami meniu."</string>
+    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Visos kalbos"</string>
     <string name="testing" msgid="6584352735303604146">"Bandymas"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Planšetinio kompiuterio informacija"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Telefono informacija"</string>
@@ -1100,6 +1123,8 @@
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"Maitinimo mygtukas"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"Maitinimo mygtukas baigia skambutį"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"Skambinant paspaudus mygtuką „Maitinimas“, vietoj to, kad būtų išjungiamas ekranas, baigiamas skambutis"</string>
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <skip />
     <string name="touchscreen_gestures_category" msgid="3109869155350859625">"Jutiklinio ekrano gestai"</string>
     <string name="long_press_timeout_selector_title" msgid="1396876537252863044">"„Paliesti ir laikyti“ delsa"</string>
     <string name="long_press_timeout_selector_summary" msgid="2261114502740278996">"Atidėti, kol palietimas interpretuojamas kaip „Paliesti ir laikyti“"</string>
@@ -1302,30 +1327,26 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(nepakeista)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(nenustatyta)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Įgaliojimų atmintinė"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Naudoti saugius įgaliojimus"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Leisti programoms pasiekti saugius sertifikatus ir kitus įgaliojimus"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Įdiegti iš atmintinės"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Įdiegti iš SD kortelės"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Įdiegti sertifikatus iš atmintinės"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Įdiegti sertifikatus iš SD kortelės"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Nustatyti slaptažodį"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Nustatyti arba pakeisti įgaliojimų atmintinės slaptažodį"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Valyti įgaliojimus"</string>
-    <string name="credentials_reset_summary" msgid="3810369467217453606">"Pašalinti visą turinį ir iš naujo nustatyti slaptažodį"</string>
+    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3369361230171260282">"Išvalyti visą įgaliojimų atmintinės turinį ir iš naujo nustatyti jos slaptažodį"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Įveskite slaptažodį"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Įvesti įgaliojimų atmintinės slaptažodį."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Nustatyti įgaliojimų atmintinės slaptažodį. Jis turi būti sudarytas mažiausiai iš 8 simbolių."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Dabartinis slaptažodis:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Naujas slaptažodis:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Patvirtinti naują slaptažodį:"</string>
-    <string name="credentials_reset_hint" msgid="2336340927894094814">"Visas turinys bus pašalintas ir slaptažodis nustatytas iš naujo. Ar tikrai norite tai atlikti?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Slaptažodžiai neatitinka."</string>
+    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="1566409057833618877">"Ar tikrai norite ištrinti visus įgaliojimas ir iš naujo nustatyti įgaliojimų atmintinės slaptažodį?"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Slaptažodį turi sudaryti mažiausiai 8 simboliai."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Neteisingas slaptažodis."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Neteisingas slaptažodis. Dar galite bandyti vieną kartą, paskui įgaliojimų atmintinė bus ištrinta."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Neteisingas slaptažodis. Dar galite bandyti <xliff:g id="NUMBER">%1$d</xliff:g> k., paskui įgaliojimų atmintinė bus ištrinta."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Įgaliojimų atmintinė ištrinta."</string>
+    <!-- no translation found for credentials_not_erased (397954733557821269) -->
+    <skip />
     <string name="credentials_enabled" msgid="7588607413349978930">"Įgaliojimų saugykla įgalinta."</string>
+    <!-- no translation found for credentials_configure_lock_screen_hint (6816970208840577219) -->
+    <skip />
     <string name="emergency_tone_title" msgid="1055954530111587114">"Pagalbos tonas"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Nustatyti elgesį, kai skambinama pagalbos numeriu"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"Privatumas"</string>
diff --git a/res/values-lv/arrays.xml b/res/values-lv/arrays.xml
index 23ef36d..1d695b8 100644
--- a/res/values-lv/arrays.xml
+++ b/res/values-lv/arrays.xml
@@ -48,6 +48,16 @@
     <item msgid="2314124409517439288">"10 minūtes"</item>
     <item msgid="6864027152847611413">"30 minūtes"</item>
   </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="3149294732238283185">"Nekad"</item>
+    <item msgid="2194151041885903260">"15 sekundes"</item>
+    <item msgid="5892295237131074341">"30 sekundes"</item>
+    <item msgid="3538441365970038213">"1 minūte"</item>
+    <item msgid="412343871668955639">"2 minūtes"</item>
+    <item msgid="5076853889688991690">"5 minūtes"</item>
+    <item msgid="1903860996174927898">"10 minūtes"</item>
+    <item msgid="6415509612413178727">"30 minūtes"</item>
+  </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"nekavējoties"</item>
     <item msgid="6736512735606834431">"5 sekundes"</item>
@@ -59,6 +69,22 @@
     <item msgid="9002737361305019353">"10 minūtes"</item>
     <item msgid="4322676235684793329">"30 minūtes"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Īpaši mazs"</item>
+    <item msgid="383133849547816572">"Ļoti mazs"</item>
+    <item msgid="6490061470416867723">"Mazs"</item>
+    <item msgid="3579015730662088893">"Parasts"</item>
+    <item msgid="1678068858001018666">"Liels"</item>
+    <item msgid="490158884605093126">"Ļoti liels"</item>
+    <item msgid="2123802548987439763">"Īpaši liels"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Ļoti lēni"</item>
     <item msgid="2361722960903353554">"Lēni"</item>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 2e93062..14cd102 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -316,7 +316,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Pieprasīt ciparu PIN, lai atbloķētu ekrānu"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Parole"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Pieprasīt paroli, lai atbloķētu ekrānu"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Atspējoja administrators vai šifrēšanas politika."</string>
+    <!-- outdated translation 5962903914511361952 -->     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Atspējoja attālās ierīces administrators"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Izslēgts"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7137296704741184239">"Drošība nav iespējota"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Aizsargāts ar kombināciju"</string>
@@ -460,6 +460,7 @@
     <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Norādīt, kad pārtraukt Wi-Fi savienojumu"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Mainot iestatījumu, radās kļūda"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Pievienot Wi-Fi tīklu"</string>
+    <string name="wifi_add_network_summary" msgid="6345544206968025811">"Konfigurēt tīklu bez apraides"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi tīkli"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Skenēt"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Papildu"</string>
@@ -598,7 +599,17 @@
     <string name="brightness_summary" msgid="838917350127550703">"Noregulēt ekrāna spilgtumu"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Noildze"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Ekrāns automātiski izslēdzas pēc šāda laika: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android ekrānsaudzētāji"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Ekrānsaudzētāji un citas izklaides iespējas dīkstāves laikā"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Atlasītais ekrānsaudzētājs"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Aktivizēšanas laiks"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"Pēc dīkstāves laika: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Nekad"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Izmēģināt"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automātisks spilgtums"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Fonta lielums"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Vispārējs fontu lielums"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Atlasīt fonta lielumu"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM kartes bloķēšanas iestatījumi"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Iestatīt SIM kartes bloķēšanu"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM kartes bloķēšana"</string>
@@ -644,7 +655,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"Mans tālruņa numurs"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"PRL versija"</string>
-    <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
+    <string name="status_meid_number" msgid="2037549729230058915">"IMEI/MEID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"Mobilo sakaru tīkla veids"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Mobilo sakaru tīkla statuss"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Pakalpojuma statuss"</string>
@@ -893,9 +904,12 @@
     <string name="install_unknown_applications" msgid="6612824788917283662">"Atļaut instalēt lietojumprogrammas, kuras nav Market"</string>
     <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"Jūsu planšetdatora un personiskie dati ir vieglāk ievainojami, ja uzbrūk lietojumprogrammas no nezināmiem avotiem. Jūs piekrītat, ka uzņematies visu atbildību par jebkādiem zaudējumiem planšetdatorā vai datu zudumu, kas var rasties šo lietojumprogrammu lietošanas rezultātā."</string>
     <string name="install_all_warning" product="default" msgid="1923717607319933741">"Jūsu tālrunis un personīgie dati ir neaizsargātāki pret nezināmas izcelsmes lietojumprogrammu uzbrukumiem. Jūs piekrītat, ka vienīgi pats esat atbildīgs par jebkādiem tālruņa bojājumiem vai datu zaudējumu, kas varētu notikt šādu lietojumprogrammu izmantošanas rezultātā."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Papildu iestatījumi"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Iespējot papildu iestatījumu opcijas."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Informācija par lietojumprogrammu"</string>
     <string name="storage_label" msgid="8700867073480107253">"Krātuve"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Uzsākšana pēc noklusējuma"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Ekrāna saderība"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Atļaujas"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Kešatmiņa"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Notīrīt kešatmiņu"</string>
@@ -915,6 +929,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Esat atlasījis opciju dažām darbībām uzsākt šo lietojumprogrammu pēc noklusējuma."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Nav iestatīti noklusējumi."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Notīrīt noklusējumus"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Iespējams, šī lietojumprogramma nav izstrādāta jūsu ierīces ekrānam. Šeit varat kontrolēt tās pielāgošanu savas ierīces ekrānam."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Jautāt palaišanas laikā"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Mērogot lietojumprogrammu"</string>
     <string name="unknown" msgid="1592123443519355854">"Nezināms"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Kārtot pēc nosaukuma"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Kārtot pēc izmēra"</string>
@@ -1019,8 +1036,13 @@
     <string name="show_password" msgid="2198798062604049206">"Redzamas paroles"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Rādīt paroli tās ievadīšanas laikā"</string>
     <string name="ime_security_warning" msgid="812267421486877917">"Lietojot šo ievades metodi, var tikt apkopots viss jūsu ievadītais teksts, tostarp, personīgie dati, piemēram, paroles un kredītkaršu numuri. Tā ir no <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g> lietojumprogrammas. Vai lietot šo ievades metodi?"</string>
+    <!-- no translation found for pointer_settings_category (6090176550039035130) -->
+    <skip />
+    <!-- no translation found for pointer_speed (1221342330217861616) -->
+    <skip />
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Lietotāja vārdnīca"</string>
-    <string name="user_dict_settings_title" msgid="8357027437499042191">"Lietotāja vārdnīca"</string>
+    <string name="user_dict_single_settings_title" msgid="5454855286173849284">"Lietotāja vārdnīca"</string>
+    <string name="user_dict_multiple_settings_title" msgid="326583195525296750">"Pārvaldīt lietotāja vārdnīcas"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Pievienot"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Pievienot vārdnīcai"</string>
@@ -1029,6 +1051,7 @@
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Dzēst"</string>
     <string name="user_dict_settings_empty_text" product="tablet" msgid="1766522102636921529">"Lietotāja vārdnīcā nav neviena vārda. Vārdu var pievienot, pieskaroties pogai Pievienot (+)."</string>
     <string name="user_dict_settings_empty_text" product="default" msgid="6209268025109242806">"Lietotāja vārdnīcā nav neviena vārda. Vārdu var pievienot, izmantojot izvēlni."</string>
+    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Visas valodas"</string>
     <string name="testing" msgid="6584352735303604146">"Testēšana"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Informācija par planšetdatoru"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Informācija par tālruni"</string>
@@ -1100,6 +1123,8 @@
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"Barošanas poga"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"Ar barošanas pogu tiek beigts zvans"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"Zvana laikā nospiežot barošanas pogu, tiek izbeigts zvans nevis izslēgts ekrāns"</string>
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <skip />
     <string name="touchscreen_gestures_category" msgid="3109869155350859625">"Skārienekrāna žesti"</string>
     <string name="long_press_timeout_selector_title" msgid="1396876537252863044">"Aizk., pieskar. un turot nosp."</string>
     <string name="long_press_timeout_selector_summary" msgid="2261114502740278996">"Aizkavēt tik ilgi, kamēr pieskāriens tiek interpretēts kā pieskāriens un turēšana."</string>
@@ -1302,30 +1327,26 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(bez izmaiņām)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(nav iestatīta)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Akreditācijas datu krātuve"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Izmantot drošos akreditācijas datus"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Ļaut lietojumprogrammām piekļūt drošajiem sertifikātiem un citiem akreditācijas datiem"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Instalēšana no atmiņas"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Instalēt no SD kartes"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Instalēt sertifikātus no atmiņas"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Instalēt sertifikātus no SD kartes"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Iestatīt paroli"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Iestatīt vai mainīt akreditācijas datu krātuves paroli"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Akreditācijas datu notīrīšana"</string>
-    <string name="credentials_reset_summary" msgid="3810369467217453606">"Noņemt visu saturu un atiestatīt paroli"</string>
+    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3369361230171260282">"Notīrīt visa satura akreditācijas datu krātuvi un atiestatīt tās paroli"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Paroles ievadīšana"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Ievadiet akreditācijas datu krātuves paroli."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Iestatiet akreditācijas datu krātuves paroli. Tai jābūt vismaz 8 rakstzīmes garai."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Pašreizējā parole:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Jaunā parole:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Apstipriniet jauno paroli:"</string>
-    <string name="credentials_reset_hint" msgid="2336340927894094814">"Tiks noņemts viss saturs, un tiks atiestatīta parole. Vai tiešām vēlaties veikt šo darbību?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Paroles nav vienādas."</string>
+    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="1566409057833618877">"Vai tiešām vēlaties dzēst visus akreditācijas datus un atiestatīt akreditācijas datu krātuves paroli?"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Parolē jābūt vismaz astoņām rakstzīmēm."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Nepareiza parole."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Nepareiza parole. Varat vēl mēģināt vienu reizi, pirms tiek izdzēsta akreditācijas datu krātuve."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Nepareiza parole. Varat vēl mēģināt <xliff:g id="NUMBER">%1$d</xliff:g> reizes, pirms tiek izdzēsta akreditācijas datu krātuve."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Akreditācijas datu krātuve ir izdzēsta."</string>
+    <!-- no translation found for credentials_not_erased (397954733557821269) -->
+    <skip />
     <string name="credentials_enabled" msgid="7588607413349978930">"Akreditācijas datu krātuve ir iespējota."</string>
+    <!-- no translation found for credentials_configure_lock_screen_hint (6816970208840577219) -->
+    <skip />
     <string name="emergency_tone_title" msgid="1055954530111587114">"Ārkārtas signāls"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Iestatīt uzvedību, kad tiek veikts ārkārtas zvans"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"Konfidencialitāte"</string>
diff --git a/res/values-ms-nokeys/strings.xml b/res/values-ms-nokeys/strings.xml
new file mode 100644
index 0000000..7da53ba
--- /dev/null
+++ b/res/values-ms-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="6616938758022986257">"Urus aplikasi"</string>
+</resources>
diff --git a/res/values-ms/arrays.xml b/res/values-ms/arrays.xml
new file mode 100644
index 0000000..1aa53a4
--- /dev/null
+++ b/res/values-ms/arrays.xml
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2007 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="5296756001147094692">"Amerika"</item>
+    <item msgid="3005562397632768392">"Eropah"</item>
+    <item msgid="5696915123093701218">"Afrika"</item>
+    <item msgid="4439789052790868249">"Asia"</item>
+    <item msgid="956915953069815961">"Australia"</item>
+    <item msgid="5345178126174698955">"Pasifik"</item>
+    <item msgid="8392017019801393511">"Semua"</item>
+  </string-array>
+    <!-- no translation found for animations_entries:0 (207790005475613429) -->
+    <!-- no translation found for animations_entries:1 (6291186755504776720) -->
+    <!-- no translation found for animations_entries:2 (3856065399819979491) -->
+    <!-- no translation found for animations_summaries:0 (4569165952409350897) -->
+    <!-- no translation found for animations_summaries:1 (4460915688877708508) -->
+    <!-- no translation found for animations_summaries:2 (488968798204105119) -->
+    <!-- no translation found for screen_timeout_entries:5 (2314124409517439288) -->
+    <!-- no translation found for screen_timeout_entries:6 (6864027152847611413) -->
+    <!-- no translation found for dream_timeout_entries:0 (3149294732238283185) -->
+    <!-- no translation found for dream_timeout_entries:1 (2194151041885903260) -->
+    <!-- no translation found for dream_timeout_entries:2 (5892295237131074341) -->
+    <!-- no translation found for dream_timeout_entries:3 (3538441365970038213) -->
+    <!-- no translation found for dream_timeout_entries:4 (412343871668955639) -->
+    <!-- no translation found for dream_timeout_entries:5 (5076853889688991690) -->
+    <!-- no translation found for dream_timeout_entries:6 (1903860996174927898) -->
+    <!-- no translation found for dream_timeout_entries:7 (6415509612413178727) -->
+    <!-- no translation found for lock_after_timeout_entries:0 (5416834369150305288) -->
+    <!-- no translation found for lock_after_timeout_entries:1 (6736512735606834431) -->
+    <!-- no translation found for lock_after_timeout_entries:2 (8044619388267891375) -->
+    <!-- no translation found for lock_after_timeout_entries:3 (1822002388249545488) -->
+    <!-- no translation found for lock_after_timeout_entries:4 (8538071621211916519) -->
+    <!-- no translation found for lock_after_timeout_entries:5 (5663439580228932882) -->
+    <!-- no translation found for lock_after_timeout_entries:6 (49888496216106852) -->
+    <!-- no translation found for lock_after_timeout_entries:7 (9002737361305019353) -->
+    <!-- no translation found for lock_after_timeout_entries:8 (4322676235684793329) -->
+    <!-- no translation found for entries_font_size:0 (2722636506084795405) -->
+    <!-- no translation found for entries_font_size:1 (383133849547816572) -->
+    <!-- no translation found for entries_font_size:2 (6490061470416867723) -->
+    <!-- no translation found for entries_font_size:3 (3579015730662088893) -->
+    <!-- no translation found for entries_font_size:4 (1678068858001018666) -->
+    <!-- no translation found for entries_font_size:5 (490158884605093126) -->
+    <!-- no translation found for entries_font_size:6 (2123802548987439763) -->
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"Sangat perlahan"</item>
+    <item msgid="2361722960903353554">"Perlahan"</item>
+    <item msgid="1145554631248513562">"Biasa"</item>
+    <item msgid="7553665153391107454">"Laju"</item>
+    <item msgid="2538100882620724753">"Sangat cepat"</item>
+  </string-array>
+  <string-array name="tts_pitch_entries">
+    <item msgid="7526050907652687351">"Sangat rendah"</item>
+    <item msgid="2692137425242433765">"Rendah"</item>
+    <item msgid="3332408460740717754">"Biasa"</item>
+    <item msgid="4907380534957572531">"Tinggi"</item>
+    <item msgid="4699640516390840297">"Sangat tinggi"</item>
+  </string-array>
+  <string-array name="tts_lang_entries">
+    <item msgid="478030717868306353">"Bahasa Inggeris Amerika"</item>
+    <item msgid="5192284521396794598">"Bahasa Inggeris British"</item>
+    <item msgid="3000262452051711991">"Bahasa Perancis"</item>
+    <item msgid="9214080387341763401">"Bahasa Jerman"</item>
+    <item msgid="5972100016440094433">"Bahasa Itali"</item>
+    <item msgid="5811378076054402537">"Bahasa Sepanyol"</item>
+  </string-array>
+    <!-- no translation found for wifi_status:1 (8934131797783724664) -->
+    <!-- no translation found for wifi_status:2 (8513729475867537913) -->
+    <!-- no translation found for wifi_status:3 (515055375277271756) -->
+    <!-- no translation found for wifi_status:4 (1943354004029184381) -->
+    <!-- no translation found for wifi_status:5 (4221763391123233270) -->
+    <!-- no translation found for wifi_status:6 (624838831631122137) -->
+    <!-- no translation found for wifi_status:7 (7979680559596111948) -->
+    <!-- no translation found for wifi_status:8 (1634960474403853625) -->
+    <!-- no translation found for wifi_status:9 (746097431216080650) -->
+    <!-- no translation found for wifi_status_with_ssid:1 (8878186979715711006) -->
+    <!-- no translation found for wifi_status_with_ssid:2 (355508996603873860) -->
+    <!-- no translation found for wifi_status_with_ssid:3 (554971459996405634) -->
+    <!-- no translation found for wifi_status_with_ssid:4 (7928343808033020343) -->
+    <!-- no translation found for wifi_status_with_ssid:5 (8937994881315223448) -->
+    <!-- no translation found for wifi_status_with_ssid:6 (1330262655415760617) -->
+    <!-- no translation found for wifi_status_with_ssid:7 (7698638434317271902) -->
+    <!-- no translation found for wifi_status_with_ssid:8 (197508606402264311) -->
+    <!-- no translation found for wifi_status_with_ssid:9 (8578370891960825148) -->
+    <!-- no translation found for wifi_security:0 (1435933968767043814) -->
+    <!-- no translation found for wifi_security:1 (6318432659048829665) -->
+    <!-- no translation found for wifi_security:2 (2966395706508338179) -->
+    <!-- no translation found for wifi_security:3 (9098390198768443435) -->
+    <!-- no translation found for wifi_eap_method:0 (1160193392455075561) -->
+    <!-- no translation found for wifi_eap_method:1 (7981731051382306293) -->
+    <!-- no translation found for wifi_eap_method:2 (2892994535305020162) -->
+    <!-- no translation found for bluetooth_visibility_timeout_entries:0 (1106621950288502195) -->
+    <!-- no translation found for bluetooth_visibility_timeout_entries:1 (5780349442819375570) -->
+    <!-- no translation found for bluetooth_visibility_timeout_entries:2 (1166466894270177580) -->
+    <!-- no translation found for bluetooth_visibility_timeout_entries:3 (9032073376232198148) -->
+    <!-- no translation found for wifi_signal:0 (2245412278046491293) -->
+    <!-- no translation found for wifi_signal:1 (5615082285463430971) -->
+    <!-- no translation found for wifi_signal:2 (3565079809875324621) -->
+    <!-- no translation found for wifi_signal:3 (5702329417707689835) -->
+  <string-array name="wifi_sleep_policy_entries">
+    <!-- outdated translation 3804733751095821976 -->     <item msgid="643915340724070374">"Apabila skrin dimatikan"</item>
+    <item msgid="1549288661423279207">"Jangan sekali-kali semasa palam dipasangkan"</item>
+    <!-- outdated translation 1986753720941888596 -->     <item msgid="6592896328877671197">"Jangan sekali-kali"</item>
+  </string-array>
+    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:0 (2659922042905569057) -->
+    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:1 (8137861573803398334) -->
+    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:2 (5996547094658157629) -->
+    <!-- no translation found for wifi_frequency_band_entries:0 (624340809384223320) -->
+    <!-- no translation found for wifi_frequency_band_entries:1 (6670588712989942178) -->
+    <!-- no translation found for wifi_frequency_band_entries:2 (2715516524973207876) -->
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="9077371706468756228">"Masa Penggunaan"</item>
+    <item msgid="1908750532762193304">"Lancar Kiraan"</item>
+    <item msgid="1213951670006606353">"Nama Aplikasi"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="8615575908717909498">"PEAP"</item>
+    <item msgid="8667872640594311615">"TLS"</item>
+    <item msgid="7182812872984827322">"TTLS"</item>
+  </string-array>
+    <!-- no translation found for wifi_phase2_entries:3 (5923246669412752932) -->
+    <!-- no translation found for wifi_network_setup:0 (784271777398638325) -->
+    <!-- no translation found for wifi_network_setup:1 (700386742589384062) -->
+    <!-- no translation found for wifi_network_setup:2 (7131487972018976724) -->
+    <!-- no translation found for wifi_network_setup:3 (4809199848225172977) -->
+    <!-- no translation found for wifi_ip_settings:0 (3906714200993111074) -->
+    <!-- no translation found for wifi_ip_settings:1 (628395202971532382) -->
+    <!-- no translation found for wifi_proxy_settings:0 (4473276491748503377) -->
+    <!-- no translation found for wifi_proxy_settings:1 (8673874894887358090) -->
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Matikan"</item>
+    <item msgid="3165868966179561687">"Awasan"</item>
+    <item msgid="6038758039030476855">"Getar"</item>
+  </string-array>
+    <!-- no translation found for apn_auth_entries:0 (3856896061242872146) -->
+    <!-- no translation found for apn_auth_entries:1 (5756844015743664882) -->
+    <!-- no translation found for apn_auth_entries:2 (535934025797984365) -->
+    <!-- no translation found for apn_auth_entries:3 (8383098660619805783) -->
+    <!-- no translation found for apn_protocol_entries:0 (4852355456199302715) -->
+    <!-- no translation found for apn_protocol_entries:1 (4394161344888484571) -->
+    <!-- no translation found for apn_protocol_entries:2 (8084938354605535381) -->
+    <!-- no translation found for app_install_location_entries:0 (8151497958991952759) -->
+    <!-- no translation found for app_install_location_entries:1 (3738430123799803530) -->
+    <!-- no translation found for app_install_location_entries:2 (4498124044785815005) -->
+    <!-- no translation found for vibrate_entries:0 (3388952299521009213) -->
+    <!-- no translation found for vibrate_entries:1 (6293147072807231256) -->
+    <!-- no translation found for vibrate_entries:2 (1276641209451816572) -->
+    <!-- no translation found for vibrate_entries:3 (8418930333779132418) -->
+    <!-- no translation found for long_press_timeout_selector_titles:0 (3511504869290423954) -->
+    <!-- no translation found for long_press_timeout_selector_titles:1 (2560532955514699713) -->
+    <!-- no translation found for long_press_timeout_selector_titles:2 (2372711992605524591) -->
+    <!-- no translation found for hdcp_checking_titles:0 (441827799230089869) -->
+    <!-- no translation found for hdcp_checking_titles:1 (6042769699089883931) -->
+    <!-- no translation found for hdcp_checking_titles:2 (9174900380056846820) -->
+    <!-- no translation found for hdcp_checking_summaries:0 (505558545611516707) -->
+    <!-- no translation found for hdcp_checking_summaries:1 (3878793616631049349) -->
+    <!-- no translation found for hdcp_checking_summaries:2 (45075631231212732) -->
+</resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
new file mode 100644
index 0000000..6eb50d8
--- /dev/null
+++ b/res/values-ms/strings.xml
@@ -0,0 +1,2141 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for yes (4676390750360727396) -->
+    <skip />
+    <!-- no translation found for no (6731231425810196216) -->
+    <skip />
+    <string name="device_info_default" msgid="7847265875578739287">"Tidak diketahui"</string>
+    <string name="turn_on_radio" msgid="8706561489788373676">"Hidupkan radio"</string>
+    <string name="turn_off_radio" msgid="1820294552893884115">"Matikan radio"</string>
+    <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Lihat buku alamat SIM"</string>
+    <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Lihat Nombor Dailan Tetap"</string>
+    <string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"Lihat Nombor Dailan Servis"</string>
+    <string name="radioInfo_menu_getPDP" msgid="560610293888406317">"Dapatkan senarai PDP"</string>
+    <string name="radioInfo_service_in" msgid="1915416319177520020">"Berfungsi"</string>
+    <string name="radioInfo_service_out" msgid="5238736759641916278">"Rosak"</string>
+    <string name="radioInfo_service_emergency" msgid="2485604591272668370">"Panggilan kecemasan sahaja"</string>
+    <string name="radioInfo_service_off" msgid="1434084741785525415">"Radio dimatikan"</string>
+    <string name="radioInfo_roaming_in" msgid="9045363884600341051">"Perayauan:"</string>
+    <string name="radioInfo_roaming_not" msgid="2851853244069662307">"Bukan perayauan"</string>
+    <string name="radioInfo_phone_idle" msgid="7489244938838742820">"Melahu"</string>
+    <string name="radioInfo_phone_ringing" msgid="4883724645684297895">"Berdering"</string>
+    <string name="radioInfo_phone_offhook" msgid="4174402846862780998">"Panggilan sedang berlangsung"</string>
+    <string name="radioInfo_data_disconnected" msgid="1959735267890719418">"Diputuskan sambungan"</string>
+    <string name="radioInfo_data_connecting" msgid="8404571440697917823">"Menyambung"</string>
+    <string name="radioInfo_data_connected" msgid="7074301157399238697">"Disambungkan"</string>
+    <string name="radioInfo_data_suspended" msgid="5315325487890334196">"Digantung"</string>
+    <string name="radioInfo_unknown" msgid="737385314432468266">"tidak diketahui"</string>
+    <string name="radioInfo_display_packets" msgid="8654359809877290639">"bgksn"</string>
+    <string name="radioInfo_display_bytes" msgid="4018206969492931883">"bait"</string>
+    <string name="radioInfo_display_dbm" msgid="3621221793699882781">"dBm"</string>
+    <string name="radioInfo_display_asu" msgid="1422248392727818082">"asu"</string>
+    <string name="radioInfo_lac" msgid="8415219164758307156">"LAC"</string>
+    <string name="radioInfo_cid" msgid="4362599198392643138">"CID"</string>
+    <!-- outdated translation 3364184561355611897 -->     <string name="sdcard_unmount" product="nosdcard" msgid="6325292633327972272">"Nyahlekap kad SD"</string>
+    <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Nyahlekap kad SD"</string>
+    <!-- outdated translation 362497552060004057 -->     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Format kad SD"</string>
+    <!-- outdated translation 362497552060004057 -->     <string name="sdcard_format" product="default" msgid="6713185532039187532">"Format kad SD"</string>
+    <string name="small_font" msgid="2295331917424072635">"Kecil"</string>
+    <string name="medium_font" msgid="2068475425515133701">"Sederhana"</string>
+    <string name="large_font" msgid="599055175160971446">"Besar"</string>
+    <string name="font_size_save" msgid="3450855718056759095">"OK"</string>
+    <!-- outdated translation 5922637503871474866 -->     <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"Kad SD"</string>
+    <string name="sdcard_setting" product="default" msgid="5922637503871474866">"Kad SD"</string>
+    <string name="battery_info_status_label" msgid="8109155295509700309">"Status bateri:"</string>
+    <!-- no translation found for battery_info_power_label (7465140230991349382) -->
+    <skip />
+    <string name="battery_info_scale_label" msgid="3649763192389778437">"Skala bateri:"</string>
+    <string name="battery_info_level_label" msgid="8706526709307788737">"Aras bateri:"</string>
+    <string name="battery_info_health_label" msgid="6416051542741886958">"Kesihatan bateri:"</string>
+    <string name="battery_info_technology_label" msgid="788304533220748681">"Teknologi bateri:"</string>
+    <string name="battery_info_voltage_label" msgid="8971764146757637863">"Voltan bateri:"</string>
+    <string name="battery_info_voltage_units" msgid="8658490792208288107">"mV"</string>
+    <string name="battery_info_temperature_label" msgid="1968383098818648037">"Suhu bateri:"</string>
+    <string name="battery_info_temperature_units" msgid="9098950587249987550">"° C"</string>
+    <string name="battery_info_uptime" msgid="5548545143573527992">"Masa sejak proses but:"</string>
+    <string name="battery_info_awake_battery" msgid="2557725975486185849">"Masa berjaga semasa menggunakan bateri:"</string>
+    <string name="battery_info_awake_plugged" msgid="176716874713478188">"Masa berjaga semasa mengecas:"</string>
+    <string name="battery_info_screen_on" msgid="376277447175613889">"Waktu HIDUP skrin:"</string>
+    <string name="battery_info_status_unknown" msgid="196130600938058547">"Tidak diketahui"</string>
+    <string name="battery_info_status_charging" msgid="1705179948350365604">"Mengecas"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Menyahcas"</string>
+    <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Tidak mengecas"</string>
+    <string name="battery_info_status_full" msgid="2824614753861462808">"Penuh"</string>
+    <!-- no translation found for battery_info_power_unplugged (5987246575519551081) -->
+    <skip />
+    <!-- no translation found for battery_info_power_ac (6808516193001604634) -->
+    <skip />
+    <!-- no translation found for battery_info_power_usb (8012931702516331797) -->
+    <skip />
+    <!-- no translation found for battery_info_power_ac_usb (6777734146838328688) -->
+    <skip />
+    <!-- no translation found for battery_info_power_unknown (7344115502868899881) -->
+    <skip />
+    <string name="battery_info_health_unknown" msgid="5664295556921944255">"Tidak diketahui"</string>
+    <string name="battery_info_health_good" msgid="8070356565806711806">"Baik"</string>
+    <string name="battery_info_health_overheat" msgid="8442959549291368806">"Terlalu panas"</string>
+    <string name="battery_info_health_dead" msgid="1725917445762829059">"Mati"</string>
+    <string name="battery_info_health_over_voltage" msgid="2420269351664490121">"Voltan lampau"</string>
+    <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Ralat tidak diketahui"</string>
+    <!-- no translation found for battery_info_health_cold (3835692786176707318) -->
+    <skip />
+    <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
+    <string name="bluetooth_visibility" msgid="2930835434091839916">"Boleh ditemui"</string>
+    <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Boleh ditemui untuk <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> saat..."</string>
+    <!-- no translation found for bluetooth_is_discoverable_always (8573385118329733931) -->
+    <skip />
+    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Jadikan peranti boleh ditemui"</string>
+    <!-- no translation found for bluetooth_visibility_timeout (6634508002347847278) -->
+    <skip />
+    <!-- no translation found for bluetooth_visibility_timeout_summary (6483353842671501585) -->
+    <skip />
+    <!-- no translation found for bluetooth_lock_voice_dialing (3139322992062086225) -->
+    <skip />
+    <!-- no translation found for bluetooth_lock_voice_dialing_summary (4741338867496787042) -->
+    <skip />
+    <string name="bluetooth_devices" msgid="1886018064039454227">"Peranti Bluetooth"</string>
+    <string name="bluetooth_device_name" msgid="8415828355207423800">"Nama peranti"</string>
+    <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Tiada nama ditetapkan, menggunakan nama akaun"</string>
+    <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Imbas untuk mengesan peranti"</string>
+    <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan diputuskan sambungan."</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"Bersambung"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Diputuskan sambungan"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Memutuskan sambungan..."</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"Menyambung..."</string>
+    <string name="bluetooth_unknown" msgid="644716244548801421"></string>
+    <string name="bluetooth_not_connected" msgid="3389882907500605937">"Pasangkan dengan peranti ini"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"Memasangkan..."</string>
+    <string name="bluetooth_paired" msgid="1247541089000057726">"Dipasangkan tetapi tidak bersambung"</string>
+    <string name="bluetooth_device" msgid="6873461446424952003">"bebas tangan/set kepala"</string>
+    <string name="progress_scanning" msgid="3760897655335759141">"Mengimbas"</string>
+    <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Permintaan menjadi pasangan Bluetooth"</string>
+    <string name="bluetooth_notif_title" msgid="2485175521845371514">"Permintaan pasangan"</string>
+    <!-- no translation found for bluetooth_notif_message (618099089987569242) -->
+    <skip />
+    <!-- no translation found for bluetooth_show_received_files_title (816172853268536399) -->
+    <skip />
+    <!-- no translation found for bluetooth_show_received_files_summary (7322193220909480775) -->
+    <skip />
+    <!-- no translation found for device_picker (8721012448931226323) -->
+    <skip />
+    <!-- no translation found for bluetooth_permission_request (1523129741266262748) -->
+    <skip />
+    <!-- no translation found for bluetooth_ask_enablement (8211158472876087588) -->
+    <skip />
+    <!-- no translation found for bluetooth_ask_discovery (5950965604673262829) -->
+    <skip />
+    <!-- no translation found for bluetooth_ask_discovery (669870705606180872) -->
+    <skip />
+    <!-- no translation found for bluetooth_ask_lasting_discovery (1680661751413856600) -->
+    <skip />
+    <!-- no translation found for bluetooth_ask_lasting_discovery (3413855805411554871) -->
+    <skip />
+    <!-- no translation found for bluetooth_ask_enablement_and_discovery (5716077575971497298) -->
+    <skip />
+    <!-- no translation found for bluetooth_ask_enablement_and_discovery (7220210326619399542) -->
+    <skip />
+    <!-- no translation found for bluetooth_ask_enablement_and_lasting_discovery (6132824454823539873) -->
+    <skip />
+    <!-- no translation found for bluetooth_ask_enablement_and_lasting_discovery (7471195931669103553) -->
+    <skip />
+    <!-- no translation found for bluetooth_turning_on (3107102168379705771) -->
+    <skip />
+    <!-- no translation found for bluetooth_auto_connect (8013003320667198460) -->
+    <skip />
+    <string name="date_and_time" msgid="4114084177056654663">"Tetapan tarikh &amp; masa"</string>
+    <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00 tengah hari"</string>
+    <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
+    <string name="choose_timezone" msgid="7762866468013985022">"Pilih zon waktu"</string>
+    <string name="normal_date_format" msgid="1982904221918374153">"Normal (<xliff:g id="DATE">%s</xliff:g>)"</string>
+    <string name="display_preview_label" msgid="1127597250917274792">"Pratonton:"</string>
+    <string name="display_font_size_label" msgid="8941851418397475389">"Saiz fon:"</string>
+    <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
+    <skip />
+    <string name="intent_sender_sendbroadcast_text" msgid="1415735148895872715">"Hantar <xliff:g id="BROADCAST">broadcast</xliff:g>"</string>
+    <string name="intent_sender_action_label" msgid="616458370005452389">"<xliff:g id="ACTION">Action</xliff:g>:"</string>
+    <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Mulakan <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
+    <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
+    <string name="intent_sender_account_label" msgid="465210404475603404">"Akaun:"</string>
+    <!-- no translation found for proxy_settings_title (5912878565897294401) -->
+    <skip />
+    <!-- no translation found for proxy_settings_summary (7898928000758321486) -->
+    <skip />
+    <string name="proxy_clear_text" msgid="5555400754952012657">"Padam bersih"</string>
+    <!-- outdated translation 2623639656638472491 -->     <string name="proxy_port_label" msgid="5655276502233453400">"Port"</string>
+    <!-- no translation found for proxy_exclusionlist_label (7700491504623418701) -->
+    <skip />
+    <!-- no translation found for proxy_exclusionlist_hint (6084099226687226948) -->
+    <skip />
+    <string name="proxy_defaultView_text" msgid="6387985519141433291">"Pulihkan lalai"</string>
+    <!-- outdated translation 477348175123635416 -->     <string name="proxy_action_text" msgid="2957063145357903951">"Simpan"</string>
+    <!-- outdated translation 7531298584350977540 -->     <string name="proxy_hostname_label" msgid="8490171412999373362">"Nama hos"</string>
+    <!-- no translation found for proxy_hostname_hint (2076157057003936176) -->
+    <skip />
+    <string name="proxy_error" msgid="8926675299638611451">"Perhatian"</string>
+    <string name="proxy_error_dismiss" msgid="4993171795485460060">"OK"</string>
+    <string name="proxy_error_invalid_host" msgid="9120776460063182119">"Nama hos yang anda taipkan tidak sah."</string>
+    <!-- no translation found for proxy_error_invalid_exclusion_list (4753810662233875893) -->
+    <skip />
+    <string name="proxy_error_empty_port" msgid="3525734169948795417">"Anda perlu melengkapkan medan port."</string>
+    <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Medan port haruslah kosong sekiranya medan hos kosong."</string>
+    <string name="proxy_error_invalid_port" msgid="1816315605424943626">"Port yang anda taipkan tidak sah."</string>
+    <!-- no translation found for proxy_warning_limited_support (7442676587591460854) -->
+    <skip />
+    <string name="radio_info_signal_location_label" msgid="16475158265551708">"Lokasi:"</string>
+    <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID berdekatan:"</string>
+    <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Percubaan data:"</string>
+    <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Perkhidmatan GPRS:"</string>
+    <string name="radio_info_roaming_label" msgid="6141505430275138647">"Perayauan:"</string>
+    <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
+    <string name="radio_info_call_redirect_label" msgid="1654674226961476872">"Pengubahhalaan panggilan:"</string>
+    <string name="radio_info_ppp_resets_label" msgid="3241667824729310546">"Bilangan tetapan semula PPP sejak proses but:"</string>
+    <string name="radio_info_gsm_disconnects_label" msgid="1683069665736339820">"GSM memutuskan:"</string>
+    <string name="radio_info_current_network_label" msgid="3256402602440102610">"Rangkaian semasa:"</string>
+    <string name="radio_info_data_successes_label" msgid="4417894113689054945">"Data yang berjaya:"</string>
+    <string name="radio_info_ppp_received_label" msgid="3345184342444878849">"PPP diterima:"</string>
+    <string name="radio_info_gsm_service_label" msgid="2082332114596916985">"Perkhidmatan GMS:"</string>
+    <string name="radio_info_signal_strength_label" msgid="1931937920896925766">"Kekuatan isyarat:"</string>
+    <string name="radio_info_call_status_label" msgid="4896238900685510883">"Status panggilan:"</string>
+    <string name="radio_info_ppp_sent_label" msgid="5009102250704375687">"PPP dihantar:"</string>
+    <string name="radio_info_radio_resets_label" msgid="9211343458143291617">"Penetapan semula radio:"</string>
+    <string name="radio_info_message_waiting_label" msgid="6981842420058672207">"Mesej menunggu:"</string>
+    <string name="radio_info_phone_number_label" msgid="7192944627907412169">"Nombor telefon:"</string>
+    <string name="radio_info_band_mode_label" msgid="441469694142042022">"Pilih jalur radio"</string>
+    <string name="radio_info_network_type_label" msgid="3706382548257257987">"Jenis rangkaian:"</string>
+    <string name="radio_info_set_perferred_label" msgid="9039200405863503267">"Tetapkan jenis rangkaian keutamaan:"</string>
+    <string name="radio_info_ping_ipaddr" msgid="498747917793263530">"Ping AlmtIp:"</string>
+    <string name="radio_info_ping_hostname" msgid="3054888474808217853">"Ping Nama Hos(www.google.com):"</string>
+    <string name="radio_info_http_client_test" msgid="5733604021077701555">"Ujian Klien HTTP:"</string>
+    <string name="ping_test_label" msgid="7255376471490860631">"Jalankan ujian ping"</string>
+    <string name="radio_info_smsc_label" msgid="6399460520126501354">"SMSC:"</string>
+    <string name="radio_info_smsc_update_label" msgid="7258686760358791539">"Kemas kini"</string>
+    <string name="radio_info_smsc_refresh_label" msgid="6902302130315125102">"Muat semula"</string>
+    <string name="radio_info_toggle_dns_check_label" msgid="8292252930563286858">"Togol semakan DNS"</string>
+    <!-- no translation found for oem_radio_info_label (6163141792477958941) -->
+    <skip />
+    <string name="band_mode_title" msgid="954174198903776205">"Tetapkan jalur GSM/UMTS"</string>
+    <string name="band_mode_loading" msgid="548764766363847336">"Memuatkan senarai jalur..."</string>
+    <string name="band_mode_set" msgid="5730560180249458484">"Tetapkan"</string>
+    <string name="band_mode_failed" msgid="1495968863884716379">"Tidak berjaya"</string>
+    <string name="band_mode_succeeded" msgid="2701016190055887575">"Berjaya"</string>
+    <string name="sdcard_changes_instructions" msgid="1364712901180556244">"Perubahan mengambil kesan apabila kabel USB disambungkan semula"</string>
+    <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"Dayakan storan massa USB"</string>
+    <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"Jumlah bait:"</string>
+    <!-- outdated translation 6666688653496819947 -->     <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"Tiada kad SD"</string>
+    <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"Tiada kad SD"</string>
+    <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"Bait tersedia:"</string>
+    <!-- outdated translation 4786433969313661655 -->     <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"Kad SD sedang digunakan sebagai peranti simpanan massa"</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"Kad SD sedang digunakan sebagai peranti simpanan massa"</string>
+    <!-- outdated translation 3812022095683863087 -->     <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="7503300818792750913">"Kini adalah selamat untuk mengeluarkan kad SD"</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="3812022095683863087">"Kini adalah selamat untuk mengeluarkan kad SD"</string>
+    <!-- outdated translation 5145797653495907970 -->     <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"Kad SD telah dikeluarkan semasa masih dalam penggunaan!"</string>
+    <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"Kad SD telah dikeluarkan semasa masih dalam penggunaan!"</string>
+    <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Bait digunakan:"</string>
+    <!-- outdated translation 2763464949274455656 -->     <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Mengimbas kad SD untuk mengesan media..."</string>
+    <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Mengimbas kad SD untuk mengesan media..."</string>
+    <!-- outdated translation 5706115860484118911 -->     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"Kad SD dilekapkan baca sahaja"</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"Kad SD dilekapkan baca sahaja"</string>
+    <!-- no translation found for skip_label (47510779345218297) -->
+    <skip />
+    <string name="next_label" msgid="4693520878012668114">"Seterusnya"</string>
+    <!-- outdated translation 4034157617842965844 -->     <string name="language_picker_title" msgid="5349877711342869319">"Tempat peristiwa"</string>
+    <string name="activity_picker_label" msgid="4910700713930693329">"Pilih aktiviti"</string>
+    <string name="device_info_label" msgid="6551553813651711205">"Maklumat peranti"</string>
+    <string name="battery_info_label" msgid="4132685016148679403">"Maklumat bateri"</string>
+    <!-- outdated translation 7403874003169865762 -->     <string name="display_label" msgid="8074070940506840792">"Paparan"</string>
+    <!-- outdated translation 2127552523124277664 -->     <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Maklumat telefon"</string>
+    <string name="phone_info_label" product="default" msgid="2127552523124277664">"Maklumat telefon"</string>
+    <!-- outdated translation 5743100901106177102 -->     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"Kad SD"</string>
+    <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Kad SD"</string>
+    <string name="proxy_settings_label" msgid="3271174136184391743">"Tetapan proksi"</string>
+    <string name="cancel" msgid="6859253417269739139">"Batal"</string>
+    <string name="settings_label" msgid="1626402585530130914">"Tetapan"</string>
+    <!-- no translation found for settings_label_launcher (8344735489639482340) -->
+    <skip />
+    <!-- outdated translation 3672145147925639262 -->     <string name="settings_shortcut" msgid="8597387747077828217">"Tetapan"</string>
+    <string name="airplane_mode" msgid="8837269988154128601">"Mod pesawat"</string>
+    <string name="airplane_mode_summary" msgid="3154817401368780988">"Lumpuhkan semua sambungan wayarles"</string>
+    <string name="airplane_mode_turning_on" msgid="8871739222526957255">"Melumpuhkan sambungan wayarles..."</string>
+    <string name="airplane_mode_turning_off" msgid="3393168549611505996">"Mendayakan sambungan wayarles..."</string>
+    <!-- no translation found for radio_controls_title (5868688473587168882) -->
+    <skip />
+    <!-- no translation found for wireless_networks_settings_title (3643009077742794212) -->
+    <skip />
+    <!-- no translation found for radio_controls_summary (2998818677094465517) -->
+    <skip />
+    <string name="roaming" msgid="3596055926335478572">"Perayauan data"</string>
+    <string name="roaming_enable" msgid="3737380951525303961">"Sambung ke perkhidmatan data semasa perayauan"</string>
+    <string name="roaming_disable" msgid="1295279574370898378">"Sambung ke perkhidmatan data semasa malakukan perayauan"</string>
+    <string name="roaming_reenable_message" msgid="9141007271031717369">"Anda telah kehilangan kesambungan data kerana anda meninggalkan rangkaian rumah anda dengan data perayauan dimatikan."</string>
+    <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Hidupkannya"</string>
+    <string name="roaming_warning" msgid="1269870211689178511">"Benarkan perayauan data? Anda boleh dikenakan caj perayauan yang tinggi!"</string>
+    <string name="roaming_reenable_title" msgid="7626425894611573131">"Perhatian"</string>
+    <string name="networks" msgid="6333316876545927039">"Pilihan pengendali"</string>
+    <string name="sum_carrier_select" msgid="6648929373316748020">"Pilih pengendali rangkaian"</string>
+    <string name="date_and_time_settings_title" msgid="3350640463596716780">"Tarikh &amp; masa"</string>
+    <!-- no translation found for date_and_time_settings_title_setup_wizard (2391530758339384324) -->
+    <skip />
+    <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Tetapkan tarikh, masa, zon waktu &amp; format"</string>
+    <!-- outdated translation 3086083265745944725 -->     <string name="date_time_auto" msgid="7076906458515908345">"Automatik"</string>
+    <!-- outdated translation 9034585614665299846 -->     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Gunakan nilai yang diberikan oleh rangkaian"</string>
+    <!-- outdated translation 3900356736797266448 -->     <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Gunakan nilai yang diberikan oleh rangkaian"</string>
+    <!-- no translation found for zone_auto (334783869352026648) -->
+    <skip />
+    <!-- no translation found for zone_auto_summaryOn (6142830927278458314) -->
+    <skip />
+    <!-- no translation found for zone_auto_summaryOff (2597745783162041390) -->
+    <skip />
+    <string name="date_time_24hour" msgid="1193032284921000063">"Gunakan format 24 jam"</string>
+    <string name="date_time_set_time" msgid="5716856602742530696">"Tetapkan masa"</string>
+    <string name="date_time_set_timezone" msgid="5045627174274377814">"Pilih zon waktu"</string>
+    <string name="date_time_set_date" msgid="7021491668550232105">"Tetapkan tarikh"</string>
+    <string name="date_time_date_format" msgid="436706100255870967">"Pilih format tarikh"</string>
+    <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Isih mengikut abjad"</string>
+    <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Diisih mengikut zon waktu"</string>
+    <!-- no translation found for date_picker_title (1338210036394128512) -->
+    <skip />
+    <!-- no translation found for time_picker_title (483460752287255019) -->
+    <skip />
+    <!-- no translation found for lock_after_timeout (940509402681580537) -->
+    <skip />
+    <!-- no translation found for lock_after_timeout_summary (4726009794344934278) -->
+    <skip />
+    <!-- no translation found for show_owner_info_on_lockscreen_label (5074906168357568434) -->
+    <skip />
+    <!-- no translation found for owner_info_settings_title (2723190010708381889) -->
+    <skip />
+    <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
+    <!-- no translation found for owner_info_settings_edit_text_hint (2382525043173672857) -->
+    <skip />
+    <!-- no translation found for security_settings_title (5168491784222013179) -->
+    <skip />
+    <!-- no translation found for location_security_settings_title (4624434296446625554) -->
+    <skip />
+    <!-- no translation found for security_settings_summary (967393342537986570) -->
+    <skip />
+    <!-- no translation found for cdma_security_settings_summary (6068799952798901542) -->
+    <skip />
+    <string name="security_passwords_title" msgid="2930627259125138363">"Kata laluan"</string>
+    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
+    <skip />
+    <!-- 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_desc (2150571569618349332) -->
+    <skip />
+    <!-- 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_low_charge_text (5920622844033087792) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_dialog_need_password_title (4058971800557767) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_dialog_need_password_message (17076329416977176) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (2496639211575162172) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (3248595818246515395) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_setup_description (5317479293244660361) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_setup_description (8166730416836285875) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_cooldown (685210918307862395) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_enter_password (1492603008983893532) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_title (1166918236711686187) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (1075638996134310507) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (3394708817932222518) -->
+    <skip />
+    <!-- no translation found for lock_settings_picker_title (8665454308380158195) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_title (4461562893699328786) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_change_title (6987228635944678726) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_change_summary (2790960639554590668) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_enable_summary (4791110798817242301) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_off_title (1613932765246180079) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_off_summary (2791013557563587655) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_none_title (7560817055143323842) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_none_summary (2609139908913114644) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pattern_title (2912067603917311700) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pattern_summary (8467282436608077882) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pin_title (5846029709462329515) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pin_summary (5556722736289132512) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_password_title (8775603825675090937) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_password_summary (7871968012198279034) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_disabled_summary (2120729867788851674) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_mode_off (378729687629105388) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_mode_none (7137296704741184239) -->
+    <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 />
+    <!-- no translation found for unlock_disable_lock_title (1427036227416979120) -->
+    <skip />
+    <!-- no translation found for unlock_disable_lock_pattern_summary (6801602880568869201) -->
+    <skip />
+    <!-- no translation found for unlock_disable_lock_pin_summary (8856842745366993387) -->
+    <skip />
+    <!-- no translation found for unlock_disable_lock_password_summary (192161194564577025) -->
+    <skip />
+    <!-- no translation found for unlock_change_lock_pattern_title (2044092014872741130) -->
+    <skip />
+    <!-- no translation found for unlock_change_lock_pin_title (806629901095938484) -->
+    <skip />
+    <!-- no translation found for unlock_change_lock_password_title (5606298470358768865) -->
+    <skip />
+    <!-- no translation found for lockpassword_password_too_short (7328975683669256660) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_short (2252847623267704683) -->
+    <skip />
+    <!-- no translation found for lockpassword_press_continue (122706614386757182) -->
+    <skip />
+    <!-- no translation found for lockpassword_continue_label (4602203784934526940) -->
+    <skip />
+    <!-- no translation found for lockpassword_password_too_long (5487426077939378487) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_long (6382649850551200693) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_contains_non_digits (3379277100136600632) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_recently_used (2729073062730842496) -->
+    <skip />
+    <!-- no translation found for lockpassword_illegal_character (6204396794254688549) -->
+    <skip />
+    <!-- no translation found for lockpassword_password_requires_alpha (5668524505560400449) -->
+    <skip />
+    <!-- no translation found for lockpassword_password_requires_digit (4840579514154254907) -->
+    <skip />
+    <!-- no translation found for lockpassword_password_requires_symbol (4140602725865312078) -->
+    <skip />
+    <!-- no translation found for lockpassword_password_requires_letters:one (1462968118065694590) -->
+    <!-- no translation found for lockpassword_password_requires_letters:other (7278096339907683541) -->
+    <!-- no translation found for lockpassword_password_requires_lowercase:one (2048653993044269649) -->
+    <!-- no translation found for lockpassword_password_requires_lowercase:other (588499075580432178) -->
+    <!-- no translation found for lockpassword_password_requires_uppercase:one (7677454174080582601) -->
+    <!-- no translation found for lockpassword_password_requires_uppercase:other (2183090598541826806) -->
+    <!-- no translation found for lockpassword_password_requires_numeric:one (8585088032818933985) -->
+    <!-- no translation found for lockpassword_password_requires_numeric:other (995673409754935278) -->
+    <!-- no translation found for lockpassword_password_requires_symbols:one (3930886641317826293) -->
+    <!-- no translation found for lockpassword_password_requires_symbols:other (3047460862484105274) -->
+    <!-- no translation found for lockpassword_password_requires_nonletter:one (1716355580615489062) -->
+    <!-- no translation found for lockpassword_password_requires_nonletter:other (5574191164708145973) -->
+    <!-- no translation found for lockpassword_password_recently_used (2739642871806935825) -->
+    <skip />
+    <!-- no translation found for lockpassword_ok_label (313822574062553672) -->
+    <skip />
+    <!-- no translation found for lockpassword_cancel_label (8818529276331121899) -->
+    <skip />
+    <!-- no translation found for lockpattern_tutorial_cancel_label (6431583477570493261) -->
+    <skip />
+    <!-- no translation found for lockpattern_tutorial_continue_label (3559793618653400434) -->
+    <skip />
+    <!-- no translation found for device_admin_title (3562216873644263804) -->
+    <skip />
+    <!-- no translation found for manage_device_admin (5059296715271077278) -->
+    <skip />
+    <!-- no translation found for manage_device_admin_summary (7672709110988761075) -->
+    <skip />
+    <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
+    <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Hidupkan Bluetooth"</string>
+    <string name="bluetooth_settings" msgid="2725796451253089609">"Tetapan Bluetooth"</string>
+    <string name="bluetooth_settings_title" msgid="2824020086246268296">"Tetapan Bluetooth"</string>
+    <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Urus sambungan, tetapkan nama peranti &amp; kebolehan ditemui"</string>
+    <!-- no translation found for bluetooth_pairing_request (6385750334766370310) -->
+    <skip />
+    <!-- no translation found for bluetooth_enter_pin_msg (1499285355129256289) -->
+    <skip />
+    <!-- no translation found for bluetooth_enter_passkey_msg (8301499416158195044) -->
+    <skip />
+    <!-- no translation found for bluetooth_confirm_passkey_msg (1205362283945104263) -->
+    <skip />
+    <!-- no translation found for bluetooth_incoming_pairing_msg (1076613564387784476) -->
+    <skip />
+    <!-- no translation found for bluetooth_display_passkey_pin_msg (9139892462102104755) -->
+    <skip />
+    <!-- no translation found for bluetooth_pairing_accept (6163520056536604875) -->
+    <skip />
+    <!-- no translation found for bluetooth_pairing_decline (930951069988011471) -->
+    <skip />
+    <!-- no translation found for bluetooth_remote_device (2406662802908395389) -->
+    <skip />
+    <string name="bluetooth_error_title" msgid="538287072376677166">"Perhatian"</string>
+    <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"Terdapat masalah memasangkan dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <!-- no translation found for bluetooth_pairing_pin_error_message (6065697229258906937) -->
+    <skip />
+    <string name="bluetooth_pairing_device_down_error_message" msgid="6688215193824686741">"Tidak boleh mewujudkan komunikasi dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Pasangan ditolak oleh <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"Terdapat masalah menyambung ke <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Imbas untuk mengesan peranti"</string>
+    <!-- no translation found for bluetooth_preference_find_nearby_title (5087410003465463318) -->
+    <skip />
+    <!-- no translation found for bluetooth_preference_device_settings (907776049862799122) -->
+    <skip />
+    <!-- no translation found for bluetooth_preference_paired_devices (1970524193086791964) -->
+    <skip />
+    <!-- no translation found for bluetooth_preference_found_devices (3133019331974936204) -->
+    <skip />
+    <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Sambung"</string>
+    <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Putus sambungan"</string>
+    <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Pasangkan &amp; sambung"</string>
+    <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Nyahpasangan"</string>
+    <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Putuskan sambungan &amp; nyahpasangan"</string>
+    <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Pilihan..."</string>
+    <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Sambung ke..."</string>
+    <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"Media"</string>
+    <!-- outdated translation 1874975688666658946 -->     <string name="bluetooth_profile_headset" msgid="81844079120986198">"Telefon"</string>
+    <!-- no translation found for bluetooth_profile_opp (3799470046565284440) -->
+    <skip />
+    <!-- no translation found for bluetooth_profile_hid (3000858580917633478) -->
+    <skip />
+    <!-- no translation found for bluetooth_profile_pan (3391606497945147673) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_a2dp_profile (3524648279150937177) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_headset_profile (8635908811168780720) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_hid_profile (3282295189719352075) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_pan_user_profile (8037627994382458698) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_pan_nap_profile (5455448395850929200) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_pan_nap_profile (5266851881175033601) -->
+    <skip />
+    <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"Pilihan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <!-- no translation found for bluetooth_device_advanced_device_actions_title (3793430949811946844) -->
+    <skip />
+    <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Sambung"</string>
+    <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Sambung ke peranti Bluetooth"</string>
+    <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Profil"</string>
+    <!-- no translation found for bluetooth_device_advanced_rename_device (350508394033808532) -->
+    <skip />
+    <!-- no translation found for bluetooth_device_advanced_enable_opp_title (8222550640371627365) -->
+    <skip />
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Disambungkan ke audio media"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Disambungkan ke audio telefon"</string>
+    <!-- no translation found for bluetooth_opp_profile_summary_connected (2611913495968309066) -->
+    <skip />
+    <!-- no translation found for bluetooth_opp_profile_summary_not_connected (1267091356089086285) -->
+    <skip />
+    <!-- no translation found for bluetooth_hid_profile_summary_connected (3381760054215168689) -->
+    <skip />
+    <!-- no translation found for bluetooth_pan_user_profile_summary_connected (4602294638909590612) -->
+    <skip />
+    <!-- no translation found for bluetooth_pan_nap_profile_summary_connected (1561383706411975199) -->
+    <skip />
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Gunakan untuk audio media"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Gunakan untuk audio telefon"</string>
+    <!-- no translation found for bluetooth_opp_profile_summary_use_for (1255674547144769756) -->
+    <skip />
+    <!-- no translation found for bluetooth_hid_profile_summary_use_for (232727040453645139) -->
+    <skip />
+    <!-- no translation found for bluetooth_pan_profile_summary_use_for (5664884523822068653) -->
+    <skip />
+    <!-- no translation found for bluetooth_dock_settings (3218335822716052885) -->
+    <skip />
+    <!-- no translation found for bluetooth_dock_settings_title (5543069893044375188) -->
+    <skip />
+    <!-- no translation found for bluetooth_dock_settings_headset (1001821426078644650) -->
+    <skip />
+    <!-- no translation found for bluetooth_dock_settings_a2dp (8791004998846630574) -->
+    <skip />
+    <!-- no translation found for bluetooth_dock_settings_remember (5551459057010609115) -->
+    <skip />
+    <!-- no translation found for nfc_quick_toggle_title (6769159366307299004) -->
+    <skip />
+    <!-- no translation found for nfc_quick_toggle_summary (1988408027741447231) -->
+    <skip />
+    <!-- no translation found for nfc_toggle_error (2233172102497535522) -->
+    <!-- no translation found for nfc_toggle_error (8998642457947607263) -->
+    <skip />
+    <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Hidupkan Wi-Fi"</string>
+    <string name="wifi_settings" msgid="4746946030627213196">"Tetapan Wi-Fi"</string>
+    <string name="wifi_settings_category" msgid="2810363951104753710">"Tetapan Wi-Fi"</string>
+    <string name="wifi_settings_summary" msgid="668767638556052820">"Sediakan &amp; urus titik capaian wayarles"</string>
+    <string name="wifi_starting" msgid="6710266609710860129">"Menghidupkan..."</string>
+    <string name="wifi_stopping" msgid="5952909472548218348">"Mematikan..."</string>
+    <string name="wifi_error" msgid="3207971103917128179">"Ralat"</string>
+    <!-- no translation found for wifi_in_airplane_mode (7618393787965366655) -->
+    <skip />
+    <!-- no translation found for wifi_fail_to_scan (6194542252808587669) -->
+    <skip />
+    <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Pemberitahuan rangkaian"</string>
+    <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Beritahu saya apabila rangkaian terbuka tersedia"</string>
+    <!-- outdated translation 1367731352485585528 -->     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Dasar tidur Wi-Fi"</string>
+    <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Tentukan bila hendak bertukar daripada Wi-Fi kepada data mudah alih"</string>
+    <!-- no translation found for wifi_setting_sleep_policy_summary_wifi_only (5025244230722670496) -->
+    <skip />
+    <!-- outdated translation 5103670439972135148 -->     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Terdapat masalah menetapkan dasar tidur."</string>
+    <!-- no translation found for wifi_add_network (1671334951296205616) -->
+    <skip />
+    <!-- no translation found for wifi_add_network_summary (6345544206968025811) -->
+    <skip />
+    <string name="wifi_access_points" msgid="2664629396767022441">"Rangkaian Wi-Fi"</string>
+    <!-- no translation found for wifi_menu_scan (1470911530412095868) -->
+    <skip />
+    <string name="wifi_menu_advanced" msgid="7522252991919573664">"Terperinci"</string>
+    <!-- no translation found for wifi_menu_connect (4996220309848349408) -->
+    <skip />
+    <!-- no translation found for wifi_menu_forget (8736964302477327114) -->
+    <skip />
+    <!-- no translation found for wifi_menu_modify (2068554918652440105) -->
+    <skip />
+    <!-- no translation found for wifi_network_setup (7974851890019344870) -->
+    <skip />
+    <!-- no translation found for wifi_wps_pin (5471842298708321115) -->
+    <skip />
+    <!-- no translation found for wifi_wps_setup_title (150518971269252336) -->
+    <skip />
+    <!-- no translation found for wifi_wps_pin_output (8682102965680650853) -->
+    <skip />
+    <!-- no translation found for wifi_wps_in_progress (2776555137392461525) -->
+    <skip />
+    <!-- no translation found for wifi_wps_failed (2277409652621482331) -->
+    <skip />
+    <!-- no translation found for wifi_ssid (641393708309146745) -->
+    <skip />
+    <string name="wifi_security" msgid="6603611185592956936">"Keselamatan"</string>
+    <!-- no translation found for wifi_signal (5514120261628065287) -->
+    <skip />
+    <string name="wifi_status" msgid="4824568012414605414">"Status"</string>
+    <!-- no translation found for wifi_speed (3526198708812322037) -->
+    <skip />
+    <string name="wifi_ip_address" msgid="1440054061044402918">"Alamat IP"</string>
+    <!-- no translation found for wifi_eap_method (8529436133640730382) -->
+    <skip />
+    <string name="please_select_phase2" msgid="5231074529772044898">"Pengesahan fasa 2"</string>
+    <!-- no translation found for wifi_eap_ca_cert (3521574865488892851) -->
+    <skip />
+    <!-- no translation found for wifi_eap_user_cert (1291089413368160789) -->
+    <skip />
+    <!-- no translation found for wifi_eap_identity (4359453783379679103) -->
+    <skip />
+    <!-- no translation found for wifi_eap_anonymous (2989469344116577955) -->
+    <skip />
+    <!-- no translation found for wifi_password (5948219759936151048) -->
+    <skip />
+    <!-- outdated translation 4235237470701732009 -->     <string name="wifi_show_password" msgid="6461249871236968884">"Tunjukkan kata laluan."</string>
+    <!-- no translation found for wifi_ip_settings (3359331401377059481) -->
+    <skip />
+    <!-- no translation found for wifi_unchanged (3410422020930397102) -->
+    <skip />
+    <!-- no translation found for wifi_unspecified (5431501214192991253) -->
+    <skip />
+    <!-- no translation found for wifi_remembered (8426719916135950136) -->
+    <skip />
+    <!-- no translation found for wifi_disabled (2104752038187543712) -->
+    <skip />
+    <!-- no translation found for wifi_not_in_range (1136191511238508967) -->
+    <skip />
+    <!-- no translation found for wifi_open_with_wps (2606968531452521147) -->
+    <skip />
+    <!-- no translation found for wifi_secured (6759903183748011566) -->
+    <skip />
+    <!-- no translation found for wifi_secured_with_wps (1822538701086256007) -->
+    <skip />
+    <!-- no translation found for wifi_secured_with_status (6489317496506267302) -->
+    <skip />
+    <!-- no translation found for wifi_connect (1076622875777072845) -->
+    <skip />
+    <!-- no translation found for wifi_forget (8168174695608386644) -->
+    <skip />
+    <!-- no translation found for wifi_save (3331121567988522826) -->
+    <skip />
+    <!-- no translation found for wifi_cancel (6763568902542968964) -->
+    <skip />
+    <!-- no translation found for wifi_wps_overlap_error (6820987241637459748) -->
+    <skip />
+    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Terperinci"</string>
+    <!-- no translation found for wifi_setting_frequency_band_title (7493768705046080060) -->
+    <skip />
+    <!-- no translation found for wifi_setting_frequency_band_summary (3250740757118009784) -->
+    <skip />
+    <!-- no translation found for wifi_setting_frequency_band_error (837281974489794378) -->
+    <skip />
+    <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Alamat MAC"</string>
+    <!-- no translation found for wifi_advanced_ip_address_title (6215297094363164846) -->
+    <skip />
+    <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"Tetapan IP"</string>
+    <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Simpan"</string>
+    <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Batal"</string>
+    <!-- no translation found for wifi_ip_settings_invalid_ip_address (6387653152103405443) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_gateway (6383012465511093067) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_dns (3428867750550854065) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_network_prefix_length (8145730615716855433) -->
+    <skip />
+    <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
+    <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
+    <string name="wifi_gateway" msgid="163914742461092086">"Get laluan"</string>
+    <!-- no translation found for wifi_network_prefix_length (3028785234245085998) -->
+    <skip />
+    <!-- no translation found for wifi_tether_checkbox_text (6961605862058056788) -->
+    <skip />
+    <!-- no translation found for wifi_tether_enabled_subtext (8948641212931906143) -->
+    <skip />
+    <!-- no translation found for wifi_tether_failed_subtext (2654888578056042315) -->
+    <skip />
+    <!-- no translation found for wifi_tether_configure_ap_text (3474995108398156258) -->
+    <skip />
+    <!-- no translation found for wifi_tether_configure_subtext (1927454307836232128) -->
+    <skip />
+    <!-- no translation found for wifi_tether_configure_ssid_default (8467525402622138547) -->
+    <skip />
+    <!-- no translation found for sound_settings_title (8735891486683305886) -->
+    <skip />
+    <!-- no translation found for display_settings_title (2378894265964357591) -->
+    <skip />
+    <string name="sound_settings" msgid="5007659014828162881">"Tetapan bunyi"</string>
+    <string name="silent_mode_title" msgid="3181479108593217704">"Mod senyap"</string>
+    <!-- no translation found for silent_mode_summary (3309650676072917899) -->
+    <skip />
+    <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"Semua bunyi kecuali media disenyapkan"</string>
+    <!-- outdated translation 5379026328015343686 -->     <string name="ringtone_title" msgid="7037881886694206550">"Nada dering telefon"</string>
+    <string name="ringtone_summary" msgid="2630023412632683493"></string>
+    <!-- no translation found for all_volume_title (8741571721868253103) -->
+    <skip />
+    <string name="ring_volume_title" msgid="7938706566797464165">"Kelantangan pendering"</string>
+    <string name="ring_volume_summary" msgid="7055497624193116879"></string>
+    <!-- no translation found for vibrate_in_silent_title (3897968069156767036) -->
+    <skip />
+    <!-- no translation found for vibrate_in_silent_summary (3312600513070076281) -->
+    <skip />
+    <!-- outdated translation 5408984084125311526 -->     <string name="vibrate_title" msgid="6045820877942801599">"Telefon bergetar"</string>
+    <!-- outdated translation 5224303668448643275 -->     <string name="vibrate_summary" msgid="7378130397830790458">"Getar telefon untuk panggilan masuk"</string>
+    <string name="notification_sound_title" msgid="6316316069880531693">"Nada dering pemberitahuan"</string>
+    <string name="notification_sound_summary" msgid="2953599929394109819"></string>
+    <!-- no translation found for notification_pulse_title (1247988024534030629) -->
+    <skip />
+    <!-- no translation found for notification_pulse_summary (6899220780534617152) -->
+    <skip />
+    <!-- no translation found for incoming_call_volume_title (8073714801365904099) -->
+    <skip />
+    <!-- no translation found for notification_volume_title (2012640760341080408) -->
+    <skip />
+    <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Gunakan kelantangan panggilan masuk untuk pemberitahuan"</string>
+    <string name="notification_sound_dialog_title" msgid="7057274209079144726">"Pilih nada dering pemberitahuan"</string>
+    <!-- outdated translation 7844516127427195383 -->     <string name="media_volume_title" msgid="3576565767317118106">"Kelantangan media"</string>
+    <string name="media_volume_summary" msgid="5363248930648849974">"Tetapkan kelantangan untuk muzik dan video"</string>
+    <!-- no translation found for alarm_volume_title (2285597478377758706) -->
+    <skip />
+    <!-- no translation found for dock_settings_summary (455802113668982481) -->
+    <skip />
+    <string name="dtmf_tone_enable_title" msgid="1453831168789523185">"Nada sentuh boleh dengar"</string>
+    <string name="dtmf_tone_enable_summary_on" msgid="3028201873989887327">"Mainkan nada apabila menggunakan pad dail"</string>
+    <string name="dtmf_tone_enable_summary_off" msgid="7791065951268525678">"Main nada apabila menggunakan pad pendail"</string>
+    <string name="sound_effects_enable_title" msgid="3197313718929122833">"Pilihan boleh dengar"</string>
+    <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Mainkan bunyi semasa membuat pilihan skrin"</string>
+    <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Mainkan bunyi semasa membuat pilihan skrin"</string>
+    <!-- no translation found for lock_sounds_enable_title (1575990840389107141) -->
+    <skip />
+    <!-- no translation found for lock_sounds_enable_summary_on (145741024028391473) -->
+    <skip />
+    <!-- no translation found for lock_sounds_enable_summary_off (8481243116223542804) -->
+    <skip />
+    <!-- no translation found for haptic_feedback_enable_title (6311736559245411290) -->
+    <skip />
+    <!-- no translation found for haptic_feedback_enable_summary_on (1875779656524793053) -->
+    <skip />
+    <!-- no translation found for haptic_feedback_enable_summary_off (7287885436963105314) -->
+    <skip />
+    <!-- no translation found for audio_record_proc_title (4271091199976457534) -->
+    <skip />
+    <!-- no translation found for audio_record_proc_summary (8113628457499616498) -->
+    <skip />
+    <!-- no translation found for dock_settings (1820107306693002541) -->
+    <skip />
+    <!-- no translation found for dock_settings_title (9161438664257429372) -->
+    <skip />
+    <!-- no translation found for dock_audio_settings_title (3324750259959570305) -->
+    <skip />
+    <!-- no translation found for dock_audio_summary_desk (6487784412371139335) -->
+    <skip />
+    <!-- no translation found for dock_audio_summary_car (6740897586006248450) -->
+    <skip />
+    <!-- no translation found for dock_audio_summary_none (8215337394914283607) -->
+    <skip />
+    <!-- no translation found for dock_audio_summary_none (289909253741048784) -->
+    <skip />
+    <!-- no translation found for dock_audio_summary_unknown (4465059868974255693) -->
+    <skip />
+    <!-- no translation found for dock_not_found_title (3290961741828952424) -->
+    <skip />
+    <!-- no translation found for dock_not_found_text (7935403744079168804) -->
+    <skip />
+    <!-- no translation found for dock_not_found_text (3035260358985111855) -->
+    <skip />
+    <!-- no translation found for dock_sounds_enable_title (3659084028644948905) -->
+    <skip />
+    <!-- no translation found for dock_sounds_enable_summary_on (838102386448981339) -->
+    <skip />
+    <!-- no translation found for dock_sounds_enable_summary_on (8491180514199743771) -->
+    <skip />
+    <!-- no translation found for dock_sounds_enable_summary_off (5077843049805652363) -->
+    <skip />
+    <!-- no translation found for dock_sounds_enable_summary_off (3151046599205265919) -->
+    <skip />
+    <!-- no translation found for sync_settings (9186125469300013491) -->
+    <skip />
+    <!-- no translation found for sync_settings_summary (2962179505214965667) -->
+    <skip />
+    <string name="search_settings" msgid="1910951467596035063">"Carian"</string>
+    <string name="search_settings_summary" msgid="9205656546570654169">"Urus tetapan dan sejarah carian"</string>
+    <!-- outdated translation 3912042046350078328 -->     <string name="display_settings" msgid="5947830029420609057">"Tetapkan paparan"</string>
+    <string name="animations_title" msgid="1062189037402346023">"Animasi"</string>
+    <string name="animations_summary_on" msgid="8843613112130484436">"Tunjukkan animasi apabila membuka &amp; menutup tetingkap"</string>
+    <string name="animations_summary_off" msgid="2777026828025551983">"Tunjukkan animasi apabila membuka &amp; menutup tetingkap"</string>
+    <!-- no translation found for accelerometer_title (7854608399547349157) -->
+    <skip />
+    <!-- outdated translation 1133737282813048021 -->     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Tukar orientasi secara automatik apabila memutarkan telefon"</string>
+    <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Tukar orientasi secara automatik apabila memutarkan telefon"</string>
+    <!-- outdated translation 5485489363715740761 -->     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Tukar orientasi secara automatik apabila memutarkan telefon"</string>
+    <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Tukar orientasi secara automatik apabila memutarkan telefon"</string>
+    <string name="brightness" msgid="2354961343555249270">"Kecerahan"</string>
+    <string name="brightness_summary" msgid="838917350127550703">"Laraskan kecerahan skrin"</string>
+    <!-- outdated translation 4882669461447531301 -->     <string name="screen_timeout" msgid="6962654593018319466">"Tamat masa skrin"</string>
+    <!-- no translation found for screen_timeout_summary (4471347210332380587) -->
+    <skip />
+    <!-- no translation found for dream_settings_title (6536876013377446805) -->
+    <skip />
+    <!-- no translation found for dream_settings_summary (6809871648071408259) -->
+    <skip />
+    <!-- no translation found for dream_component_title (505229894674572578) -->
+    <skip />
+    <!-- no translation found for dream_timeout_title (1385909618566514628) -->
+    <skip />
+    <!-- no translation found for dream_timeout_summary (6721955887728454226) -->
+    <skip />
+    <!-- no translation found for dream_timeout_zero_summary (2450290346381400092) -->
+    <skip />
+    <!-- no translation found for dream_test (5968002644622194481) -->
+    <skip />
+    <!-- no translation found for automatic_brightness (5014143533884135461) -->
+    <skip />
+    <!-- no translation found for title_font_size (4405544325522105222) -->
+    <skip />
+    <!-- no translation found for summary_font_size (7548243392515500554) -->
+    <skip />
+    <!-- no translation found for dialog_title_font_size (4503471078477715461) -->
+    <skip />
+    <string name="sim_lock_settings" msgid="3392331196873564292">"Tetapan kunci kad SIM"</string>
+    <string name="sim_lock_settings_category" msgid="5136244267576697004">"Sediakan kunci kad SIM"</string>
+    <string name="sim_lock_settings_title" msgid="9018585580955414596">"Kunci kad SIM"</string>
+    <string name="sim_pin_toggle" msgid="1742123478029451888">"Kunci kad SIM"</string>
+    <!-- outdated translation 2503536505568814324 -->     <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Memerlukan PIN untuk menggunakan telefon"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Memerlukan PIN untuk menggunakan telefon"</string>
+    <!-- outdated translation 258981978215428916 -->     <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Memerlukan PIN untuk menggunakan telefon"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"Memerlukan PIN untuk menggunakan telefon"</string>
+    <string name="sim_pin_change" msgid="6311414184279932368">"Tukar PIN SIM"</string>
+    <string name="sim_enter_pin" msgid="6608715137008508432">"PIN SIM"</string>
+    <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Kunci kad SIM"</string>
+    <string name="sim_disable_sim_lock" msgid="7664729528754784824">"Buka kunci kad SIM"</string>
+    <string name="sim_enter_old" msgid="6074196344494634348">"PIN SIM lama"</string>
+    <string name="sim_enter_new" msgid="8742727032729243562">"PIN SIM baru"</string>
+    <string name="sim_reenter_new" msgid="3178510434642201544">"Taipkan semula PIN baru"</string>
+    <string name="sim_change_pin" msgid="7328607264898359112">"PIN SIM"</string>
+    <string name="sim_bad_pin" msgid="2746201276896134075">"PIN Salah!"</string>
+    <string name="sim_pins_dont_match" msgid="4664611595579163214">"PIN tidak sepadan!"</string>
+    <string name="sim_change_failed" msgid="4823538458798362222">"Tidak boleh menukar PIN."\n"Kemungkinan PIN salah."</string>
+    <string name="sim_change_succeeded" msgid="8556135413096489627">"PIN SIM berjaya ditukar"</string>
+    <string name="sim_lock_failed" msgid="6676748290838006404">"Tidak boleh menukar keadaan penguncian kad SIM."\n"Kemungkinan PIN salah."</string>
+    <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
+    <string name="sim_enter_cancel" msgid="6240422158517208036">"Batal"</string>
+    <!-- outdated translation 475872867864762157 -->     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Status telefon"</string>
+    <string name="device_info_settings" product="default" msgid="475872867864762157">"Status telefon"</string>
+    <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Kemas kini sistem"</string>
+    <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
+    <!-- outdated translation 6284872163051667788 -->     <string name="firmware_version" msgid="4801135784886859972">"Versi perisian tegar"</string>
+    <string name="model_number" msgid="3765737700545384794">"Nombor model"</string>
+    <string name="baseband_version" msgid="1848990160763524801">"Versi jalur dasar"</string>
+    <string name="kernel_version" msgid="9192574954196167602">"Versi inti"</string>
+    <string name="build_number" msgid="3075795840572241758">"Nombor binaan"</string>
+    <string name="device_info_not_available" msgid="8062521887156825182">"Tidak tersedia"</string>
+    <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
+    <string name="device_status" msgid="607405385799807324">"Status"</string>
+    <!-- outdated translation 2599162787451519618 -->     <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Nombor telefon, isyarat, dll."</string>
+    <string name="device_status_summary" product="default" msgid="2599162787451519618">"Nombor telefon, isyarat, dll."</string>
+    <!-- no translation found for storage_settings (4211799979832404953) -->
+    <skip />
+    <!-- no translation found for storage_settings_title (8746016738388094064) -->
+    <skip />
+    <!-- outdated translation 9176693537325988610 -->     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Nyahlekap kad SD, lihat storan tersedia"</string>
+    <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Nyahlekap kad SD, lihat storan tersedia"</string>
+    <!-- outdated translation 5123197324870153205 -->     <string name="status_number" product="tablet" msgid="1138837891091222272">"Nombor telefon saya"</string>
+    <string name="status_number" product="default" msgid="5123197324870153205">"Nombor telefon saya"</string>
+    <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
+    <string name="status_prl_version" msgid="8499039751817386529">"Versi PRL"</string>
+    <!-- outdated translation 1751442889111731088 -->     <string name="status_meid_number" msgid="2037549729230058915">"MEID"</string>
+    <string name="status_network_type" msgid="3279383550222116235">"Jenis rangkaian mudah alih"</string>
+    <string name="status_data_state" msgid="5503181397066522950">"Keadaan rangkaian mudah alih"</string>
+    <string name="status_service_state" msgid="2323931627519429503">"Keadaan perkhidmatan"</string>
+    <string name="status_signal_strength" msgid="3732655254188304547">"Kekuatan isyarat"</string>
+    <string name="status_roaming" msgid="2638800467430913403">"Perayauan"</string>
+    <string name="status_operator" msgid="2274875196954742087">"Rangkaian"</string>
+    <string name="status_wifi_mac_address" msgid="33109409206264790">"Alamat MAC Wi-Fi"</string>
+    <string name="status_bt_address" msgid="4195174192087439720">"Alamat Bluetooth"</string>
+    <!-- no translation found for status_serial_number (2257111183374628137) -->
+    <skip />
+    <string name="status_unavailable" msgid="7862009036663793314">"Tidak tersedia"</string>
+    <string name="status_up_time" msgid="7294859476816760399">"Masa hidup"</string>
+    <string name="status_awake_time" msgid="2393949909051183652">"Masa berjaga"</string>
+    <!-- outdated translation 1130932766236387454 -->     <string name="internal_memory" msgid="9129595691484260784">"Storan dalaman telefon"</string>
+    <!-- outdated translation 151871913888051515 -->     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Kad SD"</string>
+    <string name="sd_memory" product="default" msgid="151871913888051515">"Kad SD"</string>
+    <!-- outdated translation 418542433817289474 -->     <string name="memory_available" msgid="5052397223077021181">"Ruang tersedia"</string>
+    <string name="memory_size" msgid="6629067715017232195">"Jumlah ruang"</string>
+    <!-- no translation found for memory_calculating_size (2188358544203768588) -->
+    <skip />
+    <!-- no translation found for memory_apps_usage (9079237985722858506) -->
+    <skip />
+    <!-- no translation found for memory_media_usage (3738830697707880405) -->
+    <skip />
+    <!-- no translation found for memory_downloads_usage (3755173051677533027) -->
+    <skip />
+    <!-- no translation found for memory_dcim_usage (6679615808140067136) -->
+    <skip />
+    <!-- no translation found for memory_music_usage (4040027367622874108) -->
+    <skip />
+    <!-- no translation found for memory_media_misc_usage (235452944021647124) -->
+    <skip />
+    <!-- outdated translation 6915293408836853020 -->     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Nyahlekap kad SD"</string>
+    <string name="sd_eject" product="default" msgid="6915293408836853020">"Nyahlekap kad SD"</string>
+    <!-- outdated translation 3315557796211542962 -->     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Nyahlekap kad SD untuk dikeluarkan dengan selamat"</string>
+    <!-- outdated translation 3315557796211542962 -->     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Nyahlekap kad SD untuk dikeluarkan dengan selamat"</string>
+    <!-- no translation found for sd_insert_summary (5264016886409577313) -->
+    <skip />
+    <!-- no translation found for sd_insert_summary (2048640010381803841) -->
+    <skip />
+    <!-- no translation found for sd_mount (8966695015677343116) -->
+    <skip />
+    <!-- no translation found for sd_mount (5940523765187704135) -->
+    <skip />
+    <string name="sd_mount_summary" product="nosdcard" msgid="4673411327373419641"></string>
+    <string name="sd_mount_summary" product="default" msgid="4673411327373419641"></string>
+    <!-- outdated translation 5448738337382712203 -->     <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"Format kad SD"</string>
+    <!-- outdated translation 5448738337382712203 -->     <string name="sd_format" product="default" msgid="2576054280507119870">"Format kad SD"</string>
+    <!-- outdated translation 6616491027883134004 -->     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Format (padam) kad SD"</string>
+    <!-- outdated translation 6616491027883134004 -->     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Format (padam) kad SD"</string>
+    <string name="read_only" msgid="6702420168629076340">" (Baca sahaja)"</string>
+    <!-- no translation found for dlg_confirm_unmount_title (2349876662428231297) -->
+    <skip />
+    <!-- no translation found for dlg_confirm_unmount_title (8612140627310646730) -->
+    <skip />
+    <!-- no translation found for dlg_confirm_unmount_text (3390169455621185223) -->
+    <skip />
+    <!-- no translation found for dlg_confirm_unmount_text (5851214273718817727) -->
+    <skip />
+    <!-- no translation found for dlg_error_unmount_title (7695491947411836733) -->
+    <skip />
+    <!-- no translation found for dlg_error_unmount_title (4004106918266783081) -->
+    <skip />
+    <!-- no translation found for dlg_error_unmount_text (1450864147013376592) -->
+    <skip />
+    <!-- no translation found for dlg_error_unmount_text (9188972789897713180) -->
+    <skip />
+    <!-- no translation found for unmount_inform_text (7120241136790744265) -->
+    <skip />
+    <!-- no translation found for unmount_inform_text (1904212716075458402) -->
+    <skip />
+    <!-- no translation found for sd_ejecting_title (8824572198034365468) -->
+    <skip />
+    <!-- no translation found for sd_ejecting_summary (2028753069184908491) -->
+    <skip />
+    <string name="battery_status_title" msgid="9159414319574976203">"Status bateri"</string>
+    <string name="battery_level_title" msgid="2965679202786873272">"Aras bateri"</string>
+    <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
+    <string name="apn_edit" msgid="1354715499708424718">"Edit titik capaian"</string>
+    <string name="apn_not_set" msgid="7422262558097875757">"&lt;Tidak ditetapkan&gt;"</string>
+    <string name="apn_name" msgid="4115580098369824123">"Nama"</string>
+    <string name="apn_apn" msgid="2479425126733513353">"APN"</string>
+    <string name="apn_http_proxy" msgid="1826885957243696354">"Proksi"</string>
+    <string name="apn_http_port" msgid="3763259523984976226">"Port"</string>
+    <string name="apn_user" msgid="455637547356117761">"Nama pengguna"</string>
+    <string name="apn_password" msgid="5412301994998250968">"Kata laluan"</string>
+    <string name="apn_server" msgid="2436185314756372858">"Pelayan"</string>
+    <string name="apn_mmsc" msgid="3670124402105585737">"MMSC"</string>
+    <string name="apn_mms_proxy" msgid="5374082621073999275">"Proksi MMS"</string>
+    <string name="apn_mms_port" msgid="4074188088199243040">"Port MMS"</string>
+    <string name="apn_mcc" msgid="4258628382260674636">"MCC"</string>
+    <string name="apn_mnc" msgid="8629374076888809874">"MNC"</string>
+    <!-- no translation found for apn_auth_type (6167205395676037015) -->
+    <skip />
+    <!-- no translation found for apn_auth_type_none (5069592676845549926) -->
+    <skip />
+    <!-- no translation found for apn_auth_type_pap (1666934536996033383) -->
+    <skip />
+    <!-- no translation found for apn_auth_type_chap (3369626283789068360) -->
+    <skip />
+    <!-- no translation found for apn_auth_type_pap_chap (9102343063036134541) -->
+    <skip />
+    <string name="apn_type" msgid="469613123902220544">"Jenis APN"</string>
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
+    <string name="menu_delete" msgid="6981294422841124659">"Padam APN"</string>
+    <string name="menu_new" msgid="3014205883303921729">"APN Baru"</string>
+    <string name="menu_save" msgid="8109345640668285399">"Simpan"</string>
+    <string name="menu_cancel" msgid="2194502410474697474">"Buang"</string>
+    <string name="error_title" msgid="1319225301794168762">"Perhatian"</string>
+    <string name="error_name_empty" msgid="1498238337687930558">"Medan Nama tidak boleh kosong."</string>
+    <string name="error_apn_empty" msgid="1513892291812404310">"APN tidak boleh kosong."</string>
+    <string name="error_mcc_not3" msgid="4560171714156251661">"Medan MCC mestilah 3 digit."</string>
+    <string name="error_mnc_not23" msgid="8418177072458379439">"Medan MNC hendaklah mempunyai 2 atau 3 digit."</string>
+    <string name="restore_default_apn" msgid="2724583218635739913">"Memulihkan tetapan lalai APN"</string>
+    <string name="menu_restore" msgid="8260067415075573273">"Tetapkan semula kepada lalai"</string>
+    <string name="restore_default_apn_completed" msgid="3990449939234957281">"Penetapan semula tetapan lalai APN selesai"</string>
+    <string name="master_clear_title" msgid="5907939616087039756">"Tetapan semula data kilang"</string>
+    <!-- outdated translation 4986154238001088492 -->     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Memadamkan semua data pada telefon"</string>
+    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Memadamkan semua data pada telefon"</string>
+    <!-- no translation found for master_clear_desc (590799767511283567) -->
+    <skip />
+    <!-- no translation found for master_clear_desc (3251400937758241249) -->
+    <skip />
+    <!-- no translation found for master_clear_accounts (6412857499147999073) -->
+    <skip />
+    <!-- no translation found for master_clear_desc_also_erases_external (1903185203791274237) -->
+    <skip />
+    <!-- no translation found for master_clear_desc_erase_external_storage (4740866328425123395) -->
+    <skip />
+    <!-- no translation found for master_clear_desc_erase_external_storage (7339100478676372901) -->
+    <skip />
+    <!-- no translation found for erase_external_storage (969364037450286809) -->
+    <skip />
+    <!-- no translation found for erase_external_storage (1397239046334307625) -->
+    <skip />
+    <!-- no translation found for erase_external_storage_description (444834593696342279) -->
+    <skip />
+    <!-- no translation found for erase_external_storage_description (46603515218075174) -->
+    <skip />
+    <!-- outdated translation 7550632653343157971 -->     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Tetapkan semula telefon"</string>
+    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Tetapkan semula telefon"</string>
+    <string name="master_clear_final_desc" msgid="6917971132484622696">"Padam semua maklumat peribadi anda dan sebarang aplikasi yang dimuat turun? Tindakan ini tidak boleh diterbalikkan!"</string>
+    <string name="master_clear_final_button_text" msgid="5390908019019242910">"Padamkan semua"</string>
+    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Lukis corak buka kunci anda"</string>
+    <!-- outdated translation 8901714274312707918 -->     <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Anda mesti melukiskan corak buka kunci anda untuk mengesahkan penetapan semula telefon."</string>
+    <string name="master_clear_failed" msgid="8655202125010189406">"Tiada penetapan semula dijalankan kerana perkhidmatan Padam Bersih Sistem tidak tersedia."</string>
+    <!-- no translation found for master_clear_confirm_title (4845794266129586839) -->
+    <skip />
+    <!-- outdated translation 4671276096695789895 -->     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Format kad SD."</string>
+    <!-- outdated translation 4671276096695789895 -->     <string name="media_format_title" product="default" msgid="4427528440306787972">"Format kad SD."</string>
+    <!-- outdated translation 3805714639375830120 -->     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Memadamkan semua data pada kad SD"</string>
+    <string name="media_format_summary" product="default" msgid="3805714639375830120">"Memadamkan semua data pada kad SD"</string>
+    <!-- outdated translation 1142563222357820834 -->     <string name="media_format_desc" product="nosdcard" msgid="4553860683952763905">"Tindakan ini akan memadamkan kad SD di dalam telefon. Anda akan kehilangan SEMUA data pada kad!"</string>
+    <!-- outdated translation 1142563222357820834 -->     <string name="media_format_desc" product="default" msgid="1598627584181935513">"Tindakan ini akan memadamkan kad SD di dalam telefon. Anda akan kehilangan SEMUA data pada kad!"</string>
+    <!-- outdated translation 370856400090190151 -->     <string name="media_format_button_text" product="nosdcard" msgid="6293669371185352810">"Format kad SD"</string>
+    <!-- outdated translation 370856400090190151 -->     <string name="media_format_button_text" product="default" msgid="6721544380069373626">"Format kad SD"</string>
+    <!-- outdated translation 1776666694910717198 -->     <string name="media_format_final_desc" product="nosdcard" msgid="8094635533378487255">"Format kad SD, padamkan semua media anda? Tindakan tidak boleh diterbalikkan!"</string>
+    <!-- outdated translation 1776666694910717198 -->     <string name="media_format_final_desc" product="default" msgid="9015504991522581434">"Format kad SD, padamkan semua media anda? Tindakan tidak boleh diterbalikkan!"</string>
+    <string name="media_format_final_button_text" msgid="4881713344315923175">"Padamkan semua"</string>
+    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Lukis corak buka kunci anda"</string>
+    <!-- outdated translation 4239529439389660159 -->     <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Anda harus melukis corak buka kunci anda untuk mengesahkan format kad SD."</string>
+    <!-- outdated translation 4239529439389660159 -->     <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Anda harus melukis corak buka kunci anda untuk mengesahkan format kad SD."</string>
+    <string name="call_settings_title" msgid="5188713413939232801">"Tetapan panggilan"</string>
+    <string name="call_settings_summary" msgid="7291195704801002886">"Tetapkan mel suara, pemajuan panggilan, panggilan menunggu, ID pemanggil"</string>
+    <!-- no translation found for tether_settings_title_usb (6688416425801386511) -->
+    <skip />
+    <!-- no translation found for tether_settings_title_wifi (3277144155960302049) -->
+    <skip />
+    <!-- no translation found for tether_settings_title_bluetooth (355855408317564420) -->
+    <skip />
+    <!-- no translation found for tether_settings_title_usb_bluetooth (5355828977109785001) -->
+    <skip />
+    <!-- no translation found for tether_settings_title_all (8356136101061143841) -->
+    <skip />
+    <!-- no translation found for tether_settings_summary_usb (785883365108362248) -->
+    <skip />
+    <!-- no translation found for tether_settings_summary_usb (3562431455625637370) -->
+    <skip />
+    <!-- no translation found for tether_settings_summary_wifi (5474383125137372164) -->
+    <skip />
+    <!-- no translation found for tether_settings_summary_bluetooth (2407506656353819750) -->
+    <skip />
+    <!-- no translation found for tether_settings_summary_usb_wifi (3834674129575844910) -->
+    <skip />
+    <!-- no translation found for tether_settings_summary_usb_wifi (3700323208282018772) -->
+    <skip />
+    <!-- no translation found for tether_settings_summary_usb_bluetooth (1245080236509560839) -->
+    <skip />
+    <!-- no translation found for tether_settings_summary_usb_bluetooth (4008195891276675882) -->
+    <skip />
+    <!-- no translation found for tether_settings_summary_wifi_bluetooth (1924576461932311140) -->
+    <skip />
+    <!-- no translation found for tether_settings_summary_wifi_bluetooth (2753904149495692201) -->
+    <skip />
+    <!-- no translation found for tether_settings_summary_all (6612660164315153427) -->
+    <skip />
+    <!-- no translation found for tether_settings_summary_all (1171769255924636665) -->
+    <skip />
+    <!-- no translation found for usb_title (7483344855356312510) -->
+    <skip />
+    <!-- no translation found for usb_tethering_button_text (585829947108007917) -->
+    <skip />
+    <!-- no translation found for usb_tethering_available_subtext (156779271296152605) -->
+    <skip />
+    <!-- no translation found for usb_tethering_active_subtext (8916210851136467042) -->
+    <skip />
+    <!-- no translation found for usb_tethering_storage_active_subtext (6608933594288072573) -->
+    <skip />
+    <!-- no translation found for usb_tethering_unavailable_subtext (1044622421184007254) -->
+    <skip />
+    <!-- no translation found for usb_tethering_errored_subtext (1377574819427841992) -->
+    <skip />
+    <!-- no translation found for bluetooth_tether_checkbox_text (2379175828878753652) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_available_subtext (8811610320942954709) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_available_subtext (4229220575771946723) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_device_connected_subtext (2730938191906597896) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_device_connected_subtext (1666736165420290466) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_devices_connected_subtext (1180765608259580143) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_devices_connected_subtext (8248942539362173005) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_off_subtext (2093881379028235555) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_off_subtext (706860924389041342) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_errored_subtext (1344187103463073993) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_overflow_error (2222060504731415763) -->
+    <skip />
+    <!-- no translation found for bluetooth_untether_blank (2871192409329334813) -->
+    <skip />
+    <!-- no translation found for tethering_help_button_text (656117495547173630) -->
+    <skip />
+    <string name="network_settings_title" msgid="7967552516440151852">"Rangkaian mudah alih"</string>
+    <string name="network_settings_summary" msgid="5149750850846813553">"Tetapkan pilihan untuk perayauan, rangkaian, APN"</string>
+    <string name="location_title" msgid="1029961368397484576">"Lokasi Saya"</string>
+    <string name="location_network_based" msgid="8815705866861993344">"Gunakan rangkaian wayarles"</string>
+    <string name="location_networks_disabled" msgid="2708968452901433980">"Lihat lokasi dalam aplikasi (seperti Peta) menggunakan rangkaian wayarles"</string>
+    <string name="location_neighborhood_level" msgid="4656658097932515921">"Lokasi ditentukan oleh Wi-Fi dan/atau rangkaian mudah alih"</string>
+    <!-- no translation found for location_neighborhood_level_wifi (7457348712272184793) -->
+    <skip />
+    <!-- no translation found for location_gps (6296125378829097831) -->
+    <skip />
+    <!-- no translation found for location_street_level (7456259025474443314) -->
+    <skip />
+    <string name="location_gps_disabled" msgid="6632537158777308128">"Cari sehingga tahap jalan (memerlukan lebih bateri serta pandangan langit)"</string>
+    <!-- no translation found for assisted_gps (4649317129586736885) -->
+    <skip />
+    <!-- no translation found for assisted_gps_enabled (8751899609589792803) -->
+    <skip />
+    <!-- no translation found for assisted_gps_disabled (6982698333968010748) -->
+    <skip />
+    <!-- no translation found for use_location_title (3659340070401464551) -->
+    <skip />
+    <!-- no translation found for use_location_summary_disabled (6518008620918354403) -->
+    <skip />
+    <!-- no translation found for use_location_summary_enabled (8110246289085796179) -->
+    <skip />
+    <!-- outdated translation 1743378368185371685 -->     <string name="about_settings" product="tablet" msgid="593457295516533765">"Mengenai telefon"</string>
+    <string name="about_settings" product="default" msgid="1743378368185371685">"Mengenai telefon"</string>
+    <!-- outdated translation 3302263393543848667 -->     <string name="about_settings_summary" msgid="3371517697156165959">"Lihat maklumat undang-undang, status telefon, versi perisian"</string>
+    <string name="legal_information" msgid="5769301644270604095">"Maklumat undang-undang"</string>
+    <string name="contributors_title" msgid="5917703088825286504">"Penyumbang"</string>
+    <string name="copyright_title" msgid="865906688917260647">"Hak cipta"</string>
+    <string name="license_title" msgid="1990487604356037871">"Lesen"</string>
+    <string name="terms_title" msgid="7697580845616764642">"Terma dan Syarat"</string>
+    <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"Tutorial sistem"</string>
+    <!-- outdated translation 3861815254521030201 -->     <string name="system_tutorial_list_item_summary" product="tablet" msgid="3341504384445734067">"Ketahui cara menggunakan telefon anda"</string>
+    <string name="system_tutorial_list_item_summary" product="default" msgid="3861815254521030201">"Ketahui cara menggunakan telefon anda"</string>
+    <string name="settings_license_activity_title" msgid="7553683406244228650">"Lesen sumber terbuka"</string>
+    <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Terdapat masalah memuatkan lesen."</string>
+    <string name="settings_license_activity_loading" msgid="3337535809093591740">"Memuatkan..."</string>
+    <!-- no translation found for settings_safetylegal_title (1289483965535937431) -->
+    <skip />
+    <!-- no translation found for settings_safetylegal_activity_title (6901214628496951727) -->
+    <skip />
+    <!-- no translation found for settings_safetylegal_activity_unreachable (170670055116721810) -->
+    <skip />
+    <!-- no translation found for settings_safetylegal_activity_loading (8059022597639516348) -->
+    <skip />
+    <!-- no translation found for lockpassword_choose_your_password_header (8624900666929394990) -->
+    <skip />
+    <!-- no translation found for lockpassword_choose_your_pattern_header (6949761069941694050) -->
+    <skip />
+    <!-- no translation found for lockpassword_choose_your_pin_header (7598849519816138302) -->
+    <skip />
+    <!-- no translation found for lockpassword_confirm_your_password_header (6308478184889846633) -->
+    <skip />
+    <!-- no translation found for lockpassword_confirm_your_pattern_header (7543433733032330821) -->
+    <skip />
+    <!-- no translation found for lockpassword_confirm_your_pin_header (49038294648213197) -->
+    <skip />
+    <!-- no translation found for lockpassword_confirm_passwords_dont_match (6850677112663979120) -->
+    <skip />
+    <!-- no translation found for lockpassword_confirm_pins_dont_match (4757532830594400147) -->
+    <skip />
+    <!-- no translation found for lockpassword_choose_lock_generic_header (3811438094903786145) -->
+    <skip />
+    <!-- no translation found for lockpassword_password_set_toast (4875050283108629383) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_set_toast (6011826444725291475) -->
+    <skip />
+    <!-- no translation found for lockpassword_pattern_set_toast (6867259621331406236) -->
+    <skip />
+    <!-- outdated translation 5828348303971852121 -->     <string name="lock_settings_title" msgid="8943058958424073651">"Corak buka kunci skrin"</string>
+    <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Tukar corak buka kunci"</string>
+    <!-- no translation found for lockpattern_change_lock_pin_label (266707138486731661) -->
+    <skip />
+    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Sahkan corak yang disimpan"</string>
+    <string name="lockpattern_need_to_unlock_wrong" msgid="5629093548611791080">"Maaf, cuba lagi:"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Lukis corak buka kunci"</string>
+    <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Tekan Menu untuk mendapatkan bantuan."</string>
+    <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Alihkan jari apabila selesai."</string>
+    <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Sambung sekurang-kurangnya <xliff:g id="NUMBER">%d</xliff:g> titik. Cuba lagi:"</string>
+    <string name="lockpattern_pattern_entered_header" msgid="5012716272001299362">"Corak dirakam!"</string>
+    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Lukis corak sekali lagi untuk mengesahkan:"</string>
+    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Corak buka kunci baru anda:"</string>
+    <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Sahkan"</string>
+    <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"Lukis semula"</string>
+    <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"Cuba semula"</string>
+    <string name="lockpattern_continue_button_text" msgid="4723771754714471410">"Teruskan"</string>
+    <string name="lockpattern_settings_title" msgid="3207750489460466680">"Corak buka kunci"</string>
+    <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"Memerlukan corak"</string>
+    <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Mesti melukiskan corak untuk membuka kunci skrin"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="104851667540971729">"Gunakan corak boleh dilihat"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="972174133075372341">"Gunakan maklum balas sentuhan"</string>
+    <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Tetapkan corak buka kunci"</string>
+    <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Tukar corak buka kunci"</string>
+    <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Cara melukis corak buka kunci"</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Terlalu banyak percubaan yang salah!"</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Cuba lagi dalam <xliff:g id="NUMBER">%d</xliff:g> saat."</string>
+    <string name="skip_button_label" msgid="8680422740354436943">"Batal"</string>
+    <string name="next_button_label" msgid="8890792540116568321">"Seterusnya"</string>
+    <!-- outdated translation 4059246467204273930 -->     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Melindungi telefon anda"</string>
+    <string name="lock_title" product="default" msgid="4059246467204273930">"Melindungi telefon anda"</string>
+    <!-- no translation found for lock_intro_message (3692151094288835065) -->
+    <skip />
+    <!-- no translation found for lock_intro_message (9100785646737118042) -->
+    <skip />
+    <string name="manageapplications_settings_title" msgid="5712405848153426706">"Urus aplikasi"</string>
+    <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Urus dan alih keluar aplikasi yang dipasang"</string>
+    <string name="applications_settings" msgid="3736173521008476946">"Aplikasi"</string>
+    <string name="applications_settings_summary" msgid="2714215108369119717">"Urus aplikasi, sediakan pintasan lancar cepat"</string>
+    <string name="applications_settings_header" msgid="6018266337275422250">"Tetapan aplikasi"</string>
+    <string name="install_applications" msgid="4872012136210802181">"Sumber tidak diketahui"</string>
+    <!-- outdated translation 4657036956866203596 -->     <string name="install_unknown_applications" msgid="6612824788917283662">"Benarkan pemasangan aplikasi bukan Market"</string>
+    <!-- outdated translation 1923717607319933741 -->     <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"Telefon dan data peribadi anda lebih mudah diserang oleh aplikasi daripada sumber-sumber yang tidak diketahui. Anda bersetuju bahawa anda bertanggungjawab sepenuhnya terhadap sebarang kerosakan pada telefon anda atau kehilangan data yang berpunca daripada penggunaan aplikasi ini."</string>
+    <string name="install_all_warning" product="default" msgid="1923717607319933741">"Telefon dan data peribadi anda lebih mudah diserang oleh aplikasi daripada sumber-sumber yang tidak diketahui. Anda bersetuju bahawa anda bertanggungjawab sepenuhnya terhadap sebarang kerosakan pada telefon anda atau kehilangan data yang berpunca daripada penggunaan aplikasi ini."</string>
+    <!-- no translation found for advanced_settings (1777249286757067969) -->
+    <skip />
+    <!-- no translation found for advanced_settings_summary (145134386044169043) -->
+    <skip />
+    <string name="application_info_label" msgid="1150486628158409543">"Maklumat aplikasi"</string>
+    <string name="storage_label" msgid="8700867073480107253">"Storan"</string>
+    <string name="auto_launch_label" msgid="3012617472833815382">"Lancarkan secara lalai"</string>
+    <!-- no translation found for screen_compatibility_label (663250687205465394) -->
+    <skip />
+    <string name="permissions_label" msgid="2605296874922726203">"Kebenaran"</string>
+    <string name="cache_header_label" msgid="1877197634162461830">"Cache"</string>
+    <string name="clear_cache_btn_text" msgid="5756314834291116325">"Kosongkan cache"</string>
+    <string name="cache_size_label" msgid="7505481393108282913">"Cache"</string>
+    <string name="controls_label" msgid="7611113077086853799">"Kawalan"</string>
+    <string name="force_stop" msgid="7435006169872876756">"Henti paksa"</string>
+    <string name="total_size_label" msgid="1048676419552557254">"Jumlah"</string>
+    <string name="application_size_label" msgid="5055196275624686382">"Aplikasi"</string>
+    <string name="data_size_label" msgid="8679376373625710107">"Data"</string>
+    <!-- no translation found for external_size_label (4465530017830945766) -->
+    <skip />
+    <!-- no translation found for external_size_label (2107155737635944440) -->
+    <skip />
+    <string name="uninstall_text" msgid="3644892466144802466">"Nyahpasang"</string>
+    <!-- no translation found for disable_text (6544054052049395202) -->
+    <skip />
+    <!-- no translation found for enable_text (9217362512327828987) -->
+    <skip />
+    <string name="clear_user_data_text" msgid="5597622864770098388">"Padam bersih data"</string>
+    <string name="app_factory_reset" msgid="6635744722502563022">"Nyahpasang kemas kini"</string>
+    <string name="auto_launch_enable_text" msgid="2630656657744196691">"Anda telah memilih untuk melancarkan aplikasi ini secara lalai untuk beberapa tindakan."</string>
+    <string name="auto_launch_disable_text" msgid="7800385822185540166">"Tiada lalai ditetapkan."</string>
+    <string name="clear_activities" msgid="7408923511535174430">"Padam bersih lalai"</string>
+    <!-- no translation found for screen_compatibility_text (2398570332021220651) -->
+    <skip />
+    <!-- no translation found for ask_compatibility (7225195569089607846) -->
+    <skip />
+    <!-- no translation found for enable_compatibility (3257284255974065538) -->
+    <skip />
+    <string name="unknown" msgid="1592123443519355854">"Tidak diketahui"</string>
+    <!-- outdated translation 8622029358896599842 -->     <string name="sort_order_alpha" msgid="1410278099123670628">"Isih"</string>
+    <string name="sort_order_size" msgid="7024513286636502362">"Isih mengikut saiz"</string>
+    <!-- no translation found for show_running_services (5736278767975544570) -->
+    <skip />
+    <!-- no translation found for show_background_processes (2009840211972293429) -->
+    <skip />
+    <string name="manage_space_text" msgid="8852711522447794676">"Urus ruang"</string>
+    <string name="filter" msgid="2018011724373033887">"Tapis"</string>
+    <string name="filter_dlg_title" msgid="6507663329723966854">"Buat pilihan penapis"</string>
+    <string name="filter_apps_all" msgid="5142129378749391876">"Semua"</string>
+    <!-- no translation found for filter_apps_third_party (7786348047690140979) -->
+    <skip />
+    <string name="filter_apps_running" msgid="7767071454371350486">"Dijalankan"</string>
+    <!-- no translation found for filter_apps_onsdcard (4843063154701023349) -->
+    <skip />
+    <!-- no translation found for filter_apps_onsdcard (1477351142334784771) -->
+    <skip />
+    <!-- no translation found for disabled (9206776641295849915) -->
+    <skip />
+    <!-- no translation found for no_applications (5190227407135243904) -->
+    <skip />
+    <!-- no translation found for internal_storage (1584700623164275282) -->
+    <skip />
+    <!-- no translation found for sd_card_storage (2673203150465132465) -->
+    <skip />
+    <!-- no translation found for sd_card_storage (7623513618171928235) -->
+    <skip />
+    <string name="recompute_size" msgid="7722567982831691718">"Mengira semula saiz..."</string>
+    <string name="clear_data_dlg_title" msgid="4470209520936375508">"Padam"</string>
+    <!-- no translation found for clear_data_dlg_text (8368035073300828451) -->
+    <skip />
+    <string name="dlg_ok" msgid="2402639055725653590">"OK"</string>
+    <string name="dlg_cancel" msgid="1674753358972975911">"Batal"</string>
+    <string name="app_not_found_dlg_title" msgid="8458335716378083713">"Aplikasi tidak ditemui"</string>
+    <string name="app_not_found_dlg_text" msgid="2980271680333341554">"Aplikasi tidak ditemui dalam senarai aplikasi yang dipasang."</string>
+    <string name="clear_data_failed" msgid="581956197586913865">"Tidak boleh memadam bersih data aplikasi."</string>
+    <string name="app_factory_reset_dlg_title" msgid="6116199391150388147">"Nyahpasang kemas kini"</string>
+    <string name="app_factory_reset_dlg_text" msgid="438395129140568893">"Adakah anda ingin menyahpasang semua kemas kini aplikasi sistem Android ini?"</string>
+    <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Kosongkan data"</string>
+    <string name="clear_failed_dlg_text" msgid="7943411157007320290">"Gagal mengosongkan data untuk aplikasi"</string>
+    <!-- outdated translation 3116027624526915561 -->     <string name="security_settings_desc" product="tablet" msgid="6158636779728455276">"Aplikasi ini boleh mengakses yang berikut pada telefon anda:"</string>
+    <string name="security_settings_desc" product="default" msgid="3116027624526915561">"Aplikasi ini boleh mengakses yang berikut pada telefon anda:"</string>
+    <string name="computing_size" msgid="1599186977475211186">"Mengira..."</string>
+    <string name="invalid_size_value" msgid="1901940003700269523">"Tidak dapat mengira saiz pakej"</string>
+    <!-- no translation found for empty_list_msg (2901049162265094971) -->
+    <skip />
+    <string name="version_text" msgid="9189073826278676425">"versi <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
+    <!-- no translation found for move_app (5042838441401731346) -->
+    <skip />
+    <!-- no translation found for move_app_to_internal (2299714147283854957) -->
+    <skip />
+    <!-- no translation found for move_app_to_internal (3895430471913858185) -->
+    <skip />
+    <!-- no translation found for move_app_to_sdcard (4350451696315265420) -->
+    <skip />
+    <!-- no translation found for move_app_to_sdcard (1143379049903056407) -->
+    <skip />
+    <!-- no translation found for moving (6431016143218876491) -->
+    <skip />
+    <!-- no translation found for insufficient_storage (8566913062094452962) -->
+    <skip />
+    <!-- no translation found for does_not_exist (837163572898468245) -->
+    <skip />
+    <!-- no translation found for app_forward_locked (5747805144210389585) -->
+    <skip />
+    <!-- no translation found for invalid_location (4934491353200240499) -->
+    <skip />
+    <!-- no translation found for system_package (1030561474413022831) -->
+    <skip />
+    <!-- no translation found for force_stop_dlg_title (4289453224368188476) -->
+    <skip />
+    <!-- no translation found for force_stop_dlg_text (5157374701213502922) -->
+    <skip />
+    <!-- no translation found for move_app_failed_dlg_title (4337731903265156405) -->
+    <skip />
+    <!-- no translation found for move_app_failed_dlg_text (8824246817947643697) -->
+    <skip />
+    <!-- no translation found for app_install_location_title (2068975150026852168) -->
+    <skip />
+    <!-- no translation found for app_install_location_summary (879753854530300436) -->
+    <skip />
+    <!-- no translation found for storageuse_settings_title (5657014373502630403) -->
+    <skip />
+    <!-- no translation found for storageuse_settings_summary (2556057379120846792) -->
+    <skip />
+    <!-- no translation found for runningservices_settings_title (8097287939865165213) -->
+    <skip />
+    <!-- no translation found for runningservices_settings_summary (854608995821032748) -->
+    <skip />
+    <!-- no translation found for service_restarting (2242747937372354306) -->
+    <skip />
+    <!-- no translation found for cached (1059590879740175019) -->
+    <skip />
+    <!-- no translation found for no_running_services (2059536495597645347) -->
+    <skip />
+    <!-- no translation found for service_started_by_app (6575184738671598131) -->
+    <skip />
+    <!-- no translation found for service_client_name (4037193625611815517) -->
+    <skip />
+    <!-- no translation found for service_background_processes (6844156253576174488) -->
+    <skip />
+    <!-- no translation found for service_foreground_processes (7583975676795574276) -->
+    <skip />
+    <!-- no translation found for memory (6609961111091483458) -->
+    <skip />
+    <!-- no translation found for service_process_name (4098932168654826656) -->
+    <skip />
+    <!-- no translation found for running_processes_item_description_s_s (5790575965282023145) -->
+    <skip />
+    <!-- no translation found for running_processes_item_description_s_p (8019860457123222953) -->
+    <skip />
+    <!-- no translation found for running_processes_item_description_p_s (744424668287252915) -->
+    <skip />
+    <!-- no translation found for running_processes_item_description_p_p (1607384595790852782) -->
+    <skip />
+    <!-- no translation found for runningservicedetails_settings_title (6188692418986988288) -->
+    <skip />
+    <!-- no translation found for no_services (7133900764462288263) -->
+    <skip />
+    <!-- no translation found for runningservicedetails_services_title (391168243725357375) -->
+    <skip />
+    <!-- no translation found for runningservicedetails_processes_title (928115582044655268) -->
+    <skip />
+    <!-- no translation found for service_stop (6369807553277527248) -->
+    <skip />
+    <!-- no translation found for service_manage (1876642087421959194) -->
+    <skip />
+    <!-- no translation found for service_stop_description (3261798282116866961) -->
+    <skip />
+    <!-- no translation found for heavy_weight_stop_description (6855241582643136019) -->
+    <skip />
+    <!-- no translation found for background_process_stop_description (1728354083304746737) -->
+    <skip />
+    <!-- no translation found for service_manage_description (7050092269951613102) -->
+    <skip />
+    <!-- no translation found for main_running_process_description (929204645380391397) -->
+    <skip />
+    <!-- no translation found for process_service_in_use_description (8993335064403217080) -->
+    <skip />
+    <!-- no translation found for process_provider_in_use_description (5586603325677678940) -->
+    <skip />
+    <!-- no translation found for runningservicedetails_stop_dlg_title (4253292537154337233) -->
+    <skip />
+    <!-- no translation found for runningservicedetails_stop_dlg_text (5420033091144016389) -->
+    <skip />
+    <!-- no translation found for runningservicedetails_stop_dlg_text (6929716497425738387) -->
+    <skip />
+    <!-- no translation found for language_settings (5292716747264442359) -->
+    <skip />
+    <!-- no translation found for language_keyboard_settings_title (243220021717425813) -->
+    <skip />
+    <!-- no translation found for language_settings_category (2288258489940617043) -->
+    <skip />
+    <!-- no translation found for keyboard_settings_category (7060453865544070642) -->
+    <skip />
+    <string name="phone_language" msgid="1165758957501090679">"Pilih bahasa"</string>
+    <string name="phone_language_summary" msgid="3871309445655554211"></string>
+    <string name="auto_replace" msgid="6199184757891937822">"Autoganti"</string>
+    <string name="auto_replace_summary" msgid="370288728200084466">"Betulkan perkataan yang ditaip salah"</string>
+    <!-- outdated translation 581633131114124121 -->     <string name="auto_caps" msgid="6379232078052591265">"Penghurufbesaran auto"</string>
+    <string name="auto_caps_summary" msgid="6358102538315261466">"Jadikan huruf pertama dalam ayat huruf besar"</string>
+    <string name="auto_punctuate" msgid="4595367243950425833">"Auto tanda baca"</string>
+    <string name="hardkeyboard_category" msgid="5957168411305769899">"Tetapan papan kekunci fizikal"</string>
+    <string name="auto_punctuate_summary" msgid="4372126865670574837">"Tekan kekunci Space dua kali untuk memasukkan \".\""</string>
+    <string name="show_password" msgid="2198798062604049206">"Kata laluan boleh dilihat"</string>
+    <string name="show_password_summary" msgid="3806709974395178121">"Tunjukkan kata laluan semasa anda menaipnya"</string>
+    <!-- no translation found for ime_security_warning (812267421486877917) -->
+    <skip />
+    <!-- no translation found for pointer_settings_category (6090176550039035130) -->
+    <skip />
+    <!-- no translation found for pointer_speed (1221342330217861616) -->
+    <skip />
+    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Kamus pengguna"</string>
+    <!-- no translation found for user_dict_single_settings_title (5454855286173849284) -->
+    <skip />
+    <!-- no translation found for user_dict_multiple_settings_title (326583195525296750) -->
+    <skip />
+    <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
+    <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Tambah"</string>
+    <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Tambah ke kamus"</string>
+    <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Edit perkataan"</string>
+    <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Edit"</string>
+    <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Padam"</string>
+    <!-- outdated translation 6209268025109242806 -->     <string name="user_dict_settings_empty_text" product="tablet" msgid="1766522102636921529">"Anda tiada sebarang perkataan dalam kamus pengguna. Anda boleh menambah perkataan melalui menu."</string>
+    <string name="user_dict_settings_empty_text" product="default" msgid="6209268025109242806">"Anda tiada sebarang perkataan dalam kamus pengguna. Anda boleh menambah perkataan melalui menu."</string>
+    <!-- no translation found for user_dict_settings_all_languages (7713910347678213719) -->
+    <skip />
+    <string name="testing" msgid="6584352735303604146">"Menguji"</string>
+    <!-- outdated translation 8656693364332840056 -->     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Maklumat telefon"</string>
+    <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Maklumat telefon"</string>
+    <string name="testing_battery_info" msgid="3497865525976497848">"Maklumat bateri"</string>
+    <string name="quick_launch_title" msgid="7904609846945905306">"Lancar cepat"</string>
+    <string name="quick_launch_summary" msgid="3453825712466417452">"Tetapkan pintasan papan kekunci untuk melancarkan aplikasi"</string>
+    <string name="quick_launch_assign_application" msgid="4521368464929956350">"Berikan aplikasi"</string>
+    <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"Tiada pintasan"</string>
+    <string name="quick_launch_shortcut" msgid="5090405067413522300">"Cari + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
+    <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Padam bersih"</string>
+    <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"Pintasan anda untuk <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) akan dipadam bersih."</string>
+    <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"OK"</string>
+    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Batal"</string>
+    <string name="quick_launch_display_mode_applications" msgid="3748789806447639039">"Aplikasi"</string>
+    <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Pintasan"</string>
+    <string name="input_methods_settings_title" msgid="6800066636850553887">"Input teks"</string>
+    <!-- no translation found for input_method (5434026103176856164) -->
+    <skip />
+    <!-- no translation found for current_input_method (2146807723398303917) -->
+    <skip />
+    <!-- no translation found for input_method_selector (4311213129681430709) -->
+    <skip />
+    <!-- no translation found for input_method_selector_show_automatically_title (1001612945471546158) -->
+    <skip />
+    <!-- no translation found for input_method_selector_always_show_title (3891824124222371634) -->
+    <skip />
+    <!-- no translation found for input_method_selector_always_hide_title (7699647095118680424) -->
+    <skip />
+    <!-- no translation found for configure_input_method (7773992829158322455) -->
+    <skip />
+    <!-- no translation found for input_method_settings (5801295625486269553) -->
+    <skip />
+    <!-- no translation found for active_input_method_subtypes (3596398805424733238) -->
+    <skip />
+    <!-- no translation found for use_system_language_to_select_input_method_subtypes (3346751753141428573) -->
+    <skip />
+    <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Tetapan <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
+    <!-- no translation found for input_methods_and_subtype_enabler_title (4018402267502337338) -->
+    <skip />
+    <!-- no translation found for onscreen_keyboard_settings_summary (5841558383556238653) -->
+    <skip />
+    <!-- outdated translation 8169889453770863227 -->     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Papan kekunci peranti"</string>
+    <!-- outdated translation 6404687907454621637 -->     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Tetapan papan kekunci terbina dalam"</string>
+    <string name="development_settings_title" msgid="6719732334835420989">"Pembangunan"</string>
+    <string name="development_settings_summary" msgid="2151320488701538355">"Tetapkan pilihan untuk pembangunan aplikasi"</string>
+    <string name="enable_adb" msgid="7982306934419797485">"Penyahpepijatan USB"</string>
+    <string name="enable_adb_summary" msgid="4881186971746056635">"Mod nyahpepijat apabila USB disambungkan"</string>
+    <string name="keep_screen_on" msgid="1146389631208760344">"Tetap berjaga"</string>
+    <string name="keep_screen_on_summary" msgid="2173114350754293009">"Skrin tidak sekali-kali akan tidur semasa pengecasan"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Benarkan lokasi olokan"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Benarkan lokasi olokan"</string>
+    <!-- no translation found for adb_warning_title (6234463310896563253) -->
+    <skip />
+    <string name="adb_warning_message" msgid="5352555112049663033">"Penyahpepijatan USB adalah bertujuan untuk pembangunan sahaja. Ia boleh digunakan untuk menyalin data antara komputer dan peranti anda, memasang aplikasi pada peranti anda tanpa pemberitahuan dan membaca data log."</string>
+    <string name="gadget_picker_title" msgid="98374951396755811">"Pilih alat"</string>
+    <string name="widget_picker_title" msgid="9130684134213467557">"Pilih widget"</string>
+    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>h <xliff:g id="HOURS">%2$d</xliff:g>j <xliff:g id="MINUTES">%3$d</xliff:g>m <xliff:g id="SECONDS">%4$d</xliff:g>s"</string>
+    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>j <xliff:g id="MINUTES">%2$d</xliff:g>m <xliff:g id="SECONDS">%3$d</xliff:g>s"</string>
+    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>m <xliff:g id="SECONDS">%2$d</xliff:g>s"</string>
+    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>s"</string>
+    <string name="usage_stats_label" msgid="5890846333487083609">"Statistik penggunaan"</string>
+    <string name="testing_usage_stats" msgid="7823048598893937339">"Statistik penggunaan"</string>
+    <string name="display_order_text" msgid="8592776965827565271">"Isih mengikut:"</string>
+    <string name="app_name_label" msgid="2000949925256858308">"Aplikasi"</string>
+    <string name="launch_count_label" msgid="4019444833263957024">"Kira"</string>
+    <string name="usage_time_label" msgid="295954901452833058">"Masa penggunaan"</string>
+    <!-- no translation found for accessibility_settings (3975902491934816215) -->
+    <skip />
+    <!-- no translation found for accessibility_settings_title (2130492524656204459) -->
+    <skip />
+    <string name="accessibility_settings_summary" msgid="8185181964847149507">"Urus pilihan kebolehaksesan"</string>
+    <string name="toggle_accessibility_title" msgid="650839277066574497">"Kebolehaksesan"</string>
+    <string name="accessibility_services_category" msgid="8127851026323672607">"Perkhidmatan kebolehaksesan"</string>
+    <string name="no_accessibility_services_summary" msgid="694578333333808159">"Tiada perkhidmatan kebolehaksesan dipasang."</string>
+    <!-- no translation found for accessibility_service_security_warning (4066258132331302670) -->
+    <skip />
+    <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Lumpuhkan kebolehaksesan?"</string>
+    <!-- no translation found for accessibility_service_no_apps_title (898893674114288531) -->
+    <skip />
+    <!-- no translation found for accessibility_service_no_apps_message (2663371323410332529) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_category (8649951751131431904) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_enabled (6927896081016611012) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_enabled_summary (3629525134901617621) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_security_warning (1113600871264359828) -->
+    <skip />
+    <!-- no translation found for accessibility_script_injection_security_warning (9078893361741942109) -->
+    <skip />
+    <!-- no translation found for accessibility_power_button_category (8545885236482339928) -->
+    <skip />
+    <!-- no translation found for accessibility_power_button_ends_call (7698764194501089533) -->
+    <skip />
+    <!-- no translation found for accessibility_power_button_ends_call_summary (8878097632186291462) -->
+    <skip />
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <skip />
+    <!-- no translation found for touchscreen_gestures_category (3109869155350859625) -->
+    <skip />
+    <!-- no translation found for long_press_timeout_selector_title (1396876537252863044) -->
+    <skip />
+    <!-- no translation found for long_press_timeout_selector_summary (2261114502740278996) -->
+    <skip />
+    <string name="power_usage_summary_title" msgid="5180282911164282324">"Penggunaan bateri"</string>
+    <string name="power_usage_summary" msgid="7237084831082848168">"Apa yang telah menggunakan bateri"</string>
+    <!-- no translation found for power_usage_not_available (3583407442633768046) -->
+    <skip />
+    <string name="battery_since_unplugged" msgid="338073389740738437">"Bateri digunakan sejak palam dicabut"</string>
+    <string name="battery_since_reset" msgid="7464546661121187045">"Kegunaan bateri sejak ditetapkan semula"</string>
+    <!-- no translation found for battery_stats_on_battery (4970762168505236033) -->
+    <skip />
+    <string name="battery_stats_duration" msgid="7464501326709469282">"<xliff:g id="TIME">%1$s</xliff:g> sejak palam dicabut"</string>
+    <!-- no translation found for battery_stats_charging_label (4223311142875178785) -->
+    <skip />
+    <!-- no translation found for battery_stats_screen_on_label (7150221809877509708) -->
+    <skip />
+    <!-- no translation found for battery_stats_gps_on_label (1193657533641951256) -->
+    <skip />
+    <!-- no translation found for battery_stats_wifi_running_label (3093545080361658269) -->
+    <skip />
+    <!-- no translation found for battery_stats_wake_lock_label (1908942681902324095) -->
+    <skip />
+    <!-- no translation found for battery_stats_phone_signal_label (4137799310329041341) -->
+    <skip />
+    <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
+    <skip />
+    <string name="awake" msgid="387122265874485088">"Waktu jaga peranti"</string>
+    <!-- outdated translation 4630925382578609056 -->     <string name="wifi_on_time" msgid="6310209835617490616">"WiFi tepat waktu"</string>
+    <!-- outdated translation 4478515071957280711 -->     <string name="bluetooth_on_time" msgid="6157799524996162271">"WiFi tepat waktu"</string>
+    <!-- no translation found for usage_name_percent (7976919382448235858) -->
+    <skip />
+    <!-- no translation found for history_details_title (3608240585315506067) -->
+    <skip />
+    <!-- outdated translation 7564809986329021063 -->     <string name="details_title" msgid="3792801565213935385">"Butiran penggunaan bateri"</string>
+    <string name="details_subtitle" msgid="32593908269911734">"Gunakan butiran"</string>
+    <string name="controls_subtitle" msgid="390468421138288702">"Laraskan penggunaan kuasa"</string>
+    <string name="packages_subtitle" msgid="4736416171658062768">"Pakej yang disertakan"</string>
+    <!-- outdated translation 2353149143338929583 -->     <string name="power_screen" msgid="3023346080675904613">"Paparan"</string>
+    <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
+    <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
+    <string name="power_cell" msgid="6596471490976003056">"Sel tunggu sedia"</string>
+    <string name="power_phone" msgid="5392641106474567277">"Panggilan suara"</string>
+    <!-- outdated translation 9055659695602194990 -->     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Telefon melahu"</string>
+    <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon melahu"</string>
+    <string name="usage_type_cpu" msgid="715162150698338714">"Jumlah CPU"</string>
+    <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Latar depan CPU"</string>
+    <!-- no translation found for usage_type_wake_lock (5125438890233677880) -->
+    <skip />
+    <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
+    <!-- no translation found for usage_type_wifi_running (8234997940652067049) -->
+    <skip />
+    <!-- outdated translation 9108247984998041853 -->     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Telefon"</string>
+    <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefon"</string>
+    <string name="usage_type_data_send" msgid="2857401966985425427">"Data yang dihantar"</string>
+    <string name="usage_type_data_recv" msgid="7251090882025234185">"Data yang diterima"</string>
+    <string name="usage_type_audio" msgid="6957269406840886290">"Audio"</string>
+    <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
+    <!-- no translation found for usage_type_on_time (3351200096173733159) -->
+    <skip />
+    <!-- no translation found for usage_type_no_coverage (3797004252954385053) -->
+    <skip />
+    <string name="battery_action_stop" msgid="649958863744041872">"Henti paksa"</string>
+    <string name="battery_action_app_details" msgid="3275013531871113681">"Maklumat aplikasi"</string>
+    <string name="battery_action_app_settings" msgid="350562653472577250">"Tetapan aplikasi"</string>
+    <!-- outdated translation 5302763261448580102 -->     <string name="battery_action_display" msgid="7338551244519110831">"Tetapan paparan"</string>
+    <!-- outdated translation 5452076674659927993 -->     <string name="battery_action_wifi" msgid="2272741639606146903">"Tetapan WiFi"</string>
+    <string name="battery_action_bluetooth" msgid="8374789049507723142">"Tetapan Bluetooth"</string>
+    <string name="battery_desc_voice" msgid="8980322055722959211">"Bateri yang digunakan oleh panggilan suara"</string>
+    <!-- outdated translation 3009080001948091424 -->     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Bateri yang digunakan apabila telefon melahu"</string>
+    <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Bateri yang digunakan apabila telefon melahu"</string>
+    <string name="battery_desc_radio" msgid="5479196477223185367">"Bateri yang digunakan oleh radio sel"</string>
+    <string name="battery_sugg_radio" msgid="8211336978326295047">"Tukar kepada mod pesawat untuk menjimatkan kuasa di kawasan yang tiada liputan sel"</string>
+    <string name="battery_desc_display" msgid="5432795282958076557">"Bateri yang digunakan oleh paparan dan lampu latar"</string>
+    <string name="battery_sugg_display" msgid="3370202402045141760">"Kurangkan kecerahan skrin dan/atau tamat masa skrin"</string>
+    <string name="battery_desc_wifi" msgid="1702486494565080431">"Bateri yang digunakan oleh Wi-Fi"</string>
+    <!-- no translation found for battery_sugg_wifi (7542345142282261691) -->
+    <skip />
+    <string name="battery_desc_bluetooth" msgid="7535520658674621902">"Bateri yang digunakan oleh bluetooth"</string>
+    <!-- no translation found for battery_sugg_bluetooth_basic (817276933922157788) -->
+    <skip />
+    <string name="battery_sugg_bluetooth_headset" msgid="8214816222115517479">"Cuba menyambung ke peranti bluetooth yang lain"</string>
+    <!-- outdated translation 8123202939321333639 -->     <string name="battery_desc_apps" msgid="6665712811746233450">"Bateri yang digunakan oleh aplikasi semasa dijalankan"</string>
+    <string name="battery_sugg_apps_info" msgid="6065882899391322442">"Berhenti atau nyahpasang aplikasi"</string>
+    <!-- no translation found for battery_sugg_apps_gps (4545056413090932541) -->
+    <skip />
+    <string name="battery_sugg_apps_settings" msgid="8021302847272481168">"Aplikasi ini mungkin menawarkan tetapan untuk mengurangkan penggunaan bateri"</string>
+    <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> sejak palam dicabut"</string>
+    <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Semasa kali terakhir palam dicabut untuk <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
+    <string name="menu_stats_total" msgid="8973377864854807854">"Jumlah penggunaan"</string>
+    <string name="menu_stats_refresh" msgid="1676215433344981075">"Muat semula"</string>
+    <string name="process_kernel_label" msgid="3916858646836739323">"OS Android"</string>
+    <string name="process_mediaserver_label" msgid="6500382062945689285">"Pelayan media"</string>
+    <!-- no translation found for voice_input_output_settings (1336135218350444783) -->
+    <skip />
+    <!-- no translation found for voice_input_output_settings_title (2442850635048676991) -->
+    <skip />
+    <!-- no translation found for voice_search_settings_title (2775469246913196536) -->
+    <skip />
+    <!-- no translation found for keyboard_settings_title (5080115226780201234) -->
+    <skip />
+    <!-- no translation found for voice_input_category (1589318440824204736) -->
+    <skip />
+    <!-- no translation found for voice_output_category (2624538587784986229) -->
+    <skip />
+    <!-- no translation found for recognizer_title (3231385184559054457) -->
+    <skip />
+    <!-- no translation found for recognizer_settings_title (6038598099039717232) -->
+    <skip />
+    <!-- no translation found for recognizer_settings_summary (4472287934134546902) -->
+    <skip />
+    <!-- no translation found for tts_settings (8186971894801348327) -->
+    <skip />
+    <!-- no translation found for tts_settings_title (4182348653053000933) -->
+    <skip />
+    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Sentiasa gunakan tetapan saya"</string>
+    <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"Tetapan lalai di bawah ini mengatasi tetapan aplikasi"</string>
+    <string name="tts_default_settings_section" msgid="5787915620218907443">"Tetapan lalai"</string>
+    <!-- no translation found for tts_default_synth_title (29467896463371992) -->
+    <skip />
+    <!-- no translation found for tts_default_synth_summary (6482936537135251690) -->
+    <skip />
+    <string name="tts_default_rate_title" msgid="6030550998379310088">"Kadar pertuturan"</string>
+    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Kelajuan pertuturan teks"</string>
+    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Pic"</string>
+    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Mempengaruhi nada teks pertuturan"</string>
+    <string name="tts_default_lang_title" msgid="8018087612299820556">"Bahasa"</string>
+    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Menetapkan suara khusus bahasa untuk teks pertuturan"</string>
+    <string name="tts_play_example_title" msgid="7094780383253097230">"Dengar contoh"</string>
+    <string name="tts_play_example_summary" msgid="8029071615047894486">"Mainkan tunjuk cara singkat sintesis pertuturan"</string>
+    <string name="tts_install_data_title" msgid="4264378440508149986">"Pasang data suara"</string>
+    <string name="tts_install_data_summary" msgid="5742135732511822589">"Pasang data suara yang diperlukan untuk sintesis pertuturan"</string>
+    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Suara yang diperlukan untuk sintesis pertuturan sudah pun dipasangkan dengan betul"</string>
+    <string name="tts_demo" msgid="405357591189935876">"Ini adalah contoh sintesis pertuturan."</string>
+    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Tetapan anda telah bertukar. Ini adalah contoh bunyinya."</string>
+    <!-- no translation found for tts_engine_error (5513288178403066867) -->
+    <skip />
+    <!-- no translation found for tts_engine_error_config (5820525416624637313) -->
+    <skip />
+    <!-- no translation found for tts_engine_error_reselect (3071453963296013376) -->
+    <skip />
+    <!-- no translation found for tts_engine_security_warning (8786238102020223650) -->
+    <skip />
+    <!-- no translation found for tts_engines_section (7515470972378742429) -->
+    <skip />
+    <!-- no translation found for tts_engine_name_settings (4974538563074395920) -->
+    <skip />
+    <!-- no translation found for tts_engine_name_is_enabled_summary (4909484006804022115) -->
+    <skip />
+    <!-- no translation found for tts_engine_name_is_disabled_summary (7644198182255168200) -->
+    <skip />
+    <!-- no translation found for pico_languages_and_voices (4611320375917773238) -->
+    <skip />
+    <!-- no translation found for pico_installed (2452546687858267414) -->
+    <skip />
+    <!-- no translation found for pico_not_installed (6266845418419994311) -->
+    <skip />
+    <!-- no translation found for pico_voice_summary_female (8047327176247727492) -->
+    <skip />
+    <!-- no translation found for pico_voice_summary_male (8331266854058577610) -->
+    <skip />
+    <!-- no translation found for tts_notif_engine_install_title (7000346872482649034) -->
+    <skip />
+    <!-- no translation found for tts_notif_engine_install_message (5304661142202662693) -->
+    <skip />
+    <string name="gadget_title" msgid="7455548605888590466">"Kawalan Kuasa"</string>
+    <!-- no translation found for gadget_toggle_wifi (2382963973155082629) -->
+    <skip />
+    <!-- no translation found for gadget_toggle_bluetooth (7538903239807020826) -->
+    <skip />
+    <string name="vpn_settings_activity_title" msgid="7276864950701612579">"Tetapan VPN"</string>
+    <!-- no translation found for vpn_connect_to (2541409082892684362) -->
+    <skip />
+    <string name="vpn_username_colon" msgid="7854930370861306247">"Nama pengguna:"</string>
+    <string name="vpn_password_colon" msgid="5716278710848606626">"Kata laluan:"</string>
+    <!-- no translation found for vpn_a_username (6664733641993968692) -->
+    <skip />
+    <!-- no translation found for vpn_a_password (1537213632501483753) -->
+    <skip />
+    <!-- no translation found for vpn_save_username (1408415289165970790) -->
+    <skip />
+    <string name="vpn_connect_button" msgid="1699007212602470655">"Sambung"</string>
+    <string name="vpn_yes_button" msgid="8034531001149843119">"Ya"</string>
+    <string name="vpn_no_button" msgid="7620339571187119107">"Tidak"</string>
+    <string name="vpn_back_button" msgid="192036339792734970">"Kembali"</string>
+    <!-- no translation found for vpn_mistake_button (1683383660912491270) -->
+    <skip />
+    <string name="vpn_menu_done" msgid="93528279226907926">"Simpan"</string>
+    <string name="vpn_menu_cancel" msgid="7234451214611202868">"Batal"</string>
+    <string name="vpn_menu_revert" msgid="4407762442281467659">"Berbalik"</string>
+    <string name="vpn_menu_connect" msgid="1089399414463784218">"Sambung ke rangkaian"</string>
+    <!-- no translation found for vpn_menu_disconnect (8254492450022562235) -->
+    <skip />
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"Edit rangkaian"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"Padamkan rangkaian"</string>
+    <!-- no translation found for vpn_error_miss_entering (5377667978602483250) -->
+    <skip />
+    <!-- no translation found for vpn_error_miss_selecting (4890780825580511345) -->
+    <skip />
+    <!-- no translation found for vpn_error_duplicate_name (2693927537390963745) -->
+    <skip />
+    <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"Adakah anda pasti ingin memadamkan VPN ini?"</string>
+    <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"Adakah anda pasti tidak mahu membuat profil ini?"</string>
+    <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"Adakah anda pasti ingin membuang perubahan yang dibuat pada profil ini?"</string>
+    <!-- no translation found for vpn_confirm_reconnect (5748535476278674296) -->
+    <skip />
+    <!-- no translation found for vpn_reconnect_from_lost (2442844155623372118) -->
+    <skip />
+    <!-- no translation found for vpn_unknown_server_dialog_msg (3080742299823671319) -->
+    <skip />
+    <!-- no translation found for vpn_challenge_error_dialog_msg (6174901754230038601) -->
+    <skip />
+    <!-- no translation found for vpn_secret_not_set_dialog_msg (8013052814131532765) -->
+    <skip />
+    <!-- no translation found for vpn_auth_error_dialog_msg (5476820106624807614) -->
+    <skip />
+    <!-- no translation found for vpn_remote_hung_up_error_dialog_msg (1566946015052633150) -->
+    <skip />
+    <!-- no translation found for vpn_remote_ppp_hung_up_error_dialog_msg (5135958511128503344) -->
+    <skip />
+    <!-- no translation found for vpn_ppp_negotiation_failed_dialog_msg (4611293656718340994) -->
+    <skip />
+    <string name="vpn_type_title" msgid="6392933604218676224">"Tambah VPN"</string>
+    <string name="vpn_add_new_vpn" msgid="5438260689052714550">"Tambah VPN"</string>
+    <!-- no translation found for vpn_details_title (418806440938510331) -->
+    <skip />
+    <!-- no translation found for vpn_edit_title_add (2121313217989682890) -->
+    <skip />
+    <!-- no translation found for vpn_edit_title_edit (2457278794066617935) -->
+    <skip />
+    <string name="vpns" msgid="3148141862835492816">"VPN"</string>
+    <string name="vpn_connecting" msgid="8039521381692090116">"Menyambung..."</string>
+    <string name="vpn_disconnecting" msgid="7748050200708257066">"Memutuskan sambungan..."</string>
+    <string name="vpn_connected" msgid="7641723116362845781">"Bersambung"</string>
+    <string name="vpn_connect_hint" msgid="7442898962925875181">"Sambung ke rangkaian"</string>
+    <string name="vpn_name" msgid="1550918148476193076">"Nama VPN"</string>
+    <!-- no translation found for vpn_a_name (8445736942405283509) -->
+    <skip />
+    <!-- no translation found for vpn_profile_added (9061017910337129840) -->
+    <skip />
+    <!-- no translation found for vpn_profile_replaced (587435576816273815) -->
+    <skip />
+    <string name="vpn_user_certificate_title" msgid="6812545893924071742">"Tetapkan sijil pengguna"</string>
+    <string name="vpn_user_certificate" msgid="949322691686938888">"Sijil pengguna"</string>
+    <!-- no translation found for vpn_a_user_certificate (8943983437956898649) -->
+    <skip />
+    <string name="vpn_ca_certificate_title" msgid="7846466160795589985">"Tetapkan sijil CA"</string>
+    <string name="vpn_ca_certificate" msgid="465085144064264742">"Sijil Pihak berkuasa perakuan (CA)"</string>
+    <!-- no translation found for vpn_a_ca_certificate (3374242520974884295) -->
+    <skip />
+    <string name="vpn_l2tp_secret_string_title" msgid="5039677186748940987">"Tetapkan rahsia L2TP"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"Rahsia L2TP"</string>
+    <!-- no translation found for vpn_a_l2tp_secret (6612042930810981845) -->
+    <skip />
+    <!-- no translation found for vpn_pptp_encryption_title (2236795167467896499) -->
+    <skip />
+    <!-- no translation found for vpn_pptp_encryption (2602329949737259686) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_presharedkey_title (2184060087690539175) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_presharedkey (5434316521616673741) -->
+    <skip />
+    <!-- no translation found for vpn_a_ipsec_presharedkey (1255301923217898418) -->
+    <skip />
+    <string name="vpn_vpn_server_title" msgid="8897005887420358913">"Tetapkan pelayan VPN"</string>
+    <string name="vpn_vpn_server" msgid="1141754908824209260">"Pelayan VPN"</string>
+    <!-- no translation found for vpn_a_vpn_server (5960906152125045853) -->
+    <skip />
+    <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"Nama pelayan VPN"</string>
+    <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"Domain carian DNS"</string>
+    <string name="vpn_dns_search_list" msgid="4230034234026605360">"Domain carian DNS"</string>
+    <!-- no translation found for vpn_field_is_set (7137320847812992243) -->
+    <skip />
+    <!-- no translation found for vpn_field_not_set (2972519243515893804) -->
+    <skip />
+    <!-- no translation found for vpn_field_not_set_optional (8840557698252556791) -->
+    <skip />
+    <!-- no translation found for vpn_enable_field (3700967675854517191) -->
+    <skip />
+    <!-- no translation found for vpn_disable_field (6905658811179634005) -->
+    <skip />
+    <!-- no translation found for vpn_is_enabled (1266304230417098877) -->
+    <skip />
+    <!-- no translation found for vpn_is_disabled (2013622485867806167) -->
+    <skip />
+    <string name="vpn_settings_title" msgid="7327468307909556719">"Tetapan VPN"</string>
+    <string name="vpn_settings_summary" msgid="8849924181594963972">"Sediakan &amp; urus Rangkaian Persendirian Maya (VPN)"</string>
+    <!-- no translation found for vpn_secret_unchanged (8700613973594154529) -->
+    <skip />
+    <!-- no translation found for vpn_secret_not_set (1037792636371641845) -->
+    <skip />
+    <!-- no translation found for credentials_title (4446234003860769883) -->
+    <skip />
+    <!-- no translation found for credentials_install (466093273825150847) -->
+    <skip />
+    <!-- no translation found for credentials_install (953914549998062317) -->
+    <skip />
+    <!-- no translation found for credentials_install_summary (4220422806818210676) -->
+    <skip />
+    <!-- no translation found for credentials_install_summary (5737658257407822713) -->
+    <skip />
+    <!-- no translation found for credentials_reset (3239382277144980418) -->
+    <skip />
+    <!-- no translation found for credentials_reset_summary (3369361230171260282) -->
+    <skip />
+    <!-- no translation found for credentials_unlock (1463040326264133844) -->
+    <skip />
+    <!-- no translation found for credentials_unlock_hint (5889551635843338639) -->
+    <skip />
+    <!-- no translation found for credentials_old_password (7553393815538684028) -->
+    <skip />
+    <!-- no translation found for credentials_reset_hint (1566409057833618877) -->
+    <skip />
+    <!-- no translation found for credentials_password_too_short (7502749986405522663) -->
+    <skip />
+    <!-- no translation found for credentials_wrong_password (2541932597104054807) -->
+    <skip />
+    <!-- no translation found for credentials_reset_warning (5320653011511797600) -->
+    <skip />
+    <!-- no translation found for credentials_reset_warning_plural (6514085665301095279) -->
+    <skip />
+    <!-- no translation found for credentials_erased (2907836028586342969) -->
+    <skip />
+    <!-- no translation found for credentials_not_erased (397954733557821269) -->
+    <skip />
+    <!-- no translation found for credentials_enabled (7588607413349978930) -->
+    <skip />
+    <!-- no translation found for credentials_configure_lock_screen_hint (6816970208840577219) -->
+    <skip />
+    <string name="emergency_tone_title" msgid="1055954530111587114">"Nada kecemasan"</string>
+    <string name="emergency_tone_summary" msgid="722259232924572153">"Tetapkan tingkah laku semasa membuat panggilan kecemasan"</string>
+    <!-- no translation found for privacy_settings (9206631214140954954) -->
+    <skip />
+    <!-- no translation found for privacy_settings_title (1987089301293213705) -->
+    <skip />
+    <!-- no translation found for backup_section_title (8856083167469467588) -->
+    <skip />
+    <!-- no translation found for personal_data_section_title (7815209034443782061) -->
+    <skip />
+    <!-- no translation found for backup_data_title (1239105919852668016) -->
+    <skip />
+    <!-- no translation found for backup_data_summary (6515285107793232815) -->
+    <skip />
+    <!-- no translation found for backup_configure_account_title (3790872965773196615) -->
+    <skip />
+    <!-- no translation found for backup_configure_account_default_summary (2436933224764745553) -->
+    <skip />
+    <!-- no translation found for auto_restore_title (5397528966329126506) -->
+    <skip />
+    <!-- no translation found for auto_restore_summary (83177150536734378) -->
+    <skip />
+    <!-- no translation found for backup_erase_dialog_title (3438255037256586237) -->
+    <skip />
+    <!-- no translation found for backup_erase_dialog_message (7766283133557587608) -->
+    <skip />
+    <!-- no translation found for device_admin_settings_title (1335557832906433309) -->
+    <skip />
+    <!-- no translation found for active_device_admin_msg (6930903262612422111) -->
+    <skip />
+    <!-- no translation found for remove_device_admin (3596845261596451437) -->
+    <skip />
+    <!-- no translation found for select_device_admin_msg (2645509057946368094) -->
+    <skip />
+    <!-- no translation found for no_device_admins (702695100241728775) -->
+    <skip />
+    <!-- no translation found for add_device_admin_msg (6246742476064507965) -->
+    <skip />
+    <!-- no translation found for add_device_admin (7133327675884827091) -->
+    <skip />
+    <!-- no translation found for device_admin_add_title (7705551449705676363) -->
+    <skip />
+    <!-- no translation found for device_admin_warning (1149471041373876923) -->
+    <skip />
+    <!-- no translation found for device_admin_status (7169948053970923035) -->
+    <skip />
+    <!-- no translation found for untitled_apn (1230060359198685513) -->
+    <skip />
+    <!-- no translation found for sound_category_sound_title (1488759370067953996) -->
+    <skip />
+    <!-- no translation found for sound_category_calls_title (3688531959256239012) -->
+    <skip />
+    <!-- no translation found for sound_category_notification_title (3502115998790286943) -->
+    <skip />
+    <!-- no translation found for sound_category_feedback_title (4399742321363475393) -->
+    <skip />
+    <!-- no translation found for wifi_setup_title (661074868726906436) -->
+    <skip />
+    <!-- no translation found for wifi_setup_title_editing_network (7304321031985059969) -->
+    <skip />
+    <!-- no translation found for wifi_setup_title_connecting_network (2408378435027118687) -->
+    <skip />
+    <!-- no translation found for wifi_setup_title_connected_network (209755856836003839) -->
+    <skip />
+    <!-- no translation found for wifi_setup_title_add_network (6932651000151032301) -->
+    <skip />
+    <!-- no translation found for wifi_setup_not_connected (6997432604664057052) -->
+    <skip />
+    <!-- no translation found for wifi_setup_add_network (5939624680150051807) -->
+    <skip />
+    <!-- no translation found for wifi_setup_refresh_list (3411615711486911064) -->
+    <skip />
+    <!-- no translation found for wifi_setup_skip (6661541841684895522) -->
+    <skip />
+    <!-- no translation found for wifi_setup_next (3388694784447820477) -->
+    <skip />
+    <!-- no translation found for wifi_setup_back (144777383739164044) -->
+    <skip />
+    <!-- no translation found for wifi_setup_detail (2336990478140503605) -->
+    <skip />
+    <!-- no translation found for wifi_setup_connect (7954456989590237049) -->
+    <skip />
+    <!-- no translation found for wifi_setup_forget (2562847595567347526) -->
+    <skip />
+    <!-- no translation found for wifi_setup_save (3659235094218508211) -->
+    <skip />
+    <!-- no translation found for wifi_setup_cancel (3185216020264410239) -->
+    <skip />
+    <!-- no translation found for wifi_setup_status_scanning (7424598483871053657) -->
+    <skip />
+    <!-- no translation found for wifi_setup_status_select_network (7519563569903137003) -->
+    <skip />
+    <!-- no translation found for wifi_setup_status_existing_network (6394925174802598186) -->
+    <skip />
+    <!-- no translation found for wifi_setup_status_unsecured_network (8143046977328718252) -->
+    <skip />
+    <!-- no translation found for wifi_setup_status_edit_network (6582036394332822032) -->
+    <skip />
+    <!-- no translation found for wifi_setup_status_new_network (7468952850452301083) -->
+    <skip />
+    <!-- no translation found for wifi_setup_status_connecting (2594117697215042584) -->
+    <skip />
+    <!-- no translation found for wifi_setup_status_proceed_to_next (9071951312604559022) -->
+    <skip />
+    <!-- no translation found for wifi_setup_status_eap_not_supported (3196386445567501484) -->
+    <skip />
+    <!-- no translation found for wifi_setup_eap_not_supported (683540356393542939) -->
+    <skip />
+    <!-- no translation found for wifi_setup_description_connecting (1884664966455980182) -->
+    <skip />
+    <!-- no translation found for wifi_setup_description_connected (5235991893829582459) -->
+    <skip />
+    <!-- no translation found for account_sync_settings_title (4578227872921044660) -->
+    <skip />
+    <string name="sync_is_failing" msgid="1591561768344128377">"Penyegerakan sedang mengalami masalah. Ia akan kembali sebentar lagi."</string>
+    <!-- no translation found for add_account_label (7811707265834013767) -->
+    <skip />
+    <!-- no translation found for header_general_sync_settings (3487451896424238469) -->
+    <skip />
+    <!-- no translation found for background_data (5779592891375473817) -->
+    <skip />
+    <!-- no translation found for background_data_summary (3630389249212620467) -->
+    <skip />
+    <!-- no translation found for background_data_dialog_title (745974259246047425) -->
+    <skip />
+    <!-- no translation found for background_data_dialog_message (9155730118215371308) -->
+    <skip />
+    <string name="sync_automatically" msgid="7558810110682562376">"Auto segerak"</string>
+    <!-- no translation found for sync_automatically_summary (6662623174608419931) -->
+    <skip />
+    <!-- no translation found for header_manage_accounts (6869002423884539607) -->
+    <skip />
+    <!-- no translation found for sync_enabled (4551148952179416813) -->
+    <skip />
+    <!-- no translation found for sync_disabled (8511659877596511991) -->
+    <skip />
+    <!-- no translation found for sync_error (5060969083117872149) -->
+    <skip />
+    <!-- no translation found for settings_backup (2274732978260797031) -->
+    <skip />
+    <!-- no translation found for settings_backup_summary (7916877705938054035) -->
+    <skip />
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"Segerakkan sekarang"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Batalkan penyegerakan"</string>
+    <!-- no translation found for sync_one_time_sync (6766593624598183090) -->
+    <skip />
+    <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
+    <string name="sync_calendar" msgid="9056527206714733735">"Kalendar"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"Kenalan"</string>
+    <!-- no translation found for sync_plug (5952575609349860569) -->
+    <skip />
+    <!-- no translation found for header_application_sync_settings (5514539555293976035) -->
+    <skip />
+    <!-- no translation found for header_data_and_synchronization (5165024023936509896) -->
+    <skip />
+    <!-- no translation found for preference_change_password_title (8955581790270130056) -->
+    <skip />
+    <!-- no translation found for header_account_settings (5382475087121880626) -->
+    <skip />
+    <!-- no translation found for remove_account_label (5921986026504804119) -->
+    <skip />
+    <!-- no translation found for header_add_an_account (756108499532023798) -->
+    <skip />
+    <!-- no translation found for finish_button_label (481587707657751116) -->
+    <skip />
+    <!-- no translation found for really_remove_account_title (6574643117748564960) -->
+    <skip />
+    <!-- no translation found for really_remove_account_message (4448645571715719563) -->
+    <skip />
+    <!-- no translation found for really_remove_account_message (1005751790899989319) -->
+    <skip />
+    <!-- no translation found for remove_account_failed (1093911989149396624) -->
+    <skip />
+    <!-- no translation found for remove_account_failed (9174390193652391412) -->
+    <skip />
+    <!-- no translation found for provider_label (7724593781904508866) -->
+    <skip />
+    <!-- no translation found for sync_item_title (1931551540462877488) -->
+    <skip />
+    <!-- no translation found for cant_sync_dialog_title (7185199796123573317) -->
+    <skip />
+    <!-- no translation found for cant_sync_dialog_message (2372359241135295930) -->
+    <skip />
+    <!-- no translation found for enter_password (3268224850821675915) -->
+    <skip />
+    <!-- no translation found for try_again (5904121494468643129) -->
+    <skip />
+    <!-- no translation found for service_busy (225227519012409130) -->
+    <skip />
+    <!-- no translation found for delete (4219243412325163003) -->
+    <skip />
+    <!-- no translation found for misc_files (6298643430106707497) -->
+    <skip />
+    <!-- no translation found for misc_files_selected_count (4647048020823912088) -->
+    <skip />
+    <!-- no translation found for misc_files_selected_count_bytes (2876232009069114352) -->
+    <skip />
+    <!-- no translation found for select_all (6783085295161532497) -->
+    <skip />
+    <!-- no translation found for hdcp_checking_title (8605478913544273282) -->
+    <skip />
+    <!-- no translation found for hdcp_checking_dialog_title (5141305530923283) -->
+    <skip />
+</resources>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index aa2ee0a..2d321b5 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -48,6 +48,16 @@
     <item msgid="2314124409517439288">"10 minutter"</item>
     <item msgid="6864027152847611413">"30 minutter"</item>
   </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="3149294732238283185">"Aldri"</item>
+    <item msgid="2194151041885903260">"15 sekunder"</item>
+    <item msgid="5892295237131074341">"30 sekunder"</item>
+    <item msgid="3538441365970038213">"1 minutt"</item>
+    <item msgid="412343871668955639">"2 minutter"</item>
+    <item msgid="5076853889688991690">"5 minutter"</item>
+    <item msgid="1903860996174927898">"10 minutter"</item>
+    <item msgid="6415509612413178727">"30 minutter"</item>
+  </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"umiddelbart"</item>
     <item msgid="6736512735606834431">"5 sekunder"</item>
@@ -59,6 +69,22 @@
     <item msgid="9002737361305019353">"10 minutter"</item>
     <item msgid="4322676235684793329">"30 minutter"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Ekstremt liten"</item>
+    <item msgid="383133849547816572">"Ekstra liten"</item>
+    <item msgid="6490061470416867723">"Liten"</item>
+    <item msgid="3579015730662088893">"Vanlig"</item>
+    <item msgid="1678068858001018666">"Stor"</item>
+    <item msgid="490158884605093126">"Ekstra stor"</item>
+    <item msgid="2123802548987439763">"Ekstremt stor"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Svært langsom"</item>
     <item msgid="2361722960903353554">"Langsom"</item>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index ac848a8..8510fdc 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -316,7 +316,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Krev personlig tallkode for å låse opp skjermen"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Passord"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Krev passord for å låse opp skjermen"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Deaktivert av administrator eller krypteringsregel"</string>
+    <!-- outdated translation 5962903914511361952 -->     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Deaktivert av ekstern enhetsadministrator"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Av"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7137296704741184239">"Ingen sikkerhet"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Sikret med mønster"</string>
@@ -460,6 +460,7 @@
     <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Angi når du vil koble fra Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Det oppstod et problem under endring av innstillingen"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Legg til Wi-Fi-nettverk"</string>
+    <string name="wifi_add_network_summary" msgid="6345544206968025811">"Konfigurer et ikke-kringkastende nettverk"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Trådløse nettverk"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Skann"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avansert"</string>
@@ -598,7 +599,17 @@
     <string name="brightness_summary" msgid="838917350127550703">"Juster skjermens lysstyrke"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Tidsavbrudd"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Skjermen slås automatisk av etter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android Dreams"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Skjermsparere og andre avledninger ved inaktivitet"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Valgt drøm"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Aktiveringstid"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"Etter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> som inaktiv"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Aldri"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Test den!"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatisk lysstyrke"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Skriftstørrelse"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Generell skriftstørrelse"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Velg skriftstørrelse"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Innstillinger for SIM-kort-lås"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Sett opp SIM-kort-lås"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM-kort-lås"</string>
@@ -644,7 +655,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"Telefonnummer"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"PRL-versjon"</string>
-    <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
+    <string name="status_meid_number" msgid="2037549729230058915">"IMEI/MEID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"Nettverkstype"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Datatilgang"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Servicestatus"</string>
@@ -893,9 +904,12 @@
     <string name="install_unknown_applications" msgid="6612824788917283662">"Tillat installasjon av applikasjoner som ikke kommer fra Android-markedet"</string>
     <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"Nettbrettet og dine personlige opplysninger er mer sårbare for angrep av applikasjoner fra ukjente kilder. Du godtar at du selv er ansvarlig for skader på nettbrettet eller tap av data som kan oppstå ved bruk av disse applikasjonene."</string>
     <string name="install_all_warning" product="default" msgid="1923717607319933741">"Telefonen og dine personlige data er mer sårbare mot angrep fra applikasjoner som kommer fra ukjente kilder. Du godtar at du selv er ansvarlig for enhver skade på telefonen eller tap av data som måtte oppstå fra bruk av slike applikasjoner."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Avanserte innstillinger"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Aktiver flere innstillingsalternativer."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Applikasjonsinformasjon"</string>
     <string name="storage_label" msgid="8700867073480107253">"Lagring"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Start som standard"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Skjermkompatibilitet"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Rettigheter"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Hurtiglager"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Fjern hurtiglager"</string>
@@ -915,6 +929,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Du har valgt å starte denne applikasjonen som standard for noen handlinger."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Ingen standardvalg satt."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Fjern standardvalg"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Denne applikasjonen er kanskje ikke utformet for skjermen din. Du kan kontrollere hvordan den justerer seg til skjermen din her."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Spør ved oppstart"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Skaler applikasjon"</string>
     <string name="unknown" msgid="1592123443519355854">"Ukjent"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Sorter etter navn"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Sorter etter størrelse"</string>
@@ -1019,8 +1036,13 @@
     <string name="show_password" msgid="2198798062604049206">"Synlige passord"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Vis passord mens de skrives inn"</string>
     <string name="ime_security_warning" msgid="812267421486877917">"Inndatametoden har mulighet til å samle inn all tekst du skriver, inkludert personlige data som passord og kredittkortnummer. Den kommer fra applikasjonen <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Aktiver inndatametoden?"</string>
+    <!-- no translation found for pointer_settings_category (6090176550039035130) -->
+    <skip />
+    <!-- no translation found for pointer_speed (1221342330217861616) -->
+    <skip />
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Ordliste"</string>
-    <string name="user_dict_settings_title" msgid="8357027437499042191">"Ordliste"</string>
+    <string name="user_dict_single_settings_title" msgid="5454855286173849284">"Brukerordliste"</string>
+    <string name="user_dict_multiple_settings_title" msgid="326583195525296750">"Administrer brukerordlister"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Legg til"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Legg til ordliste"</string>
@@ -1029,6 +1051,7 @@
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Slett"</string>
     <string name="user_dict_settings_empty_text" product="tablet" msgid="1766522102636921529">"Det finnes ingen ord i brukerordlisten. Du kan legge til et ord ved å trykke på Legg til-knappen ( + )."</string>
     <string name="user_dict_settings_empty_text" product="default" msgid="6209268025109242806">"Ordlisten er tom. Du kan legge til ord i menyen."</string>
+    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Alle språk"</string>
     <string name="testing" msgid="6584352735303604146">"Testing"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Informasjon om nettbrettet"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Telefoninformasjon"</string>
@@ -1100,6 +1123,8 @@
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"På/av-knapp"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"Legg på med på/av"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"Ved å trykke på av-knappen under en samtale, avsluttes samtalen i stedet for at skjermen slås av"</string>
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <skip />
     <string name="touchscreen_gestures_category" msgid="3109869155350859625">"Berøringsskjerm-bevegelser"</string>
     <string name="long_press_timeout_selector_title" msgid="1396876537252863044">"Forsinkelse på trykk og hold"</string>
     <string name="long_press_timeout_selector_summary" msgid="2261114502740278996">"Forsink til en berøring blir tolket som trykk og hold"</string>
@@ -1302,30 +1327,26 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(uendret)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(ikke satt)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Legitimasjonslager"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Bruk sikre akkreditiver"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Gir applikasjoner tilgang til sikre sertifikater og andre akkreditiver"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Installer fra lagringsenhet"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Installer fra SD-kort"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Installer sertifikater fra lagringsenhet"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Installer sertifikater fra SD-kort"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Velg passord"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Angi eller endre passordet for legitimasjonslageret"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Tøm legitimasjonslageret"</string>
-    <string name="credentials_reset_summary" msgid="3810369467217453606">"Fjern alt innhold og tilbakestill passordet"</string>
+    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3369361230171260282">"Tøm akkreditivlageret for alt innhold, og tilbakestill passordet"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Velg passord"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Skriv inn passordet for legitimasjonslagring."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Angi et passord for legitimasjonslageret. Det må inneholde minst åtte tegn."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Nåværende passord:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Nytt passord:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Bekreft nytt passord:"</string>
-    <string name="credentials_reset_hint" msgid="2336340927894094814">"Alt innholdet fjernes, og passordet tilbakestilles. Er du sikker?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Passordene stemmer ikke overens."</string>
+    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="1566409057833618877">"Er du sikker på at du ønsker å slette alle akkreditiver og tilbakestille passordet for akkreditivlageret?"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Passordet må bestå av minst åtte tegn."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Feil passord."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Feil passord. Du har ett forsøk til før legitimasjonslageret slettes."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Feil passord. Du har <xliff:g id="NUMBER">%1$d</xliff:g> flere forsøk før legitimasjonslageret slettes."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Legitimasjonslageret ble tømt."</string>
+    <!-- no translation found for credentials_not_erased (397954733557821269) -->
+    <skip />
     <string name="credentials_enabled" msgid="7588607413349978930">"Akkreditivlageret er aktivert."</string>
+    <!-- no translation found for credentials_configure_lock_screen_hint (6816970208840577219) -->
+    <skip />
     <string name="emergency_tone_title" msgid="1055954530111587114">"Nødtone"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Velg oppførsel når en nødsamtale opprettes"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"Personvern"</string>
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index d4137cc..ba836eb 100644
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -48,6 +48,16 @@
     <item msgid="2314124409517439288">"10 minuten"</item>
     <item msgid="6864027152847611413">"30 minuten"</item>
   </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="3149294732238283185">"Nooit"</item>
+    <item msgid="2194151041885903260">"15 seconden"</item>
+    <item msgid="5892295237131074341">"30 seconden"</item>
+    <item msgid="3538441365970038213">"1 minuut"</item>
+    <item msgid="412343871668955639">"2 minuten"</item>
+    <item msgid="5076853889688991690">"5 minuten"</item>
+    <item msgid="1903860996174927898">"10 minuten"</item>
+    <item msgid="6415509612413178727">"30 minuten"</item>
+  </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"onmiddellijk"</item>
     <item msgid="6736512735606834431">"5 seconden"</item>
@@ -59,6 +69,22 @@
     <item msgid="9002737361305019353">"10 minuten"</item>
     <item msgid="4322676235684793329">"30 minuten"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Zeer klein"</item>
+    <item msgid="383133849547816572">"Extra klein"</item>
+    <item msgid="6490061470416867723">"Klein"</item>
+    <item msgid="3579015730662088893">"Normaal"</item>
+    <item msgid="1678068858001018666">"Groot"</item>
+    <item msgid="490158884605093126">"Extra groot"</item>
+    <item msgid="2123802548987439763">"Zeer groot"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Zeer langzaam"</item>
     <item msgid="2361722960903353554">"Langzaam"</item>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index d79bc32..e29abcb 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -316,7 +316,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Numerieke PIN-code vereist voor schermontgr."</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Wachtwoord"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Wachtwoord vereist voor schermontgrendeling"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Uitgeschakeld door beheerder of coderingsbeleid"</string>
+    <!-- outdated translation 5962903914511361952 -->     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Uitgeschakeld door externe apparaatbeheerder"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Uitgeschakeld"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7137296704741184239">"Geen beveiliging"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Beveiligd met patroon"</string>
@@ -460,6 +460,7 @@
     <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Aangeven wanneer de Wi-Fi-verbinding moet worden verbroken"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Er is een probleem opgetreden bij het wijzigen van de instelling"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Wi-Fi-netwerk toevoegen"</string>
+    <string name="wifi_add_network_summary" msgid="6345544206968025811">"Een niet-broadcastnetwerk configureren"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi-netwerken"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Scannen"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Geavanceerd"</string>
@@ -598,7 +599,17 @@
     <string name="brightness_summary" msgid="838917350127550703">"Helderheid van het scherm aanpassen"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Time-out"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Het scherm wordt automatisch uitgeschakeld na <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android Dreams"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Screensavers en andere opties voor inactiviteit"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Geselecteerde droom"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Activeringsmoment"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"Na <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inactiviteit"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Nooit"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Probeer het zelf!"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatische helderheid"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Lettergrootte"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Algemene lettergrootte"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Lettergrootte selecteren"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Instellingen SIM-kaartvergrendeling"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"SIM-vergrendeling instellen"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM-kaartvergrendeling"</string>
@@ -644,7 +655,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"Mijn telefoonnummer"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"PRL-versie"</string>
-    <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
+    <string name="status_meid_number" msgid="2037549729230058915">"IMEI/MEID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"Type mobiel netwerk"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Status mobiel netwerk"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Servicestatus"</string>
@@ -893,9 +904,12 @@
     <string name="install_unknown_applications" msgid="6612824788917283662">"Installatie van andere toepassingen dan Market-toepassingen toestaan"</string>
     <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"Uw tablet en persoonlijke gegevens zijn gevoeliger voor aanvallen door toepassingen van onbekende bronnen. U gaat ermee akkoord dat u alleen verantwoordelijk bent voor enige schade aan uw tablet of verlies van gegevens die voortkomen uit het gebruik van deze toepassingen."</string>
     <string name="install_all_warning" product="default" msgid="1923717607319933741">"Uw telefoon en persoonlijke gegevens zijn gevoeliger voor aanvallen door toepassingen van onbekende bronnen. U gaat ermee akkoord dat u alleen verantwoordelijk bent voor enige schade aan uw telefoon of verlies van gegevens die voortkomen uit het gebruik van deze toepassingen."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Geavanceerde instellingen"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Meer opties voor instellingen inschakelen."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Toepassingsinfo"</string>
     <string name="storage_label" msgid="8700867073480107253">"Opslagruimte"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Standaard starten"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Schermcompatibiliteit"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Machtigingen"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Cachegeheugen"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Cache wissen"</string>
@@ -915,6 +929,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"U heeft ervoor gekozen deze app standaard te starten voor bepaalde acties."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Geen standaardwaarden ingesteld."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Standaardwaarden wissen"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Deze app is mogelijk niet ontworpen voor uw scherm. U kunt hier bepalen hoe de app wordt aangepast aan uw scherm."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Vragen bij starten"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"App schalen"</string>
     <string name="unknown" msgid="1592123443519355854">"Onbekend"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Sorteren op naam"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Sorteren op grootte"</string>
@@ -1019,8 +1036,13 @@
     <string name="show_password" msgid="2198798062604049206">"Zichtbare wachtwoorden"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Wachtwoord weergeven tijdens het typen"</string>
     <string name="ime_security_warning" msgid="812267421486877917">"Deze invoermethode verzamelt mogelijk alle tekst die u typt, inclusief persoonlijke gegevens zoals wachtwoorden en creditcardnummers. De methode is afkomstig uit de app <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Deze invoermethode inschakelen?"</string>
+    <!-- no translation found for pointer_settings_category (6090176550039035130) -->
+    <skip />
+    <!-- no translation found for pointer_speed (1221342330217861616) -->
+    <skip />
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Gebruikerswoordenboek"</string>
-    <string name="user_dict_settings_title" msgid="8357027437499042191">"Gebruikerswoordenboek"</string>
+    <string name="user_dict_single_settings_title" msgid="5454855286173849284">"Gebruikerswoordenboek"</string>
+    <string name="user_dict_multiple_settings_title" msgid="326583195525296750">"Gebruikerswoordenboeken beheren"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Toevoegen"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Toevoegen aan woordenboek"</string>
@@ -1029,6 +1051,7 @@
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Verwijderen"</string>
     <string name="user_dict_settings_empty_text" product="tablet" msgid="1766522102636921529">"Er staan geen woorden in het gebruikerswoordenboek. U kunt een woord toevoegen door de knop \'Toevoegen\' (+) aan te raken."</string>
     <string name="user_dict_settings_empty_text" product="default" msgid="6209268025109242806">"U heeft geen woorden in het gebruikerswoordenboek. U kunt een woord toevoegen via het menu."</string>
+    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Alle talen"</string>
     <string name="testing" msgid="6584352735303604146">"Testen"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Tabletinformatie"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Telefooninformatie"</string>
@@ -1100,6 +1123,8 @@
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"Aan/uit-knop"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"Knop beëindigt oproep"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"Als u tijdens een oproep op de aan/uit-knop drukt, wordt de oproep beëindigd in plaats van dat het scherm wordt uitgeschakeld"</string>
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <skip />
     <string name="touchscreen_gestures_category" msgid="3109869155350859625">"Gebaren voor het aanraakscherm"</string>
     <string name="long_press_timeout_selector_title" msgid="1396876537252863044">"Vertraging voor blijven aanraken"</string>
     <string name="long_press_timeout_selector_summary" msgid="2261114502740278996">"Vertraging totdat een aanraking wordt geïnterpreteerd als blijven aanraken"</string>
@@ -1302,30 +1327,26 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(ongewijzigd)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(niet ingesteld)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Opslag van referenties"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Beveiligingsreferenties"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Toepassingen mogen veilige certificaten en andere referenties openen"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Installeren vanuit opslag"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Installeren vanaf SD-kaart"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Certificaten vanuit opslag installeren"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Certificaten installeren vanaf SD-kaart"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Wachtwoord instellen"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Het wachtwoord voor de opslag van referenties instellen of wijzigen"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Referenties wissen"</string>
-    <string name="credentials_reset_summary" msgid="3810369467217453606">"Alle inhoud verwijderen en het wachtwoord opnieuw instellen"</string>
+    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3369361230171260282">"Referentieopslag voor inhoud wissen en wachtwoord opnieuw instellen"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Voer het wachtwoord in"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Geef het wachtwoord voor de opslag van referenties op."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Stel het wachtwoord voor de opslag van referenties in. Het wachtwoord moet bestaan uit ten minste acht tekens."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Huidig wachtwoord:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Nieuw wachtwoord:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Nieuw wachtwoord bevestigen:"</string>
-    <string name="credentials_reset_hint" msgid="2336340927894094814">"Alle inhoud wordt verwijderd en het wachtwoord wordt opnieuw ingesteld. Weet u het zeker?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"De wachtwoorden komen niet overeen."</string>
+    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="1566409057833618877">"Weet u zeker dat u alle referenties wilt verwijderen en het wachtwoord voor de opslag van referenties opnieuw wilt instellen?"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Het wachtwoord moet uit ten minste 8 tekens bestaan."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Onjuist wachtwoord."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Onjuist wachtwoord. U heeft nog één poging voordat de opslag van referenties wordt gewist."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Onjuist wachtwoord. U heeft nog <xliff:g id="NUMBER">%1$d</xliff:g> pogingen voordat de opslag van referenties wordt gewist."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Opslag van referenties is gewist."</string>
+    <!-- no translation found for credentials_not_erased (397954733557821269) -->
+    <skip />
     <string name="credentials_enabled" msgid="7588607413349978930">"De opslag van referenties is ingeschakeld."</string>
+    <!-- no translation found for credentials_configure_lock_screen_hint (6816970208840577219) -->
+    <skip />
     <string name="emergency_tone_title" msgid="1055954530111587114">"Toon voor noodoproep"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Gedrag bij noodoproepen instellen"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"Back-up &amp; herstellen"</string>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index 2e70088..6dd60af 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -48,6 +48,16 @@
     <item msgid="2314124409517439288">"10 min"</item>
     <item msgid="6864027152847611413">"30 min"</item>
   </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="3149294732238283185">"Nigdy"</item>
+    <item msgid="2194151041885903260">"15 s"</item>
+    <item msgid="5892295237131074341">"30 s"</item>
+    <item msgid="3538441365970038213">"1 min"</item>
+    <item msgid="412343871668955639">"2 min"</item>
+    <item msgid="5076853889688991690">"5 min"</item>
+    <item msgid="1903860996174927898">"10 min"</item>
+    <item msgid="6415509612413178727">"30 min"</item>
+  </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"natychmiast"</item>
     <item msgid="6736512735606834431">"5 sekund"</item>
@@ -59,6 +69,22 @@
     <item msgid="9002737361305019353">"10 min"</item>
     <item msgid="4322676235684793329">"30 min"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Wyjątkowo mały"</item>
+    <item msgid="383133849547816572">"Bardzo mały"</item>
+    <item msgid="6490061470416867723">"Mały"</item>
+    <item msgid="3579015730662088893">"Normalny"</item>
+    <item msgid="1678068858001018666">"Duży"</item>
+    <item msgid="490158884605093126">"Bardzo duży"</item>
+    <item msgid="2123802548987439763">"Wyjątkowo duży"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Bardzo wolno"</item>
     <item msgid="2361722960903353554">"Wolno"</item>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index aba41f9..c171b76 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -316,7 +316,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Wymagaj kodu PIN do odblokowania ekranu"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Hasło"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Wymagaj hasła do odblokowania ekranu"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Wyłączone przez administratora lub zasadę szyfr."</string>
+    <!-- outdated translation 5962903914511361952 -->     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Wyłączone przez zdalnego administratora urządzenia"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Wyłącz"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7137296704741184239">"Brak zabezpieczeń"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Zabezpieczenie wzorem"</string>
@@ -460,6 +460,7 @@
     <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Określ czas odłączenia od sieci Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Wystąpił problem ze zmianą ustawienia"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Dodaj sieć Wi-Fi"</string>
+    <string name="wifi_add_network_summary" msgid="6345544206968025811">"Skonfiguruj sieć bez rozgłaszania"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Sieci Wi-Fi"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Skanuj"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Zaawansowane"</string>
@@ -598,7 +599,17 @@
     <string name="brightness_summary" msgid="838917350127550703">"Dostosuj jasność ekranu"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Wygaszanie"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Ekran wyłączy się automatycznie po upływie <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Sny Androida"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Wygaszacze ekranu i inna aktywność podczas bezczynności"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Wybrany sen"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Włączenie wygaszacza"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> bezczynności"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Nigdy"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Wypróbuj"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatyczna jasność"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Rozmiar czcionki"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Ogólny rozmiar czcionek"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Wybierz rozmiar czcionki"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Ustawienia blokady karty SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Ustaw blokadę SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Blokada karty SIM"</string>
@@ -644,7 +655,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"Mój numer telefonu"</string>
     <string name="status_min_number" msgid="3519504522179420597">"Numer MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"Wersja listy PRL"</string>
-    <string name="status_meid_number" msgid="1751442889111731088">"Numer MEID"</string>
+    <string name="status_meid_number" msgid="2037549729230058915">"IMEI/MEID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"Typ sieci komórkowej"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Stan sieci komórkowej"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Stan usługi"</string>
@@ -893,9 +904,12 @@
     <string name="install_unknown_applications" msgid="6612824788917283662">"Zezwalaj na instalowanie aplikacji niepochodzących z usługi Market"</string>
     <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"Twój tablet i dane osobiste są bardziej narażone na atak aplikacji pochodzących z nieznanych źródeł. Akceptujesz fakt, że ponosisz wyłączną odpowiedzialność za wszelkie szkody powstałe w tablecie i utratę danych w wyniku używania tych aplikacji."</string>
     <string name="install_all_warning" product="default" msgid="1923717607319933741">"Telefon i dane osobiste są bardziej narażone na atak za pomocą aplikacji z nieznanych źródeł. Zgadzasz się ponieść pełną odpowiedzialność za wszelkie uszkodzenia telefonu oraz utratę danych, które mogą wyniknąć ze stosowania tych aplikacji."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Ustawienia zaawansowane"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Włącz więcej opcji ustawień."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Informacje o aplikacji"</string>
     <string name="storage_label" msgid="8700867073480107253">"Pamięć"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Uruchom domyślnie"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Zgodność z ekranem"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Uprawnienia"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Pamięć podręczna"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Wyczyść pamięć podręczną"</string>
@@ -915,6 +929,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Wybrano domyślne uruchamianie tej aplikacji dla niektórych czynności."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Brak ustawień domyślnych."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Wyczyść domyślne"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Aplikacja może nie być przystosowana do ekranu Twojego urządzenia. Tutaj możesz ją skonfigurować do obsługi ekranu."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Zapytaj po uruchomieniu"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Skaluj widok aplikacji"</string>
     <string name="unknown" msgid="1592123443519355854">"Nieznana"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Sortuj według nazwy"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Sortuj według rozmiaru"</string>
@@ -1019,8 +1036,13 @@
     <string name="show_password" msgid="2198798062604049206">"Widoczne hasła"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Pokazuj hasło podczas wpisywania"</string>
     <string name="ime_security_warning" msgid="812267421486877917">"Ten sposób wprowadzania tekstu może gromadzić całą wpisaną treść, w tym dane osobiste w postaci haseł i numerów kart kredytowych. Dotyczy to aplikacji <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Czy użyć tego sposobu wprowadzania tekstu?"</string>
+    <!-- no translation found for pointer_settings_category (6090176550039035130) -->
+    <skip />
+    <!-- no translation found for pointer_speed (1221342330217861616) -->
+    <skip />
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Słownik użytkownika"</string>
-    <string name="user_dict_settings_title" msgid="8357027437499042191">"Słownik użytkownika"</string>
+    <string name="user_dict_single_settings_title" msgid="5454855286173849284">"Słownik użytkownika"</string>
+    <string name="user_dict_multiple_settings_title" msgid="326583195525296750">"Zarządzanie słownikami użytkownika"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Dodaj"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Dodaj do słownika"</string>
@@ -1029,6 +1051,7 @@
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Usuń"</string>
     <string name="user_dict_settings_empty_text" product="tablet" msgid="1766522102636921529">"Nie masz żadnych słów w słowniku użytkownika. Możesz dodać słowo, dotykając przycisku Dodaj ( + )."</string>
     <string name="user_dict_settings_empty_text" product="default" msgid="6209268025109242806">"Nie masz żadnych słów w słowniku użytkownika. Możesz dodać słowo poprzez menu."</string>
+    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Wszystkie języki"</string>
     <string name="testing" msgid="6584352735303604146">"Testowanie"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Informacje o tablecie"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Informacje o telefonie"</string>
@@ -1100,6 +1123,8 @@
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"Przycisk zasilania"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"Koniec połączenia"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"Naciśnięcie przycisku zasilania w trakcie połączenia powoduje jego zakończenie zamiast wyłączenia ekranu"</string>
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <skip />
     <string name="touchscreen_gestures_category" msgid="3109869155350859625">"Gesty na ekranie dotykowym"</string>
     <string name="long_press_timeout_selector_title" msgid="1396876537252863044">"Czas naciśnięcia i przytrzymania"</string>
     <string name="long_press_timeout_selector_summary" msgid="2261114502740278996">"Czas, po którym dotknięcie jest interpretowane jako dotknięcie i przytrzymanie"</string>
@@ -1302,30 +1327,26 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(nie zmieniono)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(nie ustawiono)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Magazyn danych logowania"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Dostęp do poufnych danych"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Zezwalaj aplikacjom na dostęp do bezpiecznych certyfikatów i innych danych logowania"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Zainstaluj z nośnika"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Zainstaluj z karty SD"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Zainstaluj certyfikaty z nośnika"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Zainstaluj certyfikaty z karty SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Ustaw hasło"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Ustaw lub zmień hasło do magazynu danych logowania:"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Wyczyść dane logowania"</string>
-    <string name="credentials_reset_summary" msgid="3810369467217453606">"Usuń całą zawartość i zresetuj hasło"</string>
+    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3369361230171260282">"Wyczyść całą zawartość magazynu danych logowania i zresetuj jego hasło"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Wprowadź hasło"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Wprowadź hasło magazynu danych logowania."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Ustaw hasło do magazynu danych logowania. Musi ono mieć co najmniej 8 znaków."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Bieżące hasło:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Nowe hasło:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Potwierdź nowe hasło:"</string>
-    <string name="credentials_reset_hint" msgid="2336340927894094814">"Cała zawartość zostanie usunięta, a hasło zostanie zresetowane. Czy na pewno chcesz to zrobić?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Hasła nie są identyczne."</string>
+    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="1566409057833618877">"Czy na pewno chcesz usunąć wszystkie dane logowania i zresetować hasło magazynu danych logowania?"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Hasło musi mieć co najmniej 8 znaków."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Nieprawidłowe hasło."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Nieprawidłowe hasło. Pozostała jedna próba przed wyczyszczeniem magazynu danych logowania."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Nieprawidłowe hasło. Pozostała liczba prób przed wyczyszczeniem magazynu danych logowania: <xliff:g id="NUMBER">%1$d</xliff:g>."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Wyczyszczono magazyn danych logowania."</string>
+    <!-- no translation found for credentials_not_erased (397954733557821269) -->
+    <skip />
     <string name="credentials_enabled" msgid="7588607413349978930">"Magazyn danych logowania jest włączony."</string>
+    <!-- no translation found for credentials_configure_lock_screen_hint (6816970208840577219) -->
+    <skip />
     <string name="emergency_tone_title" msgid="1055954530111587114">"Sygnał alarmowy"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Skonfiguruj sposób działania w przypadku połączenia alarmowego"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"Dane użytkownika"</string>
diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml
index 396f112..29d891c 100644
--- a/res/values-pt-rPT/arrays.xml
+++ b/res/values-pt-rPT/arrays.xml
@@ -48,6 +48,16 @@
     <item msgid="2314124409517439288">"10 minutos"</item>
     <item msgid="6864027152847611413">"30 minutos"</item>
   </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="3149294732238283185">"Nunca"</item>
+    <item msgid="2194151041885903260">"15 segundos"</item>
+    <item msgid="5892295237131074341">"30 segundos"</item>
+    <item msgid="3538441365970038213">"1 minuto"</item>
+    <item msgid="412343871668955639">"2 minutos"</item>
+    <item msgid="5076853889688991690">"5 minutos"</item>
+    <item msgid="1903860996174927898">"10 minutos"</item>
+    <item msgid="6415509612413178727">"30 minutos"</item>
+  </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"imediatamente"</item>
     <item msgid="6736512735606834431">"5 segundos"</item>
@@ -59,6 +69,22 @@
     <item msgid="9002737361305019353">"10 minutos"</item>
     <item msgid="4322676235684793329">"30 minutos"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Extremamente pequeno"</item>
+    <item msgid="383133849547816572">"Extra pequeno"</item>
+    <item msgid="6490061470416867723">"Pequeno"</item>
+    <item msgid="3579015730662088893">"Normal"</item>
+    <item msgid="1678068858001018666">"Grande"</item>
+    <item msgid="490158884605093126">"Extra grande"</item>
+    <item msgid="2123802548987439763">"Extremamente grande"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Muito lenta"</item>
     <item msgid="2361722960903353554">"Lenta"</item>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 8feea21..62962ab 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -316,7 +316,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Requer PIN numérico para desbloquear o ecrã"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Palavra-passe"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Requer palavra-passe para desbloquear o ecrã"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Desat. pelo administ. ou pela política de encript."</string>
+    <!-- outdated translation 5962903914511361952 -->     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Desactivivado pelo administrador do dispositivo remoto"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Desligar"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7137296704741184239">"Sem segurança"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Protegido com sequência"</string>
@@ -460,6 +460,7 @@
     <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Especificar quando desligar do Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Ocorreu um problema ao alterar a definição"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Adicionar rede Wi-Fi"</string>
+    <string name="wifi_add_network_summary" msgid="6345544206968025811">"Configurar uma rede sem difusão"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Redes Wi-Fi"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Procurar"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avançadas"</string>
@@ -598,7 +599,17 @@
     <string name="brightness_summary" msgid="838917350127550703">"Ajustar o brilho do ecrã"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Tempo limite"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"O ecrã desliga automaticamente após <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Sonhos Android"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Proteções de ecrã e outras diversões ociosas"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Sonho selecionado"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Quando ativar"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"Após <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inativo"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Nunca"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Experimente!"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brilho automático"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Tamanho do tipo de letra"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Tamanho global dos tipos de letra"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Selecionar tamanho do tipo de letra"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Definições de bloqueio do cartão SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Configurar bloqueio do cartão SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Bloqueio do cartão SIM"</string>
@@ -644,7 +655,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"O meu número de telefone"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MINUTOS"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"Versão do PRL"</string>
-    <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
+    <string name="status_meid_number" msgid="2037549729230058915">"IMEI/MEID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"Tipo de rede móvel"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Estado da rede móvel"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Estado do serviço"</string>
@@ -893,9 +904,12 @@
     <string name="install_unknown_applications" msgid="6612824788917283662">"Permitir instalação de aplicações não Market"</string>
     <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"O seu tablet e dados pessoais estão mais vulneráveis a ataques por aplicações de fontes desconhecidas. O utilizador reconhece ser o único responsável por danos no tablet ou perda de dados que possam resultar da utilização destas aplicações."</string>
     <string name="install_all_warning" product="default" msgid="1923717607319933741">"O seu telefone e dados pessoais estão mais vulneráveis a ataques por aplicações de fontes desconhecidas. O utilizador reconhece ser o único responsável por danos no telefone ou perda de dados que possam resultar da utilização destas aplicações."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Definições avançadas"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Ativar mais opções de definições."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Informações da aplicação"</string>
     <string name="storage_label" msgid="8700867073480107253">"Armazenamento"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Iniciar por predefinição"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Compatibilidade do ecrã"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Permissões"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Cache"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Limpar cache"</string>
@@ -915,6 +929,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Optou por iniciar esta aplicação por predefinição para algumas acções."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Nenhuma predefinição estabelecida."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Limpar predefinições"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Esta aplicação poderá não ser concebida para o seu ecrã; pode controlar aqui o modo como se adapta ao seu ecrã."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Perguntar quando é iniciado"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Dimensionar a aplicação"</string>
     <string name="unknown" msgid="1592123443519355854">"Desconhecido"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Ordenar pelo nome"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Ordenar por tamanho"</string>
@@ -1019,8 +1036,13 @@
     <string name="show_password" msgid="2198798062604049206">"Palavras-passe visíveis"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Mostrar palavra-passe ao escrever"</string>
     <string name="ime_security_warning" msgid="812267421486877917">"Este método de entrada pode permitir a recolha de todo o texto que introduzir, incluindo dados pessoais como, por exemplo, palavras-passe e números de cartão de crédito. O serviço é fornecido com a aplicação <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Utilizar este método de entrada?"</string>
+    <!-- no translation found for pointer_settings_category (6090176550039035130) -->
+    <skip />
+    <!-- no translation found for pointer_speed (1221342330217861616) -->
+    <skip />
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Dicionário do utilizador"</string>
-    <string name="user_dict_settings_title" msgid="8357027437499042191">"Dicionário do utilizador"</string>
+    <string name="user_dict_single_settings_title" msgid="5454855286173849284">"Dicionário do utilizador"</string>
+    <string name="user_dict_multiple_settings_title" msgid="326583195525296750">"Gerir dicionários do utilizador"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Adicionar"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Adicionar ao dicionário"</string>
@@ -1029,6 +1051,7 @@
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Eliminar"</string>
     <string name="user_dict_settings_empty_text" product="tablet" msgid="1766522102636921529">"Não tem palavras no dicionário do utilizador. Pode adicionar uma palavra tocando no botão Adicionar (+)."</string>
     <string name="user_dict_settings_empty_text" product="default" msgid="6209268025109242806">"Não tem qualquer palavra no dicionário do utilizador. Pode adicionar palavras através do menu."</string>
+    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Todos os idiomas"</string>
     <string name="testing" msgid="6584352735303604146">"Testes"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Informações do tablet"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Informações do telefone"</string>
@@ -1100,6 +1123,8 @@
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"Botão de ligar/desligar"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"O botão de ligar/desligar termina a chamada"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"Durante uma chamada, premir o botão de ligar/desligar termina a chamada em vez de desligar o ecrã"</string>
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <skip />
     <string name="touchscreen_gestures_category" msgid="3109869155350859625">"Gestos do ecrã táctil"</string>
     <string name="long_press_timeout_selector_title" msgid="1396876537252863044">"Atraso ao manter premida a tecla"</string>
     <string name="long_press_timeout_selector_summary" msgid="2261114502740278996">"Atrasar até um toque ser interpretado como manter premida"</string>
@@ -1302,30 +1327,26 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(não alterado)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(não definido)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Armazenamento de credenciais"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Utilizar credenciais seguras"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Acesso das aplicações a certificados seguros e outras credenciais"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Instalar do armazenamento"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Instalar a partir do cartão SD"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Instalar certificados a partir do armazenamento"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Instalar certificados a partir do cartão SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Definir palavra-passe"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Definir ou alterar a palavra-passe do armazenamento de credenciais"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Limpar credenciais"</string>
-    <string name="credentials_reset_summary" msgid="3810369467217453606">"Remover todo o conteúdo e repor a palavra-passe"</string>
+    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3369361230171260282">"Limpar armazenamento de credenciais de todos os conteúdos e repor a respectiva palavra-passe"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Introduzir palavra-passe"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Introduza a palavra-passe do armazenamento de credenciais."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Defina a palavra-passe do armazenamento de credenciais. Tem de ter, pelo menos, 8 caracteres."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Palavra-passe actual:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Nova palavra-passe:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Confirmar nova palavra-passe:"</string>
-    <string name="credentials_reset_hint" msgid="2336340927894094814">"Todo o conteúdo será removido e a palavra-passe será reposta. Tem a certeza de que pretende continuar?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"As palavras-passe não correspondem."</string>
+    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="1566409057833618877">"Tem a certeza de que pretende eliminar todas as credenciais e repor a palavra-passe do armazenamento de credenciais?"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"A palavra-passe deve ter, pelo menos, 8 caracteres."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Palavra-passe incorrecta."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Palavra-passe incorrecta. Tem mais uma tentativa antes de o armazenamento de credenciais ser apagado."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Palavra-passe incorrecta. Tem mais <xliff:g id="NUMBER">%1$d</xliff:g> tentativas antes de o armazenamento de credenciais ser apagado."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Armaz. credenciais apagado."</string>
+    <!-- no translation found for credentials_not_erased (397954733557821269) -->
+    <skip />
     <string name="credentials_enabled" msgid="7588607413349978930">"O armazenamento de credenciais está activado."</string>
+    <!-- no translation found for credentials_configure_lock_screen_hint (6816970208840577219) -->
+    <skip />
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tom de emergência"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Definir o comportamento quando é efectuada uma chamada de emergência"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"Privacidade"</string>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index e0c153c..3917e2c 100644
--- a/res/values-pt/arrays.xml
+++ b/res/values-pt/arrays.xml
@@ -48,6 +48,16 @@
     <item msgid="2314124409517439288">"10 minutos"</item>
     <item msgid="6864027152847611413">"30 minutos"</item>
   </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="3149294732238283185">"Nunca"</item>
+    <item msgid="2194151041885903260">"15 segundos"</item>
+    <item msgid="5892295237131074341">"30 segundos"</item>
+    <item msgid="3538441365970038213">"1 minuto"</item>
+    <item msgid="412343871668955639">"2 minutos"</item>
+    <item msgid="5076853889688991690">"5 minutos"</item>
+    <item msgid="1903860996174927898">"10 minutos"</item>
+    <item msgid="6415509612413178727">"30 minutos"</item>
+  </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"imediatamente"</item>
     <item msgid="6736512735606834431">"5 segundos"</item>
@@ -59,6 +69,22 @@
     <item msgid="9002737361305019353">"10 minutos"</item>
     <item msgid="4322676235684793329">"30 minutos"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Extremamente pequeno"</item>
+    <item msgid="383133849547816572">"Muito pequeno"</item>
+    <item msgid="6490061470416867723">"Pequeno"</item>
+    <item msgid="3579015730662088893">"Normal"</item>
+    <item msgid="1678068858001018666">"Grande"</item>
+    <item msgid="490158884605093126">"Extra grande"</item>
+    <item msgid="2123802548987439763">"Extremamente grande"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Muito devagar"</item>
     <item msgid="2361722960903353554">"Devagar"</item>
@@ -83,7 +109,7 @@
   </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
-    <item msgid="8934131797783724664">"Verificando…"</item>
+    <item msgid="8934131797783724664">"Procurando…"</item>
     <item msgid="8513729475867537913">"Conectando..."</item>
     <item msgid="515055375277271756">"Autenticando..."</item>
     <item msgid="1943354004029184381">"Obtendo endereço IP…"</item>
@@ -95,7 +121,7 @@
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
-    <item msgid="8878186979715711006">"Verificando…"</item>
+    <item msgid="8878186979715711006">"Procurando…"</item>
     <item msgid="355508996603873860">"Conectando-se a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
     <item msgid="554971459996405634">"Autenticando com a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
     <item msgid="7928343808033020343">"Obtendo endereço IP da <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
@@ -130,12 +156,12 @@
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="643915340724070374">"Quando a tela desliga (utiliza mais dados do celular)"</item>
-    <item msgid="1549288661423279207">"Nunca quando conectado"</item>
+    <item msgid="1549288661423279207">"Nunca se conectado à energia"</item>
     <item msgid="6592896328877671197">"Nunca (usa mais energia da bateria)"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2659922042905569057">"Quando a tela é desativada"</item>
-    <item msgid="8137861573803398334">"Nunca quando conectado"</item>
+    <item msgid="8137861573803398334">"Nunca se conectado à energia"</item>
     <item msgid="5996547094658157629">"Nunca (usa mais energia da bateria)"</item>
   </string-array>
   <string-array name="wifi_frequency_band_entries">
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index c772c12..27763c3 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -111,7 +111,7 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Pareando…"</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"Pareado, mas não conectado"</string>
     <string name="bluetooth_device" msgid="6873461446424952003">"viva-voz/fone de ouvido"</string>
-    <string name="progress_scanning" msgid="3760897655335759141">"Verificando"</string>
+    <string name="progress_scanning" msgid="3760897655335759141">"Procurando"</string>
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Solicitação de pareamento Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Solicitação de pareamento"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Selecione para parear <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
@@ -316,7 +316,7 @@
     <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>
     <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="8563103042330816018">"Desativado pelo administrador ou pela política de criptografia"</string>
+    <!-- outdated translation 5962903914511361952 -->     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Desativ. pelo administrador remoto do aparelho"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Desativado"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7137296704741184239">"Sem segurança"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Protegido com padrão"</string>
@@ -460,6 +460,7 @@
     <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Especificar quando desconectar da rede Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Ocorreu um problema com a mudança de configuração"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Adicionar rede Wi-Fi"</string>
+    <string name="wifi_add_network_summary" msgid="6345544206968025811">"Configurar uma rede sem transmissão"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Redes Wi-Fi"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Verificar"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avançado"</string>
@@ -598,7 +599,17 @@
     <string name="brightness_summary" msgid="838917350127550703">"Ajustar o brilho da tela"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Tempo limite"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"A tela é automaticamente desativada após <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android Dreams"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Protetores de tela e outras distrações"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Sonho selecionado"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Quando ativar"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"Após <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inativo"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Nunca"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Experimente!"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brilho automático"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Tamanho da fonte"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Tamanho total das fontes"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Selecionar o tamanho da fonte"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Bloqueio do SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Conf. bloqueio do SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Bloqueio do cartão SIM"</string>
@@ -644,7 +655,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"Meu número de telefone"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"Versão PRL"</string>
-    <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
+    <string name="status_meid_number" msgid="2037549729230058915">"IMEI/MEID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"Tipo de rede móvel"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Estado da rede móvel"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Estado do serviço"</string>
@@ -893,9 +904,12 @@
     <string name="install_unknown_applications" msgid="6612824788917283662">"Permite a instalação de aplicativos que não são do Market"</string>
     <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"Os dados de seu tablet e os dados pessoais estão mais vulneráveis a ataques de aplicativos de fontes desconhecidas. Você concorda que é o único responsável por qualquer dano causado a seu tablet ou pela perda de dados que possa resultar do uso desses aplicativos."</string>
     <string name="install_all_warning" product="default" msgid="1923717607319933741">"Os dados do seu telefone e os dados pessoais estão mais vulneráveis a ataques de aplicativos de fontes desconhecidas. Você concorda que é o único responsável por qualquer dano causado ao seu telefone ou pela perda de dados que possa resultar do uso desses aplicativos."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Configurações avançadas"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Ativar mais opções de configuração."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Informações do aplicativo"</string>
     <string name="storage_label" msgid="8700867073480107253">"Armazenamento"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Iniciar por padrão"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Compatibilidade de tela"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Permissões"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Cache"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Limpar cache"</string>
@@ -915,6 +929,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Você selecionou a inicialização padrão deste aplicativo para algumas ações."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Nenhum padrão definido."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Limpar padrão"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Talvez este aplicativo não seja desenvolvido para sua tela. Você pode controlar o ajuste da tela aqui."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Perguntar ao iniciar"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Dimensionar aplicativo"</string>
     <string name="unknown" msgid="1592123443519355854">"Desconhecido"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Classificar por nome"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Classificar por tamanho"</string>
@@ -1019,8 +1036,13 @@
     <string name="show_password" msgid="2198798062604049206">"Senhas visíveis"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Mostrar senha ao digitar"</string>
     <string name="ime_security_warning" msgid="812267421486877917">"Este método de entrada pode coletar todo o texto que você digitar, incluindo dados pessoais como senhas e números de cartão de crédito. Ele é proveniente do aplicativo <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Usar este método de entrada?"</string>
+    <!-- no translation found for pointer_settings_category (6090176550039035130) -->
+    <skip />
+    <!-- no translation found for pointer_speed (1221342330217861616) -->
+    <skip />
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Dicionário do usuário"</string>
-    <string name="user_dict_settings_title" msgid="8357027437499042191">"Dicionário do usuário"</string>
+    <string name="user_dict_single_settings_title" msgid="5454855286173849284">"Dicionário do usuário"</string>
+    <string name="user_dict_multiple_settings_title" msgid="326583195525296750">"Gerenciar dicionários do usuário"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Adicionar"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Adicionar ao dicionário"</string>
@@ -1029,6 +1051,7 @@
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Excluir"</string>
     <string name="user_dict_settings_empty_text" product="tablet" msgid="1766522102636921529">"Você não possui palavras no dicionário do usuário. Adicione uma palavra tocando o botão \"Adicionar\" (+)."</string>
     <string name="user_dict_settings_empty_text" product="default" msgid="6209268025109242806">"Você não possui palavras no dicionário do usuário. Você pode adicionar uma palavra por meio do menu."</string>
+    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Todos os idiomas"</string>
     <string name="testing" msgid="6584352735303604146">"Testando"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Informações do tablet"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Informações do telefone"</string>
@@ -1100,6 +1123,8 @@
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"Botão Liga/desliga"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"Botão Liga/desliga encerra a chamada"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"Durante uma chamada, pressionar o botão Liga/desliga encerra a chamada em vez de desativar a tela."</string>
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <skip />
     <string name="touchscreen_gestures_category" msgid="3109869155350859625">"Gestos da tela de toque"</string>
     <string name="long_press_timeout_selector_title" msgid="1396876537252863044">"Atraso ao tocar e pressionar"</string>
     <string name="long_press_timeout_selector_summary" msgid="2261114502740278996">"Prolongue até que um toque seja interpretado como tocar e manter pressionado"</string>
@@ -1302,30 +1327,26 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(não alterado)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(não definido)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Armazenamento de credenciais"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Usar credenciais seguras"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Permitir que os aplicativos acessem credenciais e certificados seguros"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Instalar do armazenamento"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Instalar do cartão SD"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Instalar certificados do armazenamento"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Instalar certificados do cartão SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Definir senha"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Configurar ou alterar a senha para o armazenamento de credencial"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Limpar credenciais"</string>
-    <string name="credentials_reset_summary" msgid="3810369467217453606">"Remover todos os conteúdos e redefinir a senha"</string>
+    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3369361230171260282">"Remover todo o conteúdo do armazenamento de credenciais e redefinir a senha"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Inserir senha"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Digite a senha para o armazenamento de credencial."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Configure a senha para o armazenamento de credencial. A senha deve ter no mínimo 8 caracteres."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Senha atual:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Nova senha:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Confirmar nova senha:"</string>
-    <string name="credentials_reset_hint" msgid="2336340927894094814">"Todos os conteúdos serão removidos e a senha será redefinida. Tem certeza de que deseja fazer isso?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"As senhas não correspondem."</string>
+    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="1566409057833618877">"Tem certeza de que deseja excluir todas as credenciais e redefinir a senha do armazenamento de credenciais?"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"A senha deve ter no mínimo 8 caracteres."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Senha incorreta."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Senha incorreta. Você tem uma ou mais tentativas antes do armazenamento de credencial ser apagado."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Senha incorreta. Você tem mais <xliff:g id="NUMBER">%1$d</xliff:g> tentativas antes do armazenamento de credencial ser apagado."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"O armazenamento de credenciais foi apagado."</string>
+    <!-- no translation found for credentials_not_erased (397954733557821269) -->
+    <skip />
     <string name="credentials_enabled" msgid="7588607413349978930">"O armazenamento de credenciais foi ativado."</string>
+    <!-- no translation found for credentials_configure_lock_screen_hint (6816970208840577219) -->
+    <skip />
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tom de emergência"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Definir comportamento durante uma chamada de emergência"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"Privacidade"</string>
@@ -1371,7 +1392,7 @@
     <string name="wifi_setup_forget" msgid="2562847595567347526">"Esquecer"</string>
     <string name="wifi_setup_save" msgid="3659235094218508211">"Salvar"</string>
     <string name="wifi_setup_cancel" msgid="3185216020264410239">"Cancelar"</string>
-    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"Verificando redes..."</string>
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"Procurando redes..."</string>
     <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"Toque em uma rede para se conectar a ela"</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Conectar-se à rede existente"</string>
     <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"Conectar-se à rede não segura"</string>
diff --git a/res/values-rm/arrays.xml b/res/values-rm/arrays.xml
index 9761244..31abd4c 100644
--- a/res/values-rm/arrays.xml
+++ b/res/values-rm/arrays.xml
@@ -40,6 +40,14 @@
     <item msgid="488968798204105119">"Tut las animaziuns da fanestras vegnan mussadas"</item>
   </string-array>
     <!-- no translation found for screen_timeout_entries:6 (6864027152847611413) -->
+    <!-- no translation found for dream_timeout_entries:0 (3149294732238283185) -->
+    <!-- no translation found for dream_timeout_entries:1 (2194151041885903260) -->
+    <!-- no translation found for dream_timeout_entries:2 (5892295237131074341) -->
+    <!-- no translation found for dream_timeout_entries:3 (3538441365970038213) -->
+    <!-- no translation found for dream_timeout_entries:4 (412343871668955639) -->
+    <!-- no translation found for dream_timeout_entries:5 (5076853889688991690) -->
+    <!-- no translation found for dream_timeout_entries:6 (1903860996174927898) -->
+    <!-- no translation found for dream_timeout_entries:7 (6415509612413178727) -->
     <!-- no translation found for lock_after_timeout_entries:0 (5416834369150305288) -->
     <!-- no translation found for lock_after_timeout_entries:1 (6736512735606834431) -->
     <!-- no translation found for lock_after_timeout_entries:2 (8044619388267891375) -->
@@ -49,6 +57,20 @@
     <!-- no translation found for lock_after_timeout_entries:6 (49888496216106852) -->
     <!-- no translation found for lock_after_timeout_entries:7 (9002737361305019353) -->
     <!-- no translation found for lock_after_timeout_entries:8 (4322676235684793329) -->
+    <!-- no translation found for entries_font_size:0 (2722636506084795405) -->
+    <!-- no translation found for entries_font_size:1 (383133849547816572) -->
+    <!-- no translation found for entries_font_size:2 (6490061470416867723) -->
+    <!-- no translation found for entries_font_size:3 (3579015730662088893) -->
+    <!-- no translation found for entries_font_size:4 (1678068858001018666) -->
+    <!-- no translation found for entries_font_size:5 (490158884605093126) -->
+    <!-- no translation found for entries_font_size:6 (2123802548987439763) -->
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Fitg plaun"</item>
     <item msgid="2361722960903353554">"Plaun"</item>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index fab97b1..fa7643f 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -374,7 +374,7 @@
     <!-- outdated translation 4131169672844263316 -->     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Endatai in PIN numeric per debloccar il visur"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Pled-clav"</string>
     <!-- outdated translation 4623254789833899286 -->     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Endatai in pled-clav per debloccar il visur"</string>
-    <!-- outdated translation 736557879526940324 -->     <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Deactivà dad in administratur a distanza"</string>
+    <!-- outdated translation 736557879526940324 -->     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Deactivà dad in administratur a distanza"</string>
     <!-- no translation found for unlock_set_unlock_mode_off (378729687629105388) -->
     <skip />
     <!-- no translation found for unlock_set_unlock_mode_none (7137296704741184239) -->
@@ -551,6 +551,8 @@
     <skip />
     <!-- outdated translation 5103670439972135148 -->     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Cun endrizzar ina directiva da standby è cumparì in problem."</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Agiuntar ina rait WLAN"</string>
+    <!-- no translation found for wifi_add_network_summary (6345544206968025811) -->
+    <skip />
     <string name="wifi_access_points" msgid="2664629396767022441">"Raits WLAN"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Tschertgar"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avanzà"</string>
@@ -708,7 +710,27 @@
     <!-- outdated translation 4882669461447531301 -->     <string name="screen_timeout" msgid="6962654593018319466">"Timeout dal visur"</string>
     <!-- no translation found for screen_timeout_summary (4471347210332380587) -->
     <skip />
+    <!-- no translation found for dream_settings_title (6536876013377446805) -->
+    <skip />
+    <!-- no translation found for dream_settings_summary (6809871648071408259) -->
+    <skip />
+    <!-- no translation found for dream_component_title (505229894674572578) -->
+    <skip />
+    <!-- no translation found for dream_timeout_title (1385909618566514628) -->
+    <skip />
+    <!-- no translation found for dream_timeout_summary (6721955887728454226) -->
+    <skip />
+    <!-- no translation found for dream_timeout_zero_summary (2450290346381400092) -->
+    <skip />
+    <!-- no translation found for dream_test (5968002644622194481) -->
+    <skip />
     <string name="automatic_brightness" msgid="5014143533884135461">"Clerezza automatica"</string>
+    <!-- no translation found for title_font_size (4405544325522105222) -->
+    <skip />
+    <!-- no translation found for summary_font_size (7548243392515500554) -->
+    <skip />
+    <!-- no translation found for dialog_title_font_size (4503471078477715461) -->
+    <skip />
     <string name="sim_lock_settings" msgid="3392331196873564292">"Parameters da bloccaziun SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Configurar la bloccada SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Bloccaziun da la SIM"</string>
@@ -754,7 +776,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"Mes numer da telefon"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"Versiun PRL"</string>
-    <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
+    <!-- outdated translation 1751442889111731088 -->     <string name="status_meid_number" msgid="2037549729230058915">"MEID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"Tip da rait mobil"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Status da la rait mobila"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Status da servetsch"</string>
@@ -1035,9 +1057,15 @@
     <string name="install_unknown_applications" msgid="6612824788917283662">"Permetter l\'installaziun dad applicaziuns che na derivan betg dad Android Market"</string>
     <!-- outdated translation 1923717607319933741 -->     <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"Applicaziuns da funtaunas nunenconuschentas pon esser privlusas per Vossas datas privatas e per Voss telefonin. Vus confermais che Vus surpigliais la responsabladad per tut ils donns da Voss telefon e mintga sperdita da datas che pudessan resultar da l\'utilisaziun da questas applicaziuns."</string>
     <string name="install_all_warning" product="default" msgid="1923717607319933741">"Applicaziuns da funtaunas nunenconuschentas pon esser privlusas per Vossas datas privatas e per Voss telefonin. Vus confermais che Vus surpigliais la responsabladad per tut ils donns da Voss telefon e mintga sperdita da datas che pudessan resultar da l\'utilisaziun da questas applicaziuns."</string>
+    <!-- no translation found for advanced_settings (1777249286757067969) -->
+    <skip />
+    <!-- no translation found for advanced_settings_summary (145134386044169043) -->
+    <skip />
     <string name="application_info_label" msgid="1150486628158409543">"Infos davart l\'applicaziun"</string>
     <string name="storage_label" msgid="8700867073480107253">"Memoria"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Aviar sco standard"</string>
+    <!-- no translation found for screen_compatibility_label (663250687205465394) -->
+    <skip />
     <string name="permissions_label" msgid="2605296874922726203">"Autorisaziuns"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Cache"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Stizzar il cache"</string>
@@ -1059,6 +1087,12 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Vus avais definì questa applicaziun sco standard per tschertas acziuns."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Nagin standard"</string>
     <string name="clear_activities" msgid="7408923511535174430">"Stizzar las acziuns predefinidas"</string>
+    <!-- no translation found for screen_compatibility_text (2398570332021220651) -->
+    <skip />
+    <!-- no translation found for ask_compatibility (7225195569089607846) -->
+    <skip />
+    <!-- no translation found for enable_compatibility (3257284255974065538) -->
+    <skip />
     <string name="unknown" msgid="1592123443519355854">"Nunenconuschent"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Zavrar tenor num"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Zavrar tenor grondezza"</string>
@@ -1178,8 +1212,15 @@
     <string name="show_password" msgid="2198798062604049206">"Pleds-clav visibels"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Mussar il pled-clav cun endatar"</string>
     <string name="ime_security_warning" msgid="812267421486877917">"Questa metoda d\'endataziun è capabla da memorisar l\'entir text che Vus endatais inclus datas persunalas sco pleds-clav e numers da cartas da credit. Ella deriva da l\'applicaziun <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Vulais Vus activar questa metoda d\'endataziun?"</string>
+    <!-- no translation found for pointer_settings_category (6090176550039035130) -->
+    <skip />
+    <!-- no translation found for pointer_speed (1221342330217861616) -->
+    <skip />
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Dicziunari da l\'utilisader"</string>
-    <string name="user_dict_settings_title" msgid="8357027437499042191">"Dicziunari da l\'utilisader"</string>
+    <!-- no translation found for user_dict_single_settings_title (5454855286173849284) -->
+    <skip />
+    <!-- no translation found for user_dict_multiple_settings_title (326583195525296750) -->
+    <skip />
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Agiuntar"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Agiuntar al dicziunari"</string>
@@ -1188,6 +1229,8 @@
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Stizzar"</string>
     <!-- outdated translation 6209268025109242806 -->     <string name="user_dict_settings_empty_text" product="tablet" msgid="1766522102636921529">"Vus n\'avais nagins pleds en Voss dicziunari persunal"</string>
     <string name="user_dict_settings_empty_text" product="default" msgid="6209268025109242806">"Vus n\'avais nagins pleds en Voss dicziunari persunal"</string>
+    <!-- no translation found for user_dict_settings_all_languages (7713910347678213719) -->
+    <skip />
     <string name="testing" msgid="6584352735303604146">"Test"</string>
     <!-- outdated translation 8656693364332840056 -->     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Infos davart il telefonin"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Infos davart il telefonin"</string>
@@ -1274,6 +1317,8 @@
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"Buttun interruptur"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"Utilisar il buttun interruptur per finir il clom"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"Smatgar il buttun per metter en/ora il visur durant in telefon terminescha il clom (enstagl da stgirentar il visur)"</string>
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <skip />
     <!-- no translation found for touchscreen_gestures_category (3109869155350859625) -->
     <skip />
     <!-- no translation found for long_press_timeout_selector_title (1396876537252863044) -->
@@ -1484,8 +1529,6 @@
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(betg definì)"</string>
     <!-- no translation found for credentials_title (4446234003860769883) -->
     <skip />
-    <string name="credentials_access" msgid="4843187230913860492">"Identitads segiradas"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Las applicaziuns pon acceder a certificats segirads ed infurmaziuns d\'annunzia"</string>
     <!-- no translation found for credentials_install (466093273825150847) -->
     <skip />
     <!-- no translation found for credentials_install (953914549998062317) -->
@@ -1494,26 +1537,23 @@
     <skip />
     <!-- no translation found for credentials_install_summary (5737658257407822713) -->
     <skip />
-    <string name="credentials_set_password" msgid="9104473585811899989">"Definir il pled-clav"</string>
-    <!-- outdated translation 8287876917562085701 -->     <string name="credentials_set_password_summary" msgid="6756719720826053228">"Definir/midar il pled-clav da la memoria da las infurmaziuns d\'annunzia"</string>
     <!-- outdated translation 9170150870552453457 -->     <string name="credentials_reset" msgid="3239382277144980418">"Stizzar la memoria"</string>
-    <!-- outdated translation 1530388094693731636 -->     <string name="credentials_reset_summary" msgid="3810369467217453606">"Stizzar il cuntegn da la memoria da las infurmaziuns d\'annunzia e reinizialisar il pled-clav"</string>
+    <!-- outdated translation 1530388094693731636 -->     <string name="credentials_reset_summary" msgid="3369361230171260282">"Stizzar il cuntegn da la memoria da las infurmaziuns d\'annunzia e reinizialisar il pled-clav"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Endatar il pled-clav"</string>
     <!-- outdated translation 594679530407918031 -->     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Endatai il pled-clav per la memoria da las infurmaziuns d\'annunzia."</string>
-    <!-- no translation found for credentials_password_hint (4915128717409363024) -->
-    <skip />
     <string name="credentials_old_password" msgid="7553393815538684028">"Pled-clav actual:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Nov pled-clav:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Confermar il nov pled-clav:"</string>
-    <!-- outdated translation 819990295796804516 -->     <string name="credentials_reset_hint" msgid="2336340927894094814">"Vulais Vus propi stizzar tut las infurmaziuns d\'annunzia e reinizialisar il pled-clav per la memorisaziun da las infurmaziuns d\'annunzia?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Ils pleds-clav na correspundan betg."</string>
+    <!-- outdated translation 819990295796804516 -->     <string name="credentials_reset_hint" msgid="1566409057833618877">"Vulais Vus propi stizzar tut las infurmaziuns d\'annunzia e reinizialisar il pled-clav per la memorisaziun da las infurmaziuns d\'annunzia?"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Il pled-clav sto cuntegnair almain 8 caracters."</string>
     <!-- outdated translation 7525192410790152041 -->     <string name="credentials_wrong_password" msgid="2541932597104054807">"Endatai il pled-clav correct."</string>
     <!-- outdated translation 6392481296673345268 -->     <string name="credentials_reset_warning" msgid="5320653011511797600">"Endatai il pled clav correct. Vus avais anc ina emprova avant che la memoria da las infurmaziuns d\'annunzia vegn stizzada."</string>
     <!-- no translation found for credentials_reset_warning_plural (6514085665301095279) -->
     <skip />
     <!-- outdated translation 7700309135582200849 -->     <string name="credentials_erased" msgid="2907836028586342969">"La memoria per las infurmaziuns d\'annunzia è vegnì stizzà."</string>
+    <!-- no translation found for credentials_not_erased (397954733557821269) -->
+    <skip />
     <string name="credentials_enabled" msgid="7588607413349978930">"La memoria da las infurmaziuns d\'annunzia è activà"</string>
+    <!-- no translation found for credentials_configure_lock_screen_hint (6816970208840577219) -->
+    <skip />
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tun d\'urgenza"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Definir il cumportament en cas d\'in clom d\'urgenza"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"Protecziun da datas"</string>
diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
index a501017..26bae70 100644
--- a/res/values-ro/arrays.xml
+++ b/res/values-ro/arrays.xml
@@ -48,6 +48,16 @@
     <item msgid="2314124409517439288">"10 minute"</item>
     <item msgid="6864027152847611413">"30 de minute"</item>
   </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="3149294732238283185">"Niciodată"</item>
+    <item msgid="2194151041885903260">"15 secunde"</item>
+    <item msgid="5892295237131074341">"30 de secunde"</item>
+    <item msgid="3538441365970038213">"1 minut"</item>
+    <item msgid="412343871668955639">"2 minute"</item>
+    <item msgid="5076853889688991690">"5 minute"</item>
+    <item msgid="1903860996174927898">"10 minute"</item>
+    <item msgid="6415509612413178727">"30 de minute"</item>
+  </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"imediat"</item>
     <item msgid="6736512735606834431">"5 secunde"</item>
@@ -59,6 +69,22 @@
     <item msgid="9002737361305019353">"10 minute"</item>
     <item msgid="4322676235684793329">"30 de minute"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Extrem de mică"</item>
+    <item msgid="383133849547816572">"Foarte mică"</item>
+    <item msgid="6490061470416867723">"Mică"</item>
+    <item msgid="3579015730662088893">"Normală"</item>
+    <item msgid="1678068858001018666">"Mare"</item>
+    <item msgid="490158884605093126">"Foarte mare"</item>
+    <item msgid="2123802548987439763">"Extrem de mare"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Foarte încet"</item>
     <item msgid="2361722960903353554">"Încet"</item>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index d49ebf7..e6ec799 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -316,7 +316,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Necesită PIN numeric pentru debloc. ecran."</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Parolă"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Se solicită parolă pentru deblocare ecran"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Dezactivată de admin. sau de politica de criptare"</string>
+    <!-- outdated translation 5962903914511361952 -->     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Dezactivată de administratorul dispozitivelor la distanţă"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Dezactivată"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7137296704741184239">"Fără securitate"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Securizat cu model"</string>
@@ -460,6 +460,7 @@
     <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Indicaţi când doriţi deconectarea de la Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"A apărut o problemă la modificarea setării"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Adăugaţi o reţea Wi-Fi"</string>
+    <string name="wifi_add_network_summary" msgid="6345544206968025811">"Configuraţi o reţea fără difuzare"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Reţele Wi-Fi"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Scanaţi"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avansate"</string>
@@ -598,7 +599,17 @@
     <string name="brightness_summary" msgid="838917350127550703">"Ajustaţi luminozitatea ecranului"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Timp limită"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Ecranul se dezactivează automat după <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Vise Android"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Screensavere şi alte elemente amuzante pentru modul inactiv"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Visul selectat"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Când se efectuează activarea"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"După <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactivitate"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Niciodată"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Încercaţi-l!"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Luminozitate automată"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Dimensiune font"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Dimensiunea generală a fonturilor"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Selectaţi dimensiunea fontului"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Setări de blocare a cardului SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Activaţi blocarea cardului SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Blocare card SIM"</string>
@@ -644,7 +655,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"Numărul meu de telefon"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"Versiune PRL"</string>
-    <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
+    <string name="status_meid_number" msgid="2037549729230058915">"IMEI/MEID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"Tip de reţea mobilă"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Starea reţelei mobile"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Starea acoperirii"</string>
@@ -893,9 +904,12 @@
     <string name="install_unknown_applications" msgid="6612824788917283662">"Permiteţi instalarea aplicaţiilor ce nu aparţin magazinului virtual Market"</string>
     <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"Tableta şi datele dvs. personale sunt mai vulnerabile la un atac din partea aplicaţiilor ce provin din surse necunoscute. Acceptaţi faptul că sunteţi singurul responsabil pentru deteriorarea tabletei sau pierderea datelor ce pot avea loc ca urmare a utilizării acestor aplicaţii."</string>
     <string name="install_all_warning" product="default" msgid="1923717607319933741">"Telefonul şi datele dvs. personale sunt mai vulnerabile la un atac din partea aplicaţiilor ce provin din surse necunoscute. Acceptaţi faptul că sunteţi singurul responsabil pentru deteriorarea telefonului sau pierderea datelor ce pot avea loc ca urmare a utilizării acestor aplicaţii."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Setări avansate"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Activaţi mai multe opţiuni pentru setări."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Informaţii despre aplicaţie"</string>
     <string name="storage_label" msgid="8700867073480107253">"Stocare"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Lansaţi în mod prestabilit"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Compatibilitate ecran"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Permisiuni"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Memorie cache"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Goliţi memoria cache"</string>
@@ -915,6 +929,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Aţi ales să lansaţi această aplicaţie în mod prestabilit pentru anumite acţiuni."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Nu este setată nicio valoare standard."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Ştergeţi valorile standard"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Este posibil ca această aplicaţie să nu fie proiectată pentru ecranul dvs. Aici puteţi stabili modul în care aceasta se adaptează ecranului dvs."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Se stabileşte la lansare"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Scalaţi aplicaţia"</string>
     <string name="unknown" msgid="1592123443519355854">"Necunoscut"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Sortaţi după nume"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Sortaţi după dimensiune"</string>
@@ -1019,8 +1036,13 @@
     <string name="show_password" msgid="2198798062604049206">"Parole vizibile"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Afişaţi parola pe măsură ce introduceţi text"</string>
     <string name="ime_security_warning" msgid="812267421486877917">"Această metodă de introducere poate culege în întregime textul introdus, inclusiv datele personale cum ar fi parolele şi numerele cardurilor de credit. Aceasta provine de la aplicaţia <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Utilizaţi această metodă de introducere?"</string>
+    <!-- no translation found for pointer_settings_category (6090176550039035130) -->
+    <skip />
+    <!-- no translation found for pointer_speed (1221342330217861616) -->
+    <skip />
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Dicţionarul utilizatorului"</string>
-    <string name="user_dict_settings_title" msgid="8357027437499042191">"Dicţionarul utilizatorului"</string>
+    <string name="user_dict_single_settings_title" msgid="5454855286173849284">"Dicţionarul utilizatorului"</string>
+    <string name="user_dict_multiple_settings_title" msgid="326583195525296750">"Gestionaţi dicţionarele utilizatorului"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Adăugaţi"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Adăugaţi în dicţionar"</string>
@@ -1029,6 +1051,7 @@
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Ştergeţi"</string>
     <string name="user_dict_settings_empty_text" product="tablet" msgid="1766522102636921529">"Nu există cuvinte în dicţionarul pentru utilizator. Puteţi adăuga un cuvânt atingând butonul (+)."</string>
     <string name="user_dict_settings_empty_text" product="default" msgid="6209268025109242806">"Nu există cuvinte în dicţionarul pentru utilizator. Puteţi adăuga un cuvânt prin intermediul meniului."</string>
+    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Toate limbile"</string>
     <string name="testing" msgid="6584352735303604146">"Testare"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Informaţii tabletă"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Informaţii telefon"</string>
@@ -1100,6 +1123,8 @@
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"Buton de pornire"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"Butonul de pornire finalizează apelul"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"În timpul unui apel, apelul se finalizează prin apăsarea pe butonul de pornire, nu prin dezactivarea ecranului"</string>
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <skip />
     <string name="touchscreen_gestures_category" msgid="3109869155350859625">"Gesturi pentru ecranul tactil"</string>
     <string name="long_press_timeout_selector_title" msgid="1396876537252863044">"Întârz. pt. Atingeţi şi menţ. apăs."</string>
     <string name="long_press_timeout_selector_summary" msgid="2261114502740278996">"Interval scurs până la interpretarea unei apăsări ca Atingeţi şi menţineţi apăsat"</string>
@@ -1302,30 +1327,26 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(nemodificat)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(nesetat)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Stocarea acreditărilor"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Utilizaţi acreditări securizate"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Permiteţi aplicaţiilor să acceseze certificate securizate şi alte acreditări"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Instalaţi de pe stocare"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Instalaţi de pe cardul SD"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Instalaţi certificate de pe stocare"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Instalaţi certificate de pe cardul SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Setaţi parola"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Setaţi sau schimbaţi parola pentru stocarea acreditărilor"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Ştergeţi acreditările"</string>
-    <string name="credentials_reset_summary" msgid="3810369467217453606">"Eliminaţi întregul conţinut şi resetaţi parola"</string>
+    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3369361230171260282">"Eliminaţi stocarea acreditărilor pentru întregul conţinut şi resetaţi parola"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Introduceţi parola"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Introduceţi parola pentru stocarea acreditărilor."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Setaţi parola pentru stocarea acreditărilor. Parola trebuie să aibă cel puţin 8 caractere."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Parola actuală:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Parola nouă:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Confirmaţi noua parolă:"</string>
-    <string name="credentials_reset_hint" msgid="2336340927894094814">"Întregul conţinut va fi eliminat, iar parola va fi resetată. Sigur doriţi acest lucru?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Parolele nu corespund."</string>
+    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="1566409057833618877">"Sigur doriţi să ştergeţi toate acreditările şi să resetaţi parola pentru stocarea acestora?"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Parola trebuie să conţină minimum 8 caractere."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Parolă incorectă."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Parolă incorectă. Mai aveţi dreptul la o singură încercare înainte ca stocarea acreditărilor să fie ştearsă."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Parolă incorectă. Mai aveţi dreptul la <xliff:g id="NUMBER">%1$d</xliff:g> încercări înainte ca stocarea acreditărilor să fie ştearsă."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Stoc. acredit. este ştearsă."</string>
+    <!-- no translation found for credentials_not_erased (397954733557821269) -->
+    <skip />
     <string name="credentials_enabled" msgid="7588607413349978930">"Stocarea acreditărilor este activată."</string>
+    <!-- no translation found for credentials_configure_lock_screen_hint (6816970208840577219) -->
+    <skip />
     <string name="emergency_tone_title" msgid="1055954530111587114">"Ton de urgenţă"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Setaţi comportamentul la efectuarea unui apel de urgenţă"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"Confidenţialitate"</string>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index f2316c8..4fae0b6 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -48,6 +48,16 @@
     <item msgid="2314124409517439288">"10 мин"</item>
     <item msgid="6864027152847611413">"30 мин"</item>
   </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="3149294732238283185">"Никогда"</item>
+    <item msgid="2194151041885903260">"15 секунд"</item>
+    <item msgid="5892295237131074341">"30 секунд"</item>
+    <item msgid="3538441365970038213">"1 минута"</item>
+    <item msgid="412343871668955639">"2 минуты"</item>
+    <item msgid="5076853889688991690">"5 минут"</item>
+    <item msgid="1903860996174927898">"10 минут"</item>
+    <item msgid="6415509612413178727">"30 минут"</item>
+  </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"немедленно"</item>
     <item msgid="6736512735606834431">"5 сек"</item>
@@ -59,6 +69,22 @@
     <item msgid="9002737361305019353">"10 мин"</item>
     <item msgid="4322676235684793329">"30 мин"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Самый мелкий"</item>
+    <item msgid="383133849547816572">"Очень мелкий"</item>
+    <item msgid="6490061470416867723">"Мелкий"</item>
+    <item msgid="3579015730662088893">"Обычный"</item>
+    <item msgid="1678068858001018666">"Крупный"</item>
+    <item msgid="490158884605093126">"Очень крупный"</item>
+    <item msgid="2123802548987439763">"Самый крупный"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Очень медленная"</item>
     <item msgid="2361722960903353554">"Медленная"</item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 57d57ab..6fdb5b9 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -316,7 +316,7 @@
     <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_disabled_summary" msgid="8563103042330816018">"Отключено администратором или политикой шифрования"</string>
+    <!-- outdated translation 5962903914511361952 -->     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Запрещено удаленным администратором"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Откл."</string>
     <string name="unlock_set_unlock_mode_none" msgid="7137296704741184239">"Безопасность отключена"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Защита графическим ключом"</string>
@@ -460,6 +460,7 @@
     <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Настройки отключения от сети Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Не удалось изменить этот параметр"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Добавить сеть Wi-Fi"</string>
+    <string name="wifi_add_network_summary" msgid="6345544206968025811">"Настройка нешироковещательной сети"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Сети Wi-Fi"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Поиск"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Дополнительные функции"</string>
@@ -598,7 +599,17 @@
     <string name="brightness_summary" msgid="838917350127550703">"Настроить яркость экрана"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Тайм-аут"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Экран отключится автоматически после <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Экранные заставки"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Экранные заставки и другие настройки режима ожидания"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Выбранная заставка"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Время до активации"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"После простоя (<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>)"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Никогда"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Попробуйте!"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Автонастройка"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Размер шрифта"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Размер шрифтов"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Выберите размер шрифта"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Настройки блокировки SIM-карты"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Настроить блокировку"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Блокировка SIM-карты"</string>
@@ -644,7 +655,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"Мой номер телефона"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"Версия PRL"</string>
-    <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
+    <string name="status_meid_number" msgid="2037549729230058915">"IMEI/MEID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"Тип мобильной сети"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Передача данных в моб. сети"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Доступность моб. сети"</string>
@@ -893,9 +904,12 @@
     <string name="install_unknown_applications" msgid="6612824788917283662">"Разрешить установку приложений, полученных не из Маркета"</string>
     <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"Планшетный ПК и личные сведения более уязвимы к атакам приложений из неизвестных источников. Вы подтверждаете, что принимаете на себя всю ответственность в случае повреждения планшетного ПК и потери данных при использовании этих приложений."</string>
     <string name="install_all_warning" product="default" msgid="1923717607319933741">"Телефон и личные сведения более уязвимы к атакам приложений из неизвестных источников. Вы подтверждаете, что берете на себя всю ответственность в случае повреждения телефона и потери данных при использовании этих приложений."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Расширенные настройки"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Включить дополнительные настройки"</string>
     <string name="application_info_label" msgid="1150486628158409543">"Сведения о приложении"</string>
     <string name="storage_label" msgid="8700867073480107253">"Память"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Запускать по умолчанию"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Совместимость с экраном"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Разрешения"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Кэш"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Очистить кэш"</string>
@@ -915,6 +929,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Выбран запуск этого приложения по умолчанию при выполнении некоторых действий."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Значения по умолчанию не установлены."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Удалить настройки по умолчанию"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Возможно, приложение не предназначено для вашего экрана. Узнайте, как его можно настроить, здесь."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Спрашивать при запуске"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Настроить размер"</string>
     <string name="unknown" msgid="1592123443519355854">"Неизвестно"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Упорядочить по именам"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Упорядочить по размеру"</string>
@@ -1019,8 +1036,13 @@
     <string name="show_password" msgid="2198798062604049206">"Показывать пароли"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Показывать пароль при вводе"</string>
     <string name="ime_security_warning" msgid="812267421486877917">"Возможно, при использовании этого метода будут собираться все вводимые данные, в том числе такие личные сведения, как пароли или номера кредитных карт. Метод обеспечивается приложением <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Использовать этот метод ввода?"</string>
+    <!-- no translation found for pointer_settings_category (6090176550039035130) -->
+    <skip />
+    <!-- no translation found for pointer_speed (1221342330217861616) -->
+    <skip />
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Словарь пользователя"</string>
-    <string name="user_dict_settings_title" msgid="8357027437499042191">"Словарь пользователя"</string>
+    <string name="user_dict_single_settings_title" msgid="5454855286173849284">"Пользовательский словарь"</string>
+    <string name="user_dict_multiple_settings_title" msgid="326583195525296750">"Управление пользовательскими словарями"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Добавить"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Добавление в словарь"</string>
@@ -1029,6 +1051,7 @@
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Удалить"</string>
     <string name="user_dict_settings_empty_text" product="tablet" msgid="1766522102636921529">"В пользовательском словаре отсутствуют слова. Вы можете добавить слово, нажав кнопку \"Добавить ( + )\"."</string>
     <string name="user_dict_settings_empty_text" product="default" msgid="6209268025109242806">"В пользовательском словаре отсутствуют слова. Добавить слово можно с помощью меню."</string>
+    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Все языки"</string>
     <string name="testing" msgid="6584352735303604146">"Проверка"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Информация о планшетном ПК"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Информация о телефоне"</string>
@@ -1100,6 +1123,8 @@
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"Кнопка питания"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"Заверш. вызов кнопкой"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"Завершать вызов при нажатии кнопки питания"</string>
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <skip />
     <string name="touchscreen_gestures_category" msgid="3109869155350859625">"Управление с помощью жестов"</string>
     <string name="long_press_timeout_selector_title" msgid="1396876537252863044">"Задержка при нажатии и удержании"</string>
     <string name="long_press_timeout_selector_summary" msgid="2261114502740278996">"Время, по прошествии которого нажатие будет считаться удержанием"</string>
@@ -1302,30 +1327,26 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(не изменялось)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(не настроено)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Хранилище регистрационных данных"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Доступ к хранилищу"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Разрешить приложениям использовать хранилище сертификатов и учет. данных"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Устанавливать с карты памяти."</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Установка с SD-карты"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Устанавливать сертификаты с карты памяти"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Установить сертификаты с SD-карты"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Установить пароль"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Установить или изменить пароль для хранилища регистрационных данных"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Очистить учетные данные"</string>
-    <string name="credentials_reset_summary" msgid="3810369467217453606">"Удалить все содержание и сбросить пароль"</string>
+    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3369361230171260282">"Очистить все регистрационные данные в хранилище и сбросить пароль"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Ввод пароля"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Введите пароль для хранилища регистрационных данных."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Установите пароль для хранилища регистрационных данных. Он должен иметь не менее 8 знаков."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Текущий пароль:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Новый пароль:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Подтвердите новый пароль:"</string>
-    <string name="credentials_reset_hint" msgid="2336340927894094814">"Все содержание будет удалено, а пароль изменен. Продолжить?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Пароли не совпадают."</string>
+    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="1566409057833618877">"Вы действительно хотите удалить все регистрационные данные и сбросить пароль для доступа в хранилище регистрационных данных?"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"В пароле должно быть не менее 8 символов."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Неправильный пароль."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Неверный пароль. У вас осталась одна попытка, после которой хранилище регистрационных данных будет очищено."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Неверный пароль. Осталось несколько попыток (<xliff:g id="NUMBER">%1$d</xliff:g>). Затем хранилище регистрационных данных будет очищено."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Хранилище регистрационных данных очищено."</string>
+    <!-- no translation found for credentials_not_erased (397954733557821269) -->
+    <skip />
     <string name="credentials_enabled" msgid="7588607413349978930">"Хранилище регистрационных данных включено."</string>
+    <!-- no translation found for credentials_configure_lock_screen_hint (6816970208840577219) -->
+    <skip />
     <string name="emergency_tone_title" msgid="1055954530111587114">"Тональный сигнал экстренного вызова"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Настроить режим работы при экстренном вызове"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"Восстановление и сброс"</string>
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index 0c38bf1..f994ecd 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml
@@ -48,6 +48,16 @@
     <item msgid="2314124409517439288">"10 minút"</item>
     <item msgid="6864027152847611413">"30 minút"</item>
   </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="3149294732238283185">"Nikdy"</item>
+    <item msgid="2194151041885903260">"15 sekúnd"</item>
+    <item msgid="5892295237131074341">"30 sekúnd"</item>
+    <item msgid="3538441365970038213">"1 minúta"</item>
+    <item msgid="412343871668955639">"2 minúty"</item>
+    <item msgid="5076853889688991690">"5 minút"</item>
+    <item msgid="1903860996174927898">"10 minút"</item>
+    <item msgid="6415509612413178727">"30 minút"</item>
+  </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"okamžite"</item>
     <item msgid="6736512735606834431">"5 sekúnd"</item>
@@ -59,6 +69,22 @@
     <item msgid="9002737361305019353">"10 minút"</item>
     <item msgid="4322676235684793329">"30 minút"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Mimoriadne malé"</item>
+    <item msgid="383133849547816572">"Veľmi malé"</item>
+    <item msgid="6490061470416867723">"Malé"</item>
+    <item msgid="3579015730662088893">"Normálne"</item>
+    <item msgid="1678068858001018666">"Veľké"</item>
+    <item msgid="490158884605093126">"Veľmi veľké"</item>
+    <item msgid="2123802548987439763">"Mimoriadne veľké"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Veľmi pomalá"</item>
     <item msgid="2361722960903353554">"Pomalá"</item>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 9793009..2113462 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -316,7 +316,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Požadovať na odomknutie obrazovky číselný kód PIN"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Heslo"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Požadovať heslo na odomknutie obrazovky"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Zakázané správcom alebo pravidlami šifrovania"</string>
+    <!-- outdated translation 5962903914511361952 -->     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Zakázané vzdialeným správcom zariadenia"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Vypnuté"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7137296704741184239">"Bez zabezpečenia"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Zabezpečené vzorom"</string>
@@ -460,6 +460,7 @@
     <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Určte, kedy odpojiť od siete Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Pri zmene nastavení sa vyskytol problém"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Pridať sieť Wi-Fi"</string>
+    <string name="wifi_add_network_summary" msgid="6345544206968025811">"Konfigurácia siete bez vysielania"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Siete Wi-Fi"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Vyhľadávanie"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Rozšírené"</string>
@@ -598,7 +599,17 @@
     <string name="brightness_summary" msgid="838917350127550703">"Nastavenia jasu obrazovky"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Časový limit"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Obrazovka sa automaticky vypne po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Sny Android"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Šetriče obrazovky a ďalšie akcie pri nečinnosti"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Vybratý sen"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Čas aktivácie"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"Po nečinnosti <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Nikdy"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Skúsiť"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatický jas"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Veľkosť písma"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Celková veľkosť písiem"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Vyberte veľkosť písma"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Nastavenia zámky karty SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Nastavenia zámky karty SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Zámka karty SIM"</string>
@@ -644,7 +655,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"Moje telefónne číslo"</string>
     <string name="status_min_number" msgid="3519504522179420597">"Min."</string>
     <string name="status_prl_version" msgid="8499039751817386529">"Verzia PRL"</string>
-    <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
+    <string name="status_meid_number" msgid="2037549729230058915">"IMEI / MEID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"Typ mobilnej siete"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Stav mobilnej siete"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Stav služby"</string>
@@ -893,9 +904,12 @@
     <string name="install_unknown_applications" msgid="6612824788917283662">"Povoľuje inštaláciu aplikácií, ktoré nepochádzajú zo služby Market"</string>
     <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"Váš tablet a osobné údaje sú zraniteľnejšie voči útoku aplikácií z neznámych zdrojov. Vyjadrujete súhlas s tým, že nesiete osobnú zodpovednosť za akékoľvek škody spôsobené na vašom tablete alebo za stratu údajov v dôsledku používania týchto aplikácií."</string>
     <string name="install_all_warning" product="default" msgid="1923717607319933741">"Váš telefón a osobné údaje sú zraniteľnejšie voči útoku aplikácií z neznámych zdrojov. Vyjadrujete súhlas s tým, že nesiete osobnú zodpovednosť za akékoľvek škody spôsobené na vašom telefóne alebo za stratu údajov v dôsledku používania týchto aplikácií."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Rozšírené nastavenia"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Povoliť ďalšie možnosti nastavení."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Informácie o aplikácii"</string>
     <string name="storage_label" msgid="8700867073480107253">"Ukladací priestor"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Spúšťať ako predvolenú"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Kompatibilita obrazovky"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Povolenia"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Vyrovnávacia pamäť"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Vymazať vyrovnávaciu pamäť"</string>
@@ -915,6 +929,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Aplikácia bola nastavená, aby sa pri niektorých akciách spúšťala ako predvolená."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Nie je predvolená pre žiadne akcie."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Vymazať predvolené nastavenia"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Táto aplikácia pravdepodobne nie je určená pre vašu obrazovku. Tu môžete nastaviť, ako sa aplikácia obrazovke prispôsobí."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Opýtať sa pri spustení"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Prispôsobiť veľkosť aplikácie"</string>
     <string name="unknown" msgid="1592123443519355854">"Neznáme"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Zoradiť podľa názvu"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Zoradiť podľa veľkosti"</string>
@@ -1019,8 +1036,13 @@
     <string name="show_password" msgid="2198798062604049206">"Viditeľné heslá"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Zobraziť heslo pri jeho zadávaní"</string>
     <string name="ime_security_warning" msgid="812267421486877917">"Pri tomto spôsobe zadávania údajov je možné zhromažďovať zadávaný text, vrátane osobných údajov, ako sú napríklad heslá alebo čísla kreditných kariet. Tento spôsob je používaný aplikáciou <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Chcete použiť tento spôsob zadávania údajov?"</string>
+    <!-- no translation found for pointer_settings_category (6090176550039035130) -->
+    <skip />
+    <!-- no translation found for pointer_speed (1221342330217861616) -->
+    <skip />
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Používateľský slovník"</string>
-    <string name="user_dict_settings_title" msgid="8357027437499042191">"Používateľský slovník"</string>
+    <string name="user_dict_single_settings_title" msgid="5454855286173849284">"Používateľský slovník"</string>
+    <string name="user_dict_multiple_settings_title" msgid="326583195525296750">"Spravovať používateľské slovníky"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Pridať"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Pridať do slovníka"</string>
@@ -1029,6 +1051,7 @@
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Odstrániť"</string>
     <string name="user_dict_settings_empty_text" product="tablet" msgid="1766522102636921529">"V používateľskom slovníku nie sú žiadne slová. Slovo môžete pridať dotknutím sa tlačidla Pridať ( + )."</string>
     <string name="user_dict_settings_empty_text" product="default" msgid="6209268025109242806">"V používateľskom slovníku nie sú žiadne slová. Slovo môžete pridať pomocou ponuky."</string>
+    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Všetky jazyky"</string>
     <string name="testing" msgid="6584352735303604146">"Testovanie"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Informácie o tablete"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Informácie o telefóne"</string>
@@ -1100,6 +1123,8 @@
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"Tlačidlo Napájanie"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"Tlačidlo Napájanie ukončuje hovor"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"Stlačenie tlačidla Napájanie počas hovoru namiesto vypnutia obrazovky ukončí hovor"</string>
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <skip />
     <string name="touchscreen_gestures_category" msgid="3109869155350859625">"Gestá dotykovej obrazovky"</string>
     <string name="long_press_timeout_selector_title" msgid="1396876537252863044">"Doba dotyku a podržania"</string>
     <string name="long_press_timeout_selector_summary" msgid="2261114502740278996">"Doba, po ktorej sa dotyk interpretuje ako dotyk a následné podržanie"</string>
@@ -1302,30 +1327,26 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(nezmenené)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(nie je nastavené)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Ukladací priestor poverení"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Použiť zabezpečené poverenia"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Povoliť aplikáciám prístup k zabezpečeným certifikátom a ďalším povereniam"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Inštalovať z uklad. priestoru"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Inštalácia z karty SD"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Inštalovať certifikáty z ukladacieho priestoru"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Inštalovať certifikáty z karty SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Nastaviť heslo"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Nastaviť alebo zmeniť heslo pre ukladací priestor poverení"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Vymazať poverenia"</string>
-    <string name="credentials_reset_summary" msgid="3810369467217453606">"Odstrániť všetok obsah a obnoviť heslo"</string>
+    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3369361230171260282">"Vymazať celý obsah ukladacieho priestoru poverení a obnoviť heslo"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Zadajte heslo"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Zadajte heslo pre ukladací priestor poverení."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Nastaviť heslo pre ukladací priestor poverení (najmenej 8 znakov)."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Aktuálne heslo:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Nové heslo:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Potvrďte nové heslo:"</string>
-    <string name="credentials_reset_hint" msgid="2336340927894094814">"Všetok obsah bude odstránený a heslo bude obnovené. Naozaj chcete pokračovať?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Heslá sa nezhodujú."</string>
+    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="1566409057833618877">"Naozaj chcete odstrániť všetky poverenia a obnoviť heslo do ukladacieho priestoru poverení?"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Heslo musí mať aspoň 8 znakov."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Nesprávne heslo."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Nesprávne heslo. Do vymazania ukladacieho priestoru poverení vám zostáva jeden pokus."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Nesprávne heslo. Počet zostávajúcich pokusov do vymazania ukladacieho priestoru poverení: <xliff:g id="NUMBER">%1$d</xliff:g>."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Ukl. priestor pover. je vymaz."</string>
+    <!-- no translation found for credentials_not_erased (397954733557821269) -->
+    <skip />
     <string name="credentials_enabled" msgid="7588607413349978930">"Ukladací priestor poverení je aktivovaný."</string>
+    <!-- no translation found for credentials_configure_lock_screen_hint (6816970208840577219) -->
+    <skip />
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tiesňové vyzváňanie"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Nastaviť správanie pri tiesňovom volaní"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"Ochrana osobných údajov"</string>
diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
index bf49a63..12fbff5 100644
--- a/res/values-sl/arrays.xml
+++ b/res/values-sl/arrays.xml
@@ -48,6 +48,16 @@
     <item msgid="2314124409517439288">"10 minut"</item>
     <item msgid="6864027152847611413">"30 minut"</item>
   </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="3149294732238283185">"Nikoli"</item>
+    <item msgid="2194151041885903260">"15 sekund"</item>
+    <item msgid="5892295237131074341">"30 sekund"</item>
+    <item msgid="3538441365970038213">"1 minuta"</item>
+    <item msgid="412343871668955639">"2 minuti"</item>
+    <item msgid="5076853889688991690">"5 minut"</item>
+    <item msgid="1903860996174927898">"10 minut"</item>
+    <item msgid="6415509612413178727">"30 minut"</item>
+  </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"takoj"</item>
     <item msgid="6736512735606834431">"5 sekund"</item>
@@ -59,6 +69,22 @@
     <item msgid="9002737361305019353">"10 minut"</item>
     <item msgid="4322676235684793329">"30 minut"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Izredno majhna"</item>
+    <item msgid="383133849547816572">"Zelo majhna"</item>
+    <item msgid="6490061470416867723">"Majhna"</item>
+    <item msgid="3579015730662088893">"Običajna"</item>
+    <item msgid="1678068858001018666">"Velika"</item>
+    <item msgid="490158884605093126">"Zelo velika"</item>
+    <item msgid="2123802548987439763">"Izredno velika"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Zelo počasna"</item>
     <item msgid="2361722960903353554">"Počasna"</item>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 7bd648b..d1e0fe8 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -316,7 +316,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Zahtevaj številski PIN za odklep. zaslona"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Geslo"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Zahtevaj geslo za odklepanje zaslona"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Onemogočil skrbnik ali pravilnik za šifriranje"</string>
+    <!-- outdated translation 5962903914511361952 -->     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Onemogočil oddaljeni skrbnik naprave"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Izklopljeno"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7137296704741184239">"Brez varnosti"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Zaščiten z vzorcem"</string>
@@ -460,6 +460,7 @@
     <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Določite, kdaj se naj prekine povezava z omrežjem Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Težava pri spreminjanju nastavitve"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Dodaj brezžično omrežje"</string>
+    <string name="wifi_add_network_summary" msgid="6345544206968025811">"Nastavite omrežje, ki ne oddaja"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Brezžična omrežja"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Išči"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Dodatno"</string>
@@ -598,7 +599,17 @@
     <string name="brightness_summary" msgid="838917350127550703">"Prilagoditev svetlosti zaslona"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Časovna omejitev"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Zaslon se samodejno izklopi po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Androidne sanje"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Ohranjevalniki zaslona in druge vrste zabave za prosti čas"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Izbrane sanje"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Kdaj aktivirati"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"Po obdobju nedejavnosti: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Nikoli"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Preskusite"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Samodejna svetlost"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Velikost pisave"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Skupna velikost pisav"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Izbira velikosti pisave"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Nastavitve zaklepanja kartice SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Nastavi zaklepanje kartice SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Zaklepanje kartice SIM"</string>
@@ -644,7 +655,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"Moja telefonska številka"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"Različica seznama prednostnih omrežij za gostovanje"</string>
-    <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
+    <string name="status_meid_number" msgid="2037549729230058915">"IMEI/MEID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"Vrsta mobilnega omrežja"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Stanje mobilnega omrežja"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Stanje storitve"</string>
@@ -893,9 +904,12 @@
     <string name="install_unknown_applications" msgid="6612824788917283662">"Dovoli nameščanje programov, ki niso iz storitve Market"</string>
     <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"Programi iz neznanih virov lažje napadejo tablični računalnik in osebne podatke. Strinjate se, da ste izključno sami odgovorni za morebitno škodo, nastalo na tabličnem računalniku, ali izgubo podatkov, ki sta posledica rabe teh programov."</string>
     <string name="install_all_warning" product="default" msgid="1923717607319933741">"Vaš telefon in osebni podatki so bolj dovzetni za napade programov iz neznanih virov. Strinjate se, da ste sami odgovorni za vse poškodbe telefona ali izgubo podatkov, ki je lahko posledica uporabe teh programov."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Dodatne nastavitve"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Omogoči več možnosti nastavitev."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Informacije o programu"</string>
     <string name="storage_label" msgid="8700867073480107253">"Prostor za shranjevanje"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Privzeti zagon"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Združljivost zaslona"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Dovoljenja"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Predpomnilnik"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Počisti predpomnilnik"</string>
@@ -915,6 +929,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Izbrali ste privzeti zagon tega programa za nekatera dejanja."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Ni privzetih nastavitev."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Počisti privzete nastavitve"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Ta program morda ni namenjen za vaš zaslon; način prilagajanja zaslona."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Vprašaj, ko se zažene"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Prilagodi program zaslonu"</string>
     <string name="unknown" msgid="1592123443519355854">"Neznano"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Razvrsti po imenu"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Razvrsti po velikosti"</string>
@@ -1019,8 +1036,13 @@
     <string name="show_password" msgid="2198798062604049206">"Vidna gesla"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Pokaži geslo med tipkanjem"</string>
     <string name="ime_security_warning" msgid="812267421486877917">"Ta način vnosa morda lahko zbere besedilo, ki ga vtipkate, vključno z osebnimi podatki, kot so gesla in številke kreditnih kartic. Omogoča jo program <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Ali želite uporabiti ta način vnosa?"</string>
+    <!-- no translation found for pointer_settings_category (6090176550039035130) -->
+    <skip />
+    <!-- no translation found for pointer_speed (1221342330217861616) -->
+    <skip />
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Uporabniški slovar"</string>
-    <string name="user_dict_settings_title" msgid="8357027437499042191">"Uporabniški slovar"</string>
+    <string name="user_dict_single_settings_title" msgid="5454855286173849284">"Uporabniški slovar"</string>
+    <string name="user_dict_multiple_settings_title" msgid="326583195525296750">"Upravljanje uporabniških slovarjev"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Dodaj"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Dodaj v slovar"</string>
@@ -1029,6 +1051,7 @@
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Izbriši"</string>
     <string name="user_dict_settings_empty_text" product="tablet" msgid="1766522102636921529">"V uporabniškem slovarju ni besed. Besede lahko dodate z dotikom gumba »Dodaj« (+)."</string>
     <string name="user_dict_settings_empty_text" product="default" msgid="6209268025109242806">"V uporabniškem slovarju ni besed. Besede lahko dodate v meniju."</string>
+    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Vsi jeziki"</string>
     <string name="testing" msgid="6584352735303604146">"Preizkušanje"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Informacije o tabličnem računalniku"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Informacije o telefonu"</string>
@@ -1100,6 +1123,8 @@
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"Gumb za vklop"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"Gumb za vklop konča klic"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"Če med klicem pritisnete tipko za izklop, se klic konča, namesto da bi se izklopil zaslon"</string>
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <skip />
     <string name="touchscreen_gestures_category" msgid="3109869155350859625">"Poteze za zaslon na dotik"</string>
     <string name="long_press_timeout_selector_title" msgid="1396876537252863044">"Zakasnitev za dotik in pridržanje"</string>
     <string name="long_press_timeout_selector_summary" msgid="2261114502740278996">"Zakasnitev, dokler dotik ni razumljen kot dotik in pridržanje"</string>
@@ -1302,30 +1327,26 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(nespremenjeno)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(ni nastavljeno)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Shramba poverilnic"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Uporabi zaščitene poverilnice"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Dovoli programom dostop do zaščitenih potrdil in drugih poverilnic"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Namesti iz shrambe"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Namesti s kartice SD"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Namesti šifrirana potrdila iz shrambe"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Namesti potrdila s kartice SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Nastavi geslo"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Nastavitev ali spreminjanje gesla za shrambo poverilnic"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Brisanje poverilnic"</string>
-    <string name="credentials_reset_summary" msgid="3810369467217453606">"Odstranitev vsebine in obnovitev gesla"</string>
+    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3369361230171260282">"Počisti vso vsebino v shrambi poverilnic in ponastavi njeno geslo"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Vnesite geslo"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Vnesite geslo za shrambo poverilnic."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Nastavite geslo za shrambo poverilnic. Imeti mora vsaj 8 znakov."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Trenutno geslo:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Novo geslo:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Potrdite novo geslo:"</string>
-    <string name="credentials_reset_hint" msgid="2336340927894094814">"Vsebina bo izbrisana in geslo ponastavljeno. Ali ste prepričani, da želite to?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Gesli se ne ujemata."</string>
+    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="1566409057833618877">"Ali ste prepričani, da želite izbrisati vse poverilnice in ponastaviti geslo shrambe poverilnic?"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Geslo mora imeti vsaj 8 znakov"</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Napačno geslo."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Napačno geslo. Poskusite lahko še enkrat, preden se shramba poverilnic izbriše."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Napačno geslo. Poskusite lahko še <xliff:g id="NUMBER">%1$d</xliff:g>-krat, preden se shramba poverilnic izbriše."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Shramba poverilnic je izbrisana."</string>
+    <!-- no translation found for credentials_not_erased (397954733557821269) -->
+    <skip />
     <string name="credentials_enabled" msgid="7588607413349978930">"Shramba poverilnic je omogočena."</string>
+    <!-- no translation found for credentials_configure_lock_screen_hint (6816970208840577219) -->
+    <skip />
     <string name="emergency_tone_title" msgid="1055954530111587114">"Ton v sili"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Nastavi način delovanja ob klicanju v sili"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"Zasebnost"</string>
diff --git a/res/values-sr/arrays.xml b/res/values-sr/arrays.xml
index 0a8c493..db2ef30 100644
--- a/res/values-sr/arrays.xml
+++ b/res/values-sr/arrays.xml
@@ -48,6 +48,16 @@
     <item msgid="2314124409517439288">"10 минута"</item>
     <item msgid="6864027152847611413">"30 минута"</item>
   </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="3149294732238283185">"Никад"</item>
+    <item msgid="2194151041885903260">"15 секунди"</item>
+    <item msgid="5892295237131074341">"30 секунди"</item>
+    <item msgid="3538441365970038213">"1 минут"</item>
+    <item msgid="412343871668955639">"2 минута"</item>
+    <item msgid="5076853889688991690">"5 минута"</item>
+    <item msgid="1903860996174927898">"10 минута"</item>
+    <item msgid="6415509612413178727">"30 минута"</item>
+  </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"одмах"</item>
     <item msgid="6736512735606834431">"5 секунди"</item>
@@ -59,6 +69,22 @@
     <item msgid="9002737361305019353">"10 минута"</item>
     <item msgid="4322676235684793329">"30 минута"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Изузетно мала"</item>
+    <item msgid="383133849547816572">"Веома мала"</item>
+    <item msgid="6490061470416867723">"Мала"</item>
+    <item msgid="3579015730662088893">"Нормална"</item>
+    <item msgid="1678068858001018666">"Велика"</item>
+    <item msgid="490158884605093126">"Веома велика"</item>
+    <item msgid="2123802548987439763">"Изузетно велика"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Веома споро"</item>
     <item msgid="2361722960903353554">"Полако"</item>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index e3bd144..7e61776 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -316,7 +316,7 @@
     <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_disabled_summary" msgid="8563103042330816018">"Онемогућио администратор или смернице за шифровање"</string>
+    <!-- outdated translation 5962903914511361952 -->     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Онемогућио администратор удаљеног уређаја"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Искључено"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7137296704741184239">"Безбедност је онемогућена"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Обезбеђено помоћу шаблона"</string>
@@ -460,6 +460,7 @@
     <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Наведите када треба прекинути везу са Wi-Fi мрежом"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Дошло је до проблема приликом промене подешавања"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Додај Wi-Fi мрежу"</string>
+    <string name="wifi_add_network_summary" msgid="6345544206968025811">"Конфигуришите мрежу која не емитује"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi мреже"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Скенирај"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Напредно"</string>
@@ -598,7 +599,17 @@
     <string name="brightness_summary" msgid="838917350127550703">"Прилагођавање осветљености екрана"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Време чекања"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Екран се аутоматски искључује након <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android Dreams"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Чувари екрана и други начини за прекид неактивности"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Selected dream"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Када да се активира"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"Након <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> стања неактивности"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Никад"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Испробај!"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Аутоматски ниво осветљености"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Величина фонта"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Општа величина фонтова"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Избор величине фонта"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Подешавања закључавања SIM картице"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Подешавање закључавања SIM картице"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Закључавање SIM картице"</string>
@@ -644,7 +655,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"Мој број телефона"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"PRL верзија"</string>
-    <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
+    <string name="status_meid_number" msgid="2037549729230058915">"IMEI/MEID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"Тип мобилне мреже"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Стање мобилне мреже"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Стање услуге"</string>
@@ -893,9 +904,12 @@
     <string name="install_unknown_applications" msgid="6612824788917283662">"Дозволи инсталације апликација непознатог порекла"</string>
     <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"Таблет и лични подаци су подложнији нападима апликација из непознатих извора. Сагласни сте да сте једино ви одговорни за оштећења таблета или губитак података који могу да настану као последица употребе ових апликација."</string>
     <string name="install_all_warning" product="default" msgid="1923717607319933741">"Телефон и лични подаци подложнији су нападу апликација од непознатих извора. Сагласни сте да сте само ви одговорни за сву штету на телефону или губитак података до ког може да дође услед коришћења ових апликација."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Напредна подешавања"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Омогући још опција подешавања."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Информације о апликацији"</string>
     <string name="storage_label" msgid="8700867073480107253">"Складиште"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Подразумевано покрени"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Компатибилност екрана"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Дозволе"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Кеш"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Обриши кеш"</string>
@@ -915,6 +929,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Изабрали сте да се ова апликација подразумевано покреће за неке радње."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Нису постављене подразумеване вредности."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Обриши подразумевано"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Ова апликација можда није дизајнирана за ваш екран; овде можете да управљате тиме како ће се прилагодити екрану."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Питај при покретању"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Подеси апликацију"</string>
     <string name="unknown" msgid="1592123443519355854">"Непознато"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Сортирај према имену"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Сортирај према величини"</string>
@@ -1019,8 +1036,13 @@
     <string name="show_password" msgid="2198798062604049206">"Видљиве лозинке"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Приказивање лозинке током куцања"</string>
     <string name="ime_security_warning" msgid="812267421486877917">"Овај метод уноса можда може да прикупља сав текст који уносите, укључујући личне податке, као што су лозинке и бројеви кредитних картица. Потиче од апликације <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Желите ли да користите овај метод уноса?"</string>
+    <!-- no translation found for pointer_settings_category (6090176550039035130) -->
+    <skip />
+    <!-- no translation found for pointer_speed (1221342330217861616) -->
+    <skip />
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Кориснички речник"</string>
-    <string name="user_dict_settings_title" msgid="8357027437499042191">"Кориснички речник"</string>
+    <string name="user_dict_single_settings_title" msgid="5454855286173849284">"Кориснички речник"</string>
+    <string name="user_dict_multiple_settings_title" msgid="326583195525296750">"Управљање корисничким речницима"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Додај"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Додавање у речник"</string>
@@ -1029,6 +1051,7 @@
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Избриши"</string>
     <string name="user_dict_settings_empty_text" product="tablet" msgid="1766522102636921529">"Не постоји ниједна реч у корисничком речнику. Реч можете да додате ако додирнете дугме Додај (+)."</string>
     <string name="user_dict_settings_empty_text" product="default" msgid="6209268025109242806">"Немате ниједну реч у корисничком речнику. Можете да је додате путем менија."</string>
+    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Сви језици"</string>
     <string name="testing" msgid="6584352735303604146">"Тестирање"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Информације о таблету"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Информације о телефону"</string>
@@ -1100,6 +1123,8 @@
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"Дугме за укључивање и искључивање"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"Дугме за укључивање/искључивање прекида позив"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"Уколико током позива притиснете дугме за укључивање и искључивање, прекидате позив уместо да искључите екран"</string>
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <skip />
     <string name="touchscreen_gestures_category" msgid="3109869155350859625">"Покрети на додирном екрану"</string>
     <string name="long_press_timeout_selector_title" msgid="1396876537252863044">"Одлагање притискa и задржавањa"</string>
     <string name="long_press_timeout_selector_summary" msgid="2261114502740278996">"Одлагање док се додир не интерпретира као притисак и задржавање"</string>
@@ -1302,30 +1327,26 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(непромењено)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(није подешено)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Складиште акредитива"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Коришћење безбедносних акредитива"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Дозвољавање да апликације приступе безбедносним сертификатима и другим акредитивима"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Инсталирање из меморије"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Инсталирање са SD картице"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Инсталирај сертификате из меморије"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Инсталирање сертификата са SD картице"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Подешавање лозинке"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Подешавање или промена лозинке за складиште акредитива"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Брисање акредитива"</string>
-    <string name="credentials_reset_summary" msgid="3810369467217453606">"Уклањање целокупног садржаја и поновно постављање лозинке"</string>
+    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3369361230171260282">"Брисање свог садржаја из складишта акредитива и поновно постављање лозинке"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Унос лозинке"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Унесите лозинку за складиште акредитива."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Подесите лозинку за складиште акредитива. Мора да има најмање 8 знакова."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Тренутна лозинка:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Нова лозинка:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Потврдите нову лозинку:"</string>
-    <string name="credentials_reset_hint" msgid="2336340927894094814">"Сав садржај ће бити уклоњен, а лозинка ће бити поново постављена. Јесте ли сигурни да то желите?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Лозинке се не подударају."</string>
+    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="1566409057833618877">"Желите ли заиста да избришете све акредитиве и поново поставите лозинку за складиште акредитива?"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Лозинка мора да има најмање 8 знакова."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Нетачна лозинка."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Нетачна лозинка. Имате још један унос пре брисања складишта акредитива."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Нетачна лозинка. Имате још <xliff:g id="NUMBER">%1$d</xliff:g> уноса пре брисања складишта акредитива."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Складиште акред. је избрисано."</string>
+    <!-- no translation found for credentials_not_erased (397954733557821269) -->
+    <skip />
     <string name="credentials_enabled" msgid="7588607413349978930">"Складиште акредитива је омогућено."</string>
+    <!-- no translation found for credentials_configure_lock_screen_hint (6816970208840577219) -->
+    <skip />
     <string name="emergency_tone_title" msgid="1055954530111587114">"Тон за хитне позиве"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Подешавање понашања када се успоставља хитни позив"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"Приватност"</string>
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
index cc8b24c..74e976c 100644
--- a/res/values-sv/arrays.xml
+++ b/res/values-sv/arrays.xml
@@ -48,6 +48,16 @@
     <item msgid="2314124409517439288">"10 minuter"</item>
     <item msgid="6864027152847611413">"30 minuter"</item>
   </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="3149294732238283185">"Aldrig"</item>
+    <item msgid="2194151041885903260">"15 sekunder"</item>
+    <item msgid="5892295237131074341">"30 sekunder"</item>
+    <item msgid="3538441365970038213">"1 minut"</item>
+    <item msgid="412343871668955639">"2 minuter"</item>
+    <item msgid="5076853889688991690">"5 minuter"</item>
+    <item msgid="1903860996174927898">"10 minuter"</item>
+    <item msgid="6415509612413178727">"30 minuter"</item>
+  </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"omedelbart"</item>
     <item msgid="6736512735606834431">"5 sekunder"</item>
@@ -59,6 +69,22 @@
     <item msgid="9002737361305019353">"10 minuter"</item>
     <item msgid="4322676235684793329">"30 minuter"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Mycket liten"</item>
+    <item msgid="383133849547816572">"Extra liten"</item>
+    <item msgid="6490061470416867723">"Liten"</item>
+    <item msgid="3579015730662088893">"Normal"</item>
+    <item msgid="1678068858001018666">"Stor"</item>
+    <item msgid="490158884605093126">"Extra stor"</item>
+    <item msgid="2123802548987439763">"Mycket stor"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Mycket långsam"</item>
     <item msgid="2361722960903353554">"Långsam"</item>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 2e407c5..705263c 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -316,7 +316,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Kräv en PIN-kod för att låsa upp skärmen"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Lösenord"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Kräv lösenord för att låsa upp skärmen"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Inaktiverad av admin eller krypteringspolicy"</string>
+    <!-- outdated translation 5962903914511361952 -->     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Har inaktiverats av fjärradministratören"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Av"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7137296704741184239">"Ingen säkerhet"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Skyddad med grafiskt lösenord"</string>
@@ -460,6 +460,7 @@
     <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Ange när du vill koppla från Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Ett problem inträffade när inställningen ändrades"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Lägg till Wi-Fi-nätverk"</string>
+    <string name="wifi_add_network_summary" msgid="6345544206968025811">"Konfigurera ett icke-broadcast-nätverk"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi-nätverk"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Skanna"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avancerad"</string>
@@ -598,7 +599,17 @@
     <string name="brightness_summary" msgid="838917350127550703">"Ändra skärmens ljusstyrka"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Tidsgräns"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Skärmen stängs av automatiskt efter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android-drömmar"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Skärmsläckare och andra funktioner vid inaktivitet"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Vald dröm"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Tidsgräns för skärmsläckare"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"Efter att ha varit inaktiv i <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Aldrig"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Testa den!"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatisk ljusstyrka"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Teckenstorlek"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Övergripande teckenstorlek"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Välj teckenstorlek"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Låsinställningar för SIM-kort"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Ställ in lås för SIM-kort"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Lås för SIM-kort"</string>
@@ -644,7 +655,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"Mitt telefonnummer"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"PRL-version"</string>
-    <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
+    <string name="status_meid_number" msgid="2037549729230058915">"IMEI-/MEID-kod"</string>
     <string name="status_network_type" msgid="3279383550222116235">"Mobil nätverkstyp"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Status för mobilt nätverk"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Tjänststatus"</string>
@@ -893,9 +904,12 @@
     <string name="install_unknown_applications" msgid="6612824788917283662">"Tillåt installation av appar som inte finns i Market"</string>
     <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"Din pekdator och dina personliga uppgifter är mer känsliga för hot från program från okända källor. Du godkänner att du själv är ansvarig för eventuella skador på din pekdator eller förlust av data som kan uppstå när du använder dessa program."</string>
     <string name="install_all_warning" product="default" msgid="1923717607319933741">"Din telefon och dina personliga uppgifter är mer känsliga för hot från program från okända källor. Du godkänner att du själv är ansvarig för eventuella skador på din telefon eller förlust av data som kan uppstå när du använder dessa program."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Avancerade inställningar"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Aktivera fler inställningsalternativ."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Programinformation"</string>
     <string name="storage_label" msgid="8700867073480107253">"Lagring"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Starta som standard"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Skärmkompatibilitet"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Behörigheter"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Cacheminne"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Rensa cacheminne"</string>
@@ -915,6 +929,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Du har valt att starta denna app som standard för vissa åtgärder."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Inga standardinställningar har angetts."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Rensa standardinställn."</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Det är inte säkert att den här appen har skapats för din skärm. Här kan du välja hur den ska anpassas till skärmen."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Fråga vid start"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Skala appen"</string>
     <string name="unknown" msgid="1592123443519355854">"Okänd"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Sortera efter namn"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Sortera efter storlek"</string>
@@ -1019,8 +1036,13 @@
     <string name="show_password" msgid="2198798062604049206">"Synliga lösenord"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Visa lösenord när du skriver"</string>
     <string name="ime_security_warning" msgid="812267421486877917">"Den här inmatningsmetoden kan samla all text som du anger, inklusive personliga uppgifter som lösenord och kreditkortsnummer. Den kommer från programmet <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Ska inmatningsmetoden aktiveras?"</string>
+    <!-- no translation found for pointer_settings_category (6090176550039035130) -->
+    <skip />
+    <!-- no translation found for pointer_speed (1221342330217861616) -->
+    <skip />
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Användarens ordlista"</string>
-    <string name="user_dict_settings_title" msgid="8357027437499042191">"Användarens ordlista"</string>
+    <string name="user_dict_single_settings_title" msgid="5454855286173849284">"Användarordlista"</string>
+    <string name="user_dict_multiple_settings_title" msgid="326583195525296750">"Hantera användarordlistor"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Lägg till"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Lägg till i ordlista"</string>
@@ -1029,6 +1051,7 @@
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Radera"</string>
     <string name="user_dict_settings_empty_text" product="tablet" msgid="1766522102636921529">"Det finns inga ord i användarordlistan. Du kan lägga till ord med knappen Lägg till (+)."</string>
     <string name="user_dict_settings_empty_text" product="default" msgid="6209268025109242806">"Det finns inga ord i användarordlistan. Du lägger till ord från menyn."</string>
+    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Alla språk"</string>
     <string name="testing" msgid="6584352735303604146">"Testa"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Information om pekdatorn"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Telefoninformation"</string>
@@ -1100,6 +1123,8 @@
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"Avstängningsknapp"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"Avstängningsknappen avslutar samtal"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"Under ett samtal avslutar avstängningsknappen samtalet i stället för att stänga av skärmen"</string>
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <skip />
     <string name="touchscreen_gestures_category" msgid="3109869155350859625">"Pekskärmsrörelser"</string>
     <string name="long_press_timeout_selector_title" msgid="1396876537252863044">"Fördröjning för håll ned"</string>
     <string name="long_press_timeout_selector_summary" msgid="2261114502740278996">"Vänta tills en tryckning tolkas som lång"</string>
@@ -1302,30 +1327,26 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(oförändrat)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(ej angivet)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Uppgiftslagring"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Använd säkra uppgifter"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Tillåt att appar får åtkomst till säkra certifikat och andra uppgifter"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Installera från lagringsenhet"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Installera från SD-kort"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Installera certifikat från lagringsenhet"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Installera certifikat från SD-kort"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Ange lösenord"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Ange eller ändra lösenordet för uppgiftslagring"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Rensa användaruppgifter"</string>
-    <string name="credentials_reset_summary" msgid="3810369467217453606">"Ta bort allt innehåll och återställ lösenordet"</string>
+    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3369361230171260282">"Ta bort uppgiftslagring för allt innehåll och återställ lösenordet"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Ange lösenord"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Ange lösenordet för uppgiftslagring."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Ange lösenordet för uppgiftslagring. Det måste innehålla minst 8 tecken."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Nuvarande lösenord:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Nytt lösenord:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Bekräfta det nya lösenordet:"</string>
-    <string name="credentials_reset_hint" msgid="2336340927894094814">"Allt innehåll tas bort och lösenordet återställs. Vill du ändå fortsätta?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Lösenorden stämmer inte överens."</string>
+    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="1566409057833618877">"Vill du ta bort alla uppgifter och återställa lösenordet för uppgiftslagring?"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Lösenordet måste innehålla minst 8 tecken."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Fel lösenord."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Fel lösenord. Du har ett försök till att ange rätt lösenord, därefter raderas uppgiftslagringen"</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Fel lösenord. Du har <xliff:g id="NUMBER">%1$d</xliff:g> försök på dig att ange rätt lösenord, därefter raderas uppgiftslagringen."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Uppgiftslagringen raderades."</string>
+    <!-- no translation found for credentials_not_erased (397954733557821269) -->
+    <skip />
     <string name="credentials_enabled" msgid="7588607413349978930">"Uppgiftslagring är aktiverat."</string>
+    <!-- no translation found for credentials_configure_lock_screen_hint (6816970208840577219) -->
+    <skip />
     <string name="emergency_tone_title" msgid="1055954530111587114">"Nödsignal"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Ange beteende vid nödsamtal"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"Sekretess"</string>
diff --git a/res/values-sw-nokeys/strings.xml b/res/values-sw-nokeys/strings.xml
new file mode 100644
index 0000000..9814e24
--- /dev/null
+++ b/res/values-sw-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="6616938758022986257">"Simamia programu za kompyuta"</string>
+</resources>
diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml
new file mode 100644
index 0000000..d9d4215
--- /dev/null
+++ b/res/values-sw/arrays.xml
@@ -0,0 +1,205 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2007 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="5296756001147094692">"Marekani"</item>
+    <item msgid="3005562397632768392">"Ulaya"</item>
+    <item msgid="5696915123093701218">"Afrika"</item>
+    <item msgid="4439789052790868249">"Asia"</item>
+    <item msgid="956915953069815961">"Australia"</item>
+    <item msgid="5345178126174698955">"Pasifiki"</item>
+    <item msgid="8392017019801393511">"Zote"</item>
+  </string-array>
+  <string-array name="animations_entries">
+    <item msgid="207790005475613429">"Hakuna uhuisho"</item>
+    <item msgid="6291186755504776720">"uhuisho kadhaa"</item>
+    <item msgid="3856065399819979491">"Huisho zote"</item>
+  </string-array>
+  <string-array name="animations_summaries">
+    <item msgid="4569165952409350897">"Hapana huisho za madirisha zimeonyeshwa"</item>
+    <item msgid="4460915688877708508">"Baadhi ya huisho za dirisha zimeonyeshwa"</item>
+    <item msgid="488968798204105119">"huisho zote za madirisha zimeonyeshwa"</item>
+  </string-array>
+    <!-- no translation found for screen_timeout_entries:6 (6864027152847611413) -->
+    <!-- no translation found for dream_timeout_entries:0 (3149294732238283185) -->
+    <!-- no translation found for dream_timeout_entries:1 (2194151041885903260) -->
+    <!-- no translation found for dream_timeout_entries:2 (5892295237131074341) -->
+    <!-- no translation found for dream_timeout_entries:3 (3538441365970038213) -->
+    <!-- no translation found for dream_timeout_entries:4 (412343871668955639) -->
+    <!-- no translation found for dream_timeout_entries:5 (5076853889688991690) -->
+    <!-- no translation found for dream_timeout_entries:6 (1903860996174927898) -->
+    <!-- no translation found for dream_timeout_entries:7 (6415509612413178727) -->
+    <!-- no translation found for lock_after_timeout_entries:6 (49888496216106852) -->
+    <!-- no translation found for lock_after_timeout_entries:7 (9002737361305019353) -->
+    <!-- no translation found for lock_after_timeout_entries:8 (4322676235684793329) -->
+    <!-- no translation found for entries_font_size:0 (2722636506084795405) -->
+    <!-- no translation found for entries_font_size:1 (383133849547816572) -->
+    <!-- no translation found for entries_font_size:2 (6490061470416867723) -->
+    <!-- no translation found for entries_font_size:3 (3579015730662088893) -->
+    <!-- no translation found for entries_font_size:4 (1678068858001018666) -->
+    <!-- no translation found for entries_font_size:5 (490158884605093126) -->
+    <!-- no translation found for entries_font_size:6 (2123802548987439763) -->
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"Polepole sana"</item>
+    <item msgid="2361722960903353554">"Polepole"</item>
+    <item msgid="1145554631248513562">"Kawaida"</item>
+    <item msgid="7553665153391107454">"Haraka"</item>
+    <item msgid="2538100882620724753">"Haraka sana"</item>
+  </string-array>
+  <string-array name="tts_pitch_entries">
+    <item msgid="7526050907652687351">"Chini sana"</item>
+    <item msgid="2692137425242433765">"Chini"</item>
+    <item msgid="3332408460740717754">"Kawaida"</item>
+    <item msgid="4907380534957572531">"Juu"</item>
+    <item msgid="4699640516390840297">"Juu sana"</item>
+  </string-array>
+  <string-array name="tts_lang_entries">
+    <item msgid="478030717868306353">"Kiingereza cha Marekani"</item>
+    <item msgid="5192284521396794598">"Kiingereza cha Briteni"</item>
+    <item msgid="3000262452051711991">"Kifaransa"</item>
+    <item msgid="9214080387341763401">"Ujerumani"</item>
+    <item msgid="5972100016440094433">"Kiitaliano"</item>
+    <item msgid="5811378076054402537">"Kihispania"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Inasafisha..."</item>
+    <item msgid="8513729475867537913">"Inaunganisha…"</item>
+    <item msgid="515055375277271756">"Uhalalishaji..."</item>
+    <item msgid="1943354004029184381">"Inapata anwani ya Ip..."</item>
+    <item msgid="4221763391123233270">"Umeunganishwa"</item>
+    <item msgid="624838831631122137">"Imesimamishwa"</item>
+    <item msgid="7979680559596111948">"Inakatisha muunganisho..."</item>
+    <item msgid="1634960474403853625">"Muunganisho Umekatika"</item>
+    <item msgid="746097431216080650">"Haijafanikiwa"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"Inasafisha..."</item>
+    <item msgid="355508996603873860">"Inaunganisha kwa <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="554971459996405634">"Uhalalishaji kwa <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7928343808033020343">"Inamiliki anwani ya IP kutoka <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="8937994881315223448">" Umeunganishwa kwa<xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="1330262655415760617">"Imesimamishwa"</item>
+    <item msgid="7698638434317271902">"inakatisha muunganisho kutoka <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="197508606402264311">"Muunganisho Umekatika"</item>
+    <item msgid="8578370891960825148">"Haijafanikiwa"</item>
+  </string-array>
+  <string-array name="wifi_security">
+    <item msgid="1435933968767043814">"Fungua"</item>
+    <item msgid="6318432659048829665">"WEP"</item>
+    <item msgid="2966395706508338179">"WPA/WPA2 PSK"</item>
+    <item msgid="9098390198768443435">"802.1x EAP"</item>
+  </string-array>
+  <string-array name="wifi_eap_method">
+    <item msgid="1160193392455075561">"PEAP"</item>
+    <item msgid="7981731051382306293">"TLS"</item>
+    <item msgid="2892994535305020162">"TTLS"</item>
+  </string-array>
+    <!-- no translation found for bluetooth_visibility_timeout_entries:0 (1106621950288502195) -->
+    <!-- no translation found for bluetooth_visibility_timeout_entries:1 (5780349442819375570) -->
+    <!-- no translation found for bluetooth_visibility_timeout_entries:2 (1166466894270177580) -->
+    <!-- no translation found for bluetooth_visibility_timeout_entries:3 (9032073376232198148) -->
+  <string-array name="wifi_signal">
+    <item msgid="2245412278046491293">"Mbaya"</item>
+    <item msgid="5615082285463430971">"Ya Haki"</item>
+    <item msgid="3565079809875324621">"Nzuri"</item>
+    <item msgid="5702329417707689835">"Bora zaidi"</item>
+  </string-array>
+  <string-array name="wifi_sleep_policy_entries">
+    <!-- outdated translation 3804733751095821976 -->     <item msgid="643915340724070374">"Wakati skrini inapozima"</item>
+    <item msgid="1549288661423279207">"Katu wakati imechopekwa"</item>
+    <!-- outdated translation 1986753720941888596 -->     <item msgid="6592896328877671197">"Katu"</item>
+  </string-array>
+    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:0 (2659922042905569057) -->
+    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:1 (8137861573803398334) -->
+    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:2 (5996547094658157629) -->
+    <!-- no translation found for wifi_frequency_band_entries:0 (624340809384223320) -->
+    <!-- no translation found for wifi_frequency_band_entries:1 (6670588712989942178) -->
+    <!-- no translation found for wifi_frequency_band_entries:2 (2715516524973207876) -->
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="9077371706468756228">"Muda wa Utumiaji"</item>
+    <item msgid="1908750532762193304">"Zindua Hesabu"</item>
+    <item msgid="1213951670006606353">"Jina la programu"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="8615575908717909498">"PEAP"</item>
+    <item msgid="8667872640594311615">"TLS"</item>
+    <item msgid="7182812872984827322">"TTLS"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="1818786254010764570">"Hamna"</item>
+    <item msgid="6189918678874123056">"PAP"</item>
+    <item msgid="1524112260493662517">"MSCHAP"</item>
+    <item msgid="5923246669412752932">"MSCHAPV2"</item>
+    <item msgid="8651992560135239389">"GTC"</item>
+  </string-array>
+    <!-- no translation found for wifi_network_setup:2 (7131487972018976724) -->
+    <!-- no translation found for wifi_network_setup:3 (4809199848225172977) -->
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"DHCP"</item>
+    <item msgid="628395202971532382">"Haibadiliki"</item>
+  </string-array>
+    <!-- no translation found for wifi_proxy_settings:0 (4473276491748503377) -->
+    <!-- no translation found for wifi_proxy_settings:1 (8673874894887358090) -->
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Zima"</item>
+    <item msgid="3165868966179561687">"Tahadhari"</item>
+    <item msgid="6038758039030476855">"Tetema"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="3856896061242872146">"Hamna"</item>
+    <item msgid="5756844015743664882">"PAP"</item>
+    <item msgid="535934025797984365">"CHAP"</item>
+    <item msgid="8383098660619805783">"PAP au CHAP"</item>
+  </string-array>
+    <!-- no translation found for apn_protocol_entries:0 (4852355456199302715) -->
+    <!-- no translation found for apn_protocol_entries:1 (4394161344888484571) -->
+    <!-- no translation found for apn_protocol_entries:2 (8084938354605535381) -->
+  <string-array name="app_install_location_entries">
+    <item msgid="8151497958991952759">"Kifaa cha hifadhi ya ndani"</item>
+    <item msgid="3738430123799803530">"Kadi ya SD inayoondolewa"</item>
+    <item msgid="4498124044785815005">"Wacha mfumo uamue"</item>
+  </string-array>
+  <string-array name="vibrate_entries">
+    <item msgid="3388952299521009213">"Kila wakati"</item>
+    <item msgid="6293147072807231256">"Katu"</item>
+    <item msgid="1276641209451816572">"Ikiwa kwa mtindo kimya tu"</item>
+    <item msgid="8418930333779132418">"Wakati hapo kwenye mtindo wa Kimya pekee"</item>
+  </string-array>
+    <!-- no translation found for long_press_timeout_selector_titles:0 (3511504869290423954) -->
+    <!-- no translation found for long_press_timeout_selector_titles:1 (2560532955514699713) -->
+    <!-- no translation found for long_press_timeout_selector_titles:2 (2372711992605524591) -->
+    <!-- no translation found for hdcp_checking_titles:0 (441827799230089869) -->
+    <!-- no translation found for hdcp_checking_titles:1 (6042769699089883931) -->
+    <!-- no translation found for hdcp_checking_titles:2 (9174900380056846820) -->
+    <!-- no translation found for hdcp_checking_summaries:0 (505558545611516707) -->
+    <!-- no translation found for hdcp_checking_summaries:1 (3878793616631049349) -->
+    <!-- no translation found for hdcp_checking_summaries:2 (45075631231212732) -->
+</resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
new file mode 100644
index 0000000..339769a
--- /dev/null
+++ b/res/values-sw/strings.xml
@@ -0,0 +1,2090 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="yes" msgid="4676390750360727396">"Ndiyo"</string>
+    <string name="no" msgid="6731231425810196216">"Hapana"</string>
+    <!-- no translation found for device_info_default (7847265875578739287) -->
+    <skip />
+    <!-- no translation found for turn_on_radio (8706561489788373676) -->
+    <skip />
+    <!-- no translation found for turn_off_radio (1820294552893884115) -->
+    <skip />
+    <!-- no translation found for radioInfo_menu_viewADN (8743377494429930831) -->
+    <skip />
+    <!-- no translation found for radioInfo_menu_viewFDN (7934301566925610318) -->
+    <skip />
+    <!-- no translation found for radioInfo_menu_viewSDN (7130280686244955669) -->
+    <skip />
+    <!-- no translation found for radioInfo_menu_getPDP (560610293888406317) -->
+    <skip />
+    <!-- no translation found for radioInfo_service_in (1915416319177520020) -->
+    <skip />
+    <!-- no translation found for radioInfo_service_out (5238736759641916278) -->
+    <skip />
+    <!-- no translation found for radioInfo_service_emergency (2485604591272668370) -->
+    <skip />
+    <!-- no translation found for radioInfo_service_off (1434084741785525415) -->
+    <skip />
+    <!-- no translation found for radioInfo_roaming_in (9045363884600341051) -->
+    <skip />
+    <!-- no translation found for radioInfo_roaming_not (2851853244069662307) -->
+    <skip />
+    <!-- no translation found for radioInfo_phone_idle (7489244938838742820) -->
+    <skip />
+    <!-- no translation found for radioInfo_phone_ringing (4883724645684297895) -->
+    <skip />
+    <!-- no translation found for radioInfo_phone_offhook (4174402846862780998) -->
+    <skip />
+    <!-- no translation found for radioInfo_data_disconnected (1959735267890719418) -->
+    <skip />
+    <!-- no translation found for radioInfo_data_connecting (8404571440697917823) -->
+    <skip />
+    <!-- no translation found for radioInfo_data_connected (7074301157399238697) -->
+    <skip />
+    <!-- no translation found for radioInfo_data_suspended (5315325487890334196) -->
+    <skip />
+    <!-- no translation found for radioInfo_unknown (737385314432468266) -->
+    <skip />
+    <!-- no translation found for radioInfo_display_packets (8654359809877290639) -->
+    <skip />
+    <!-- no translation found for radioInfo_display_bytes (4018206969492931883) -->
+    <skip />
+    <!-- no translation found for radioInfo_display_dbm (3621221793699882781) -->
+    <skip />
+    <!-- no translation found for radioInfo_display_asu (1422248392727818082) -->
+    <skip />
+    <!-- no translation found for radioInfo_lac (8415219164758307156) -->
+    <skip />
+    <!-- no translation found for radioInfo_cid (4362599198392643138) -->
+    <skip />
+    <!-- no translation found for sdcard_unmount (6325292633327972272) -->
+    <skip />
+    <!-- no translation found for sdcard_unmount (3364184561355611897) -->
+    <skip />
+    <!-- outdated translation 362497552060004057 -->     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Fomati kadi ya SD"</string>
+    <!-- outdated translation 362497552060004057 -->     <string name="sdcard_format" product="default" msgid="6713185532039187532">"Fomati kadi ya SD"</string>
+    <!-- no translation found for small_font (2295331917424072635) -->
+    <skip />
+    <!-- no translation found for medium_font (2068475425515133701) -->
+    <skip />
+    <!-- no translation found for large_font (599055175160971446) -->
+    <skip />
+    <!-- no translation found for font_size_save (3450855718056759095) -->
+    <skip />
+    <!-- no translation found for sdcard_setting (8281011784066476192) -->
+    <skip />
+    <!-- no translation found for sdcard_setting (5922637503871474866) -->
+    <skip />
+    <!-- no translation found for battery_info_status_label (8109155295509700309) -->
+    <skip />
+    <string name="battery_info_power_label" msgid="7465140230991349382">"Plagi ya nishati."</string>
+    <!-- no translation found for battery_info_scale_label (3649763192389778437) -->
+    <skip />
+    <!-- no translation found for battery_info_level_label (8706526709307788737) -->
+    <skip />
+    <!-- no translation found for battery_info_health_label (6416051542741886958) -->
+    <skip />
+    <!-- no translation found for battery_info_technology_label (788304533220748681) -->
+    <skip />
+    <!-- no translation found for battery_info_voltage_label (8971764146757637863) -->
+    <skip />
+    <!-- no translation found for battery_info_voltage_units (8658490792208288107) -->
+    <skip />
+    <!-- no translation found for battery_info_temperature_label (1968383098818648037) -->
+    <skip />
+    <!-- no translation found for battery_info_temperature_units (9098950587249987550) -->
+    <skip />
+    <!-- no translation found for battery_info_uptime (5548545143573527992) -->
+    <skip />
+    <!-- no translation found for battery_info_awake_battery (2557725975486185849) -->
+    <skip />
+    <!-- no translation found for battery_info_awake_plugged (176716874713478188) -->
+    <skip />
+    <!-- no translation found for battery_info_screen_on (376277447175613889) -->
+    <skip />
+    <!-- no translation found for battery_info_status_unknown (196130600938058547) -->
+    <skip />
+    <!-- no translation found for battery_info_status_charging (1705179948350365604) -->
+    <skip />
+    <!-- no translation found for battery_info_status_charging_ac (5874340256342956252) -->
+    <skip />
+    <!-- no translation found for battery_info_status_charging_usb (4059070156126770959) -->
+    <skip />
+    <!-- no translation found for battery_info_status_discharging (6222697503392774475) -->
+    <skip />
+    <!-- no translation found for battery_info_status_not_charging (2820070506621483576) -->
+    <skip />
+    <!-- no translation found for battery_info_status_full (2824614753861462808) -->
+    <skip />
+    <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Imechopolewa"</string>
+    <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
+    <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
+    <string name="battery_info_power_unknown" msgid="7344115502868899881">"Haijulikani"</string>
+    <!-- no translation found for battery_info_health_unknown (5664295556921944255) -->
+    <skip />
+    <!-- no translation found for battery_info_health_good (8070356565806711806) -->
+    <skip />
+    <!-- no translation found for battery_info_health_overheat (8442959549291368806) -->
+    <skip />
+    <!-- no translation found for battery_info_health_dead (1725917445762829059) -->
+    <skip />
+    <!-- no translation found for battery_info_health_over_voltage (2420269351664490121) -->
+    <skip />
+    <!-- no translation found for battery_info_health_unspecified_failure (6347021103185471590) -->
+    <skip />
+    <!-- no translation found for battery_info_health_cold (3835692786176707318) -->
+    <skip />
+    <!-- no translation found for bluetooth (5549625000628014477) -->
+    <skip />
+    <!-- no translation found for bluetooth_visibility (2930835434091839916) -->
+    <skip />
+    <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Inaweza kupatikana kwa sekunde <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>..."</string>
+    <!-- no translation found for bluetooth_is_discoverable_always (8573385118329733931) -->
+    <skip />
+    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Fanya kifaa kiweze kutambuliwa"</string>
+    <!-- no translation found for bluetooth_visibility_timeout (6634508002347847278) -->
+    <skip />
+    <!-- no translation found for bluetooth_visibility_timeout_summary (6483353842671501585) -->
+    <skip />
+    <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Funga sauti ya upigaji simu"</string>
+    <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Zuia matumizi yakibonyezi cha bluetooth wakati skrini imefungwa"</string>
+    <!-- no translation found for bluetooth_devices (1886018064039454227) -->
+    <skip />
+    <!-- no translation found for bluetooth_device_name (8415828355207423800) -->
+    <skip />
+    <!-- no translation found for bluetooth_name_not_set (2653752006416027426) -->
+    <skip />
+    <!-- no translation found for bluetooth_scan_for_devices (9214184305566815727) -->
+    <skip />
+    <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> itatenganishwa."</string>
+    <!-- no translation found for bluetooth_connected (6038755206916626419) -->
+    <skip />
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Imetenganishwa"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Inatenganisha..."</string>
+    <!-- no translation found for bluetooth_connecting (8555009514614320497) -->
+    <skip />
+    <string name="bluetooth_unknown" msgid="644716244548801421"></string>
+    <!-- no translation found for bluetooth_not_connected (3389882907500605937) -->
+    <skip />
+    <!-- no translation found for bluetooth_pairing (1426882272690346242) -->
+    <skip />
+    <string name="bluetooth_paired" msgid="1247541089000057726">"Imelinganishwa lakini haijaunganishwa"</string>
+    <!-- no translation found for bluetooth_device (6873461446424952003) -->
+    <skip />
+    <!-- no translation found for progress_scanning (3760897655335759141) -->
+    <skip />
+    <!-- no translation found for bluetooth_notif_ticker (4726721390078512173) -->
+    <skip />
+    <string name="bluetooth_notif_title" msgid="2485175521845371514">"Ombi la ulinganishaji"</string>
+    <!-- no translation found for bluetooth_notif_message (618099089987569242) -->
+    <skip />
+    <!-- no translation found for bluetooth_show_received_files_title (816172853268536399) -->
+    <skip />
+    <!-- no translation found for bluetooth_show_received_files_summary (7322193220909480775) -->
+    <skip />
+    <string name="device_picker" msgid="8721012448931226323">"Kitwaa kifaa cha Bluetooth"</string>
+    <string name="bluetooth_permission_request" msgid="1523129741266262748">"Ombi la kibali cha Bluetooth"</string>
+    <!-- outdated translation 2342558978033892004 -->     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"programu kwenye simu yako inaomba kibali cha kuwasha Bluetooth. Unataka kufanya hivi?"</string>
+    <!-- no translation found for bluetooth_ask_discovery (5950965604673262829) -->
+    <skip />
+    <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"programu kwenye simu yako inaomba kibali cha kufanya simu yako iweze kutambuliwa na vifaa vingine vya Bluetooth kwa sekunde <xliff:g id="TIMEOUT">%1$d</xliff:g>. Unataka kufanya hivi?"</string>
+    <!-- no translation found for bluetooth_ask_lasting_discovery (1680661751413856600) -->
+    <skip />
+    <!-- no translation found for bluetooth_ask_lasting_discovery (3413855805411554871) -->
+    <skip />
+    <!-- no translation found for bluetooth_ask_enablement_and_discovery (5716077575971497298) -->
+    <skip />
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"programu kwenye simu yako inaomba kibali cha kuwasha Bluetooth na kufanya simu yako iweze kutambuliwa na vifaa vingine kwa sekunde <xliff:g id="TIMEOUT">%1$d</xliff:g>. Unataka kufanya hivi?"</string>
+    <!-- no translation found for bluetooth_ask_enablement_and_lasting_discovery (6132824454823539873) -->
+    <skip />
+    <!-- no translation found for bluetooth_ask_enablement_and_lasting_discovery (7471195931669103553) -->
+    <skip />
+    <string name="bluetooth_turning_on" msgid="3107102168379705771">"Inawasha Bluetooth..."</string>
+    <!-- no translation found for bluetooth_auto_connect (8013003320667198460) -->
+    <skip />
+    <!-- no translation found for date_and_time (4114084177056654663) -->
+    <skip />
+    <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00 mchana"</string>
+    <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
+    <!-- no translation found for choose_timezone (7762866468013985022) -->
+    <skip />
+    <string name="normal_date_format" msgid="1982904221918374153">"Kawaida (<xliff:g id="DATE">%s</xliff:g>)"</string>
+    <!-- no translation found for display_preview_label (1127597250917274792) -->
+    <skip />
+    <!-- no translation found for display_font_size_label (8941851418397475389) -->
+    <skip />
+    <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
+    <skip />
+    <string name="intent_sender_sendbroadcast_text" msgid="1415735148895872715">"Tuma <xliff:g id="BROADCAST">broadcast</xliff:g>"</string>
+    <string name="intent_sender_action_label" msgid="616458370005452389">"<xliff:g id="ACTION">Action</xliff:g>:"</string>
+    <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Anzisha <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
+    <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
+    <string name="intent_sender_account_label" msgid="465210404475603404">"Akaunti:"</string>
+    <!-- no translation found for proxy_settings_title (5912878565897294401) -->
+    <skip />
+    <string name="proxy_settings_summary" msgid="7898928000758321486">"Weka mbadala wa ulimwengu wa HTTP na orodha yakuondolewa"</string>
+    <!-- no translation found for proxy_clear_text (5555400754952012657) -->
+    <skip />
+    <!-- no translation found for proxy_port_label (5655276502233453400) -->
+    <skip />
+    <!-- outdated translation 204409815790850313 -->     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"hakuna mbadala wa"</string>
+    <!-- no translation found for proxy_exclusionlist_hint (6084099226687226948) -->
+    <skip />
+    <!-- no translation found for proxy_defaultView_text (6387985519141433291) -->
+    <skip />
+    <string name="proxy_action_text" msgid="2957063145357903951">"Kwisha"</string>
+    <!-- no translation found for proxy_hostname_label (8490171412999373362) -->
+    <skip />
+    <!-- no translation found for proxy_hostname_hint (2076157057003936176) -->
+    <skip />
+    <!-- no translation found for proxy_error (8926675299638611451) -->
+    <skip />
+    <!-- no translation found for proxy_error_dismiss (4993171795485460060) -->
+    <skip />
+    <!-- no translation found for proxy_error_invalid_host (9120776460063182119) -->
+    <skip />
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"Orodha ya kuepusha uliyoichapisha haijaumbizwa sawa sawa. Tafadhali ingiza koma inayotenganisha orodha ya vikoa epuliwa."</string>
+    <!-- no translation found for proxy_error_empty_port (3525734169948795417) -->
+    <skip />
+    <!-- no translation found for proxy_error_empty_host_set_port (2451694104858226781) -->
+    <skip />
+    <!-- no translation found for proxy_error_invalid_port (1816315605424943626) -->
+    <skip />
+    <!-- no translation found for proxy_warning_limited_support (7442676587591460854) -->
+    <skip />
+    <!-- no translation found for radio_info_signal_location_label (16475158265551708) -->
+    <skip />
+    <!-- no translation found for radio_info_neighboring_location_label (2385625674055934880) -->
+    <skip />
+    <!-- no translation found for radio_info_data_attempts_label (1731106244577323381) -->
+    <skip />
+    <!-- no translation found for radio_info_gprs_service_label (2331818110375395364) -->
+    <skip />
+    <!-- no translation found for radio_info_roaming_label (6141505430275138647) -->
+    <skip />
+    <!-- no translation found for radio_info_imei_label (1220524224732944192) -->
+    <skip />
+    <!-- no translation found for radio_info_call_redirect_label (1654674226961476872) -->
+    <skip />
+    <!-- no translation found for radio_info_ppp_resets_label (3241667824729310546) -->
+    <skip />
+    <!-- no translation found for radio_info_gsm_disconnects_label (1683069665736339820) -->
+    <skip />
+    <!-- no translation found for radio_info_current_network_label (3256402602440102610) -->
+    <skip />
+    <!-- no translation found for radio_info_data_successes_label (4417894113689054945) -->
+    <skip />
+    <!-- no translation found for radio_info_ppp_received_label (3345184342444878849) -->
+    <skip />
+    <!-- no translation found for radio_info_gsm_service_label (2082332114596916985) -->
+    <skip />
+    <!-- no translation found for radio_info_signal_strength_label (1931937920896925766) -->
+    <skip />
+    <!-- no translation found for radio_info_call_status_label (4896238900685510883) -->
+    <skip />
+    <!-- no translation found for radio_info_ppp_sent_label (5009102250704375687) -->
+    <skip />
+    <!-- no translation found for radio_info_radio_resets_label (9211343458143291617) -->
+    <skip />
+    <!-- no translation found for radio_info_message_waiting_label (6981842420058672207) -->
+    <skip />
+    <!-- no translation found for radio_info_phone_number_label (7192944627907412169) -->
+    <skip />
+    <!-- no translation found for radio_info_band_mode_label (441469694142042022) -->
+    <skip />
+    <!-- no translation found for radio_info_network_type_label (3706382548257257987) -->
+    <skip />
+    <!-- no translation found for radio_info_set_perferred_label (9039200405863503267) -->
+    <skip />
+    <!-- no translation found for radio_info_ping_ipaddr (498747917793263530) -->
+    <skip />
+    <!-- no translation found for radio_info_ping_hostname (3054888474808217853) -->
+    <skip />
+    <!-- no translation found for radio_info_http_client_test (5733604021077701555) -->
+    <skip />
+    <!-- no translation found for ping_test_label (7255376471490860631) -->
+    <skip />
+    <!-- no translation found for radio_info_smsc_label (6399460520126501354) -->
+    <skip />
+    <!-- no translation found for radio_info_smsc_update_label (7258686760358791539) -->
+    <skip />
+    <!-- no translation found for radio_info_smsc_refresh_label (6902302130315125102) -->
+    <skip />
+    <string name="radio_info_toggle_dns_check_label" msgid="8292252930563286858">"Geuza ukaguaji DNS"</string>
+    <string name="oem_radio_info_label" msgid="6163141792477958941">"OEM-sbainifu Habari/Mipangilio"</string>
+    <!-- no translation found for band_mode_title (954174198903776205) -->
+    <skip />
+    <!-- no translation found for band_mode_loading (548764766363847336) -->
+    <skip />
+    <!-- no translation found for band_mode_set (5730560180249458484) -->
+    <skip />
+    <!-- no translation found for band_mode_failed (1495968863884716379) -->
+    <skip />
+    <!-- no translation found for band_mode_succeeded (2701016190055887575) -->
+    <skip />
+    <!-- no translation found for sdcard_changes_instructions (1364712901180556244) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_screen_mass_storage_text (3741220147296482474) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_total_bytes_label (9184160745785062144) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_not_present_status (2902787003418172125) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_not_present_status (6666688653496819947) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_available_bytes_label (763232429899373001) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_mass_storage_status (2736378870889777857) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_mass_storage_status (4786433969313661655) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_unmounted_status (7503300818792750913) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_unmounted_status (3812022095683863087) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_bad_removal_status (7761390725880773697) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_bad_removal_status (5145797653495907970) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_used_bytes_label (8820289486001170836) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_scanning_status (7503429447676219564) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_scanning_status (2763464949274455656) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_read_only_status (3771783090621312312) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_read_only_status (5706115860484118911) -->
+    <skip />
+    <string name="skip_label" msgid="47510779345218297">"Ruka"</string>
+    <!-- no translation found for next_label (4693520878012668114) -->
+    <skip />
+    <string name="language_picker_title" msgid="5349877711342869319">"Lugha"</string>
+    <!-- no translation found for activity_picker_label (4910700713930693329) -->
+    <skip />
+    <!-- no translation found for device_info_label (6551553813651711205) -->
+    <skip />
+    <!-- no translation found for battery_info_label (4132685016148679403) -->
+    <skip />
+    <!-- no translation found for display_label (8074070940506840792) -->
+    <skip />
+    <!-- no translation found for phone_info_label (7820855350955963628) -->
+    <skip />
+    <!-- no translation found for phone_info_label (2127552523124277664) -->
+    <skip />
+    <!-- no translation found for sd_card_settings_label (8101475181301178428) -->
+    <skip />
+    <!-- no translation found for sd_card_settings_label (5743100901106177102) -->
+    <skip />
+    <!-- no translation found for proxy_settings_label (3271174136184391743) -->
+    <skip />
+    <!-- no translation found for cancel (6859253417269739139) -->
+    <skip />
+    <!-- no translation found for settings_label (1626402585530130914) -->
+    <skip />
+    <string name="settings_label_launcher" msgid="8344735489639482340">"Mipangilio"</string>
+    <!-- outdated translation 3672145147925639262 -->     <string name="settings_shortcut" msgid="8597387747077828217">"Mipangilio"</string>
+    <!-- no translation found for airplane_mode (8837269988154128601) -->
+    <skip />
+    <string name="airplane_mode_summary" msgid="3154817401368780988">"Lemaza miunganisho yote isiyotumia waya"</string>
+    <!-- no translation found for airplane_mode_turning_on (8871739222526957255) -->
+    <skip />
+    <!-- no translation found for airplane_mode_turning_off (3393168549611505996) -->
+    <skip />
+    <string name="radio_controls_title" msgid="5868688473587168882">"Isiyotumia waya &amp; mitandao"</string>
+    <!-- outdated translation 149274247949769551 -->     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Isiyotumia waya &amp; mipangilio ya mtandao"</string>
+    <string name="radio_controls_summary" msgid="2998818677094465517">"Dhibiti Wi-Fi, Bluetooth, hali ya ndege, mitandao ya simu za mkononi na VPN"</string>
+    <!-- no translation found for roaming (3596055926335478572) -->
+    <skip />
+    <!-- no translation found for roaming_enable (3737380951525303961) -->
+    <skip />
+    <!-- no translation found for roaming_disable (1295279574370898378) -->
+    <skip />
+    <!-- no translation found for roaming_reenable_message (9141007271031717369) -->
+    <skip />
+    <!-- no translation found for roaming_turn_it_on_button (4387601818162120589) -->
+    <skip />
+    <!-- no translation found for roaming_warning (1269870211689178511) -->
+    <skip />
+    <!-- no translation found for roaming_reenable_title (7626425894611573131) -->
+    <skip />
+    <!-- no translation found for networks (6333316876545927039) -->
+    <skip />
+    <!-- no translation found for sum_carrier_select (6648929373316748020) -->
+    <skip />
+    <!-- no translation found for date_and_time_settings_title (3350640463596716780) -->
+    <skip />
+    <!-- no translation found for date_and_time_settings_title_setup_wizard (2391530758339384324) -->
+    <skip />
+    <!-- no translation found for date_and_time_settings_summary (2435705040205950381) -->
+    <skip />
+    <string name="date_time_auto" msgid="7076906458515908345">"Tarehe otomatiki &amp; saa"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Tumia muda uliopeanwa wa mtandao"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Tumia saa iliyopeanwa kwenye mtandao"</string>
+    <string name="zone_auto" msgid="334783869352026648">"Ukanda wa saa otomatiki"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Tumia ukanda wa saa uliopeanwa wa mtandao"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Tumia ukanda wa saa uliopeanwa wa mtandao"</string>
+    <!-- no translation found for date_time_24hour (1193032284921000063) -->
+    <skip />
+    <!-- no translation found for date_time_set_time (5716856602742530696) -->
+    <skip />
+    <string name="date_time_set_timezone" msgid="5045627174274377814">"Chagua ukanda wa saa"</string>
+    <!-- no translation found for date_time_set_date (7021491668550232105) -->
+    <skip />
+    <!-- no translation found for date_time_date_format (436706100255870967) -->
+    <skip />
+    <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Panga kialfabeti"</string>
+    <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Panga kwa ukanda wa saa"</string>
+    <!-- no translation found for date_picker_title (1338210036394128512) -->
+    <skip />
+    <!-- no translation found for time_picker_title (483460752287255019) -->
+    <skip />
+    <!-- no translation found for lock_after_timeout (940509402681580537) -->
+    <skip />
+    <!-- no translation found for lock_after_timeout_summary (4726009794344934278) -->
+    <skip />
+    <!-- no translation found for show_owner_info_on_lockscreen_label (5074906168357568434) -->
+    <skip />
+    <!-- no translation found for owner_info_settings_title (2723190010708381889) -->
+    <skip />
+    <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
+    <!-- no translation found for owner_info_settings_edit_text_hint (2382525043173672857) -->
+    <skip />
+    <string name="security_settings_title" msgid="5168491784222013179">"Mahali na usalama"</string>
+    <string name="location_security_settings_title" msgid="4624434296446625554">"Mahali &amp; mipangilio ya usalama"</string>
+    <string name="security_settings_summary" msgid="967393342537986570">"Weka Mahali Pangu, fungua skrini, funga kadi ya SIM, funga hifadhi ya hati-tambulishi"</string>
+    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Weka Mahali Pangu, fungua skrini, funga hifadhi ya hati-tambulishi"</string>
+    <!-- no translation found for security_passwords_title (2930627259125138363) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
+    <skip />
+    <!-- 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_desc (2150571569618349332) -->
+    <skip />
+    <!-- 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_low_charge_text (5920622844033087792) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_dialog_need_password_title (4058971800557767) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_dialog_need_password_message (17076329416977176) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (2496639211575162172) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (3248595818246515395) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_setup_description (5317479293244660361) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_setup_description (8166730416836285875) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_cooldown (685210918307862395) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_enter_password (1492603008983893532) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_title (1166918236711686187) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (1075638996134310507) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (3394708817932222518) -->
+    <skip />
+    <!-- outdated translation 3973555216065628262 -->     <string name="lock_settings_picker_title" msgid="8665454308380158195">"Fungua usallama wa skrini"</string>
+    <!-- outdated translation 1129684221223017902 -->     <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Weka kufunga kwa skrini"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"Badilisha skrini ya kufunga"</string>
+    <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Badilisha au lemaza umbo, PIn, au usalama wa neniosiri"</string>
+    <!-- no translation found for unlock_set_unlock_launch_picker_enable_summary (4791110798817242301) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_off_title (1613932765246180079) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_off_summary (2791013557563587655) -->
+    <skip />
+    <!-- outdated translation 3760684669884671990 -->     <string name="unlock_set_unlock_none_title" msgid="7560817055143323842">"Hamna"</string>
+    <!-- outdated translation 2658550480388272618 -->     <string name="unlock_set_unlock_none_summary" msgid="2609139908913114644">"Lemaza usalama wa skrini ya kufungua"</string>
+    <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Mchoro"</string>
+    <!-- outdated translation 3018395214738645405 -->     <string name="unlock_set_unlock_pattern_summary" msgid="8467282436608077882">"Chora umbo kwa kufungua skrini"</string>
+    <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
+    <!-- outdated translation 4131169672844263316 -->     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Ingiza PIN ya numeriki kwa kufungua skrini"</string>
+    <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Nenosiri"</string>
+    <!-- outdated translation 4623254789833899286 -->     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Ingiza nenosiri kufungua skrini"</string>
+    <!-- outdated translation 736557879526940324 -->     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Inalemazwa kwa msimamizi wa simu ya mbali"</string>
+    <!-- no translation found for unlock_set_unlock_mode_off (378729687629105388) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_mode_none (7137296704741184239) -->
+    <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_disable_lock_title" msgid="1427036227416979120">"Lemaza kufungwa kwa skrini"</string>
+    <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Ondoa umbo la kufungua"</string>
+    <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Ondoa PIN ufunguaji"</string>
+    <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Ondoa nenosiri la kufungua"</string>
+    <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Badilisha umbo la kufungua"</string>
+    <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Badilisha PIN ya kufungua"</string>
+    <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Badilisha nenosiri la kufungua"</string>
+    <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Nenosiri lazima iwe angalau na vibambo %d"</string>
+    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN lazima iwe angalau na vibambo %d"</string>
+    <string name="lockpassword_press_continue" msgid="122706614386757182">"Gusa Endelea wakati imekamilaka"</string>
+    <string name="lockpassword_continue_label" msgid="4602203784934526940">"Endelea"</string>
+    <!-- no translation found for lockpassword_password_too_long (5487426077939378487) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_long (6382649850551200693) -->
+    <skip />
+    <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"PIN lazima iwe tu na tarakimu 0-9"</string>
+    <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Msimamizi wa kifaa haruhusu kutumia PIN ya sasa"</string>
+    <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Nenosiri linalo kibambo haramu"</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"Nenosiri lazima liwe na angalau herufi moja"</string>
+    <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"Nenosiri lazima liwe na angalau dijiti moja ya numeriki"</string>
+    <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"Nenosiri lazima liwe na angalau alama moja"</string>
+  <plurals name="lockpassword_password_requires_letters">
+    <item quantity="one" msgid="1462968118065694590">"Nenosiri lazima liwe na angalau herufi 1"</item>
+    <item quantity="other" msgid="7278096339907683541">"Nenosiri lazima liwe kwa angalau herufi %d"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_lowercase">
+    <item quantity="one" msgid="2048653993044269649">"Nenosiri lazima liwe kwa angalau herufi 1 ndogo"</item>
+    <item quantity="other" msgid="588499075580432178">"Nenosiri lazima liwe na angalau herufi %d kubwa"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_uppercase">
+    <item quantity="one" msgid="7677454174080582601">"Nenosiri lazima liwe na angalau herufi 1 kubwa"</item>
+    <item quantity="other" msgid="2183090598541826806">"Nenosiri lazima liwe na angalau herufi %d kubwa"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_numeric">
+    <item quantity="one" msgid="8585088032818933985">"Nenosiri lazima liwe na angalau dijiti ya numeriki 1"</item>
+    <item quantity="other" msgid="995673409754935278">"Nenosiri lazima liwe na angalau dijiti ya numeriki %d"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_symbols">
+    <item quantity="one" msgid="3930886641317826293">"Nenosiri lazima liwe na angalau alama 1 maalum"</item>
+    <item quantity="other" msgid="3047460862484105274">"Nenosiri lazima liwe na angalau alama maalum %d"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_nonletter">
+    <item quantity="one" msgid="1716355580615489062">"Lazima nenosiri liwe na angalau kibambo 1 kisicho cha barua"</item>
+    <item quantity="other" msgid="5574191164708145973">"Nenosiri lazima liwe na angalau vibambo visivyo na herufi %d"</item>
+  </plurals>
+    <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"Msimamizi wa kifaa haruhusu kutumia nenosiri la sasa"</string>
+    <string name="lockpassword_ok_label" msgid="313822574062553672">"Sawa"</string>
+    <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Ghairi"</string>
+    <!-- no translation found for lockpattern_tutorial_cancel_label (6431583477570493261) -->
+    <skip />
+    <!-- no translation found for lockpattern_tutorial_continue_label (3559793618653400434) -->
+    <skip />
+    <string name="device_admin_title" msgid="3562216873644263804">"Usimamizi wa kifaa"</string>
+    <!-- outdated translation 3864120111085199551 -->     <string name="manage_device_admin" msgid="5059296715271077278">"Chagua wasimamizi wa kifaa"</string>
+    <!-- outdated translation 915390201809231575 -->     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Ongeza au ondoa kifaa cha msimamizi"</string>
+    <!-- no translation found for bluetooth_quick_toggle_title (1037056952714061893) -->
+    <skip />
+    <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Washa Bluetooth"</string>
+    <!-- no translation found for bluetooth_settings (2725796451253089609) -->
+    <skip />
+    <!-- no translation found for bluetooth_settings_title (2824020086246268296) -->
+    <skip />
+    <!-- no translation found for bluetooth_settings_summary (2091062709530570462) -->
+    <skip />
+    <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Ombi la kulinganisha Bluetooth"</string>
+    <!-- no translation found for bluetooth_enter_pin_msg (1499285355129256289) -->
+    <skip />
+    <!-- no translation found for bluetooth_enter_passkey_msg (8301499416158195044) -->
+    <skip />
+    <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"Kulinganisha na \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\", thibitisha kwamba inaonyesha nenosiri: <xliff:g id="PASSKEY">%2$s</xliff:g>."</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1076613564387784476">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n" inataka kulinganisha."</string>
+    <!-- no translation found for bluetooth_display_passkey_pin_msg (9139892462102104755) -->
+    <skip />
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Oanisha"</string>
+    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"Usioanishe"</string>
+    <string name="bluetooth_remote_device" msgid="2406662802908395389">"kifaa cha bluetooth"</string>
+    <string name="bluetooth_error_title" msgid="538287072376677166">"Zingatia"</string>
+    <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"Kulikuwa na tatizo katika kuwasiliana na <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="6065697229258906937">"Kulikuwa na tatizo la kulinganisha na <xliff:g id="DEVICE_NAME">%1$s</xliff:g> kwa sababu PIN au nenosiri sio sahihi."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="6688215193824686741">"Haiwezi kuanzisha mawasiliano na <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Ulinganishaji umekataliwa na <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"Kulikuwa na tatizo katika kuunganisha kwa <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Chunguza vifaa"</string>
+    <!-- no translation found for bluetooth_preference_find_nearby_title (5087410003465463318) -->
+    <skip />
+    <!-- no translation found for bluetooth_preference_device_settings (907776049862799122) -->
+    <skip />
+    <!-- no translation found for bluetooth_preference_paired_devices (1970524193086791964) -->
+    <skip />
+    <!-- no translation found for bluetooth_preference_found_devices (3133019331974936204) -->
+    <skip />
+    <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Unganisha"</string>
+    <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Tenganisha"</string>
+    <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Oanisha kisha unganisha"</string>
+    <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Batilisha ulinganishaji"</string>
+    <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Tenganisha na ughari uoanishaji"</string>
+    <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Chaguo…"</string>
+    <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Unganisha kwa..."</string>
+    <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"media"</string>
+    <!-- outdated translation 1874975688666658946 -->     <string name="bluetooth_profile_headset" msgid="81844079120986198">"Simu"</string>
+    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Hamisha"</string>
+    <string name="bluetooth_profile_hid" msgid="3000858580917633478">"Kifaa cha Kuingiza"</string>
+    <!-- outdated translation 4225813400648547154 -->     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Inazuia"</string>
+    <!-- no translation found for bluetooth_disconnect_a2dp_profile (3524648279150937177) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_headset_profile (8635908811168780720) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_hid_profile (3282295189719352075) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_pan_user_profile (8037627994382458698) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_pan_nap_profile (5455448395850929200) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_pan_nap_profile (5266851881175033601) -->
+    <skip />
+    <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"Chaguo <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <!-- no translation found for bluetooth_device_advanced_device_actions_title (3793430949811946844) -->
+    <skip />
+    <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Unganisha"</string>
+    <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Unganisha kwa kifaa cha Bluetooth"</string>
+    <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Maelezo mafupi"</string>
+    <!-- no translation found for bluetooth_device_advanced_rename_device (350508394033808532) -->
+    <skip />
+    <!-- no translation found for bluetooth_device_advanced_enable_opp_title (8222550640371627365) -->
+    <skip />
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Imeunganishwa kwenye sikika ya njia ya mawasiliano"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Imeunganishwa kwenye sauti ya simu"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Imeunganishwa kwenye seva ya kuhamisha faili"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Haijaunganishwa kwenye seva ya kuhamisha faili"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Umeunganishwa kwa kifaa cha kuingiza"</string>
+    <!-- no translation found for bluetooth_pan_user_profile_summary_connected (4602294638909590612) -->
+    <skip />
+    <!-- no translation found for bluetooth_pan_nap_profile_summary_connected (1561383706411975199) -->
+    <skip />
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Tumia kwa sauti ya media"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Tumia kwa sauti ya simu"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Tumia kwa hali faili"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Tumia kwa kuingiza"</string>
+    <!-- no translation found for bluetooth_pan_profile_summary_use_for (5664884523822068653) -->
+    <skip />
+    <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Mipangilio ya Gati"</string>
+    <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Tumia dock ya sauti"</string>
+    <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Kama simu ya spika"</string>
+    <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Kwa muziki na midia"</string>
+    <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Kumbuka mipangilio"</string>
+    <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
+    <!-- no translation found for nfc_quick_toggle_summary (1988408027741447231) -->
+    <skip />
+    <!-- no translation found for nfc_toggle_error (2233172102497535522) -->
+    <!-- no translation found for nfc_toggle_error (8998642457947607263) -->
+    <skip />
+    <!-- no translation found for wifi_quick_toggle_title (874495178395350104) -->
+    <skip />
+    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Washa Wi-Fi"</string>
+    <!-- no translation found for wifi_settings (4746946030627213196) -->
+    <skip />
+    <!-- no translation found for wifi_settings_category (2810363951104753710) -->
+    <skip />
+    <!-- no translation found for wifi_settings_summary (668767638556052820) -->
+    <skip />
+    <!-- no translation found for wifi_starting (6710266609710860129) -->
+    <skip />
+    <!-- no translation found for wifi_stopping (5952909472548218348) -->
+    <skip />
+    <!-- no translation found for wifi_error (3207971103917128179) -->
+    <skip />
+    <string name="wifi_in_airplane_mode" msgid="7618393787965366655">"Katika mtindo wa anga ndege"</string>
+    <string name="wifi_fail_to_scan" msgid="6194542252808587669">"Haiwezi kusafisha kwa mitandao"</string>
+    <!-- no translation found for wifi_notify_open_networks (3755768188029653293) -->
+    <skip />
+    <!-- no translation found for wifi_notify_open_networks_summary (3038290727701553612) -->
+    <skip />
+    <!-- outdated translation 1367731352485585528 -->     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Sera ya kulala ya Wi-Fi"</string>
+    <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Bainisha wakati wa kubadili kutoka kwa Wi-Fi hadi data ya simu ya mkononi"</string>
+    <!-- no translation found for wifi_setting_sleep_policy_summary_wifi_only (5025244230722670496) -->
+    <skip />
+    <!-- outdated translation 5103670439972135148 -->     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Kulikuwa na tatizo la kuweka sera ya kulala."</string>
+    <string name="wifi_add_network" msgid="1671334951296205616">"Ongeza mtandao wa Wi-Fi"</string>
+    <!-- no translation found for wifi_add_network_summary (6345544206968025811) -->
+    <skip />
+    <!-- no translation found for wifi_access_points (2664629396767022441) -->
+    <skip />
+    <string name="wifi_menu_scan" msgid="1470911530412095868">"Safisha"</string>
+    <!-- no translation found for wifi_menu_advanced (7522252991919573664) -->
+    <skip />
+    <string name="wifi_menu_connect" msgid="4996220309848349408">"Unganisha kwa mtandao"</string>
+    <string name="wifi_menu_forget" msgid="8736964302477327114">"Sahau mtandao"</string>
+    <string name="wifi_menu_modify" msgid="2068554918652440105">"Mtandao umerekebishwa"</string>
+    <string name="wifi_network_setup" msgid="7974851890019344870">"Weka Mtandao"</string>
+    <string name="wifi_wps_pin" msgid="5471842298708321115">"Ingiza nenosiri kutoka kwa pointi ya ufikio"</string>
+    <!-- no translation found for wifi_wps_setup_title (150518971269252336) -->
+    <skip />
+    <!-- no translation found for wifi_wps_pin_output (8682102965680650853) -->
+    <skip />
+    <!-- no translation found for wifi_wps_in_progress (2776555137392461525) -->
+    <skip />
+    <!-- no translation found for wifi_wps_failed (2277409652621482331) -->
+    <skip />
+    <string name="wifi_ssid" msgid="641393708309146745">"Mtandao wa SSID"</string>
+    <!-- no translation found for wifi_security (6603611185592956936) -->
+    <skip />
+    <string name="wifi_signal" msgid="5514120261628065287">"Nguvu ya kionyeshi cha ishara"</string>
+    <!-- no translation found for wifi_status (4824568012414605414) -->
+    <skip />
+    <string name="wifi_speed" msgid="3526198708812322037">"Unganisha kasi"</string>
+    <!-- no translation found for wifi_ip_address (1440054061044402918) -->
+    <skip />
+    <string name="wifi_eap_method" msgid="8529436133640730382">"Mtindo wa EAP"</string>
+    <string name="please_select_phase2" msgid="5231074529772044898">"Uhalalishaji wa awamu ya 2"</string>
+    <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Cheti cha CA"</string>
+    <string name="wifi_eap_user_cert" msgid="1291089413368160789">"Cheti cha mtumiaji"</string>
+    <string name="wifi_eap_identity" msgid="4359453783379679103">"Kitambulisho"</string>
+    <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Kitambulkisho kikubwa"</string>
+    <string name="wifi_password" msgid="5948219759936151048">"Nenosiri"</string>
+    <string name="wifi_show_password" msgid="6461249871236968884">"Onyesha nenosiri"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"Mipangilio ya IP"</string>
+    <string name="wifi_unchanged" msgid="3410422020930397102">"(haijabadilishwa)"</string>
+    <string name="wifi_unspecified" msgid="5431501214192991253">"(haijabainishwa)"</string>
+    <string name="wifi_remembered" msgid="8426719916135950136">"Imerejeshwa"</string>
+    <string name="wifi_disabled" msgid="2104752038187543712">"Imelemazwa"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Haiko kwenye mpango"</string>
+    <!-- no translation found for wifi_open_with_wps (2606968531452521147) -->
+    <skip />
+    <string name="wifi_secured" msgid="6759903183748011566">"Inausalama kwa<xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_with_wps" msgid="1822538701086256007">"Imepewa usalama kwa <xliff:g id="WIFI_SECURITY">%1$s</xliff:g> (WPS inapatikana)"</string>
+    <string name="wifi_secured_with_status" msgid="6489317496506267302">"<xliff:g id="WIFI_STATUS">%2$s</xliff:g>imepewa usalama kwa<xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
+    <string name="wifi_connect" msgid="1076622875777072845">"Unganisha"</string>
+    <string name="wifi_forget" msgid="8168174695608386644">"Sahau"</string>
+    <string name="wifi_save" msgid="3331121567988522826">"Hifadhi"</string>
+    <string name="wifi_cancel" msgid="6763568902542968964">"Ghairi"</string>
+    <!-- no translation found for wifi_wps_overlap_error (6820987241637459748) -->
+    <skip />
+    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Mahiri"</string>
+    <!-- no translation found for wifi_setting_frequency_band_title (7493768705046080060) -->
+    <skip />
+    <!-- no translation found for wifi_setting_frequency_band_summary (3250740757118009784) -->
+    <skip />
+    <!-- no translation found for wifi_setting_frequency_band_error (837281974489794378) -->
+    <skip />
+    <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Anwani ya MAC"</string>
+    <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Anwani ya IP"</string>
+    <!-- no translation found for wifi_ip_settings_titlebar (4345739031248760326) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_menu_save (7296724066102908366) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_menu_cancel (6582567330136502340) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_ip_address (6387653152103405443) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_gateway (6383012465511093067) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_dns (3428867750550854065) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_network_prefix_length (8145730615716855433) -->
+    <skip />
+    <!-- no translation found for wifi_dns1 (7344118050720080045) -->
+    <skip />
+    <!-- no translation found for wifi_dns2 (1368601006824882659) -->
+    <skip />
+    <!-- no translation found for wifi_gateway (163914742461092086) -->
+    <skip />
+    <!-- no translation found for wifi_network_prefix_length (3028785234245085998) -->
+    <skip />
+    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Ubebezi wa Mipangilo ya ubebezi wa eneo maalum la Wi-Fi"</string>
+    <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Hotspot bebezi<xliff:g id="NETWORK_SSID">%1$s</xliff:g> amilifu"</string>
+    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Wi-Fi hotspot bebezi ina hitilafu"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="3474995108398156258">"Sanidi Wi-Fi hotspot"</string>
+    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g><xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> ubebezi wa Wi-Fi hotspot"</string>
+    <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
+    <string name="sound_settings_title" msgid="8735891486683305886">"Sauti"</string>
+    <!-- outdated translation 1708697328627382561 -->     <string name="display_settings_title" msgid="2378894265964357591">"Onyesha"</string>
+    <!-- no translation found for sound_settings (5007659014828162881) -->
+    <skip />
+    <!-- no translation found for silent_mode_title (3181479108593217704) -->
+    <skip />
+    <string name="silent_mode_summary" msgid="3309650676072917899">"Nyamazisha sauti zote isipokuwa kengele za midia &amp;"</string>
+    <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"Sauti zote isipokuwa za njia ya mawasiliano zimenyamazishwa"</string>
+    <!-- no translation found for ringtone_title (7037881886694206550) -->
+    <skip />
+    <string name="ringtone_summary" msgid="2630023412632683493"></string>
+    <string name="all_volume_title" msgid="8741571721868253103">"Kiwango"</string>
+    <!-- no translation found for ring_volume_title (7938706566797464165) -->
+    <skip />
+    <string name="ring_volume_summary" msgid="7055497624193116879"></string>
+    <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Tetema wakati imenyamaza"</string>
+    <string name="vibrate_in_silent_summary" msgid="3312600513070076281">"Ruhusu kutetema kwa maoni katika mtindo wa kunyamaza"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"Tikisika"</string>
+    <string name="vibrate_summary" msgid="7378130397830790458">"Tetema maoni ya simu na arifa"</string>
+    <!-- no translation found for notification_sound_title (6316316069880531693) -->
+    <skip />
+    <string name="notification_sound_summary" msgid="2953599929394109819"></string>
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Arifu ya mwangaza wa palsi"</string>
+    <string name="notification_pulse_summary" msgid="6899220780534617152">"Palsi ya mwangaza wa trackball kwa uradidi wa arifa mpya"</string>
+    <string name="incoming_call_volume_title" msgid="8073714801365904099">"Mlio wa simu"</string>
+    <string name="notification_volume_title" msgid="2012640760341080408">"Arifa"</string>
+    <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Tumia sauti ya simu inayoingia kwa arifa"</string>
+    <!-- no translation found for notification_sound_dialog_title (7057274209079144726) -->
+    <skip />
+    <string name="media_volume_title" msgid="3576565767317118106">"Vyombo vya Mawasiliano"</string>
+    <!-- no translation found for media_volume_summary (5363248930648849974) -->
+    <skip />
+    <string name="alarm_volume_title" msgid="2285597478377758706">"Kengele"</string>
+    <string name="dock_settings_summary" msgid="455802113668982481">"Mipangilio ya sauti ya kiambatisho cha gati"</string>
+    <!-- no translation found for dtmf_tone_enable_title (1453831168789523185) -->
+    <skip />
+    <!-- no translation found for dtmf_tone_enable_summary_on (3028201873989887327) -->
+    <skip />
+    <!-- no translation found for dtmf_tone_enable_summary_off (7791065951268525678) -->
+    <skip />
+    <!-- no translation found for sound_effects_enable_title (3197313718929122833) -->
+    <skip />
+    <!-- no translation found for sound_effects_enable_summary_on (6154141289879491329) -->
+    <skip />
+    <!-- no translation found for sound_effects_enable_summary_off (3447739581759560125) -->
+    <skip />
+    <string name="lock_sounds_enable_title" msgid="1575990840389107141">"Sauti ya kufunga skrini"</string>
+    <string name="lock_sounds_enable_summary_on" msgid="145741024028391473">"Chezesha sauti wakati wa ufungaji na ufunguaji wa skrini"</string>
+    <string name="lock_sounds_enable_summary_off" msgid="8481243116223542804">"Chezesha sauti wakati wa ufungaji na ufunguaji wa skrini"</string>
+    <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"Majibu unayoweza kuhisi"</string>
+    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"Tetema wakati wa kubonyeza vitufe na kwenye miingiliano mingine ya UI"</string>
+    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Tetema wakati wa kubonyeza vitufe vyepesi na kwenye miingiliano mingine ya onyesho"</string>
+    <string name="audio_record_proc_title" msgid="4271091199976457534">"Ughairi wa kelele"</string>
+    <string name="audio_record_proc_summary" msgid="8113628457499616498">"Punguza sauti ya maandhari nyuma wakati unaongea au kurekodi."</string>
+    <string name="dock_settings" msgid="1820107306693002541">"Gati"</string>
+    <string name="dock_settings_title" msgid="9161438664257429372">"Mipangilio ya gati"</string>
+    <string name="dock_audio_settings_title" msgid="3324750259959570305">"Faili ya kusikika"</string>
+    <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Mipangilio ya gati ya eneo kazii iliyoambatishwa"</string>
+    <string name="dock_audio_summary_car" msgid="6740897586006248450">"Mipangilio ya gati ya gari iliyoambatishwa"</string>
+    <!-- outdated translation 289909253741048784 -->     <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"Simu haija gatiwa"</string>
+    <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Simu haija gatiwa"</string>
+    <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Mipangilio ya gati iliyoambatishwa"</string>
+    <string name="dock_not_found_title" msgid="3290961741828952424">"Gati haipatikani"</string>
+    <!-- outdated translation 3035260358985111855 -->     <string name="dock_not_found_text" product="tablet" msgid="7935403744079168804">"Simu lazima iwekwe dock kwa kusanidi sauti ya dock"</string>
+    <string name="dock_not_found_text" product="default" msgid="3035260358985111855">"Simu lazima iwekwe dock kwa kusanidi sauti ya dock"</string>
+    <string name="dock_sounds_enable_title" msgid="3659084028644948905">"Uwekaji wa sauti ya Dock"</string>
+    <!-- outdated translation 8491180514199743771 -->     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Chezesha sauti wakati unapoingiza au kuondoa simu nkutoka gati"</string>
+    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Chezesha sauti wakati unapoingiza au kuondoa simu nkutoka gati"</string>
+    <!-- outdated translation 3151046599205265919 -->     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Usichezeshe sauti wakati unapoingiza au kuondoa simu kutoka kwa gati"</string>
+    <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Usichezeshe sauti wakati unapoingiza au kuondoa simu kutoka kwa gati"</string>
+    <string name="sync_settings" msgid="9186125469300013491">"Akaunti &amp; sawazisha"</string>
+    <string name="sync_settings_summary" msgid="2962179505214965667">"Ongeza au ondoa akaunti na ubadilishe mipangilio ya akaunti"</string>
+    <string name="search_settings" msgid="1910951467596035063">"Tafuta"</string>
+    <string name="search_settings_summary" msgid="9205656546570654169">"Simamia mipangilio ya utafutaji na historia"</string>
+    <!-- no translation found for display_settings (5947830029420609057) -->
+    <skip />
+    <string name="animations_title" msgid="1062189037402346023">"Uhuishaji"</string>
+    <string name="animations_summary_on" msgid="8843613112130484436">"Onyesha uhuisho wakati wa kufungua &amp; kufunga madirisha"</string>
+    <string name="animations_summary_off" msgid="2777026828025551983">"Onyesha uhuisho wakati wa kufungua na kufunga madirisha"</string>
+    <string name="accelerometer_title" msgid="7854608399547349157">"Zungusha otomatiki skrini"</string>
+    <!-- outdated translation 1133737282813048021 -->     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Badili uelekezaji kiotomatiki wakati wa kuzungusha simu"</string>
+    <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Badili uelekezaji kiotomatiki wakati wa kuzungusha simu"</string>
+    <!-- outdated translation 5485489363715740761 -->     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Badili uelekezaji kiotomatiki wakati wa kuzungusha simu"</string>
+    <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Badili uelekezaji kiotomatiki wakati wa kuzungusha simu"</string>
+    <!-- no translation found for brightness (2354961343555249270) -->
+    <skip />
+    <string name="brightness_summary" msgid="838917350127550703">"Rekebisha mwangaza wa skrini"</string>
+    <!-- no translation found for screen_timeout (6962654593018319466) -->
+    <skip />
+    <!-- no translation found for screen_timeout_summary (4471347210332380587) -->
+    <skip />
+    <!-- no translation found for dream_settings_title (6536876013377446805) -->
+    <skip />
+    <!-- no translation found for dream_settings_summary (6809871648071408259) -->
+    <skip />
+    <!-- no translation found for dream_component_title (505229894674572578) -->
+    <skip />
+    <!-- no translation found for dream_timeout_title (1385909618566514628) -->
+    <skip />
+    <!-- no translation found for dream_timeout_summary (6721955887728454226) -->
+    <skip />
+    <!-- no translation found for dream_timeout_zero_summary (2450290346381400092) -->
+    <skip />
+    <!-- no translation found for dream_test (5968002644622194481) -->
+    <skip />
+    <string name="automatic_brightness" msgid="5014143533884135461">"Mwangaza wa kiotomatiki"</string>
+    <!-- no translation found for title_font_size (4405544325522105222) -->
+    <skip />
+    <!-- no translation found for summary_font_size (7548243392515500554) -->
+    <skip />
+    <!-- no translation found for dialog_title_font_size (4503471078477715461) -->
+    <skip />
+    <!-- no translation found for sim_lock_settings (3392331196873564292) -->
+    <skip />
+    <!-- no translation found for sim_lock_settings_category (5136244267576697004) -->
+    <skip />
+    <!-- no translation found for sim_lock_settings_title (9018585580955414596) -->
+    <skip />
+    <!-- no translation found for sim_pin_toggle (1742123478029451888) -->
+    <skip />
+    <!-- no translation found for sim_lock_on (5058355081270397764) -->
+    <skip />
+    <!-- no translation found for sim_lock_on (2503536505568814324) -->
+    <skip />
+    <!-- no translation found for sim_lock_off (2813800553917012356) -->
+    <skip />
+    <!-- no translation found for sim_lock_off (258981978215428916) -->
+    <skip />
+    <string name="sim_pin_change" msgid="6311414184279932368">"Badilisha PIN ya SIM"</string>
+    <string name="sim_enter_pin" msgid="6608715137008508432">"PIN ya SIM"</string>
+    <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Funga kadi ya SIM"</string>
+    <string name="sim_disable_sim_lock" msgid="7664729528754784824">"Fungua kadi ya SIM"</string>
+    <string name="sim_enter_old" msgid="6074196344494634348">"PIN ya zamani ya SIM"</string>
+    <string name="sim_enter_new" msgid="8742727032729243562">"Msimbo mpya wa PIN ya SIM"</string>
+    <!-- no translation found for sim_reenter_new (3178510434642201544) -->
+    <skip />
+    <string name="sim_change_pin" msgid="7328607264898359112">"PIN ya SIM"</string>
+    <!-- no translation found for sim_bad_pin (2746201276896134075) -->
+    <skip />
+    <string name="sim_pins_dont_match" msgid="4664611595579163214">"PIN hazioani!"</string>
+    <string name="sim_change_failed" msgid="4823538458798362222">"Haiwezi kubadilisha PIN."\n" Kuna uwezekano PIN sio sahihi."</string>
+    <!-- no translation found for sim_change_succeeded (8556135413096489627) -->
+    <skip />
+    <string name="sim_lock_failed" msgid="6676748290838006404">"Haiwezi kubadilisha hali ya kufunga kadi ya SIM. "\n" Kuna uwezekano kwamba PIN sio sahihi."</string>
+    <!-- no translation found for sim_enter_ok (6475946836899218919) -->
+    <skip />
+    <!-- no translation found for sim_enter_cancel (6240422158517208036) -->
+    <skip />
+    <!-- no translation found for device_info_settings (1119755927536987178) -->
+    <skip />
+    <!-- no translation found for device_info_settings (475872867864762157) -->
+    <skip />
+    <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Visasisho vya mfumo"</string>
+    <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
+    <string name="firmware_version" msgid="4801135784886859972">"Toleo la Android"</string>
+    <!-- no translation found for model_number (3765737700545384794) -->
+    <skip />
+    <!-- no translation found for baseband_version (1848990160763524801) -->
+    <skip />
+    <!-- no translation found for kernel_version (9192574954196167602) -->
+    <skip />
+    <!-- no translation found for build_number (3075795840572241758) -->
+    <skip />
+    <!-- no translation found for device_info_not_available (8062521887156825182) -->
+    <skip />
+    <string name="device_status_activity_title" msgid="1411201799384697904">"Hali"</string>
+    <!-- no translation found for device_status (607405385799807324) -->
+    <skip />
+    <!-- outdated translation 2599162787451519618 -->     <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Nambari a simu, mawimbi, n.k."</string>
+    <string name="device_status_summary" product="default" msgid="2599162787451519618">"Nambari a simu, mawimbi, n.k."</string>
+    <string name="storage_settings" msgid="4211799979832404953">"Hifadhi"</string>
+    <string name="storage_settings_title" msgid="8746016738388094064">"Hifadhi mipangilio"</string>
+    <!-- no translation found for storage_settings_summary (3543813623294870759) -->
+    <skip />
+    <!-- no translation found for storage_settings_summary (9176693537325988610) -->
+    <skip />
+    <!-- outdated translation 5123197324870153205 -->     <string name="status_number" product="tablet" msgid="1138837891091222272">"Nambari yangu ya simu"</string>
+    <string name="status_number" product="default" msgid="5123197324870153205">"Nambari yangu ya simu"</string>
+    <string name="status_min_number" msgid="3519504522179420597">"NDOGO"</string>
+    <string name="status_prl_version" msgid="8499039751817386529">"Toleo la PRL"</string>
+    <!-- outdated translation 1751442889111731088 -->     <string name="status_meid_number" msgid="2037549729230058915">"MEID"</string>
+    <string name="status_network_type" msgid="3279383550222116235">"Aina ya mtandao wa simu ya mkononi"</string>
+    <string name="status_data_state" msgid="5503181397066522950">"Hali ya mtandao wa simu ya mkononi"</string>
+    <!-- no translation found for status_service_state (2323931627519429503) -->
+    <skip />
+    <!-- no translation found for status_signal_strength (3732655254188304547) -->
+    <skip />
+    <!-- no translation found for status_roaming (2638800467430913403) -->
+    <skip />
+    <!-- no translation found for status_operator (2274875196954742087) -->
+    <skip />
+    <!-- no translation found for status_wifi_mac_address (33109409206264790) -->
+    <skip />
+    <!-- no translation found for status_bt_address (4195174192087439720) -->
+    <skip />
+    <!-- no translation found for status_serial_number (2257111183374628137) -->
+    <skip />
+    <!-- no translation found for status_unavailable (7862009036663793314) -->
+    <skip />
+    <!-- no translation found for status_up_time (7294859476816760399) -->
+    <skip />
+    <!-- no translation found for status_awake_time (2393949909051183652) -->
+    <skip />
+    <!-- no translation found for internal_memory (9129595691484260784) -->
+    <skip />
+    <!-- no translation found for sd_memory (2510246194083052841) -->
+    <skip />
+    <!-- no translation found for sd_memory (151871913888051515) -->
+    <skip />
+    <!-- no translation found for memory_available (5052397223077021181) -->
+    <skip />
+    <!-- no translation found for memory_size (6629067715017232195) -->
+    <skip />
+    <!-- no translation found for memory_calculating_size (2188358544203768588) -->
+    <skip />
+    <!-- no translation found for memory_apps_usage (9079237985722858506) -->
+    <skip />
+    <!-- no translation found for memory_media_usage (3738830697707880405) -->
+    <skip />
+    <!-- no translation found for memory_downloads_usage (3755173051677533027) -->
+    <skip />
+    <!-- no translation found for memory_dcim_usage (6679615808140067136) -->
+    <skip />
+    <!-- no translation found for memory_music_usage (4040027367622874108) -->
+    <skip />
+    <!-- no translation found for memory_media_misc_usage (235452944021647124) -->
+    <skip />
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Angua hifadhi iliyoshirikishwa"</string>
+    <string name="sd_eject" product="default" msgid="6915293408836853020">"Ondoa kadi ya SD"</string>
+    <!-- outdated translation 3315557796211542962 -->     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Ondoa kadi ya SD ili kuondolewa salama"</string>
+    <!-- outdated translation 3315557796211542962 -->     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Ondoa kadi ya SD ili kuondolewa salama"</string>
+    <!-- outdated translation 2048640010381803841 -->     <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Ingiza kadi ya SD ya uangikaji"</string>
+    <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Ingiza kadi ya SD ya uangikaji"</string>
+    <!-- outdated translation 5940523765187704135 -->     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Angika kadi ya SD"</string>
+    <string name="sd_mount" product="default" msgid="5940523765187704135">"Angika kadi ya SD"</string>
+    <string name="sd_mount_summary" product="nosdcard" msgid="4673411327373419641"></string>
+    <string name="sd_mount_summary" product="default" msgid="4673411327373419641"></string>
+    <!-- outdated translation 5448738337382712203 -->     <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"Fomati kadi ya SD"</string>
+    <!-- outdated translation 5448738337382712203 -->     <string name="sd_format" product="default" msgid="2576054280507119870">"Fomati kadi ya SD"</string>
+    <!-- outdated translation 6616491027883134004 -->     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Fomati (futa) kadi ya SD"</string>
+    <!-- outdated translation 6616491027883134004 -->     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Fomati (futa) kadi ya SD"</string>
+    <!-- no translation found for read_only (6702420168629076340) -->
+    <skip />
+    <!-- outdated translation 8612140627310646730 -->     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"Uanguaji wa kadi ya SD"</string>
+    <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"Uanguaji wa kadi ya SD"</string>
+    <!-- outdated translation 5851214273718817727 -->     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"Ikiwa utaangua kadi ya SD, baadhi ya programu unazozitumia zitakomesha na huenda zisipatikane hadi utakapo angika kadi ya SD."</string>
+    <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Ikiwa utaangua kadi ya SD, baadhi ya programu unazozitumia zitakomesha na huenda zisipatikane hadi utakapo angika kadi ya SD."</string>
+    <!-- outdated translation 4004106918266783081 -->     <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"Uanguaji wa kadi ya SD umeshindikana"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"Uanguaji wa kadi ya SD umeshindikana"</string>
+    <!-- outdated translation 9188972789897713180 -->     <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"Haiwezi kuangua kadi ya SD. Jaribu tena baadaye."</string>
+    <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"Haiwezi kuangua kadi ya SD. Jaribu tena baadaye."</string>
+    <!-- outdated translation 1904212716075458402 -->     <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"Kadi ya SD itaanguliwa"</string>
+    <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"Kadi ya SD itaanguliwa"</string>
+    <string name="sd_ejecting_title" msgid="8824572198034365468">"Inaangua"</string>
+    <string name="sd_ejecting_summary" msgid="2028753069184908491">"Shughuli ya kuanguliwa inaendelea"</string>
+    <!-- no translation found for battery_status_title (9159414319574976203) -->
+    <skip />
+    <!-- no translation found for battery_level_title (2965679202786873272) -->
+    <skip />
+    <!-- no translation found for apn_settings (3743170484827528406) -->
+    <skip />
+    <!-- no translation found for apn_edit (1354715499708424718) -->
+    <skip />
+    <!-- no translation found for apn_not_set (7422262558097875757) -->
+    <skip />
+    <!-- no translation found for apn_name (4115580098369824123) -->
+    <skip />
+    <!-- no translation found for apn_apn (2479425126733513353) -->
+    <skip />
+    <!-- no translation found for apn_http_proxy (1826885957243696354) -->
+    <skip />
+    <!-- no translation found for apn_http_port (3763259523984976226) -->
+    <skip />
+    <!-- no translation found for apn_user (455637547356117761) -->
+    <skip />
+    <!-- no translation found for apn_password (5412301994998250968) -->
+    <skip />
+    <!-- no translation found for apn_server (2436185314756372858) -->
+    <skip />
+    <!-- no translation found for apn_mmsc (3670124402105585737) -->
+    <skip />
+    <!-- no translation found for apn_mms_proxy (5374082621073999275) -->
+    <skip />
+    <!-- no translation found for apn_mms_port (4074188088199243040) -->
+    <skip />
+    <!-- no translation found for apn_mcc (4258628382260674636) -->
+    <skip />
+    <!-- no translation found for apn_mnc (8629374076888809874) -->
+    <skip />
+    <string name="apn_auth_type" msgid="6167205395676037015">"Aina ya uhalalishaji"</string>
+    <string name="apn_auth_type_none" msgid="5069592676845549926">"Hamna"</string>
+    <string name="apn_auth_type_pap" msgid="1666934536996033383">"PAP"</string>
+    <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
+    <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP au CHAP"</string>
+    <!-- no translation found for apn_type (469613123902220544) -->
+    <skip />
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
+    <!-- no translation found for menu_delete (6981294422841124659) -->
+    <skip />
+    <!-- no translation found for menu_new (3014205883303921729) -->
+    <skip />
+    <!-- no translation found for menu_save (8109345640668285399) -->
+    <skip />
+    <!-- no translation found for menu_cancel (2194502410474697474) -->
+    <skip />
+    <!-- no translation found for error_title (1319225301794168762) -->
+    <skip />
+    <!-- no translation found for error_name_empty (1498238337687930558) -->
+    <skip />
+    <!-- no translation found for error_apn_empty (1513892291812404310) -->
+    <skip />
+    <!-- no translation found for error_mcc_not3 (4560171714156251661) -->
+    <skip />
+    <!-- no translation found for error_mnc_not23 (8418177072458379439) -->
+    <skip />
+    <string name="restore_default_apn" msgid="2724583218635739913">"Inarejesha mipangilio ya chaguo-msingi ya APN"</string>
+    <string name="menu_restore" msgid="8260067415075573273">"Weka upya kwa chaguo-msingi"</string>
+    <string name="restore_default_apn_completed" msgid="3990449939234957281">"Kuweka upya kwa mipangilio chaguo msingi ya APN kumekamilika"</string>
+    <!-- no translation found for master_clear_title (5907939616087039756) -->
+    <skip />
+    <!-- no translation found for master_clear_summary (4036344100254678429) -->
+    <skip />
+    <!-- no translation found for master_clear_summary (4986154238001088492) -->
+    <skip />
+    <!-- unknown placeholder BREAK_10 in master_clear_desc -->
+    <skip />
+    <!-- no translation found for master_clear_desc (590799767511283567) -->
+    <skip />
+    <!-- unknown placeholder BREAK_10 in master_clear_desc -->
+    <skip />
+    <!-- no translation found for master_clear_desc (3251400937758241249) -->
+    <skip />
+    <!-- no translation found for master_clear_accounts (6412857499147999073) -->
+    <skip />
+    <!-- no translation found for master_clear_desc_also_erases_external (1903185203791274237) -->
+    <skip />
+    <!-- no translation found for master_clear_desc_erase_external_storage (4740866328425123395) -->
+    <skip />
+    <!-- no translation found for master_clear_desc_erase_external_storage (7339100478676372901) -->
+    <skip />
+    <!-- no translation found for erase_external_storage (969364037450286809) -->
+    <skip />
+    <!-- no translation found for erase_external_storage (1397239046334307625) -->
+    <skip />
+    <!-- no translation found for erase_external_storage_description (444834593696342279) -->
+    <skip />
+    <!-- no translation found for erase_external_storage_description (46603515218075174) -->
+    <skip />
+    <!-- no translation found for master_clear_button_text (3130786116528304116) -->
+    <skip />
+    <!-- no translation found for master_clear_button_text (7550632653343157971) -->
+    <skip />
+    <string name="master_clear_final_desc" msgid="6917971132484622696">"Futa maelezo yako yote ya kibinafsi na programu zozote za kompyuta zilizopakuliwa? Haiwezekani kupindua tendo hili!"</string>
+    <!-- no translation found for master_clear_final_button_text (5390908019019242910) -->
+    <skip />
+    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Mchoro wa kufungua"</string>
+    <!-- no translation found for master_clear_gesture_explanation (2234954758550554549) -->
+    <skip />
+    <!-- no translation found for master_clear_failed (8655202125010189406) -->
+    <skip />
+    <!-- no translation found for master_clear_confirm_title (4845794266129586839) -->
+    <skip />
+    <!-- outdated translation 4671276096695789895 -->     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Fomati kadi ya SD."</string>
+    <!-- outdated translation 4671276096695789895 -->     <string name="media_format_title" product="default" msgid="4427528440306787972">"Fomati kadi ya SD."</string>
+    <!-- outdated translation 3805714639375830120 -->     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Futa data zote kwenye kadi ya SD"</string>
+    <string name="media_format_summary" product="default" msgid="3805714639375830120">"Futa data zote kwenye kadi ya SD"</string>
+    <!-- outdated translation 1142563222357820834 -->     <string name="media_format_desc" product="nosdcard" msgid="4553860683952763905">"Tendo hili litafuta kadi ya SD kwenye simu. Utapoteza data ZOTE kwenye kadi!"</string>
+    <!-- outdated translation 1142563222357820834 -->     <string name="media_format_desc" product="default" msgid="1598627584181935513">"Tendo hili litafuta kadi ya SD kwenye simu. Utapoteza data ZOTE kwenye kadi!"</string>
+    <!-- outdated translation 370856400090190151 -->     <string name="media_format_button_text" product="nosdcard" msgid="6293669371185352810">"Fomati kadi ya SD"</string>
+    <!-- outdated translation 370856400090190151 -->     <string name="media_format_button_text" product="default" msgid="6721544380069373626">"Fomati kadi ya SD"</string>
+    <!-- outdated translation 1776666694910717198 -->     <string name="media_format_final_desc" product="nosdcard" msgid="8094635533378487255">"Fomati kadi ya SD, na kufuta midia yako yote? Kitendo hakiwezi kutenduliwa!"</string>
+    <!-- outdated translation 1776666694910717198 -->     <string name="media_format_final_desc" product="default" msgid="9015504991522581434">"Fomati kadi ya SD, na kufuta midia yako yote? Kitendo hakiwezi kutenduliwa!"</string>
+    <string name="media_format_final_button_text" msgid="4881713344315923175">"Futa kila kitu"</string>
+    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Chora mchoro wako wa kufungua"</string>
+    <!-- outdated translation 4239529439389660159 -->     <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Lazima mchoro wa kufungua ili kuthibitisha fomati ya kadi ya SD."</string>
+    <!-- outdated translation 4239529439389660159 -->     <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Lazima mchoro wa kufungua ili kuthibitisha fomati ya kadi ya SD."</string>
+    <!-- no translation found for call_settings_title (5188713413939232801) -->
+    <skip />
+    <!-- no translation found for call_settings_summary (7291195704801002886) -->
+    <skip />
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"Inazuia USB"</string>
+    <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Hotspot Bebezi"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Uzuiaji wa Bluetooth"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Inazuia"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"Uzuiaji &amp;bebezi ya hotspot"</string>
+    <!-- outdated translation 3562431455625637370 -->     <string name="tether_settings_summary_usb" product="tablet" msgid="785883365108362248">"Shiriki data yako ya simu ya mkononi kuunganisha kupitia USB"</string>
+    <string name="tether_settings_summary_usb" product="default" msgid="3562431455625637370">"Shiriki data yako ya simu ya mkononi kuunganisha kupitia USB"</string>
+    <!-- outdated translation 4690912027002467246 -->     <string name="tether_settings_summary_wifi" msgid="5474383125137372164">"Shiriki muunganisho wa simu yako ya mkononi kama Wi-Fi hotspot ibebekayo"</string>
+    <!-- no translation found for tether_settings_summary_bluetooth (2407506656353819750) -->
+    <skip />
+    <!-- outdated translation 3700323208282018772 -->     <string name="tether_settings_summary_usb_wifi" product="tablet" msgid="3834674129575844910">"Shiriki muunganisho wa data ya simu ya mkononi kupitia USB au Wi-Fi hotspot bebezi"</string>
+    <string name="tether_settings_summary_usb_wifi" product="default" msgid="3700323208282018772">"Shiriki muunganisho wa data ya simu ya mkononi kupitia USB au Wi-Fi hotspot bebezi"</string>
+    <!-- outdated translation 4008195891276675882 -->     <string name="tether_settings_summary_usb_bluetooth" product="tablet" msgid="1245080236509560839">"Shiriki data yako ya simu ya mkononi kuunganisha kupitia USB au Bluetooth"</string>
+    <string name="tether_settings_summary_usb_bluetooth" product="default" msgid="4008195891276675882">"Shiriki data yako ya simu ya mkononi kuunganisha kupitia USB au Bluetooth"</string>
+    <!-- outdated translation 2753904149495692201 -->     <string name="tether_settings_summary_wifi_bluetooth" product="tablet" msgid="1924576461932311140">"Shiriki muunganisho wa data ya simu ya mkononi kupitia Bluetooth au Wi-Fi hotspot bebezi"</string>
+    <string name="tether_settings_summary_wifi_bluetooth" product="default" msgid="2753904149495692201">"Shiriki muunganisho wa data ya simu ya mkononi kupitia Bluetooth au Wi-Fi hotspot bebezi"</string>
+    <!-- outdated translation 1171769255924636665 -->     <string name="tether_settings_summary_all" product="tablet" msgid="6612660164315153427">"Shiriki data yako ya simu ya mkononi kuunganisha kupitia USB, Wi-Fi, au Bluetooth"</string>
+    <string name="tether_settings_summary_all" product="default" msgid="1171769255924636665">"Shiriki data yako ya simu ya mkononi kuunganisha kupitia USB, Wi-Fi, au Bluetooth"</string>
+    <string name="usb_title" msgid="7483344855356312510">"USB"</string>
+    <string name="usb_tethering_button_text" msgid="585829947108007917">"Inazuia USB"</string>
+    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB imeunganishwa, angalia herufi"</string>
+    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Imezuia"</string>
+    <string name="usb_tethering_storage_active_subtext" msgid="6608933594288072573">"Haiwezi kuzuia wakati uhifadhi wa UsB unatumika"</string>
+    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB haijaunganishwa"</string>
+    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Uzuiaji wa hitilafu ya USB"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Uzuiaji wa Bluetooth"</string>
+    <!-- outdated translation 3317112145693933963 -->     <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"inazuia Bluetooth kwenye, lakini haijaunganishwa"</string>
+    <!-- outdated translation 3317112145693933963 -->     <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"inazuia Bluetooth kwenye, lakini haijaunganishwa"</string>
+    <!-- no translation found for bluetooth_tethering_device_connected_subtext (2730938191906597896) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_device_connected_subtext (1666736165420290466) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_devices_connected_subtext (1180765608259580143) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_devices_connected_subtext (8248942539362173005) -->
+    <skip />
+    <!-- outdated translation 1798863866978968964 -->     <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Uzuiaji wa Bluetooth zima"</string>
+    <!-- outdated translation 1798863866978968964 -->     <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Uzuiaji wa Bluetooth zima"</string>
+    <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Hitilafy ya uzuiaji wa bluetooth"</string>
+    <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"Haiwezi kuzuia kwa zaidi kuliko vifaa <xliff:g id="MAXCONNECTION">%1$d</xliff:g>"</string>
+    <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>itazuiwa"</string>
+    <string name="tethering_help_button_text" msgid="656117495547173630">"Msaada"</string>
+    <!-- no translation found for network_settings_title (7967552516440151852) -->
+    <skip />
+    <!-- no translation found for network_settings_summary (5149750850846813553) -->
+    <skip />
+    <string name="location_title" msgid="1029961368397484576">"Mahali pangu"</string>
+    <!-- no translation found for location_network_based (8815705866861993344) -->
+    <skip />
+    <!-- no translation found for location_networks_disabled (2708968452901433980) -->
+    <skip />
+    <!-- no translation found for location_neighborhood_level (4656658097932515921) -->
+    <skip />
+    <!-- no translation found for location_neighborhood_level_wifi (7457348712272184793) -->
+    <skip />
+    <string name="location_gps" msgid="6296125378829097831">"Tumia setileti za GPS"</string>
+    <string name="location_street_level" msgid="7456259025474443314">"Unapoelekeza, usawa kwa kiwango cha mji"</string>
+    <!-- no translation found for location_gps_disabled (6632537158777308128) -->
+    <skip />
+    <string name="assisted_gps" msgid="4649317129586736885">"Tumia GPS iliyosaidiwa"</string>
+    <string name="assisted_gps_enabled" msgid="8751899609589792803">"Tumia seva ili kusaidia GPS (toa tiki ili kupunguza utumiaji wa mtandao)"</string>
+    <string name="assisted_gps_disabled" msgid="6982698333968010748">"Tumia seva ili kusaidia GPS (Toa tiki ili kuboresha utendajikazi wa GPS)"</string>
+    <!-- outdated translation 5447030582538504247 -->     <string name="use_location_title" msgid="3659340070401464551">"Tumia Mahali Pangu"</string>
+    <!-- no translation found for use_location_summary_disabled (6518008620918354403) -->
+    <skip />
+    <!-- no translation found for use_location_summary_enabled (8110246289085796179) -->
+    <skip />
+    <!-- no translation found for about_settings (593457295516533765) -->
+    <skip />
+    <!-- no translation found for about_settings (1743378368185371685) -->
+    <skip />
+    <!-- no translation found for about_settings_summary (3371517697156165959) -->
+    <skip />
+    <!-- no translation found for legal_information (5769301644270604095) -->
+    <skip />
+    <!-- no translation found for contributors_title (5917703088825286504) -->
+    <skip />
+    <!-- no translation found for copyright_title (865906688917260647) -->
+    <skip />
+    <!-- no translation found for license_title (1990487604356037871) -->
+    <skip />
+    <!-- no translation found for terms_title (7697580845616764642) -->
+    <skip />
+    <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"Mafunzo ya mfumo"</string>
+    <!-- outdated translation 3861815254521030201 -->     <string name="system_tutorial_list_item_summary" product="tablet" msgid="3341504384445734067">"Jifunze jinsi ya kutumia simu yako"</string>
+    <string name="system_tutorial_list_item_summary" product="default" msgid="3861815254521030201">"Jifunze jinsi ya kutumia simu yako"</string>
+    <!-- no translation found for settings_license_activity_title (7553683406244228650) -->
+    <skip />
+    <!-- no translation found for settings_license_activity_unavailable (4210539215951487627) -->
+    <skip />
+    <!-- no translation found for settings_license_activity_loading (3337535809093591740) -->
+    <skip />
+    <string name="settings_safetylegal_title" msgid="1289483965535937431">"Maelezo ya usalama"</string>
+    <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Maelezo ya usalama"</string>
+    <!-- no translation found for settings_safetylegal_activity_unreachable (170670055116721810) -->
+    <skip />
+    <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Inapakia…"</string>
+    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Chagua nenosiri lako"</string>
+    <!-- no translation found for lockpassword_choose_your_pattern_header (6949761069941694050) -->
+    <skip />
+    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Chagua PIn yako"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Thibitisha nenosiri lako"</string>
+    <!-- no translation found for lockpassword_confirm_your_pattern_header (7543433733032330821) -->
+    <skip />
+    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Thibitisha PIn yako"</string>
+    <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"Nenosiri halilingani"</string>
+    <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"PIN hailingani"</string>
+    <!-- no translation found for lockpassword_choose_lock_generic_header (3811438094903786145) -->
+    <skip />
+    <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Nenosiri limewekwa"</string>
+    <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN imewekwa"</string>
+    <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Mchoro umewekwa"</string>
+    <!-- outdated translation 975088518210629938 -->     <string name="lock_settings_title" msgid="8943058958424073651">"Fungua skrini"</string>
+    <!-- no translation found for lockpattern_change_lock_pattern_label (5679630792003440352) -->
+    <skip />
+    <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Badilisha PIN ya kufungua"</string>
+    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Thibitisha ruwaza iliyohifadhiwa"</string>
+    <!-- no translation found for lockpattern_need_to_unlock_wrong (5629093548611791080) -->
+    <skip />
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Mchoro wa kufungua"</string>
+    <!-- no translation found for lockpattern_recording_intro_footer (1118579101409152113) -->
+    <skip />
+    <!-- no translation found for lockpattern_recording_inprogress (4622772178078818425) -->
+    <skip />
+    <!-- no translation found for lockpattern_recording_incorrect_too_short (3103250430366718996) -->
+    <skip />
+    <!-- no translation found for lockpattern_pattern_entered_header (5012716272001299362) -->
+    <skip />
+    <!-- no translation found for lockpattern_need_to_confirm (5144676887162575050) -->
+    <skip />
+    <!-- no translation found for lockpattern_pattern_confirmed_header (2223856038485537716) -->
+    <skip />
+    <!-- no translation found for lockpattern_confirm_button_text (1128204343957002841) -->
+    <skip />
+    <!-- no translation found for lockpattern_restart_button_text (3337574403350953926) -->
+    <skip />
+    <!-- no translation found for lockpattern_retry_button_text (1949847413862309134) -->
+    <skip />
+    <!-- no translation found for lockpattern_continue_button_text (4723771754714471410) -->
+    <skip />
+    <!-- no translation found for lockpattern_settings_title (3207750489460466680) -->
+    <skip />
+    <!-- no translation found for lockpattern_settings_enable_title (6920616873671115281) -->
+    <skip />
+    <!-- no translation found for lockpattern_settings_enable_summary (1165707416664252167) -->
+    <skip />
+    <!-- no translation found for lockpattern_settings_enable_visible_pattern_title (104851667540971729) -->
+    <skip />
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="972174133075372341">"Tumia majibu ya mguso"</string>
+    <!-- no translation found for lockpattern_settings_choose_lock_pattern (1652352830005653447) -->
+    <skip />
+    <!-- no translation found for lockpattern_settings_change_lock_pattern (1123908306116495545) -->
+    <skip />
+    <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Jinsi ya kuchora mchoro wa kufungua"</string>
+    <!-- no translation found for lockpattern_too_many_failed_confirmation_attempts_header (819903817323783498) -->
+    <skip />
+    <!-- no translation found for lockpattern_too_many_failed_confirmation_attempts_footer (6759029360597122873) -->
+    <skip />
+    <!-- no translation found for skip_button_label (8680422740354436943) -->
+    <skip />
+    <!-- no translation found for next_button_label (8890792540116568321) -->
+    <skip />
+    <!-- no translation found for lock_title (2909697418179419990) -->
+    <skip />
+    <!-- no translation found for lock_title (4059246467204273930) -->
+    <skip />
+    <!-- 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="default" msgid="9100785646737118042"><font size="17">"Linda simu yako dhidi ya utumiaji usioidhinishwa kwa kuunda mchoro wa kibinafsi wa kufungua skrini. "\n<font height="17">\n</font><b>"1"</b>"  Kwenye skrini inayofuta, tazama wakati ruwaza ya mfano inachorwa. "\n<font height="17">\n</font><b>"2"</b>"  Wakati iko tayari, chora ruwaza yako binafsi ya kufungua. Jaribu na ruwaza tofauti lakini unganisha angalau vitone vinne "\n<font height="17">\n</font><b>"3"</b>"  Chora upya ruwaza yako ili kuthibitisha. "\n<font height="17">\n</font><b>"Uko tayari kuanza? Gusa \"Inayofuata\""</b>". "\n<font height="3">\n</font>"Ili kuacha simu yako bila ulinzi, gusa \"Ghairi\"."</font></string>
+    <!-- no translation found for manageapplications_settings_title (5712405848153426706) -->
+    <skip />
+    <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Simamia na ondoa programu za kompyuta zilizosakinishwa"</string>
+    <!-- no translation found for applications_settings (3736173521008476946) -->
+    <skip />
+    <!-- no translation found for applications_settings_summary (2714215108369119717) -->
+    <skip />
+    <!-- no translation found for applications_settings_header (6018266337275422250) -->
+    <skip />
+    <!-- no translation found for install_applications (4872012136210802181) -->
+    <skip />
+    <string name="install_unknown_applications" msgid="6612824788917283662">"Ruhusu usakinishaji wa programu zisizo za Soko"</string>
+    <!-- outdated translation 1923717607319933741 -->     <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"Simu yako na data za kibinafsi zinaweza kushambuliwa zaidi na programu za kompyuta kutoka vyanzo visivyojulikana. Unakubali kwamba unawajibika kabisa kwa uharibifu wowote wa simu yako au upotezaji data ambao unaweza kusababishwa kutokana na kutumia programu hizi za kompyuta."</string>
+    <string name="install_all_warning" product="default" msgid="1923717607319933741">"Simu yako na data za kibinafsi zinaweza kushambuliwa zaidi na programu za kompyuta kutoka vyanzo visivyojulikana. Unakubali kwamba unawajibika kabisa kwa uharibifu wowote wa simu yako au upotezaji data ambao unaweza kusababishwa kutokana na kutumia programu hizi za kompyuta."</string>
+    <!-- no translation found for advanced_settings (1777249286757067969) -->
+    <skip />
+    <!-- no translation found for advanced_settings_summary (145134386044169043) -->
+    <skip />
+    <!-- no translation found for application_info_label (1150486628158409543) -->
+    <skip />
+    <!-- no translation found for storage_label (8700867073480107253) -->
+    <skip />
+    <!-- no translation found for auto_launch_label (3012617472833815382) -->
+    <skip />
+    <!-- no translation found for screen_compatibility_label (663250687205465394) -->
+    <skip />
+    <!-- no translation found for permissions_label (2605296874922726203) -->
+    <skip />
+    <string name="cache_header_label" msgid="1877197634162461830">"kache"</string>
+    <string name="clear_cache_btn_text" msgid="5756314834291116325">"Futa kache"</string>
+    <string name="cache_size_label" msgid="7505481393108282913">"kache"</string>
+    <string name="controls_label" msgid="7611113077086853799">"Vidhibiti"</string>
+    <string name="force_stop" msgid="7435006169872876756">"Lazimisha komesha"</string>
+    <!-- no translation found for total_size_label (1048676419552557254) -->
+    <skip />
+    <!-- no translation found for application_size_label (5055196275624686382) -->
+    <skip />
+    <!-- no translation found for data_size_label (8679376373625710107) -->
+    <skip />
+    <!-- no translation found for external_size_label (4465530017830945766) -->
+    <skip />
+    <!-- no translation found for external_size_label (2107155737635944440) -->
+    <skip />
+    <!-- no translation found for uninstall_text (3644892466144802466) -->
+    <skip />
+    <string name="disable_text" msgid="6544054052049395202">"Lemaza"</string>
+    <string name="enable_text" msgid="9217362512327828987">"Wezesha"</string>
+    <!-- no translation found for clear_user_data_text (5597622864770098388) -->
+    <skip />
+    <string name="app_factory_reset" msgid="6635744722502563022">"Sanidua visasisho"</string>
+    <!-- no translation found for auto_launch_enable_text (2630656657744196691) -->
+    <skip />
+    <!-- no translation found for auto_launch_disable_text (7800385822185540166) -->
+    <skip />
+    <!-- no translation found for clear_activities (7408923511535174430) -->
+    <skip />
+    <!-- no translation found for screen_compatibility_text (2398570332021220651) -->
+    <skip />
+    <!-- no translation found for ask_compatibility (7225195569089607846) -->
+    <skip />
+    <!-- no translation found for enable_compatibility (3257284255974065538) -->
+    <skip />
+    <!-- no translation found for unknown (1592123443519355854) -->
+    <skip />
+    <string name="sort_order_alpha" msgid="1410278099123670628">"Panga kwa jina"</string>
+    <string name="sort_order_size" msgid="7024513286636502362">"Panga kwa ukubwa"</string>
+    <!-- no translation found for show_running_services (5736278767975544570) -->
+    <skip />
+    <!-- no translation found for show_background_processes (2009840211972293429) -->
+    <skip />
+    <!-- no translation found for manage_space_text (8852711522447794676) -->
+    <skip />
+    <string name="filter" msgid="2018011724373033887">"Kichujio"</string>
+    <string name="filter_dlg_title" msgid="6507663329723966854">"Chagua chaguo za kichujio"</string>
+    <string name="filter_apps_all" msgid="5142129378749391876">"Zote"</string>
+    <string name="filter_apps_third_party" msgid="7786348047690140979">"Iliyopakuliwa"</string>
+    <string name="filter_apps_running" msgid="7767071454371350486">"Inaendesha"</string>
+    <!-- outdated translation 1477351142334784771 -->     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Kwenye kadi ya SD"</string>
+    <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Kwenye kadi ya SD"</string>
+    <string name="disabled" msgid="9206776641295849915">"Imelemazwa"</string>
+    <string name="no_applications" msgid="5190227407135243904">"Hakuna programu"</string>
+    <!-- no translation found for internal_storage (1584700623164275282) -->
+    <skip />
+    <!-- no translation found for sd_card_storage (2673203150465132465) -->
+    <skip />
+    <!-- no translation found for sd_card_storage (7623513618171928235) -->
+    <skip />
+    <!-- no translation found for recompute_size (7722567982831691718) -->
+    <skip />
+    <!-- no translation found for clear_data_dlg_title (4470209520936375508) -->
+    <skip />
+    <string name="clear_data_dlg_text" msgid="8368035073300828451">"Data hizo zote za programu zitafutwa kabisa. Hii inajumuisha faili zote, mipangilio, akaunti, hifadhidata na kuendelea."</string>
+    <!-- no translation found for dlg_ok (2402639055725653590) -->
+    <skip />
+    <!-- no translation found for dlg_cancel (1674753358972975911) -->
+    <skip />
+    <!-- no translation found for app_not_found_dlg_title (8458335716378083713) -->
+    <skip />
+    <string name="app_not_found_dlg_text" msgid="2980271680333341554">"Programu haikupatikana katika orodha ya programu za kompyuta zilizosakinishwa."</string>
+    <!-- no translation found for clear_data_failed (581956197586913865) -->
+    <skip />
+    <string name="app_factory_reset_dlg_title" msgid="6116199391150388147">"Ondoa visasisho"</string>
+    <string name="app_factory_reset_dlg_text" msgid="438395129140568893">"Unataka kuondoa visasisho vyote vya programu ya mfumo wa Android?"</string>
+    <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Futa data"</string>
+    <string name="clear_failed_dlg_text" msgid="7943411157007320290">"Imeshindwa kufuta data ya programu"</string>
+    <!-- outdated translation 3116027624526915561 -->     <string name="security_settings_desc" product="tablet" msgid="6158636779728455276">"Programu hii ya kompyuta inaweza kufikia ifuatayo kwenye simu yako:"</string>
+    <string name="security_settings_desc" product="default" msgid="3116027624526915561">"Programu hii ya kompyuta inaweza kufikia ifuatayo kwenye simu yako:"</string>
+    <string name="computing_size" msgid="1599186977475211186">"Inahesabu..."</string>
+    <string name="invalid_size_value" msgid="1901940003700269523">"Haiwezi kuhesabu ukubwa wa furushi"</string>
+    <string name="empty_list_msg" msgid="2901049162265094971">"huna programu zingine za wahusika wengine zilizosakinishwa."</string>
+    <string name="version_text" msgid="9189073826278676425">"Toleo <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
+    <string name="move_app" msgid="5042838441401731346">"Songa"</string>
+    <!-- outdated translation 3895430471913858185 -->     <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Sogeza kwa simu"</string>
+    <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Sogeza kwa simu"</string>
+    <!-- outdated translation 1143379049903056407 -->     <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Sogeza hadi kwa kadi ya SD"</string>
+    <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Sogeza hadi kwa kadi ya SD"</string>
+    <string name="moving" msgid="6431016143218876491">"Inaondoa"</string>
+    <string name="insufficient_storage" msgid="8566913062094452962">"Kunayo hifadhi ya kutosha iliyobakishwa."</string>
+    <string name="does_not_exist" msgid="837163572898468245">"Programu halipo."</string>
+    <string name="app_forward_locked" msgid="5747805144210389585">"Nakala ya programu limelindwa."</string>
+    <string name="invalid_location" msgid="4934491353200240499">"Eneo bainishwa la kusakinisha sio halali."</string>
+    <string name="system_package" msgid="1030561474413022831">"Sasisho za mfumo haziwezi kusakinisha kwa midia ya nje."</string>
+    <string name="force_stop_dlg_title" msgid="4289453224368188476">"Lazimisha kukoma"</string>
+    <string name="force_stop_dlg_text" msgid="5157374701213502922">"Lazimisha ukomeshaji wa programu unaweza kusababisha isikose maadili. Je, una uhakika?"</string>
+    <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Sogeza programu"</string>
+    <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Imeshindwa kusogeza programu <xliff:g id="REASON">%1$s</xliff:g>"</string>
+    <string name="app_install_location_title" msgid="2068975150026852168">"Eneo sakinishwa pendekezwa"</string>
+    <string name="app_install_location_summary" msgid="879753854530300436">"Badilisha usakinishaji wa eneo la unaopendekezwa ya programu mpya."</string>
+    <string name="storageuse_settings_title" msgid="5657014373502630403">"Matumizi ya hifadhi"</string>
+    <string name="storageuse_settings_summary" msgid="2556057379120846792">"Muonekano wa hifadhi uliotumika kwa programu"</string>
+    <string name="runningservices_settings_title" msgid="8097287939865165213">"Huduma zinazoendeshwa"</string>
+    <string name="runningservices_settings_summary" msgid="854608995821032748">"Onyesha na dhibiti huduma zinazoendeshwa kwa sasa"</string>
+    <string name="service_restarting" msgid="2242747937372354306">"Inawasha upya"</string>
+    <!-- no translation found for cached (1059590879740175019) -->
+    <skip />
+    <string name="no_running_services" msgid="2059536495597645347">"Hakuna uendeshaji."</string>
+    <string name="service_started_by_app" msgid="6575184738671598131">"Ilianzishwa kwa programu"</string>
+    <!-- no translation found for service_client_name (4037193625611815517) -->
+    <skip />
+    <!-- no translation found for service_background_processes (6844156253576174488) -->
+    <skip />
+    <!-- no translation found for service_foreground_processes (7583975676795574276) -->
+    <skip />
+    <!-- no translation found for memory (6609961111091483458) -->
+    <skip />
+    <!-- no translation found for service_process_name (4098932168654826656) -->
+    <skip />
+    <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> shughulika na <xliff:g id="NUMSERVICES">%2$d</xliff:g> huduma"</string>
+    <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> shughulika na <xliff:g id="NUMSERVICES">%2$d</xliff:g> huduma"</string>
+    <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> shughulikia na <xliff:g id="NUMSERVICES">%2$d</xliff:g> huduma"</string>
+    <string name="running_processes_item_description_p_p" msgid="1607384595790852782">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> shughulika na <xliff:g id="NUMSERVICES">%2$d</xliff:g> huduma"</string>
+    <string name="runningservicedetails_settings_title" msgid="6188692418986988288">"Inaendesha programu"</string>
+    <string name="no_services" msgid="7133900764462288263">"Sio amilifu"</string>
+    <string name="runningservicedetails_services_title" msgid="391168243725357375">"Huduma"</string>
+    <string name="runningservicedetails_processes_title" msgid="928115582044655268">"Shughuli"</string>
+    <string name="service_stop" msgid="6369807553277527248">"Acha"</string>
+    <string name="service_manage" msgid="1876642087421959194">"Mipangilio"</string>
+    <string name="service_stop_description" msgid="3261798282116866961">"Huduma hii ilianizishwa kwa programu yake. kuisimamisha kunaweza kusababisha programu kushindwa."</string>
+    <string name="heavy_weight_stop_description" msgid="6855241582643136019">"Programu hii haiwezi kukomeshwa kwa usalama. Kwa kufanya hivyo sasa inaweza kupoteza baadhi ya kazi yako ya sasa."</string>
+    <!-- no translation found for background_process_stop_description (1728354083304746737) -->
+    <skip />
+    <string name="service_manage_description" msgid="7050092269951613102">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g> Inatumika kwa sasa. Gusa Mipangilio kwa kuidhibiti."</string>
+    <string name="main_running_process_description" msgid="929204645380391397">"Shughuli kuu ambayo inatumika."</string>
+    <string name="process_service_in_use_description" msgid="8993335064403217080">"Huduma inatumika <xliff:g id="COMP_NAME">%1$s</xliff:g>"</string>
+    <string name="process_provider_in_use_description" msgid="5586603325677678940">"Mtoaji huduma <xliff:g id="COMP_NAME">%1$s</xliff:g> anatumika"</string>
+    <!-- no translation found for runningservicedetails_stop_dlg_title (4253292537154337233) -->
+    <skip />
+    <!-- no translation found for runningservicedetails_stop_dlg_text (5420033091144016389) -->
+    <skip />
+    <!-- no translation found for runningservicedetails_stop_dlg_text (6929716497425738387) -->
+    <skip />
+    <!-- outdated translation 502219872342167227 -->     <string name="language_settings" msgid="5292716747264442359">"Lugha &amp; kibodi"</string>
+    <!-- outdated translation 3455826933385341107 -->     <string name="language_keyboard_settings_title" msgid="243220021717425813">"Lugha &amp; mipangilio ya kibodi"</string>
+    <string name="language_settings_category" msgid="2288258489940617043">"Mipangilio ya lugha"</string>
+    <string name="keyboard_settings_category" msgid="7060453865544070642">"Mipangilio ya baobonye"</string>
+    <!-- outdated translation 2138384312336494991 -->     <string name="phone_language" msgid="1165758957501090679">"Chagua mahali"</string>
+    <string name="phone_language_summary" msgid="3871309445655554211"></string>
+    <!-- no translation found for auto_replace (6199184757891937822) -->
+    <skip />
+    <!-- no translation found for auto_replace_summary (370288728200084466) -->
+    <skip />
+    <!-- no translation found for auto_caps (6379232078052591265) -->
+    <skip />
+    <!-- no translation found for auto_caps_summary (6358102538315261466) -->
+    <skip />
+    <!-- no translation found for auto_punctuate (4595367243950425833) -->
+    <skip />
+    <string name="hardkeyboard_category" msgid="5957168411305769899">"Mipangilio ya kibodi halisi"</string>
+    <!-- no translation found for auto_punctuate_summary (4372126865670574837) -->
+    <skip />
+    <!-- no translation found for show_password (2198798062604049206) -->
+    <skip />
+    <!-- no translation found for show_password_summary (3806709974395178121) -->
+    <skip />
+    <string name="ime_security_warning" msgid="812267421486877917">"Mbinu hii ya kuingiza huenda ikaweza kukusanya maandishi yote unayoandika, pamoja na data ya kibinafsi kama vile manenosiri na nambari za kadi ya mkopo.  Inatoka kwa programu <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Tumia mbinu hii ya uingizaji?"</string>
+    <!-- no translation found for pointer_settings_category (6090176550039035130) -->
+    <skip />
+    <!-- no translation found for pointer_speed (1221342330217861616) -->
+    <skip />
+    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Kamusi ya mtumiaji"</string>
+    <!-- no translation found for user_dict_single_settings_title (5454855286173849284) -->
+    <skip />
+    <!-- no translation found for user_dict_multiple_settings_title (326583195525296750) -->
+    <skip />
+    <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
+    <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Ongeza"</string>
+    <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Ongeza kwenye kamusi"</string>
+    <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Hariri Neno"</string>
+    <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Hariri"</string>
+    <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Futa"</string>
+    <!-- outdated translation 6209268025109242806 -->     <string name="user_dict_settings_empty_text" product="tablet" msgid="1766522102636921529">"Huna maneno yoyote katika kamusi ya mtumiaji. Unaweza kuongeza neno kupitia menyu."</string>
+    <string name="user_dict_settings_empty_text" product="default" msgid="6209268025109242806">"Huna maneno yoyote katika kamusi ya mtumiaji. Unaweza kuongeza neno kupitia menyu."</string>
+    <!-- no translation found for user_dict_settings_all_languages (7713910347678213719) -->
+    <skip />
+    <!-- no translation found for testing (6584352735303604146) -->
+    <skip />
+    <!-- no translation found for testing_phone_info (193561832258534798) -->
+    <skip />
+    <!-- no translation found for testing_phone_info (8656693364332840056) -->
+    <skip />
+    <!-- no translation found for testing_battery_info (3497865525976497848) -->
+    <skip />
+    <!-- no translation found for quick_launch_title (7904609846945905306) -->
+    <skip />
+    <!-- no translation found for quick_launch_summary (3453825712466417452) -->
+    <skip />
+    <!-- no translation found for quick_launch_assign_application (4521368464929956350) -->
+    <skip />
+    <!-- no translation found for quick_launch_no_shortcut (5998005833838278693) -->
+    <skip />
+    <!-- no translation found for quick_launch_shortcut (5090405067413522300) -->
+    <skip />
+    <!-- no translation found for quick_launch_clear_dialog_title (5546543501250320220) -->
+    <skip />
+    <!-- no translation found for quick_launch_clear_dialog_message (3921015601470260722) -->
+    <skip />
+    <!-- no translation found for quick_launch_clear_ok_button (2634568926597586716) -->
+    <skip />
+    <!-- no translation found for quick_launch_clear_cancel_button (1892854652197747064) -->
+    <skip />
+    <!-- no translation found for quick_launch_display_mode_applications (3748789806447639039) -->
+    <skip />
+    <!-- no translation found for quick_launch_display_mode_shortcuts (4177934019174169042) -->
+    <skip />
+    <string name="input_methods_settings_title" msgid="6800066636850553887">"Uingizaji maandishi"</string>
+    <string name="input_method" msgid="5434026103176856164">"Mbinu ya uingizaji"</string>
+    <!-- no translation found for current_input_method (2146807723398303917) -->
+    <skip />
+    <!-- no translation found for input_method_selector (4311213129681430709) -->
+    <skip />
+    <!-- no translation found for input_method_selector_show_automatically_title (1001612945471546158) -->
+    <skip />
+    <!-- no translation found for input_method_selector_always_show_title (3891824124222371634) -->
+    <skip />
+    <!-- no translation found for input_method_selector_always_hide_title (7699647095118680424) -->
+    <skip />
+    <!-- no translation found for configure_input_method (7773992829158322455) -->
+    <skip />
+    <!-- no translation found for input_method_settings (5801295625486269553) -->
+    <skip />
+    <!-- no translation found for active_input_method_subtypes (3596398805424733238) -->
+    <skip />
+    <!-- no translation found for use_system_language_to_select_input_method_subtypes (3346751753141428573) -->
+    <skip />
+    <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Mipangilio ya <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
+    <!-- no translation found for input_methods_and_subtype_enabler_title (4018402267502337338) -->
+    <skip />
+    <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Mipangilio ya kibodi kwenye skrini"</string>
+    <!-- outdated translation 5274990495405941804 -->     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Baobonye iliyowekwa ndani"</string>
+    <!-- outdated translation 7990296351888096836 -->     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Baobonye iliyoundwa kwa ndani, mipangilio ya baobonye ya mkono"</string>
+    <!-- no translation found for development_settings_title (6719732334835420989) -->
+    <skip />
+    <string name="development_settings_summary" msgid="2151320488701538355">"Weka chaguo za utengenezaji programu"</string>
+    <!-- no translation found for enable_adb (7982306934419797485) -->
+    <skip />
+    <!-- no translation found for enable_adb_summary (4881186971746056635) -->
+    <skip />
+    <!-- no translation found for keep_screen_on (1146389631208760344) -->
+    <skip />
+    <!-- no translation found for keep_screen_on_summary (2173114350754293009) -->
+    <skip />
+    <string name="allow_mock_location" msgid="2787962564578664888">"Ruhusu maeneo ya jaribio"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Ruhusu maeneo ya majaribio"</string>
+    <string name="adb_warning_title" msgid="6234463310896563253">"Ruhusu utatuaji USB?"</string>
+    <string name="adb_warning_message" msgid="5352555112049663033">"Utatuaji USB umekusudiwa kwa malengo ya utengenezaji tu. Inaweza kutumiwa kunakili data kati ya kompyuta yako na kifaa chako, kuweka programu kwenye kifaa chako bila notisi, na kusoma data ya kumbukumbu."</string>
+    <string name="gadget_picker_title" msgid="98374951396755811">"Chagua kidude"</string>
+    <string name="widget_picker_title" msgid="9130684134213467557">"Chagua wijeti"</string>
+    <string name="battery_history_days" msgid="7110262897769622564">"s<xliff:g id="DAYS">%1$d</xliff:g> s<xliff:g id="HOURS">%2$d</xliff:g> d<xliff:g id="MINUTES">%3$d</xliff:g> s<xliff:g id="SECONDS">%4$d</xliff:g>"</string>
+    <string name="battery_history_hours" msgid="7525170329826274999">"s<xliff:g id="HOURS">%1$d</xliff:g> d<xliff:g id="MINUTES">%2$d</xliff:g> s<xliff:g id="SECONDS">%3$d</xliff:g>"</string>
+    <string name="battery_history_minutes" msgid="1467775596084148610">"d <xliff:g id="MINUTES">%1$d</xliff:g> s <xliff:g id="SECONDS">%2$d</xliff:g>"</string>
+    <string name="battery_history_seconds" msgid="4283492130945761685">"s<xliff:g id="SECONDS">%1$d</xliff:g>"</string>
+    <string name="usage_stats_label" msgid="5890846333487083609">"Takwimu za utumiaji"</string>
+    <string name="testing_usage_stats" msgid="7823048598893937339">"Takwimu za utumiaji"</string>
+    <string name="display_order_text" msgid="8592776965827565271">"Panga kwa:"</string>
+    <string name="app_name_label" msgid="2000949925256858308">"programu"</string>
+    <string name="launch_count_label" msgid="4019444833263957024">"Hesabu"</string>
+    <string name="usage_time_label" msgid="295954901452833058">"Muda wa utumiaji"</string>
+    <string name="accessibility_settings" msgid="3975902491934816215">"Ufikiaji"</string>
+    <string name="accessibility_settings_title" msgid="2130492524656204459">"Mipangilio ya ufikiaji"</string>
+    <string name="accessibility_settings_summary" msgid="8185181964847149507">"Simamia chaguo za ufikiaji"</string>
+    <string name="toggle_accessibility_title" msgid="650839277066574497">"Ufikiaji"</string>
+    <string name="accessibility_services_category" msgid="8127851026323672607">"Huduma za ufikiaji"</string>
+    <string name="no_accessibility_services_summary" msgid="694578333333808159">"Hakuna huduma zilizosakinishwa za ufikiaji."</string>
+    <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Huduma hii ya ufikiaji huenda ikaweza kukusanya maandishi yote uliyoyaandika, pamoja na nambari za data za kibinafsi za kadi ya mkopo isipokuwa manenosiri. Huenda pia ikakumbuka maingiliano yako ya mtumiaji ya kiolesura. Huja kutoka kwa programu <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Tumia huduma hii ya ufikiaji?"</string>
+    <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Lemaza ufikiaji?"</string>
+    <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"Hakuna ufikivu unaohusiana na programu iliyopatikana"</string>
+    <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"Hauna ufikivu wowote unaohusiana na programu zilizosakinishwa."\n\n"Unaweza kupakua kisomaji cha skrini kwa kifaa chako kutoka Soko la Android."\n\n"Bofya Sawa kwa kusakinisha kisomaji cha skrini."</string>
+    <string name="accessibility_script_injection_category" msgid="8649951751131431904">"Ufikivu wa nakala"</string>
+    <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"Pakua ufikivu wa maandishi"</string>
+    <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"Ruhusu programu kupakua ufikivu wa nakala kutoka Google"</string>
+    <!-- outdated translation 9078893361741942109 -->     <string name="accessibility_script_injection_security_warning" product="tablet" msgid="1113600871264359828">"Baadhi ya programu iweze kuuliza Google kupakua nakala kwa simu yako ambayo inafanya maudhui kufikiwa zaidi. Unahakika unataka kuruhusu Google kusakinisha ufikivu wa nakala kwenye simu yako?"</string>
+    <string name="accessibility_script_injection_security_warning" product="default" msgid="9078893361741942109">"Baadhi ya programu iweze kuuliza Google kupakua nakala kwa simu yako ambayo inafanya maudhui kufikiwa zaidi. Unahakika unataka kuruhusu Google kusakinisha ufikivu wa nakala kwenye simu yako?"</string>
+    <string name="accessibility_power_button_category" msgid="8545885236482339928">"kitufe cha nguvu ya wezesha"</string>
+    <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"kitufe cha nguvu kinamaliza upigaji simu"</string>
+    <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"Wakati wa upigaji simu, obonyezaji wa Nguvu unamaliza simu badala ya kuwezesha skrini"</string>
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <skip />
+    <!-- no translation found for touchscreen_gestures_category (3109869155350859625) -->
+    <skip />
+    <!-- no translation found for long_press_timeout_selector_title (1396876537252863044) -->
+    <skip />
+    <!-- no translation found for long_press_timeout_selector_summary (2261114502740278996) -->
+    <skip />
+    <string name="power_usage_summary_title" msgid="5180282911164282324">"Utumiaji wa betri"</string>
+    <string name="power_usage_summary" msgid="7237084831082848168">"Ni nini kimekuwa kikitumia betri"</string>
+    <!-- no translation found for power_usage_not_available (3583407442633768046) -->
+    <skip />
+    <string name="battery_since_unplugged" msgid="338073389740738437">"Utumizi wa betri tangu kuchopolewa"</string>
+    <string name="battery_since_reset" msgid="7464546661121187045">"Utumiaji wa betri tangu iliposetiwa upya"</string>
+    <string name="battery_stats_on_battery" msgid="4970762168505236033">"Kwenye betri <xliff:g id="TIME">%1$s</xliff:g>"</string>
+    <string name="battery_stats_duration" msgid="7464501326709469282">"<xliff:g id="TIME">%1$s</xliff:g> tangu ilipoondolewa"</string>
+    <string name="battery_stats_charging_label" msgid="4223311142875178785">"Inachaji"</string>
+    <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Skrini imewezeshwa"</string>
+    <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS kwa"</string>
+    <!-- no translation found for battery_stats_wifi_running_label (3093545080361658269) -->
+    <skip />
+    <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Amka"</string>
+    <!-- outdated translation 6822042940376636775 -->     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Ishara ya simu"</string>
+    <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
+    <skip />
+    <string name="awake" msgid="387122265874485088">"Muda wa kuamka kwa kifaa"</string>
+    <!-- outdated translation 4630925382578609056 -->     <string name="wifi_on_time" msgid="6310209835617490616">"WiFi kwa wakati unaofaa"</string>
+    <!-- outdated translation 4478515071957280711 -->     <string name="bluetooth_on_time" msgid="6157799524996162271">"WiFi kwa wakati unaofaa"</string>
+    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
+    <!-- no translation found for history_details_title (3608240585315506067) -->
+    <skip />
+    <!-- outdated translation 7564809986329021063 -->     <string name="details_title" msgid="3792801565213935385">"Maelezo ya utumiaji betri"</string>
+    <string name="details_subtitle" msgid="32593908269911734">"Tumia maelezo"</string>
+    <string name="controls_subtitle" msgid="390468421138288702">"Rekebisha utumiaji wa nishati"</string>
+    <string name="packages_subtitle" msgid="4736416171658062768">"Furushi zilizojumuishwa"</string>
+    <!-- outdated translation 2353149143338929583 -->     <string name="power_screen" msgid="3023346080675904613">"Onyesha"</string>
+    <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
+    <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
+    <string name="power_cell" msgid="6596471490976003056">"Hali-tumizi ya seli"</string>
+    <string name="power_phone" msgid="5392641106474567277">"Simu za sauti"</string>
+    <!-- outdated translation 9055659695602194990 -->     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Simu haitumiki"</string>
+    <string name="power_idle" product="default" msgid="9055659695602194990">"Simu haitumiki"</string>
+    <string name="usage_type_cpu" msgid="715162150698338714">"CPU kwa jumla"</string>
+    <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Mandharimbele ya CPU"</string>
+    <string name="usage_type_wake_lock" msgid="5125438890233677880">"Weka chonjo"</string>
+    <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
+    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Inaendesha Wi-Fi"</string>
+    <!-- outdated translation 9108247984998041853 -->     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Simu"</string>
+    <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Simu"</string>
+    <string name="usage_type_data_send" msgid="2857401966985425427">"Data imetumwa"</string>
+    <string name="usage_type_data_recv" msgid="7251090882025234185">"Data iliyopokewa"</string>
+    <string name="usage_type_audio" msgid="6957269406840886290">"Kusikika"</string>
+    <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
+    <string name="usage_type_on_time" msgid="3351200096173733159">"Washa saa"</string>
+    <string name="usage_type_no_coverage" msgid="3797004252954385053">"Muda bila mawimbi"</string>
+    <string name="battery_action_stop" msgid="649958863744041872">"Lazimisha komesha"</string>
+    <string name="battery_action_app_details" msgid="3275013531871113681">"Maelezo ya programu"</string>
+    <string name="battery_action_app_settings" msgid="350562653472577250">"Mipangilio ya programu"</string>
+    <!-- outdated translation 5302763261448580102 -->     <string name="battery_action_display" msgid="7338551244519110831">"Onyesha mipangilio"</string>
+    <!-- outdated translation 5452076674659927993 -->     <string name="battery_action_wifi" msgid="2272741639606146903">"Mipangilio ya Wi-Fi"</string>
+    <string name="battery_action_bluetooth" msgid="8374789049507723142">"Mipangilio ya Bluetooth"</string>
+    <string name="battery_desc_voice" msgid="8980322055722959211">"Betri iliyotumiwa na simu za sauti"</string>
+    <!-- outdated translation 3009080001948091424 -->     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Betri imetumiwa wakati simu haitumiki"</string>
+    <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Betri imetumiwa wakati simu haitumiki"</string>
+    <string name="battery_desc_radio" msgid="5479196477223185367">"Betri inayotumiwa na redio ya seli"</string>
+    <string name="battery_sugg_radio" msgid="8211336978326295047">"Badili kwa gumzo ya ndege na okoa nishati katika maeneo ambayo hakuna mtandao wa simu ya mkononi"</string>
+    <string name="battery_desc_display" msgid="5432795282958076557">"Betri uliyotumiwa na kizinza na taa ya nyuma"</string>
+    <string name="battery_sugg_display" msgid="3370202402045141760">"Punguza mwangaza wa skrini na/au muda wa kuisha wa skrini"</string>
+    <string name="battery_desc_wifi" msgid="1702486494565080431">"Betri imetumiwa na Wi-Fi"</string>
+    <string name="battery_sugg_wifi" msgid="7542345142282261691">"Zima Wi-Fi wakati hauitumii au mahali ambapo haipatikani"</string>
+    <string name="battery_desc_bluetooth" msgid="7535520658674621902">"Betri iloyotumiwa na bluetooth"</string>
+    <string name="battery_sugg_bluetooth_basic" msgid="817276933922157788">"Zima bluetooth wakati hauitumii"</string>
+    <string name="battery_sugg_bluetooth_headset" msgid="8214816222115517479">"Jaribu kuunganisha kwa kifaa tofauti cha bluetooth"</string>
+    <string name="battery_desc_apps" msgid="6665712811746233450">"Betri iliyotumiwa kwa programu"</string>
+    <string name="battery_sugg_apps_info" msgid="6065882899391322442">"Komesha au sanidua programu"</string>
+    <string name="battery_sugg_apps_gps" msgid="4545056413090932541">"Dhibiti kwa mkono GPS kwa kuzuia programu kutokana na kuitumia"</string>
+    <string name="battery_sugg_apps_settings" msgid="8021302847272481168">"Huenda programu ikatoa mipangilio ya kupunguza utumiaji wa betri"</string>
+    <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> tangu ilipoondolewa"</string>
+    <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Ilipochopolewa mara ya mwisho kwa <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
+    <string name="menu_stats_total" msgid="8973377864854807854">"Jumla ya utumiaji"</string>
+    <string name="menu_stats_refresh" msgid="1676215433344981075">"Onyesha upya"</string>
+    <string name="process_kernel_label" msgid="3916858646836739323">"OS ya Android"</string>
+    <string name="process_mediaserver_label" msgid="6500382062945689285">"Seva ya media"</string>
+    <string name="voice_input_output_settings" msgid="1336135218350444783">"Kiingizaji cha sauti &amp; kutoa nje"</string>
+    <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Kiingizaji cha sauti &amp; mipangilio ya kutoa nje"</string>
+    <string name="voice_search_settings_title" msgid="2775469246913196536">"Tafuta sauti"</string>
+    <string name="keyboard_settings_title" msgid="5080115226780201234">"Baobonye la Android"</string>
+    <string name="voice_input_category" msgid="1589318440824204736">"Ingizo la sauti"</string>
+    <string name="voice_output_category" msgid="2624538587784986229">"Uingizaji wa Sauti"</string>
+    <string name="recognizer_title" msgid="3231385184559054457">"Kitambulizi cha sauti"</string>
+    <string name="recognizer_settings_title" msgid="6038598099039717232">"Mipangilio ya utambuzi wa sauti"</string>
+    <string name="recognizer_settings_summary" msgid="4472287934134546902">"Mipangilio ya\"<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\""</string>
+    <string name="tts_settings" msgid="8186971894801348327">"Mipangilio ya maandishi kwa hotuba"</string>
+    <string name="tts_settings_title" msgid="4182348653053000933">"Mipangilio ya maandishi hadi usemaji"</string>
+    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Tumia mipangilio yangu kila wakati"</string>
+    <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"Mipangilio ya chaguo-msingi hapa chini inafuta mipangilio ya programu"</string>
+    <string name="tts_default_settings_section" msgid="5787915620218907443">"Mipangilio ya chaguo-msingi"</string>
+    <string name="tts_default_synth_title" msgid="29467896463371992">"Injini Chaguo-msingi"</string>
+    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Inaweka injini ya hotumba ya mwondoko kwa kutumiwa na maandishi yaliyotamkwa"</string>
+    <string name="tts_default_rate_title" msgid="6030550998379310088">"Kiwango cha usemaji"</string>
+    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Kasi ya kutamkwa kwa maandishi"</string>
+    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Giza"</string>
+    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Huadhiri hali ya maandishi yaliyosemwa"</string>
+    <string name="tts_default_lang_title" msgid="8018087612299820556">"Lugha"</string>
+    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Huweka sauti maalum ya lugha kwa maandishi yanayozungumzwa"</string>
+    <string name="tts_play_example_title" msgid="7094780383253097230">"Sikiliza mfano"</string>
+    <string name="tts_play_example_summary" msgid="8029071615047894486">"Cheza onyesho fupi la usanisi usemaji"</string>
+    <string name="tts_install_data_title" msgid="4264378440508149986">"Sakinisha data ya sauti"</string>
+    <string name="tts_install_data_summary" msgid="5742135732511822589">"Sakinisha data ya sauti inayohitajika kwa usanidi usemaji"</string>
+    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Sauti zinazohitajika kwa usanisi wa usemaji tayari zimesakinishwa vizuri"</string>
+    <string name="tts_demo" msgid="405357591189935876">"Huu ni mfano wa usanisi usemaji."</string>
+    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Mipangilio yako imebadilika. Huu ni mfano wa jinsi inavyosikika."</string>
+    <string name="tts_engine_error" msgid="5513288178403066867">"Injini ulioichagua haiwezi kuendesha"</string>
+    <string name="tts_engine_error_config" msgid="5820525416624637313">"Sanidi"</string>
+    <string name="tts_engine_error_reselect" msgid="3071453963296013376">"Chagua injini nyingine"</string>
+    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Hotuba hii inawezesha injini huenda ikaweza kukusanya maandishi ambayo yatazungumziwa, ikijumlisha data ya kibinafsi ya nenosiri na namba ya kaddi ya mkopo. Inatoka kwa injini ya <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> Wezesha matumizi ya hotuba hii iliyowezeshwa ya injini?"</string>
+    <string name="tts_engines_section" msgid="7515470972378742429">"Injini"</string>
+    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> mipangilio"</string>
+    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> imewezeshwa"</string>
+    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"Imelemazwa <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
+    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Lugha na sauti"</string>
+    <string name="pico_installed" msgid="2452546687858267414">"Imesakinishwa"</string>
+    <string name="pico_not_installed" msgid="6266845418419994311">"Haija sakinishwa"</string>
+    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Mwanamke"</string>
+    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Mwanamume"</string>
+    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Hotuba kiwezeshi cha injini imesakinishwa"</string>
+    <string name="tts_notif_engine_install_message" msgid="5304661142202662693">"Wezesha injini mpya kabla ya kutumia"</string>
+    <string name="gadget_title" msgid="7455548605888590466">"Kidhibiti Nishati"</string>
+    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Inasasisha mpangilio wa Wi-Fi"</string>
+    <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Inasasisha mpangilio wa Bluetooth"</string>
+    <string name="vpn_settings_activity_title" msgid="7276864950701612579">"Mipangilio ya VPN"</string>
+    <string name="vpn_connect_to" msgid="2541409082892684362">"Unganisha kwa <xliff:g id="NAME">%s</xliff:g>"</string>
+    <string name="vpn_username_colon" msgid="7854930370861306247">"Jina la mtumiaji:"</string>
+    <string name="vpn_password_colon" msgid="5716278710848606626">"Nenosiri:"</string>
+    <string name="vpn_a_username" msgid="6664733641993968692">"jina la mtumiaji"</string>
+    <string name="vpn_a_password" msgid="1537213632501483753">"nenosiri"</string>
+    <string name="vpn_save_username" msgid="1408415289165970790">"Kumbuka jina la mtumiaji"</string>
+    <string name="vpn_connect_button" msgid="1699007212602470655">"Unganisha"</string>
+    <string name="vpn_yes_button" msgid="8034531001149843119">"Ndiyo"</string>
+    <string name="vpn_no_button" msgid="7620339571187119107">"Hapana"</string>
+    <string name="vpn_back_button" msgid="192036339792734970">"Nyuma"</string>
+    <string name="vpn_mistake_button" msgid="1683383660912491270">"Hapana"</string>
+    <string name="vpn_menu_done" msgid="93528279226907926">"Hifadhi"</string>
+    <string name="vpn_menu_cancel" msgid="7234451214611202868">"Ghairi"</string>
+    <string name="vpn_menu_revert" msgid="4407762442281467659">"Rudi"</string>
+    <string name="vpn_menu_connect" msgid="1089399414463784218">"Unganisha kwa mtandao"</string>
+    <string name="vpn_menu_disconnect" msgid="8254492450022562235">"Tenganisha kutoka kwa mtandao"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"Hariri mtandao"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"Futa mtandao"</string>
+    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"Lazima uingize <xliff:g id="CODE">%s</xliff:g>."</string>
+    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"Lazima uchague <xliff:g id="OPTION">%s</xliff:g>."</string>
+    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"Jina la VPN la \'<xliff:g id="NAME">%s</xliff:g>\' tayari lipo. Tafuta jina lingine."</string>
+    <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"Je, una uhakika kuwa unataka kufuta VPN hii?"</string>
+    <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"Una uhakika unataka kuunda maelezo haya mafupi?"</string>
+    <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"Una uhakika unataka kutupa mabadiliko yaliyofanywa kwenye maelezo haya mafupi?"</string>
+    <string name="vpn_confirm_reconnect" msgid="5748535476278674296">"Haiwezi kuunganisha kwenye mtandao. Unataka kujaribu tena?"</string>
+    <string name="vpn_reconnect_from_lost" msgid="2442844155623372118">"Muunganisho umepotea. Unataka kuunganisha tena?"</string>
+    <string name="vpn_unknown_server_dialog_msg" msgid="3080742299823671319">"Jina la seva haliwezi kutatuliwa. Unataka kukagua mpangilio wa jina la seva yako?"</string>
+    <string name="vpn_challenge_error_dialog_msg" msgid="6174901754230038601">"Hitilafu ya changamoto. Unataka kukagua mpangilio wako wa siri?"</string>
+    <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"Siri moja au zaidi zinazokesana katika usanidi wa VPN. Unataka kukagua mpangilio wako wa siri?"</string>
+    <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"Jina la mtumiaji au nenosiri uliloingiza sio sahihi. Unataka kujaribu tena?"</string>
+    <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"Seva imekwama. Jina la mtumiaji au nenosiri uliloingiza huenda lisiwe sahihi. Unataka kujaribu tena?"</string>
+    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"Seva imekwama. Kuna uwezekano kwamba uko nyuma ya ngome ambayo inakuzuia dhidi ya kuunganisha kwa seva. Unataka kujaribu tena?"</string>
+    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"Majadiliano ya seva yameshindwa. Huenda seva isikubaliane na chaguo la usimbaji fiche. Unataka kukagua mpangilio wako wa usimbaji fiche?"</string>
+    <string name="vpn_type_title" msgid="6392933604218676224">"Ongeza VPN"</string>
+    <string name="vpn_add_new_vpn" msgid="5438260689052714550">"Ongeza VPN"</string>
+    <!-- no translation found for vpn_details_title (418806440938510331) -->
+    <skip />
+    <string name="vpn_edit_title_add" msgid="2121313217989682890">"Ongeza VPN ya<xliff:g id="NAME">%s</xliff:g>"</string>
+    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"Maelezo ya <xliff:g id="NAME">%s</xliff:g>"</string>
+    <string name="vpns" msgid="3148141862835492816">"VPN"</string>
+    <string name="vpn_connecting" msgid="8039521381692090116">"Inaunganisha..."</string>
+    <string name="vpn_disconnecting" msgid="7748050200708257066">"Inatenganisha..."</string>
+    <string name="vpn_connected" msgid="7641723116362845781">"Umeunganishwa"</string>
+    <string name="vpn_connect_hint" msgid="7442898962925875181">"Unganisha kwa mtandao"</string>
+    <string name="vpn_name" msgid="1550918148476193076">"Jina la VPN"</string>
+    <string name="vpn_a_name" msgid="8445736942405283509">"Jina la VPN"</string>
+    <string name="vpn_profile_added" msgid="9061017910337129840">"\'<xliff:g id="NAME">%s</xliff:g>\' imeongezwa"</string>
+    <string name="vpn_profile_replaced" msgid="587435576816273815">"Mabadiliko yamefanywa kwa \'<xliff:g id="NAME">%s</xliff:g>\'"</string>
+    <string name="vpn_user_certificate_title" msgid="6812545893924071742">"Weka cheti cha mtumiaji"</string>
+    <string name="vpn_user_certificate" msgid="949322691686938888">"Cheti cha mtumiaji"</string>
+    <string name="vpn_a_user_certificate" msgid="8943983437956898649">"cheti cha mtumiaji"</string>
+    <string name="vpn_ca_certificate_title" msgid="7846466160795589985">"Weka Cheti cha CA"</string>
+    <string name="vpn_ca_certificate" msgid="465085144064264742">"Cheti cha mamlaka ya vyeti (CA)"</string>
+    <string name="vpn_a_ca_certificate" msgid="3374242520974884295">"Cheti cha CA"</string>
+    <string name="vpn_l2tp_secret_string_title" msgid="5039677186748940987">"Weka siri ya L2TP"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"Siri ya L2TP"</string>
+    <string name="vpn_a_l2tp_secret" msgid="6612042930810981845">"Siri ya L2TP"</string>
+    <string name="vpn_pptp_encryption_title" msgid="2236795167467896499">"Usimbaji fiche"</string>
+    <string name="vpn_pptp_encryption" msgid="2602329949737259686">"Usimbaji wa PPTP"</string>
+    <string name="vpn_ipsec_presharedkey_title" msgid="2184060087690539175">"Weka ufunguo ulioshirikiwa mapema wa IPSec"</string>
+    <string name="vpn_ipsec_presharedkey" msgid="5434316521616673741">"Ufunguo wa IPSec ulioshirikiwa mapema"</string>
+    <string name="vpn_a_ipsec_presharedkey" msgid="1255301923217898418">"ufunguo ulioshirikiwa mapema wa IPSec"</string>
+    <string name="vpn_vpn_server_title" msgid="8897005887420358913">"Weka seva ya VPN"</string>
+    <string name="vpn_vpn_server" msgid="1141754908824209260">"Seva ya VPN"</string>
+    <string name="vpn_a_vpn_server" msgid="5960906152125045853">"Seva ya VPN"</string>
+    <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"Jina la seva ya VPN"</string>
+    <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"Vikoa vya utafutaji DNS"</string>
+    <string name="vpn_dns_search_list" msgid="4230034234026605360">"Vikoa vya utafutaji DNS"</string>
+    <string name="vpn_field_is_set" msgid="7137320847812992243">"<xliff:g id="VALUE">%s</xliff:g> imewekwa kwa"</string>
+    <string name="vpn_field_not_set" msgid="2972519243515893804">"<xliff:g id="VALUE">%s</xliff:g> haijawekwa"</string>
+    <string name="vpn_field_not_set_optional" msgid="8840557698252556791">"<xliff:g id="VALUE">%s</xliff:g> haijawekwa (ya hiari)"</string>
+    <string name="vpn_enable_field" msgid="3700967675854517191">"Wezesha <xliff:g id="OPTION">%s</xliff:g>"</string>
+    <string name="vpn_disable_field" msgid="6905658811179634005">"Lemaza <xliff:g id="OPTION">%s</xliff:g>"</string>
+    <string name="vpn_is_enabled" msgid="1266304230417098877">"<xliff:g id="OPTION">%s</xliff:g> imewezeshwa"</string>
+    <string name="vpn_is_disabled" msgid="2013622485867806167">"<xliff:g id="OPTION">%s</xliff:g> imelemazwa"</string>
+    <string name="vpn_settings_title" msgid="7327468307909556719">"Mipangilio ya VPN"</string>
+    <string name="vpn_settings_summary" msgid="8849924181594963972">"Sanidi na udhibiti Mitandao Isiobayana ya Siri (VPN)"</string>
+    <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(haijabadilishwa)"</string>
+    <string name="vpn_secret_not_set" msgid="1037792636371641845">"(haijawekwa)"</string>
+    <!-- no translation found for credentials_title (4446234003860769883) -->
+    <skip />
+    <!-- no translation found for credentials_install (466093273825150847) -->
+    <skip />
+    <!-- no translation found for credentials_install (953914549998062317) -->
+    <skip />
+    <!-- no translation found for credentials_install_summary (4220422806818210676) -->
+    <skip />
+    <!-- no translation found for credentials_install_summary (5737658257407822713) -->
+    <skip />
+    <!-- outdated translation 9170150870552453457 -->     <string name="credentials_reset" msgid="3239382277144980418">"Futa hifadhi"</string>
+    <!-- outdated translation 1530388094693731636 -->     <string name="credentials_reset_summary" msgid="3369361230171260282">"Futa hifadhi ya hati-tambulishi ya maudhui yote na uweke upya nenosiri lake"</string>
+    <string name="credentials_unlock" msgid="1463040326264133844">"Ingiza nenosiri"</string>
+    <!-- outdated translation 594679530407918031 -->     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Ingiza nenosiri la hifadhi ya hati-tambulishi."</string>
+    <string name="credentials_old_password" msgid="7553393815538684028">"Nenosiri la sasa:"</string>
+    <!-- outdated translation 819990295796804516 -->     <string name="credentials_reset_hint" msgid="1566409057833618877">"Una uhakika unataka kufuta hati-tambulishi zote na kuweka upya nenosiri la kuhifadhi hati-tambulishi?"</string>
+    <string name="credentials_password_too_short" msgid="7502749986405522663">"Nenosiri lazima liwe na angalau vibambo 8."</string>
+    <!-- outdated translation 7525192410790152041 -->     <string name="credentials_wrong_password" msgid="2541932597104054807">"Tafadhali ingiza nenosiri sahihi."</string>
+    <!-- outdated translation 6392481296673345268 -->     <string name="credentials_reset_warning" msgid="5320653011511797600">"Tafadhali ingiza nenosiri sahihi. Una jaribio moja zaidi la kujaribu kuingiza nenosiri sahihi kabla ya hifadhi ya hati-tambulishi kufutwa."</string>
+    <!-- no translation found for credentials_reset_warning_plural (6514085665301095279) -->
+    <skip />
+    <!-- outdated translation 7700309135582200849 -->     <string name="credentials_erased" msgid="2907836028586342969">"Hifadhi ya hati-tambulishi imefutwa."</string>
+    <!-- no translation found for credentials_not_erased (397954733557821269) -->
+    <skip />
+    <string name="credentials_enabled" msgid="7588607413349978930">"Hifadhi ya hati-tambulishi imewezeshwa."</string>
+    <!-- no translation found for credentials_configure_lock_screen_hint (6816970208840577219) -->
+    <skip />
+    <string name="emergency_tone_title" msgid="1055954530111587114">"Mlio wa dharura"</string>
+    <string name="emergency_tone_summary" msgid="722259232924572153">"Weka tabia wakati simu ya dharura imepigwa"</string>
+    <string name="privacy_settings" msgid="9206631214140954954">"Faragha"</string>
+    <string name="privacy_settings_title" msgid="1987089301293213705">"Mipangilio ya faragha"</string>
+    <string name="backup_section_title" msgid="8856083167469467588">"Cheleza na kuonyesha upya"</string>
+    <string name="personal_data_section_title" msgid="7815209034443782061">"Data za kibinafsi"</string>
+    <string name="backup_data_title" msgid="1239105919852668016">"Cheleza data yangu"</string>
+    <!-- outdated translation 5662190190240860035 -->     <string name="backup_data_summary" msgid="6515285107793232815">"Cheleza mipangilio yangu na data nyingine ya programu."</string>
+    <!-- no translation found for backup_configure_account_title (3790872965773196615) -->
+    <skip />
+    <!-- no translation found for backup_configure_account_default_summary (2436933224764745553) -->
+    <skip />
+    <string name="auto_restore_title" msgid="5397528966329126506">"Onyesha upya otomatiki"</string>
+    <!-- outdated translation 6867766474057290177 -->     <string name="auto_restore_summary" msgid="83177150536734378">"Ikiwa nitasakinisha upya programu, onyesha upya mipangilio ya chelezo au data nyingine."</string>
+    <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Cheleza"</string>
+    <!-- outdated translation 2948090854996352245 -->     <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Unahakika unataka kukomesha kucheleza mipangilio yako na data ya programu na kufuta nakala kwenye seva za Google?"</string>
+    <string name="device_admin_settings_title" msgid="1335557832906433309">"Mipangilio za usimamizi wa kifaa"</string>
+    <string name="active_device_admin_msg" msgid="6930903262612422111">"Msimamizi wa kifaa"</string>
+    <string name="remove_device_admin" msgid="3596845261596451437">"Lemaza"</string>
+    <string name="select_device_admin_msg" msgid="2645509057946368094">"Wasimamizi wa kifaa"</string>
+    <string name="no_device_admins" msgid="702695100241728775">"Hakuna kifaa kinachopatikana cha msimamizi"</string>
+    <string name="add_device_admin_msg" msgid="6246742476064507965">"Amilisha usimamizi wa kifaa?"</string>
+    <string name="add_device_admin" msgid="7133327675884827091">"Wezesha"</string>
+    <string name="device_admin_add_title" msgid="7705551449705676363">"Msimamizi wa kifaa"</string>
+    <string name="device_admin_warning" msgid="1149471041373876923">"Uamilishaji wa msimamizi utaruhusu programu ya <xliff:g id="APP_NAME">%1$s</xliff:g> kwa kufanya kazi ya uendeshi ufuatao:"</string>
+    <string name="device_admin_status" msgid="7169948053970923035">"Msimamizi huyu ni amilifu na huruhusu programu <xliff:g id="APP_NAME">%1$s</xliff:g> kwa kutenda uendeshi ufuatao:"</string>
+    <string name="untitled_apn" msgid="1230060359198685513">"Hakuna Kichwa"</string>
+    <string name="sound_category_sound_title" msgid="1488759370067953996">"Kawaida"</string>
+    <string name="sound_category_calls_title" msgid="3688531959256239012">"Simu zinazoingia"</string>
+    <string name="sound_category_notification_title" msgid="3502115998790286943">"Arifa"</string>
+    <string name="sound_category_feedback_title" msgid="4399742321363475393">"Maoni"</string>
+    <!-- no translation found for wifi_setup_title (661074868726906436) -->
+    <skip />
+    <!-- no translation found for wifi_setup_title_editing_network (7304321031985059969) -->
+    <skip />
+    <!-- no translation found for wifi_setup_title_connecting_network (2408378435027118687) -->
+    <skip />
+    <!-- no translation found for wifi_setup_title_connected_network (209755856836003839) -->
+    <skip />
+    <!-- no translation found for wifi_setup_title_add_network (6932651000151032301) -->
+    <skip />
+    <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Hujaunganishwa"</string>
+    <string name="wifi_setup_add_network" msgid="5939624680150051807">"Ongeza mtandao"</string>
+    <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Onyesha orodha upya"</string>
+    <string name="wifi_setup_skip" msgid="6661541841684895522">"Ruka"</string>
+    <string name="wifi_setup_next" msgid="3388694784447820477">"Ifuatayo"</string>
+    <!-- no translation found for wifi_setup_back (144777383739164044) -->
+    <skip />
+    <!-- no translation found for wifi_setup_detail (2336990478140503605) -->
+    <skip />
+    <!-- no translation found for wifi_setup_connect (7954456989590237049) -->
+    <skip />
+    <!-- no translation found for wifi_setup_forget (2562847595567347526) -->
+    <skip />
+    <!-- no translation found for wifi_setup_save (3659235094218508211) -->
+    <skip />
+    <!-- no translation found for wifi_setup_cancel (3185216020264410239) -->
+    <skip />
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"Inasafisha mitandao..."</string>
+    <!-- no translation found for wifi_setup_status_select_network (7519563569903137003) -->
+    <skip />
+    <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Unganisha kwa mtandao uliopo"</string>
+    <!-- no translation found for wifi_setup_status_unsecured_network (8143046977328718252) -->
+    <skip />
+    <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"Ingiza usanidi wa mtandao"</string>
+    <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Unganisha kwa mtandao mpya"</string>
+    <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Inaunganisha..."</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Nenda kwenye hatua inayofuata"</string>
+    <!-- no translation found for wifi_setup_status_eap_not_supported (3196386445567501484) -->
+    <skip />
+    <!-- no translation found for wifi_setup_eap_not_supported (683540356393542939) -->
+    <skip />
+    <!-- no translation found for wifi_setup_description_connecting (1884664966455980182) -->
+    <skip />
+    <!-- no translation found for wifi_setup_description_connected (5235991893829582459) -->
+    <skip />
+    <!-- no translation found for account_sync_settings_title (4578227872921044660) -->
+    <skip />
+    <!-- no translation found for sync_is_failing (1591561768344128377) -->
+    <skip />
+    <string name="add_account_label" msgid="7811707265834013767">"Ongeza akaunti"</string>
+    <string name="header_general_sync_settings" msgid="3487451896424238469">"Mipangilio ya kawaida ya kusawazisha"</string>
+    <string name="background_data" msgid="5779592891375473817">"Data ya maandhari nyuma"</string>
+    <string name="background_data_summary" msgid="3630389249212620467">"Programu inaweza kusawazisha, kutuma, na kupokea data kwa wakati wowote"</string>
+    <string name="background_data_dialog_title" msgid="745974259246047425">"Zingatia"</string>
+    <string name="background_data_dialog_message" msgid="9155730118215371308">"Kulemaza data ya maandhari nyuma huzidisha nguvu za batri na kupunguza matumizi ya data. Baadhi ya programu huenda zikatumia muunganisho wa data ya maandhari nyuma."</string>
+    <!-- no translation found for sync_automatically (7558810110682562376) -->
+    <skip />
+    <string name="sync_automatically_summary" msgid="6662623174608419931">"Programu imewezesha data ya otomatiki"</string>
+    <string name="header_manage_accounts" msgid="6869002423884539607">"Dhibiti akaunti"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"Kusawazishwa Kumewezeshwa"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"Sawazisha Kumezimwa"</string>
+    <string name="sync_error" msgid="5060969083117872149">"Hitilafu ya usawazishaji"</string>
+    <!-- no translation found for settings_backup (2274732978260797031) -->
+    <skip />
+    <!-- no translation found for settings_backup_summary (7916877705938054035) -->
+    <skip />
+    <!-- no translation found for sync_menu_sync_now (6154608350395805683) -->
+    <skip />
+    <!-- no translation found for sync_menu_sync_cancel (8292379009626966949) -->
+    <skip />
+    <!-- no translation found for sync_one_time_sync (6766593624598183090) -->
+    <skip />
+    <!-- no translation found for sync_gmail (714886122098006477) -->
+    <skip />
+    <!-- no translation found for sync_calendar (9056527206714733735) -->
+    <skip />
+    <!-- no translation found for sync_contacts (9174914394377828043) -->
+    <skip />
+    <!-- no translation found for sync_plug (5952575609349860569) -->
+    <skip />
+    <!-- no translation found for header_application_sync_settings (5514539555293976035) -->
+    <skip />
+    <!-- no translation found for header_data_and_synchronization (5165024023936509896) -->
+    <skip />
+    <!-- no translation found for preference_change_password_title (8955581790270130056) -->
+    <skip />
+    <!-- no translation found for header_account_settings (5382475087121880626) -->
+    <skip />
+    <!-- no translation found for remove_account_label (5921986026504804119) -->
+    <skip />
+    <!-- no translation found for header_add_an_account (756108499532023798) -->
+    <skip />
+    <!-- no translation found for finish_button_label (481587707657751116) -->
+    <skip />
+    <!-- no translation found for really_remove_account_title (6574643117748564960) -->
+    <skip />
+    <!-- no translation found for really_remove_account_message (4448645571715719563) -->
+    <skip />
+    <!-- no translation found for really_remove_account_message (1005751790899989319) -->
+    <skip />
+    <!-- no translation found for remove_account_failed (1093911989149396624) -->
+    <skip />
+    <!-- no translation found for remove_account_failed (9174390193652391412) -->
+    <skip />
+    <!-- no translation found for provider_label (7724593781904508866) -->
+    <skip />
+    <!-- no translation found for sync_item_title (1931551540462877488) -->
+    <skip />
+    <!-- no translation found for cant_sync_dialog_title (7185199796123573317) -->
+    <skip />
+    <!-- no translation found for cant_sync_dialog_message (2372359241135295930) -->
+    <skip />
+    <!-- no translation found for enter_password (3268224850821675915) -->
+    <skip />
+    <!-- no translation found for try_again (5904121494468643129) -->
+    <skip />
+    <!-- no translation found for service_busy (225227519012409130) -->
+    <skip />
+    <!-- no translation found for delete (4219243412325163003) -->
+    <skip />
+    <!-- no translation found for misc_files (6298643430106707497) -->
+    <skip />
+    <!-- no translation found for misc_files_selected_count (4647048020823912088) -->
+    <skip />
+    <!-- no translation found for misc_files_selected_count_bytes (2876232009069114352) -->
+    <skip />
+    <!-- no translation found for select_all (6783085295161532497) -->
+    <skip />
+    <!-- no translation found for hdcp_checking_title (8605478913544273282) -->
+    <skip />
+    <!-- no translation found for hdcp_checking_dialog_title (5141305530923283) -->
+    <skip />
+</resources>
diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml
index ae51eef..aa212fb 100644
--- a/res/values-th/arrays.xml
+++ b/res/values-th/arrays.xml
@@ -48,6 +48,16 @@
     <item msgid="2314124409517439288">"10 นาที"</item>
     <item msgid="6864027152847611413">"30 นาที"</item>
   </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="3149294732238283185">"ไม่เลย"</item>
+    <item msgid="2194151041885903260">"15 วินาที"</item>
+    <item msgid="5892295237131074341">"30 วินาที"</item>
+    <item msgid="3538441365970038213">"1 นาที"</item>
+    <item msgid="412343871668955639">"2 นาที"</item>
+    <item msgid="5076853889688991690">"5 นาที"</item>
+    <item msgid="1903860996174927898">"10 นาที"</item>
+    <item msgid="6415509612413178727">"30 นาที"</item>
+  </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"ทันที"</item>
     <item msgid="6736512735606834431">"5 วินาที"</item>
@@ -59,6 +69,22 @@
     <item msgid="9002737361305019353">"10 นาที"</item>
     <item msgid="4322676235684793329">"30 นาที"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"เล็กมาก"</item>
+    <item msgid="383133849547816572">"เล็กพิเศษ"</item>
+    <item msgid="6490061470416867723">"เล็ก"</item>
+    <item msgid="3579015730662088893">"ปกติ"</item>
+    <item msgid="1678068858001018666">"ใหญ่"</item>
+    <item msgid="490158884605093126">"ใหญ่พิเศษ"</item>
+    <item msgid="2123802548987439763">"ใหญ่มาก"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"ช้ามาก"</item>
     <item msgid="2361722960903353554">"ช้า"</item>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 403c85b..bee638e 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -316,7 +316,7 @@
     <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_disabled_summary" msgid="8563103042330816018">"ปิดใช้งานโดยผู้ดูแลระบบหรือนโยบายการเข้ารหัส"</string>
+    <!-- outdated translation 5962903914511361952 -->     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"ปิดใช้งานโดยผู้ดูแลระบบอุปกรณ์รีโมต"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"ปิด"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7137296704741184239">"ไม่มีการรักษาความปลอดภัย"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"รักษาความปลอดภัยด้วยรูปแบบ"</string>
@@ -460,6 +460,7 @@
     <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"ระบุเวลาที่จะยกเลิกการเชื่อมต่อจาก Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"มีปัญหาในการเปลี่ยนแปลงการตั้งค่า"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"เพิ่มเครือข่าย Wi-Fi"</string>
+    <string name="wifi_add_network_summary" msgid="6345544206968025811">"กำหนดค่าเครือข่ายที่ไม่กระจายข้อมูล"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"เครือข่าย Wi-Fi"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"สแกน"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"ขั้นสูง"</string>
@@ -598,7 +599,17 @@
     <string name="brightness_summary" msgid="838917350127550703">"ปรับความสว่างหน้าจอ"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"ระยะหมดเวลา"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"หน้าจอปิดการทำงานโดยอัตโนมัติหลังจาก <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android Dreams"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"โปรแกรมรักษาหน้าจอและการควบคุมการไม่มีกิจกรรมอื่นๆ"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Dream ที่เลือก"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"เวลาที่เปิดใช้งาน"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"หลังจากไม่มีกิจกรรมเป็นเวลา <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"ไม่เลย"</string>
+    <string name="dream_test" msgid="5968002644622194481">"ลองใช้งาน!"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"ปรับความสว่างอัตโนมัติ"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"ขนาดอักษร"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"ขนาดโดยรวมของอักษร"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"เลือกขนาดอักษร"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"การตั้งค่าการล็อกซิมการ์ด"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"ตั้งค่าการล็อกซิมการ์ด"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"การล็อกซิมการ์ด"</string>
@@ -644,7 +655,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"หมายเลขโทรศัพท์ของฉัน"</string>
     <string name="status_min_number" msgid="3519504522179420597">"นาที"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"รุ่น PRL"</string>
-    <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
+    <string name="status_meid_number" msgid="2037549729230058915">"IMEI/MEID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"ประเภทเครือข่ายมือถือ"</string>
     <string name="status_data_state" msgid="5503181397066522950">"สถานะเครือข่ายมือถือ"</string>
     <string name="status_service_state" msgid="2323931627519429503">"สถานะบริการ"</string>
@@ -893,9 +904,12 @@
     <string name="install_unknown_applications" msgid="6612824788917283662">"อนุญาตให้ติดตั้งแอปพลิเคชันที่ไม่ได้มาจาก Market"</string>
     <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"แท็บแล็ตและข้อมูลส่วนบุคคลของคุณจะมีความเสี่ยงมากขึ้นต่อการถูกโจมตีโดยแอปพลิเคชันที่ไม่ทราบที่มา คุณยอมรับว่าคุณเป็นผู้รับผิดชอบแต่เพียงผู้เดียวต่อความเสียหายที่จะเกิดขึ้นกับแท็บเล็ตหรือการสูญเสียข้อมูลที่อาจเป็นผลจากการใช้แอปพลิเคชันเหล่านี้"</string>
     <string name="install_all_warning" product="default" msgid="1923717607319933741">"โทรศัพท์และข้อมูลส่วนบุคคลของคุณเสี่ยงต่อการถูกโจมตีโดยแอปพลิเคชันที่ไม่ทราบที่มา คุณยอมรับว่าคุณเป็นผู้รับผิดชอบแต่เพียงผู้เดียวต่อความเสียหายต่อโทรศัพท์หรือการสูญเสียข้อมูลที่อาจเป็นผลจากการใช้แอปพลิเคชันเหล่านี้"</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"การตั้งค่าขั้นสูง"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"เปิดใช้งานตัวเลือกการตั้งค่าเพิ่มเติม"</string>
     <string name="application_info_label" msgid="1150486628158409543">"ข้อมูลแอปพลิเคชัน"</string>
     <string name="storage_label" msgid="8700867073480107253">"พื้นที่เก็บข้อมูล"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"เริ่มใช้งานตามค่าเริ่มต้น"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"ความเข้ากันได้ของหน้าจอ"</string>
     <string name="permissions_label" msgid="2605296874922726203">"การอนุญาต"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"แคช"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"ล้างแคช"</string>
@@ -915,6 +929,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"คุณได้เลือกเริ่มการใช้งานแอปพลิเคชันนี้โดยค่าเริ่มต้นสำหรับการทำงานบางอย่าง"</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"ไม่ได้ตั้งค่าเริ่มต้น"</string>
     <string name="clear_activities" msgid="7408923511535174430">"ล้างค่าเริ่มต้น"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"แอปพลิเคชันนี้อาจไม่ได้รับการออกแบบมาสำหรับหน้าจอของคุณ คุณสามารถควบคุมวิธีที่แอปพลิเคชันถูกปรับให้เข้ากับหน้าจอของคุณได้ที่นี่"</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"ถามเมื่อเปิดโปรแกรม"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"กำหนดขนาดแอปพลิเคชัน"</string>
     <string name="unknown" msgid="1592123443519355854">"ไม่ทราบ"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"จัดเรียงตามชื่อ"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"จัดเรียงตามขนาด"</string>
@@ -1019,8 +1036,13 @@
     <string name="show_password" msgid="2198798062604049206">"รหัสผ่านที่มองเห็นได้"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"แสดงรหัสผ่านขณะพิมพ์"</string>
     <string name="ime_security_warning" msgid="812267421486877917">"วิธีป้อนข้อมูลนี้อาจเก็บข้อความทั้งหมดที่คุณพิมพ์ รวมถึงข้อมูลส่วนบุคคล เช่น รหัสผ่านและหมายเลขบัตรเครดิต โดยมาจากแอปพลิเคชัน<xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g> ใช้วิธีป้อนข้อมูลนี้หรือไม่"</string>
+    <!-- no translation found for pointer_settings_category (6090176550039035130) -->
+    <skip />
+    <!-- no translation found for pointer_speed (1221342330217861616) -->
+    <skip />
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"พจนานุกรมของผู้ใช้"</string>
-    <string name="user_dict_settings_title" msgid="8357027437499042191">"พจนานุกรมของผู้ใช้"</string>
+    <string name="user_dict_single_settings_title" msgid="5454855286173849284">"พจนานุกรมของผู้ใช้"</string>
+    <string name="user_dict_multiple_settings_title" msgid="326583195525296750">"จัดการพจนานุกรมของผู้ใช้"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"เพิ่ม"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"เพิ่มลงในพจนานุกรม"</string>
@@ -1029,6 +1051,7 @@
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"ลบ"</string>
     <string name="user_dict_settings_empty_text" product="tablet" msgid="1766522102636921529">"คุณไม่มีคำใดๆ ในพจนานุกรมผู้ใช้ คุณสามารถเพิ่มคำได้โดยแตะปุ่ม เพิ่ม ( + )"</string>
     <string name="user_dict_settings_empty_text" product="default" msgid="6209268025109242806">"คุณไม่มีคำใดๆ ในพจนานุกรมผู้ใช้ คุณสามารถเพิ่มคำได้ผ่านทางเมนู"</string>
+    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"ทุกภาษา"</string>
     <string name="testing" msgid="6584352735303604146">"กำลังทดสอบ"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"ข้อมูลแท็บเล็ต"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"ข้อมูลโทรศัพท์"</string>
@@ -1100,6 +1123,8 @@
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"ปุ่มเปิด/ปิดเครื่อง"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"กดปุ่มเปิด/ปิดเพื่อวางสาย"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"ขณะโทร การกดปุ่มเปิด/ปิดเครื่องจะวางสายแทนที่จะปิดหน้าจอ"</string>
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <skip />
     <string name="touchscreen_gestures_category" msgid="3109869155350859625">"ลักษณะการลากนิ้วบนจอสัมผัส"</string>
     <string name="long_press_timeout_selector_title" msgid="1396876537252863044">"การหน่วงเวลาการแตะ &amp; ค้างไว้"</string>
     <string name="long_press_timeout_selector_summary" msgid="2261114502740278996">"หน่วงเวลาจนกว่าจะแตะหมายถึงการแตะ&amp;ค้าง"</string>
@@ -1302,30 +1327,26 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(ไม่เปลี่ยน)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(ไม่ได้ตั้งค่า)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"ที่จัดเก็บข้อมูลรับรอง"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"ใช้ข้อมูลรับรองความปลอดภัย"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"อนุญาตให้แอปพลิเคชันนี้เข้าถึงใบรับรองความปลอดภัยและข้อมูลรับรองอื่น"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"ติดตั้งจากที่เก็บข้อมูล"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"ติดตั้งจากการ์ด SD"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"ติดตั้งใบรับรองจากที่เก็บข้อมูล"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"ติดตั้งใบรับรองจากการ์ด SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"ตั้งค่ารหัสผ่าน"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"ตั้งหรือเปลี่ยนรหัสผ่านสำหรับที่จัดเก็บข้อมูลรับรอง"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"ล้างข้อมูลรับรอง"</string>
-    <string name="credentials_reset_summary" msgid="3810369467217453606">"นำข้อมูลทั้งหมดออกและรีเซ็ตรหัสผ่าน"</string>
+    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3369361230171260282">"ล้างข้อมูลทั้งหมดในที่จัดเก็บข้อมูลรับรองและรีเซ็ตรหัสผ่าน"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"ป้อนรหัสผ่าน"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"ใส่รหัสผ่านสำหรับที่จัดเก็บข้อมูลรับรอง"</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"ตั้งรหัสผ่านสำหรับที่จัดเก็บข้อมูลรับรอง ต้องมีอย่างน้อย 8 อักขระ"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"รหัสผ่านปัจจุบัน:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"รหัสผ่านใหม่:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"ยืนยันรหัสผ่านใหม่:"</string>
-    <string name="credentials_reset_hint" msgid="2336340927894094814">"เนื้อหาทั้งหมดจะถูกลบและมีการรีเซ็ตรหัสผ่านนี้ คุณแน่ใจหรือไม่"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"รหัสผ่านของคุณไม่ตรง"</string>
+    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="1566409057833618877">"คุณแน่ใจหรือไม่ว่าต้องการลบข้อมูลรับรองทั้งหมดและรีเซ็ตรหัสผ่านที่เก็บข้อมูลรับรอง"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"รหัสผ่านต้องมีอักขระอย่างน้อย 8 ตัว"</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"รหัสผ่านไม่ถูกต้อง"</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"รหัสผ่านไม่ถูกต้อง คุณมีโอกาสหนึ่งครั้งก่อนที่ที่จัดเก็บข้อมูลรับรองจะถูกลบ"</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"รหัสผ่านไม่ถูกต้อง คุณมีโอกาสอีก <xliff:g id="NUMBER">%1$d</xliff:g> ครั้งก่อนที่ที่จัดเก็บข้อมูลรับรองจะถูกลบ"</string>
     <string name="credentials_erased" msgid="2907836028586342969">"ที่จัดเก็บข้อมูลรับรองถูกลบ"</string>
+    <!-- no translation found for credentials_not_erased (397954733557821269) -->
+    <skip />
     <string name="credentials_enabled" msgid="7588607413349978930">"เปิดการใช้งานที่จัดเก็บข้อมูลรับรองไว้"</string>
+    <!-- no translation found for credentials_configure_lock_screen_hint (6816970208840577219) -->
+    <skip />
     <string name="emergency_tone_title" msgid="1055954530111587114">"โทนเสียงฉุกเฉิน"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"ตั้งค่าการทำงานเมื่อมีการโทรหาหมายเลขฉุกเฉิน"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"ข้อมูลส่วนบุคคล"</string>
diff --git a/res/values-tl/arrays.xml b/res/values-tl/arrays.xml
index 772f990..5111bf4 100644
--- a/res/values-tl/arrays.xml
+++ b/res/values-tl/arrays.xml
@@ -48,6 +48,16 @@
     <item msgid="2314124409517439288">"10 minuto"</item>
     <item msgid="6864027152847611413">"30 minuto"</item>
   </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="3149294732238283185">"Hindi Kailanman"</item>
+    <item msgid="2194151041885903260">"15 segundo"</item>
+    <item msgid="5892295237131074341">"30 segundo"</item>
+    <item msgid="3538441365970038213">"1 minuto"</item>
+    <item msgid="412343871668955639">"2 minuto"</item>
+    <item msgid="5076853889688991690">"5 minuto"</item>
+    <item msgid="1903860996174927898">"10 minuto"</item>
+    <item msgid="6415509612413178727">"30 minuto"</item>
+  </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"agad"</item>
     <item msgid="6736512735606834431">"5 segundo"</item>
@@ -59,6 +69,22 @@
     <item msgid="9002737361305019353">"10 minuto"</item>
     <item msgid="4322676235684793329">"30 minuto"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Sobrang Liit"</item>
+    <item msgid="383133849547816572">"Sobrang Liit"</item>
+    <item msgid="6490061470416867723">"Maliit"</item>
+    <item msgid="3579015730662088893">"Normal"</item>
+    <item msgid="1678068858001018666">"Malaki"</item>
+    <item msgid="490158884605093126">"Sobrang Laki"</item>
+    <item msgid="2123802548987439763">"Sobrang Laki"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Napakabagal"</item>
     <item msgid="2361722960903353554">"Mabagal"</item>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 4562cd3..771bb0e 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -316,7 +316,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Nangangailangan ng numeric na PIN upang i-unlock ang screen"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Password"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Nangangailangan ng password upang i-unlock ang screen"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Hindi pinagana ng admin o patakaran sa encryption"</string>
+    <!-- outdated translation 5962903914511361952 -->     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Hindi pinagana ng administrator ng remote device"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Naka-off"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7137296704741184239">"Walang seguridad"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Naka-secure na may pattern"</string>
@@ -460,6 +460,7 @@
     <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Tukuyin kung kailan aalisin ang koneksyon mula sa Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Nagkaproblema sa pagbabago ng setting"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Magdagdag ng Wi-Fi network"</string>
+    <string name="wifi_add_network_summary" msgid="6345544206968025811">"Mag-configure ng network na hindi para sa broadcast"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Mga Wi-Fi network"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"I-scan"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Advanced"</string>
@@ -598,7 +599,17 @@
     <string name="brightness_summary" msgid="838917350127550703">"Ayusin ang liwanag ng screen"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Timeout"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Awtomatikong nag-o-off ang screen pagkatapos ng <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android Dreams"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Mga screen saver at iba pang mga dibersyon ng idle"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Napiling dream"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Kailan ia-activate"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"Pagkatapos ng idle ng paggugol ng <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Hindi Kailanman"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Subukan ito!"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Awtomatikong pagliwanag"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Laki ng font"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Pangkalahatang laki ng mga font"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Pumili ng laki ng font"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Mga setting ng lock ng SIM card"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"I-set up ang lock ng SIM card"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Lock ng SIM card"</string>
@@ -644,7 +655,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"Numero ng aking telepono"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"Bersyon ng PRL"</string>
-    <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
+    <string name="status_meid_number" msgid="2037549729230058915">"IMEI / MEID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"Uri ng network ng mobile"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Katayuan ng mobile network"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Katayuan ng serbisyo"</string>
@@ -893,9 +904,12 @@
     <string name="install_unknown_applications" msgid="6612824788917283662">"Payagan ang pag-install ng mga application na di-Market"</string>
     <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"Higit na madaling maapektuhan ang iyong tablet at personal na data ng pag-atake ng mga application mula sa mga hindi kilalang pinagmulan. Sumasang-ayon ka na ikaw lang ang responsable para sa anumang pinsala sa iyong tablet o pagkawala ng data na maaaring magresulta mula sa paggamit ng mga application na ito."</string>
     <string name="install_all_warning" product="default" msgid="1923717607319933741">"Mas madaling maapektuhan ang iyong telepono at personal na data upang maatake ng mga application mula sa mga hindi kilalang pinagmumulan. Sumasang-ayon ka na ikaw ang nag-iisang may pananagutan para sa anumang pinsala sa iyong telepono o pagkawala ng data na maaaring magresulta mula sa paggamit ng mga application na ito."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Mga advanced na setting"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Paganahin ang higit pang mga pagpipilian sa mga setting."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Impormasyon ng application"</string>
     <string name="storage_label" msgid="8700867073480107253">"Imbakan"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Paglunsad bilang default"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Pagiging tugma ng screen"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Mga Pahintulot"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Cache"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"I-clear ang cache"</string>
@@ -915,6 +929,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Pinili mong ilunsad ang application na ito bilang default para sa ilang pagkilos."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Walang nakatakdang mga default."</string>
     <string name="clear_activities" msgid="7408923511535174430">"I-clear ang mga default"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Maaaring hindi nakadisenyo ang application na ito para sa iyong screen; makokontrol mo kung paano ito umaakma sa iyong screen dito."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Magtanong kapag nailunsad"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"I-scale ang application"</string>
     <string name="unknown" msgid="1592123443519355854">"Hindi Kilala"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Pag-uri-uriin sa pangalan"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Pag-uri-uriin ayon sa laki"</string>
@@ -1019,8 +1036,13 @@
     <string name="show_password" msgid="2198798062604049206">"Mga nakikitang password"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Ipakita ang password habang nagta-type ka"</string>
     <string name="ime_security_warning" msgid="812267421486877917">"Maaaring magawa ng pamamaraan ng pag-input na ito na makolekta ang lahat ng teksto na iyong tina-type, kasama ang personal na data tulad ng mga password at mga numero ng credit card. Nanggagaling ito mula sa application na <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Gamitin ang pamamaraan ng pag-input na ito?"</string>
+    <!-- no translation found for pointer_settings_category (6090176550039035130) -->
+    <skip />
+    <!-- no translation found for pointer_speed (1221342330217861616) -->
+    <skip />
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Diksyunaryo ng user"</string>
-    <string name="user_dict_settings_title" msgid="8357027437499042191">"Diksyunaryo ng user"</string>
+    <string name="user_dict_single_settings_title" msgid="5454855286173849284">"Diksyunaryo ng user"</string>
+    <string name="user_dict_multiple_settings_title" msgid="326583195525296750">"Pamahalaan ang mga diksyunaryo ng user"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Magdagdag"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Idagdag sa diksyunaryo"</string>
@@ -1029,6 +1051,7 @@
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Tanggalin"</string>
     <string name="user_dict_settings_empty_text" product="tablet" msgid="1766522102636921529">"Wala kang anumang mga salita sa diksyunaryo ng user. Maaari kang magdagdag ng salita sa pamamagitan ng pagpindot ng pindutan na Magdagdag ( + )."</string>
     <string name="user_dict_settings_empty_text" product="default" msgid="6209268025109242806">"Wala kang anumang mga salita sa diksyunaryo ng user. Maaari kang magdagdag ng salita sa pamamagitan ng menu."</string>
+    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Lahat ng mga wika"</string>
     <string name="testing" msgid="6584352735303604146">"Pagsubok"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Impormasyon ng tablet"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Impormasyon ng telepono"</string>
@@ -1100,6 +1123,8 @@
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"Pindutan ng power"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"Winawakasan ng pindutan ng power ang tawag"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"Sa panahon ng pagtawag, tinatapos ng Power ang tawag sa halip na i-off ang screen"</string>
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <skip />
     <string name="touchscreen_gestures_category" msgid="3109869155350859625">"Mga kilos na touchscreen"</string>
     <string name="long_press_timeout_selector_title" msgid="1396876537252863044">"Pagkaantala ng pagpindot na matagal"</string>
     <string name="long_press_timeout_selector_summary" msgid="2261114502740278996">"Pagkaantala hanggang makilala ang isang pagpindot bilang pagpindot nang matagal"</string>
@@ -1302,30 +1327,26 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(di-nabago)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(hindi nakatakda)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Storage ng kredensyal"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Gumamit ng mga secure na kredensyal"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Payagan ang mga application upang ma-access ang mga secure na certificate at iba pang mga kredensyal"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"I-install mula sa imbakan"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"I-install mula sa SD card"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Mag-install ng mga certificate mula sa storage"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Mag-install ng mga certificate mula sa SD card"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Itakda ang password"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Itakda o baguhin ang password para sa imbakan ng kredensyal"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"I-clear ang mga kredensyal"</string>
-    <string name="credentials_reset_summary" msgid="3810369467217453606">"Alisin ang lahat ng mga nilalaman at i-reset ang password"</string>
+    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3369361230171260282">"I-clear ang imbakan ng kredensyal ng lahat ng mga nilalaman at i-reset ang password nito"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Magpasok ng password"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Ipasok ang password para sa storage ng kredensyal."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Itakda ang password para sa storage ng kredensyal. Dapat na mayroon itong hindi bababa sa 8 character."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Kasalukuyang password:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Bagong password:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Kumpirmahin ang bagong password:"</string>
-    <string name="credentials_reset_hint" msgid="2336340927894094814">"Maaalis ang lahat ng mga nilalaman, at mare-reset ang password. Sigurado ka ba tungkol doon?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Hindi tumutugma ang iyong mga password."</string>
+    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="1566409057833618877">"Sigurado ka bang gusto mong tanggalin ang lahat ng mga kredensyal at i-reset ang password ng imbakan ng kredensyal?"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Dapat na may hindi bababa sa 8 character ang password."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Hindi tamang password."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Hindi tamang password. Mayroon kang isa pang pagkakataon bago mabura ang imbakan ng kredensyal."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Hindi tamang password. Mayroon kang <xliff:g id="NUMBER">%1$d</xliff:g> pang pagkakataon bago mabura ang imbakan ng kredensyal."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Binura storage ng kredensyal."</string>
+    <!-- no translation found for credentials_not_erased (397954733557821269) -->
+    <skip />
     <string name="credentials_enabled" msgid="7588607413349978930">"Pinagana ang imbakan ng kredensyal."</string>
+    <!-- no translation found for credentials_configure_lock_screen_hint (6816970208840577219) -->
+    <skip />
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tonong pang-emergency"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Itakda ang pag-uugali kapag naganap ang isang pang-emergency na tawag"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"Privacy"</string>
diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
index ba31802..153204d 100644
--- a/res/values-tr/arrays.xml
+++ b/res/values-tr/arrays.xml
@@ -48,6 +48,16 @@
     <item msgid="2314124409517439288">"10 dakika"</item>
     <item msgid="6864027152847611413">"30 dakika"</item>
   </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="3149294732238283185">"Hiçbir zaman"</item>
+    <item msgid="2194151041885903260">"15 saniye"</item>
+    <item msgid="5892295237131074341">"30 saniye"</item>
+    <item msgid="3538441365970038213">"1 dakika"</item>
+    <item msgid="412343871668955639">"2 dakika"</item>
+    <item msgid="5076853889688991690">"5 dakika"</item>
+    <item msgid="1903860996174927898">"10 dakika"</item>
+    <item msgid="6415509612413178727">"30 dakika"</item>
+  </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"derhal"</item>
     <item msgid="6736512735606834431">"5 saniye"</item>
@@ -59,6 +69,22 @@
     <item msgid="9002737361305019353">"10 dakika"</item>
     <item msgid="4322676235684793329">"30 dakika"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Çok Küçük"</item>
+    <item msgid="383133849547816572">"Ekstra Küçük"</item>
+    <item msgid="6490061470416867723">"Küçük"</item>
+    <item msgid="3579015730662088893">"Normal"</item>
+    <item msgid="1678068858001018666">"Büyük"</item>
+    <item msgid="490158884605093126">"Ekstra Büyük"</item>
+    <item msgid="2123802548987439763">"Çok Büyük"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Çok yavaş"</item>
     <item msgid="2361722960903353554">"Yavaş"</item>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index ad315cf..e86df7d 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -316,7 +316,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Ekr kilidini açmak için sayısal PIN gerektir"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Şifre"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Ekranın kilidini açmak için şifre gerektir"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Yönetc veya şifr politikası trfn devre dışı brkldı"</string>
+    <!-- outdated translation 5962903914511361952 -->     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Cihazın uzaktan yöneticisi tarafından devre dışı bırakıldı"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Kapalı"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7137296704741184239">"Güvenlik yok"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Desenle güvenlik etkin"</string>
@@ -460,6 +460,7 @@
     <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Kablosuz bağlantısının ne zaman kesileceğini belirtin"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Ayarı değiştirirken bir sorun oluştu"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Kablosuz ağ ekle"</string>
+    <string name="wifi_add_network_summary" msgid="6345544206968025811">"Yayın yapmayan ağ yapılandır"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Kablosuz ağlar"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Tara"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Gelişmiş"</string>
@@ -598,7 +599,17 @@
     <string name="brightness_summary" msgid="838917350127550703">"Ekranın parlaklığını ayarla"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Zaman aşımı"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> sonra ekran otomatik olarak kapanır"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android Dreams"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Ekran koruyucular ve diğer opsiyonlar"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Seçili rüya"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Etkinleştirme zamanı"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> boşta kaldıktan sonra"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Hiçbir zaman"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Deneyin!"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Otomatik parlaklık"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Yazı tipi boyutu"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Tüm yazı tipi boyutları"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Yazı tipini seçin"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM kart kilit ayarları"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"SIM kart kilidini ayarla"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM kart kilidi"</string>
@@ -644,7 +655,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"Telefon numaram"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MİN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"PRL Sürümü"</string>
-    <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
+    <string name="status_meid_number" msgid="2037549729230058915">"IMEI / MEID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"Mobil ağ türü"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Mobil ağ durumu"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Hizmet durumu"</string>
@@ -893,9 +904,12 @@
     <string name="install_unknown_applications" msgid="6612824788917283662">"Market üzerinden alınmayan uygulamaların yüklenmesine izin ver"</string>
     <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"Tabletiniz ve kişisel verileriniz, bilinmeyen kaynaklardan gelen uygulamaların saldırılarına karşı daha savunmasızdır. Bu uygulamaları kullanmanız sonucunda tabletinizin başına gelebilecek her tür hasardan ve veri kaybından kendinizin sorumlu olduğunu kabul edersiniz."</string>
     <string name="install_all_warning" product="default" msgid="1923717607319933741">"Telefonunuz ve kişisel verileriniz, bilinmeyen kaynaklardan gelen uygulamaların saldırılarına karşı daha savunmasızdır. Bu uygulamaları kullanmanız sonucunda telefonunuzun başına gelebilecek her tür hasardan ve veri kaybından tarafınızın sorumlu olduğunu kabul edersiniz."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Gelişmiş ayarlar"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Diğer ayar seçeneklerini etkinleştirin."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Uygulama bilgileri"</string>
     <string name="storage_label" msgid="8700867073480107253">"Depolama"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Varsayılan olarak başlat"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Ekran uyumluluğu"</string>
     <string name="permissions_label" msgid="2605296874922726203">"İzinler"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Önbellek"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Önbelleği temizle"</string>
@@ -915,6 +929,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Bu uygulamayı bazı işlemler için varsayılan olarak başlatmayı seçtiniz."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Hiçbir varsayılan ayarlanmadı."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Varsayılanları temizle"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Bu uygulama, ekranınıza göre tasarlanmamış olabilir; ekranınızda nasıl duracağını buradan kontrol edebilirsiniz."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Başlarken sor"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Uygulamayı ölçekle"</string>
     <string name="unknown" msgid="1592123443519355854">"Bilinmiyor"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Ada göre sırala"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Boyuta göre sırala"</string>
@@ -1019,8 +1036,13 @@
     <string name="show_password" msgid="2198798062604049206">"Görünür şifreler"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Yazarken şifreyi göster"</string>
     <string name="ime_security_warning" msgid="812267421486877917">"Bu giriş yöntemi, şifreler ve kredi kartı numaraları gibi kişisel veriler de dahil olmak üzere yazdığınız tüm metni toplayabilir. <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g> uygulamasından gelmektedir. Bu giriş yöntemini kullanmak istiyor musunuz?"</string>
+    <!-- no translation found for pointer_settings_category (6090176550039035130) -->
+    <skip />
+    <!-- no translation found for pointer_speed (1221342330217861616) -->
+    <skip />
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Kullanıcı sözlüğü"</string>
-    <string name="user_dict_settings_title" msgid="8357027437499042191">"Kullanıcı sözlüğü"</string>
+    <string name="user_dict_single_settings_title" msgid="5454855286173849284">"Kullanıcı sözlüğü"</string>
+    <string name="user_dict_multiple_settings_title" msgid="326583195525296750">"Kullanıcı sözlüklerini yönet"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Ekle"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Sözlüğe ekle"</string>
@@ -1029,6 +1051,7 @@
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Sil"</string>
     <string name="user_dict_settings_empty_text" product="tablet" msgid="1766522102636921529">"Kullanıcı sözlüğünde hiçbir kelimeniz yok. Ekle (+) düğmesini kullanarak kelime ekleyebilirsiniz."</string>
     <string name="user_dict_settings_empty_text" product="default" msgid="6209268025109242806">"Kullanıcı sözlüğünüzde hiçbir kelime yok. Menüyü kullanarak kelime ekleyebilirsiniz."</string>
+    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Tüm diller"</string>
     <string name="testing" msgid="6584352735303604146">"Test ediliyor"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Tablet bilgileri"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Telefon bilgileri"</string>
@@ -1100,6 +1123,8 @@
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"Güç düğmesi"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"Güç düğmesi çağrıyı sonlandırır"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"Çağrı sırasında, Güç düğmesine basıldığında ekranın kapanması yerine çağrı sonlanır"</string>
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <skip />
     <string name="touchscreen_gestures_category" msgid="3109869155350859625">"Dokunmatik ekran hareketleri"</string>
     <string name="long_press_timeout_selector_title" msgid="1396876537252863044">"Dokunma ve tutma bekleme süresi"</string>
     <string name="long_press_timeout_selector_summary" msgid="2261114502740278996">"Dokunmanın, dokunma ve tutma olarak yorumlanmasına kadar geçen süre"</string>
@@ -1302,30 +1327,26 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(değişmedi)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(ayarlanmadı)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Kimlik bilgileri deposu"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Güvenli kimlik bilgilerini kullan"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Uygulamaların güvenli sertifikalara ve diğer kimlik bilgilerine erişmesine izin verin"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Depolama biriminden yükle"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"SD karttan yükle"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Sertifikaları depolama biriminden yükle"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Sertifikaları SD karttan yükle"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Şifreyi ayarla"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Kimlik bilgileri deposu için şifre ayarla veya mevcut şifreyi değiştir"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Kimlik bilgilerini temizle"</string>
-    <string name="credentials_reset_summary" msgid="3810369467217453606">"Tüm içeriği kaldır ve şifreyi sıfırla"</string>
+    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3369361230171260282">"Tüm içeriklerin kimlik bilgileri deposunu temizleyin ve bu depolama alanının şifresini sıfırlayın"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Şifreyi girin"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Kimlik bilgileri deposu için şifre girin."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Kimlik bilgileri deposu için şifreyi girin. En az 8 karakter olmalıdır."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Geçerli şifre:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Yeni şifre:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Yeni şifreyi doğrulayın:"</string>
-    <string name="credentials_reset_hint" msgid="2336340927894094814">"Tüm içerik kaldırılacak ve şifre sıfırlanacak. Bundan emin misiniz?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Şifreler eşleşmiyor."</string>
+    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="1566409057833618877">"Tüm kimlik bilgilerini silmek ve kimlik bilgileri deposunun şifresini sıfırlamak istediğinizden emin misiniz?"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Şifre, en az 8 karakterden oluşmalıdır."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Yanlış şifre."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Yanlış şifre. Kimlik bilgileri deposu silinmeden önce tek bir şansınız kaldı."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Yanlış şifre. Kimlik bilgileri deposu silinmeden önce <xliff:g id="NUMBER">%1$d</xliff:g> şansınız kaldı."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Kimlik bilgileri deposu silindi."</string>
+    <!-- no translation found for credentials_not_erased (397954733557821269) -->
+    <skip />
     <string name="credentials_enabled" msgid="7588607413349978930">"Kimlik bilgileri deposu etkin."</string>
+    <!-- no translation found for credentials_configure_lock_screen_hint (6816970208840577219) -->
+    <skip />
     <string name="emergency_tone_title" msgid="1055954530111587114">"Acil sesi"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Acil çağrı yapıldığında nasıl işlev göreceğini ayarlayın"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"Gizlilik"</string>
diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml
index 93701b3..4c0f23c 100644
--- a/res/values-uk/arrays.xml
+++ b/res/values-uk/arrays.xml
@@ -48,6 +48,16 @@
     <item msgid="2314124409517439288">"10 хвилин"</item>
     <item msgid="6864027152847611413">"30 хвилин"</item>
   </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="3149294732238283185">"Ніколи"</item>
+    <item msgid="2194151041885903260">"15 секунд"</item>
+    <item msgid="5892295237131074341">"30 секунд"</item>
+    <item msgid="3538441365970038213">"1 хвилина"</item>
+    <item msgid="412343871668955639">"2 хвилини"</item>
+    <item msgid="5076853889688991690">"5 хвилин"</item>
+    <item msgid="1903860996174927898">"10 хвилин"</item>
+    <item msgid="6415509612413178727">"30 хвилин"</item>
+  </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"відразу"</item>
     <item msgid="6736512735606834431">"5 сек."</item>
@@ -59,6 +69,22 @@
     <item msgid="9002737361305019353">"10 хвилин"</item>
     <item msgid="4322676235684793329">"30 хвилин"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Малесенький"</item>
+    <item msgid="383133849547816572">"Дуже малий"</item>
+    <item msgid="6490061470416867723">"Малий"</item>
+    <item msgid="3579015730662088893">"Звичайний"</item>
+    <item msgid="1678068858001018666">"Великий"</item>
+    <item msgid="490158884605093126">"Дуже великий"</item>
+    <item msgid="2123802548987439763">"Величезний"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Дуже пов."</item>
     <item msgid="2361722960903353554">"Повіл."</item>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 5bde614..85e7b9e 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -316,7 +316,7 @@
     <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_disabled_summary" msgid="8563103042330816018">"Вимкнено адміністратором або політикою шифрування"</string>
+    <!-- outdated translation 5962903914511361952 -->     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Вимкнено адміністратором віддаленого пристрою"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Вимк."</string>
     <string name="unlock_set_unlock_mode_none" msgid="7137296704741184239">"Без захисту"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Захищено шаблоном"</string>
@@ -460,6 +460,7 @@
     <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Укажіть, коли від’єднуватися від Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Виникла проблема зі зміною налаштувань"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Додати Wi-Fi мережу"</string>
+    <string name="wifi_add_network_summary" msgid="6345544206968025811">"Налаштування неширокомовної мережі"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi мережі"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Сканув."</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Додатково"</string>
@@ -598,7 +599,17 @@
     <string name="brightness_summary" msgid="838917350127550703">"Налаштуйте яскравість екрана"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Час очікування"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Екран автоматично відключається через <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android Dreams"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Заставки й інші розваги в режимі очікування"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Selected dream"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Час для активації"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"Через <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> в режимі очікування"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Ніколи"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Спробувати!"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Автоматична яскравість"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Розмір шрифту"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Загальний розмір шрифтів"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Виберіть розмір шрифту"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Налашт. блокув. SIM-карти"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Налашт. блок. SIM-карти"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Блок. SIM-карти"</string>
@@ -644,7 +655,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"Мій номер телеф."</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"Версія PRL"</string>
-    <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
+    <string name="status_meid_number" msgid="2037549729230058915">"IMEI / MEID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"Тип мобільної мережі"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Стан мобільної мережі"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Стан служби"</string>
@@ -893,9 +904,12 @@
     <string name="install_unknown_applications" msgid="6612824788917283662">"Дозвол. встан. програм, які не походять з Market"</string>
     <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"Ваш пристрій і особисті дані більш уразливі до атак із боку програм із невідомих джерел. Ви погоджуєтеся з тим, що несете особисту відповідальн. за будь-які збитки, заподіяні пристр., або втрату даних унаслідок використ. таких програм."</string>
     <string name="install_all_warning" product="default" msgid="1923717607319933741">"Ваш тел. і особисті дані більш вразливі до атак з боку програм з невідомих джерел. Ви погодж. із тим, що несете особисту відпов. за будь-які збитки, заподіяні тел., чи втрату даних, яка може стати результ. використ. таких програм."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Розширені налаштування"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Увімкнути додаткові варіанти налаштувань."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Інф-я програми"</string>
     <string name="storage_label" msgid="8700867073480107253">"Пам\'ять"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Запускати за умовч."</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Сумісність екрана"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Дозволи"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Кеш"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Очистити кеш"</string>
@@ -915,6 +929,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Вибрано запускати цю програму за умовчанням для деяких дій."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Знач.за умовч не вст."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Очист.парам.за умовч."</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Можливо ця програма не призначена для вашого екрана. Тут можна вибрати, як вона налаштовується для вашого екрана."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Запитувати під час запуску"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Масштабувати програму"</string>
     <string name="unknown" msgid="1592123443519355854">"Невідомо"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Сортувати за іменем"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Сорт. за розм."</string>
@@ -1019,8 +1036,13 @@
     <string name="show_password" msgid="2198798062604049206">"Видимі паролі"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Показ. пароль при введенні"</string>
     <string name="ime_security_warning" msgid="812267421486877917">"Цей метод введення може збирати всі введені вами тексти, зокрема особисті дані, такі як паролі та номери кредитних карток. Він походить від програми. <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Використ. цей метод введення?"</string>
+    <!-- no translation found for pointer_settings_category (6090176550039035130) -->
+    <skip />
+    <!-- no translation found for pointer_speed (1221342330217861616) -->
+    <skip />
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Словник корист-ча"</string>
-    <string name="user_dict_settings_title" msgid="8357027437499042191">"Словник корист-ча"</string>
+    <string name="user_dict_single_settings_title" msgid="5454855286173849284">"Словник користувача"</string>
+    <string name="user_dict_multiple_settings_title" msgid="326583195525296750">"Керування словниками користувача"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Додати"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Додати до словника"</string>
@@ -1029,6 +1051,7 @@
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Видалити"</string>
     <string name="user_dict_settings_empty_text" product="tablet" msgid="1766522102636921529">"У словнику користувача немає жодного слова. Слово можна додати, торкнувшись кнопки \"Додати\" ( + )."</string>
     <string name="user_dict_settings_empty_text" product="default" msgid="6209268025109242806">"У словнику користувача немає жодних слів. Слово можна додати за допомогою меню."</string>
+    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Усі мови"</string>
     <string name="testing" msgid="6584352735303604146">"Тестування"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Інф-ція про пристрій"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Інф-я тел-ну"</string>
@@ -1100,6 +1123,8 @@
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"Кнопка живлення"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"Кноп. живл. закінч. викл."</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"При натис. кноп. живл. під час дзвінка заверш. дзв., а не вимик. екран"</string>
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <skip />
     <string name="touchscreen_gestures_category" msgid="3109869155350859625">"Жести на сенсорному екрані"</string>
     <string name="long_press_timeout_selector_title" msgid="1396876537252863044">"Затримка натискання й утримування"</string>
     <string name="long_press_timeout_selector_summary" msgid="2261114502740278996">"Затримка, доки натискання не буде розпізнано як натискання й утримування"</string>
@@ -1302,30 +1327,26 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(незмін.)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(не встан.)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Сховище облікових даних"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Викор. безпечні обл. дані"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Дозвол. програмі отр. доступ до безпечних сертифікатів й інших обл. даних"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Установити з носія"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Установити з карти SD"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Установлювати сертифікати з носія"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Установлювати сертифікати з карти SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Устан. пароль"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Установлювати чи змінювати пароль для сховища облікових даних"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Видалити облікові дані"</string>
-    <string name="credentials_reset_summary" msgid="3810369467217453606">"Видалити весь вміст і змінити пароль"</string>
+    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3369361230171260282">"Очищає весь вміст сховища облікових даних і змінює його пароль"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Введіть пароль"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Ввести пароль для сховища облікових даних."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Установіть пароль для сховища облікових даних. Він має складатися щонайменше з 8 символів."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Поточний пароль:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Новий пароль:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Підтвердьте нов. пароль:"</string>
-    <string name="credentials_reset_hint" msgid="2336340927894094814">"Увесь вміст буде видалено, а пароль буде змінено. Ви впевнені?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Паролі не збігаються."</string>
+    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="1566409057833618877">"Дійсно видалити всі облікові дані та змінити пароль сховища облікових даних?"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Пароль має складатися принаймні з 8 символів."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Неправильний пароль."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Неправильний пароль. У вас залишилася ще одна спроба до очищення сховища облікових даних."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Неправильний пароль. У вас залишилося ще стільки спроб: <xliff:g id="NUMBER">%1$d</xliff:g> до очищення сховища облікових даних."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Сховище облік. даних очищено."</string>
+    <!-- no translation found for credentials_not_erased (397954733557821269) -->
+    <skip />
     <string name="credentials_enabled" msgid="7588607413349978930">"Сховище облік. даних увімкнено."</string>
+    <!-- no translation found for credentials_configure_lock_screen_hint (6816970208840577219) -->
+    <skip />
     <string name="emergency_tone_title" msgid="1055954530111587114">"Аварійний сингал"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Устан. поведінку при розміщ. аварійного виклику"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"Конфід-сть"</string>
diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml
index c873648..d1806d3 100644
--- a/res/values-vi/arrays.xml
+++ b/res/values-vi/arrays.xml
@@ -48,6 +48,16 @@
     <item msgid="2314124409517439288">"10 phút"</item>
     <item msgid="6864027152847611413">"30 phút"</item>
   </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="3149294732238283185">"Không bao giờ"</item>
+    <item msgid="2194151041885903260">"15 giây"</item>
+    <item msgid="5892295237131074341">"30 giây"</item>
+    <item msgid="3538441365970038213">"1 phút"</item>
+    <item msgid="412343871668955639">"2 phút"</item>
+    <item msgid="5076853889688991690">"5 phút"</item>
+    <item msgid="1903860996174927898">"10 phút"</item>
+    <item msgid="6415509612413178727">"30 phút"</item>
+  </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"ngay lập tức"</item>
     <item msgid="6736512735606834431">"5 giây"</item>
@@ -59,6 +69,22 @@
     <item msgid="9002737361305019353">"10 phút"</item>
     <item msgid="4322676235684793329">"30 phút"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Cực nhỏ"</item>
+    <item msgid="383133849547816572">"Quá nhỏ"</item>
+    <item msgid="6490061470416867723">"Nhỏ"</item>
+    <item msgid="3579015730662088893">"Thường"</item>
+    <item msgid="1678068858001018666">"Lớn"</item>
+    <item msgid="490158884605093126">"Quá lớn"</item>
+    <item msgid="2123802548987439763">"Cực lớn"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"Rất chậm"</item>
     <item msgid="2361722960903353554">"Chậm"</item>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index bb2f4f5..3bec7d2 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -316,7 +316,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Yêu cầu PIN số để mở khóa màn hình"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Mật khẩu"</string>
     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Yêu cầu mật khẩu để mở khóa màn hình"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="8563103042330816018">"Bị vô hiệu hóa bởi quản trị viên hoặc chính sách mã hóa"</string>
+    <!-- outdated translation 5962903914511361952 -->     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Bị vô hiệu hóa bởi quản trị viên điện thoại từ xa"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Tắt"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7137296704741184239">"Không có bảo mật"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Được bảo mật bằng hình"</string>
@@ -460,6 +460,7 @@
     <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Chỉ rõ thời điểm ngắt kết nối Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Đã xảy ra sự cố khi thay đổi cài đặt"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"Thêm mạng Wi-Fi"</string>
+    <string name="wifi_add_network_summary" msgid="6345544206968025811">"Định cấu hình mạng không phát"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Mạng Wi-Fi"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Quét"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Nâng cao"</string>
@@ -598,7 +599,17 @@
     <string name="brightness_summary" msgid="838917350127550703">"Điều chỉnh độ sáng của màn hình"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Thời gian chờ"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Màn hình tự động tắt sau <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android Dreams"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Trình bảo vệ màn hình và các trò tiêu khiển nhàn rỗi khác"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Mô-đun đã chọn"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Thời điểm kích hoạt"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"Sau <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> không hoạt động"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Không bao giờ"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Dùng thử!"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Độ sáng tự động"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Kích thước phông chữ"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Kích thước phông chữ chung"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Chọn kích thước phông chữ"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Cài đặt khoá thẻ SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Thiết lập khoá thẻ SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Khoá thẻ SIM"</string>
@@ -644,7 +655,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"Số điện thoại của tôi"</string>
     <string name="status_min_number" msgid="3519504522179420597">"TỐI THIỂU"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"Phiên bản PRL"</string>
-    <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
+    <string name="status_meid_number" msgid="2037549729230058915">"IMEI / MEID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"Loại mạng di động"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Trạng thái mạng di động"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Tình trạng sử dụng"</string>
@@ -893,9 +904,12 @@
     <string name="install_unknown_applications" msgid="6612824788917283662">"Cho phép cài đặt các ứng dụng không phải của Market"</string>
     <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"Máy tính bảng và dữ liệu cá nhân của bạn dễ bị các ứng dụng từ các nguồn không xác định tấn công hơn. Bạn đồng ý rằng bạn tự chịu trách nhiệm về bất kỳ thiệt hại nào đối với máy tính bảng hoặc việc mất dữ liệu có thể gây ra do việc sử dụng các ứng dụng này."</string>
     <string name="install_all_warning" product="default" msgid="1923717607319933741">"Điện thoại và dữ liệu cá nhân của bạn dễ bị các ứng dụng từ các nguồn không xác định tấn công hơn. Bạn đồng ý rằng bạn tự chịu trách nhiệm về bất kỳ thiệt hại nào đối với điện thoại hoặc việc mất dữ liệu có thể gây ra do việc sử dụng các ứng dụng này."</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Cài đặt nâng cao"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Bật thêm các tùy chọn cài đặt."</string>
     <string name="application_info_label" msgid="1150486628158409543">"Thông tin ứng dụng"</string>
     <string name="storage_label" msgid="8700867073480107253">"Dung lượng"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Khởi chạy theo mặc định"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"Khả năng tương thích với màn hình"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Quyền"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Bộ nhớ cache"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Xoá bộ nhớ cache"</string>
@@ -915,6 +929,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"Bạn đã chọn khởi chạy ứng dụng này theo mặc định cho một số tác vụ."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Chưa đặt mặc định."</string>
     <string name="clear_activities" msgid="7408923511535174430">"Xoá mặc định"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"Có thể ứng dụng này không được thiết kế cho màn hình của bạn; bạn có thể kiểm soát cách ứng dụng điều chỉnh phù hợp với màn hình của mình tại đây."</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"Hỏi khi chạy"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"Ứng dụng quy mô lớn"</string>
     <string name="unknown" msgid="1592123443519355854">"Không xác định"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Sắp xếp theo tên"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Sắp xếp theo kích thước"</string>
@@ -1019,8 +1036,13 @@
     <string name="show_password" msgid="2198798062604049206">"Mật khẩu hiển thị"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Hiển thị mật khẩu khi bạn nhập"</string>
     <string name="ime_security_warning" msgid="812267421486877917">"Phương thức nhập này có thể thu thập tất cả văn bản bạn nhập, bao gồm dữ liệu cá nhân như mật khẩu và số thẻ tín dụng. Phương thức nhập này xuất phát từ ứng dụng <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Sử dụng phương thức nhập này?"</string>
+    <!-- no translation found for pointer_settings_category (6090176550039035130) -->
+    <skip />
+    <!-- no translation found for pointer_speed (1221342330217861616) -->
+    <skip />
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Từ điển người dùng"</string>
-    <string name="user_dict_settings_title" msgid="8357027437499042191">"Từ điển người dùng"</string>
+    <string name="user_dict_single_settings_title" msgid="5454855286173849284">"Từ điển người dùng"</string>
+    <string name="user_dict_multiple_settings_title" msgid="326583195525296750">"Quản lý từ điển người dùng"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Thêm"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Thêm vào từ điển"</string>
@@ -1029,6 +1051,7 @@
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Xoá"</string>
     <string name="user_dict_settings_empty_text" product="tablet" msgid="1766522102636921529">"Bạn không có bất kỳ từ nào trong từ điển người dùng. Bạn có thể thêm từ bằng cách chạm vào nút Thêm ( + )."</string>
     <string name="user_dict_settings_empty_text" product="default" msgid="6209268025109242806">"Bạn không có từ nào trong từ điển người dùng. Bạn có thể thêm từ qua trình đơn."</string>
+    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"Tất cả ngôn ngữ"</string>
     <string name="testing" msgid="6584352735303604146">"Đang kiểm tra"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Thông tin về máy tính bảng"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Thông tin điện thoại"</string>
@@ -1100,6 +1123,8 @@
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"Nút Nguồn"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"Nút Nguồn kết thúc cuộc gọi"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"Trong suốt cuộc gọi, việc nhấn phím Nguồn sẽ kết thúc cuộc gọi thay vì tắt màn hình"</string>
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <skip />
     <string name="touchscreen_gestures_category" msgid="3109869155350859625">"Thao tác dành cho màn hình cảm ứng"</string>
     <string name="long_press_timeout_selector_title" msgid="1396876537252863044">"Thời gian chờ cho Chạm &amp; giữ"</string>
     <string name="long_press_timeout_selector_summary" msgid="2261114502740278996">"Thời gian chờ cho đến khi thao tác chạm được hiểu là chạm &amp; giữ"</string>
@@ -1302,30 +1327,26 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(không thay đổi)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(chưa được đặt)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Lưu thông tin xác thực"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Sử dụng thông tin xác thực bảo mật"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"Cho phép các ứng dụng truy cập vào chứng chỉ bảo mật và thông tin xác thực khác"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Cài đặt từ bộ nhớ"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Cài đặt từ thẻ SD"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Cài đặt chứng chỉ từ bộ nhớ"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Cài đặt chứng chỉ từ thẻ SD"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"Đặt mật khẩu"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"Đặt hoặc thay đổi mật khẩu cho bộ nhớ thông tin xác thực"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Xóa thông tin xác thực"</string>
-    <string name="credentials_reset_summary" msgid="3810369467217453606">"Xóa tất cả nội dung và đặt lại mật khẩu"</string>
+    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3369361230171260282">"Xóa bộ nhớ thông tin xác thực của tất cả nội dung và đặt lại mật khẩu của nó"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Nhập mật khẩu"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Nhập mật khẩu cho bộ nhớ thông tin xác thực."</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"Đặt mật khẩu cho bộ nhớ thông tin xác thực. Mật khẩu phải có ít nhất 8 ký tự."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Mật khẩu hiện tại:"</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"Mật khẩu mới:"</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"Xác nhận mật khẩu mới:"</string>
-    <string name="credentials_reset_hint" msgid="2336340927894094814">"Tất cả nội dung sẽ bị xóa và mật khẩu sẽ được đặt lại. Bạn có chắc chắn việc đó không?"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"Mật khẩu không khớp."</string>
+    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="1566409057833618877">"Bạn có chắc chắn muốn xóa tất cả thông tin xác thực và đặt lại mật khẩu lưu trữ thông tin xác thực không?"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Mật khẩu phải có ít nhất 8 ký tự."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Mật khẩu không chính xác."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Mật khẩu không chính xác. Bạn còn một cơ hội nữa trước khi bộ nhớ thông tin xác thực bị xóa."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Mật khẩu không chính xác. Bạn có <xliff:g id="NUMBER">%1$d</xliff:g> cơ hội nữa trước khi bộ nhớ thông tin xác thực bị xóa."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Bộ nhớ thông tin xác thực đã bị xóa."</string>
+    <!-- no translation found for credentials_not_erased (397954733557821269) -->
+    <skip />
     <string name="credentials_enabled" msgid="7588607413349978930">"Bộ nhớ thông tin xác thực đã bật."</string>
+    <!-- no translation found for credentials_configure_lock_screen_hint (6816970208840577219) -->
+    <skip />
     <string name="emergency_tone_title" msgid="1055954530111587114">"Âm khẩn cấp"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Đặt chế độ khi cuộc gọi khẩn cấp được thực hiện"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"Bảo mật"</string>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index c001714..2955c92 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -48,6 +48,16 @@
     <item msgid="2314124409517439288">"10 分钟"</item>
     <item msgid="6864027152847611413">"30 分钟"</item>
   </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="3149294732238283185">"从不"</item>
+    <item msgid="2194151041885903260">"15 秒"</item>
+    <item msgid="5892295237131074341">"30 秒"</item>
+    <item msgid="3538441365970038213">"1 分钟"</item>
+    <item msgid="412343871668955639">"2 分钟"</item>
+    <item msgid="5076853889688991690">"5 分钟"</item>
+    <item msgid="1903860996174927898">"10 分钟"</item>
+    <item msgid="6415509612413178727">"30 分钟"</item>
+  </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"无延迟"</item>
     <item msgid="6736512735606834431">"5 秒"</item>
@@ -59,6 +69,22 @@
     <item msgid="9002737361305019353">"10 分钟"</item>
     <item msgid="4322676235684793329">"30 分钟"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"极小"</item>
+    <item msgid="383133849547816572">"较小"</item>
+    <item msgid="6490061470416867723">"小"</item>
+    <item msgid="3579015730662088893">"正常"</item>
+    <item msgid="1678068858001018666">"大"</item>
+    <item msgid="490158884605093126">"较大"</item>
+    <item msgid="2123802548987439763">"极大"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"很慢"</item>
     <item msgid="2361722960903353554">"慢"</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index ae9e55c..d841813 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -316,7 +316,7 @@
     <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_disabled_summary" msgid="8563103042330816018">"已被管理员或加密政策停用"</string>
+    <!-- outdated translation 5962903914511361952 -->     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"已由远程设备管理员停用"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"关闭"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7137296704741184239">"无安全措施"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"使用图案设置安全保护"</string>
@@ -460,6 +460,7 @@
     <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"指定何时断开 Wi-Fi 连接"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"更改设置时出现问题"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"添加 Wi-Fi 网络"</string>
+    <string name="wifi_add_network_summary" msgid="6345544206968025811">"配置非广播网络"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi 网络"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"扫描"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"高级"</string>
@@ -598,7 +599,17 @@
     <string name="brightness_summary" msgid="838917350127550703">"调整屏幕亮度"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"超时"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"屏幕会在 <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>后自动关闭"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android Dream"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"屏幕保护程序和其他待机程序"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"所选 Dream"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"激活时间"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"闲置 <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>后"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"从不"</string>
+    <string name="dream_test" msgid="5968002644622194481">"试试看！"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"自动调整亮度"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"字体大小"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"整体字体大小"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"选择字体大小"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM 卡锁定设置"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"设置 SIM 卡锁定"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM 卡锁定"</string>
@@ -644,7 +655,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"本机号码"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"PRL 版本"</string>
-    <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
+    <string name="status_meid_number" msgid="2037549729230058915">"IMEI/MEID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"手机网络类型"</string>
     <string name="status_data_state" msgid="5503181397066522950">"移动网络状态"</string>
     <string name="status_service_state" msgid="2323931627519429503">"服务状态"</string>
@@ -893,9 +904,12 @@
     <string name="install_unknown_applications" msgid="6612824788917283662">"允许安装非电子市场提供的应用程序"</string>
     <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"您的平板电脑和个人数据更容易受到来自未知来源的应用程序的攻击。对于您因使用这些应用程序而造成的平板电脑损坏或数据丢失，您同意自行承担全部责任。"</string>
     <string name="install_all_warning" product="default" msgid="1923717607319933741">"您的手机和个人数据会更容易受到来自未知来源的应用程序的攻击。您同意自己对因使用这些应用程序而造成的手机损坏或数据丢失承担全部责任。"</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"高级设置"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"启用更多设置选项。"</string>
     <string name="application_info_label" msgid="1150486628158409543">"应用程序信息"</string>
     <string name="storage_label" msgid="8700867073480107253">"存储"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"默认启动"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"屏幕兼容性"</string>
     <string name="permissions_label" msgid="2605296874922726203">"权限"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"缓存"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"清除缓存"</string>
@@ -915,6 +929,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"您已选择在默认情况下对某些操作启动此应用程序。"</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"无默认设置。"</string>
     <string name="clear_activities" msgid="7408923511535174430">"清除默认设置"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"此应用程序可能不是针对您的屏幕设计的；您可以在此处调整其显示尺寸/比例，使其适合您的屏幕。"</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"启动时确认"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"调整应用程序的显示尺寸/比例"</string>
     <string name="unknown" msgid="1592123443519355854">"未知"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"按姓名排序"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"按大小排序"</string>
@@ -1019,8 +1036,13 @@
     <string name="show_password" msgid="2198798062604049206">"密码可见"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"输入时密码可见"</string>
     <string name="ime_security_warning" msgid="812267421486877917">"该输入法可能会收集您输入的所有文字，包括密码和信用卡号码等个人数据。它源自 <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g> 应用程序。是否要使用该输入法？"</string>
+    <!-- no translation found for pointer_settings_category (6090176550039035130) -->
+    <skip />
+    <!-- no translation found for pointer_speed (1221342330217861616) -->
+    <skip />
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"用户词典"</string>
-    <string name="user_dict_settings_title" msgid="8357027437499042191">"用户词典"</string>
+    <string name="user_dict_single_settings_title" msgid="5454855286173849284">"用户词典"</string>
+    <string name="user_dict_multiple_settings_title" msgid="326583195525296750">"管理用户词典"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"添加"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"添加到词典"</string>
@@ -1029,6 +1051,7 @@
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"删除"</string>
     <string name="user_dict_settings_empty_text" product="tablet" msgid="1766522102636921529">"用户词典中没有您定义的字词。您可以触摸“添加”( + ) 按钮添加字词。"</string>
     <string name="user_dict_settings_empty_text" product="default" msgid="6209268025109242806">"用户词典中没有您定义的字词。您可以按 MENU 添加字词。"</string>
+    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"所有语言"</string>
     <string name="testing" msgid="6584352735303604146">"测试"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"平板电脑信息"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"手机信息"</string>
@@ -1100,6 +1123,8 @@
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"“电源”按钮"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"按“电源”按钮结束通话"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"通话时，按下“电源”将结束通话而不是关闭屏幕"</string>
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <skip />
     <string name="touchscreen_gestures_category" msgid="3109869155350859625">"触摸屏手势"</string>
     <string name="long_press_timeout_selector_title" msgid="1396876537252863044">"触摸和按住延迟"</string>
     <string name="long_press_timeout_selector_summary" msgid="2261114502740278996">"延迟至用户执行触摸和按住操作"</string>
@@ -1302,30 +1327,26 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"（未更改）"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"（未设置）"</string>
     <string name="credentials_title" msgid="4446234003860769883">"凭据存储"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"使用安全凭证"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"允许应用程序访问安全凭证和其他凭证"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"从存储设备安装"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"从 SD 卡安装"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"从存储设备安装证书"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"从 SD 卡安装证书"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"设置密码"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"设置或更改凭据存储密码"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"清除凭据"</string>
-    <string name="credentials_reset_summary" msgid="3810369467217453606">"删除所有内容并重置密码"</string>
+    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3369361230171260282">"清除所有内容的凭证存储并重置其密码"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"输入密码"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"输入凭据存储密码。"</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"设置凭据存储密码（至少 8 个字符）。"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"当前密码："</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"新密码："</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"确认新密码："</string>
-    <string name="credentials_reset_hint" msgid="2336340927894094814">"系统会删除所有内容并重置密码。您确定要执行此操作吗？"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"密码不匹配。"</string>
+    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="1566409057833618877">"确定要删除所有凭证，并且重置凭证存储密码吗？"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"密码至少应包含 8 个字符。"</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"密码不正确。"</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"密码不正确。您还可以重试一次，如果输入的密码仍不正确，系统将删除凭据存储。"</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"密码不正确。您还可以重试 <xliff:g id="NUMBER">%1$d</xliff:g> 次，如果输入的密码仍不正确，系统将删除凭据存储。"</string>
     <string name="credentials_erased" msgid="2907836028586342969">"凭据存储已删除。"</string>
+    <!-- no translation found for credentials_not_erased (397954733557821269) -->
+    <skip />
     <string name="credentials_enabled" msgid="7588607413349978930">"凭证存储已启用。"</string>
+    <!-- no translation found for credentials_configure_lock_screen_hint (6816970208840577219) -->
+    <skip />
     <string name="emergency_tone_title" msgid="1055954530111587114">"紧急提示音"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"设置进行紧急呼救时的行为"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"隐私权"</string>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index 3cc5f05..c2d1472 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -48,6 +48,16 @@
     <item msgid="2314124409517439288">"10 分鐘"</item>
     <item msgid="6864027152847611413">"30 分鐘"</item>
   </string-array>
+  <string-array name="dream_timeout_entries">
+    <item msgid="3149294732238283185">"永不"</item>
+    <item msgid="2194151041885903260">"15 秒"</item>
+    <item msgid="5892295237131074341">"30 秒"</item>
+    <item msgid="3538441365970038213">"1 分鐘"</item>
+    <item msgid="412343871668955639">"2 分鐘"</item>
+    <item msgid="5076853889688991690">"5 分鐘"</item>
+    <item msgid="1903860996174927898">"10 分鐘"</item>
+    <item msgid="6415509612413178727">"30 分鐘"</item>
+  </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="5416834369150305288">"立即"</item>
     <item msgid="6736512735606834431">"5 秒"</item>
@@ -59,6 +69,22 @@
     <item msgid="9002737361305019353">"10 分鐘"</item>
     <item msgid="4322676235684793329">"30 分鐘"</item>
   </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"最小"</item>
+    <item msgid="383133849547816572">"較小"</item>
+    <item msgid="6490061470416867723">"小"</item>
+    <item msgid="3579015730662088893">"一般"</item>
+    <item msgid="1678068858001018666">"大"</item>
+    <item msgid="490158884605093126">"較大"</item>
+    <item msgid="2123802548987439763">"最大"</item>
+  </string-array>
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"非常慢"</item>
     <item msgid="2361722960903353554">"慢"</item>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index de0c206..7a16eb9 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -316,7 +316,7 @@
     <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_disabled_summary" msgid="8563103042330816018">"由管理員停用，或因加密政策而遭停用"</string>
+    <!-- outdated translation 5962903914511361952 -->     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"已由遠端裝置管理員停用"</string>
     <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"關閉"</string>
     <string name="unlock_set_unlock_mode_none" msgid="7137296704741184239">"無安全性設定"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"以解鎖圖形設定安全保護"</string>
@@ -460,6 +460,7 @@
     <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"指定中斷 Wi-Fi 連線的時間"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"變更設定時發生問題"</string>
     <string name="wifi_add_network" msgid="1671334951296205616">"新增 Wi-Fi 網路"</string>
+    <string name="wifi_add_network_summary" msgid="6345544206968025811">"設定非公開網路"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi 網路"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"掃描"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"進階"</string>
@@ -598,7 +599,17 @@
     <string name="brightness_summary" msgid="838917350127550703">"調整螢幕亮度"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"逾時"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>後自動關閉螢幕"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android Dreams"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"螢幕保護程式和其他閒置處理方式"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"選取的 Dream"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"啟動時間"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"閒置 <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>後"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"永不"</string>
+    <string name="dream_test" msgid="5968002644622194481">"試試看！"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"自動調整亮度"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"字型大小"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"整體字型大小"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"選取字型大小"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM 卡鎖定設定"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"設定 SIM 卡鎖定"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM 卡鎖定"</string>
@@ -644,7 +655,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"我的電話號碼"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_prl_version" msgid="8499039751817386529">"PRL 版本"</string>
-    <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
+    <string name="status_meid_number" msgid="2037549729230058915">"IMEI / MEID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"行動網路類型"</string>
     <string name="status_data_state" msgid="5503181397066522950">"行動網路狀態"</string>
     <string name="status_service_state" msgid="2323931627519429503">"服務狀態"</string>
@@ -893,9 +904,12 @@
     <string name="install_unknown_applications" msgid="6612824788917283662">"允許安裝非 Market 應用程式"</string>
     <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"來歷不明的應用程式可能會損害您的平板電腦及個人資料，如因使用這些應用程式導致平板電腦受損或資料遺失，請自行承擔責任。"</string>
     <string name="install_all_warning" product="default" msgid="1923717607319933741">"未知來源的應用程式可能會損害您的手機及個人資訊。如使用這些應用程式而造成手機受損或資料遺失，您必須自行承擔責任。"</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"進階設定"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"啟用更多設定選項。"</string>
     <string name="application_info_label" msgid="1150486628158409543">"應用程式資訊"</string>
     <string name="storage_label" msgid="8700867073480107253">"儲存空間"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"預設為啟動"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"螢幕相容性"</string>
     <string name="permissions_label" msgid="2605296874922726203">"權限"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"快取"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"清除快取"</string>
@@ -915,6 +929,9 @@
     <string name="auto_launch_enable_text" msgid="2630656657744196691">"您已設定在某些操作下啟動此應用程式。"</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"沒有預設值。"</string>
     <string name="clear_activities" msgid="7408923511535174430">"清除預設值"</string>
+    <string name="screen_compatibility_text" msgid="2398570332021220651">"這個應用程式可能與您的螢幕不相容；您可以在這裡進行設定，將應用程式調整成與您的螢幕相容。"</string>
+    <string name="ask_compatibility" msgid="7225195569089607846">"啓動時詢問"</string>
+    <string name="enable_compatibility" msgid="3257284255974065538">"調整應用程式大小"</string>
     <string name="unknown" msgid="1592123443519355854">"不明"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"按名稱排序"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"依大小排序"</string>
@@ -1019,8 +1036,13 @@
     <string name="show_password" msgid="2198798062604049206">"顯示密碼"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"顯示輸入的密碼"</string>
     <string name="ime_security_warning" msgid="812267421486877917">"此輸入法可能會收集您輸入的所有文字，包括密碼和信用卡號等個人資料。此輸入法來自「<xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>」應用程式。是否要使用此輸入法？"</string>
+    <!-- no translation found for pointer_settings_category (6090176550039035130) -->
+    <skip />
+    <!-- no translation found for pointer_speed (1221342330217861616) -->
+    <skip />
     <string name="user_dict_settings_titlebar" msgid="765659257455000490">"使用者字典"</string>
-    <string name="user_dict_settings_title" msgid="8357027437499042191">"使用者字典"</string>
+    <string name="user_dict_single_settings_title" msgid="5454855286173849284">"使用者字典"</string>
+    <string name="user_dict_multiple_settings_title" msgid="326583195525296750">"管理使用者字典"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"新增"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"新增至字典"</string>
@@ -1029,6 +1051,7 @@
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"刪除"</string>
     <string name="user_dict_settings_empty_text" product="tablet" msgid="1766522102636921529">"您的使用者字典中沒有任何字詞，請輕觸 [新增] ( + ) 按鈕，即可新增字詞。"</string>
     <string name="user_dict_settings_empty_text" product="default" msgid="6209268025109242806">"您的使用者字典中沒有任何字詞，您可以透過 [Menu] 新增字詞。"</string>
+    <string name="user_dict_settings_all_languages" msgid="7713910347678213719">"所有語言"</string>
     <string name="testing" msgid="6584352735303604146">"測試中"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"平板電腦資訊"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"手機資訊"</string>
@@ -1100,6 +1123,8 @@
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"電源鍵"</string>
     <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"電源鍵可結束通話"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"通話時按下電源鍵結束通話，不會關閉螢幕"</string>
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <skip />
     <string name="touchscreen_gestures_category" msgid="3109869155350859625">"觸控式螢幕手勢"</string>
     <string name="long_press_timeout_selector_title" msgid="1396876537252863044">"輕觸並按住延遲"</string>
     <string name="long_press_timeout_selector_summary" msgid="2261114502740278996">"延遲等到裝置將觸控操作解讀為輕觸並按住為止"</string>
@@ -1302,30 +1327,26 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(未變更)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(未設定)"</string>
     <string name="credentials_title" msgid="4446234003860769883">"憑證儲存空間"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"使用安全認證"</string>
-    <string name="credentials_access_summary" msgid="319662078718574168">"允許應用程式存取安全認證及其他認證"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"從儲存裝置安裝"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"從 SD 卡安裝"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"從儲存裝置安裝憑證"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"從 SD 卡安裝憑證"</string>
-    <string name="credentials_set_password" msgid="9104473585811899989">"設定密碼"</string>
-    <string name="credentials_set_password_summary" msgid="6756719720826053228">"設定或變更憑證儲存空間的密碼"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"清除憑證"</string>
-    <string name="credentials_reset_summary" msgid="3810369467217453606">"移除所有內容並重設密碼"</string>
+    <!-- outdated translation 2127419861568976637 -->     <string name="credentials_reset_summary" msgid="3369361230171260282">"清除認證儲存空間的所有內容，並重設密碼"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"輸入密碼"</string>
     <string name="credentials_unlock_hint" msgid="5889551635843338639">"輸入憑證儲存空間的密碼。"</string>
-    <string name="credentials_password_hint" msgid="4915128717409363024">"設定憑證儲存空間的密碼，密碼至少必須包含 8 個字元。"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"目前的密碼："</string>
-    <string name="credentials_new_password" msgid="267487774686796938">"新密碼："</string>
-    <string name="credentials_confirm_password" msgid="4732250000633424345">"確認新密碼："</string>
-    <string name="credentials_reset_hint" msgid="2336340927894094814">"這會移除所有內容並重設密碼，您確定要繼續進行嗎？"</string>
-    <string name="credentials_passwords_mismatch" msgid="5288565139590031733">"密碼不符。"</string>
+    <!-- outdated translation 7883277320781857760 -->     <string name="credentials_reset_hint" msgid="1566409057833618877">"您確定要刪除所有憑證，並重設認證儲存空間密碼嗎？"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"密碼最少必須包含 8 個字元。"</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"密碼不正確。"</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"密碼不正確。您還有 1 次輸入密碼的機會，如果輸入錯誤，憑證儲存空間將遭到清除。"</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"密碼不正確。您還有 <xliff:g id="NUMBER">%1$d</xliff:g> 次輸入密碼的機會，如果輸入錯誤，憑證儲存空間將遭到清除。"</string>
     <string name="credentials_erased" msgid="2907836028586342969">"憑證儲存空間已清除。"</string>
+    <!-- no translation found for credentials_not_erased (397954733557821269) -->
+    <skip />
     <string name="credentials_enabled" msgid="7588607413349978930">"已啟用認證儲存空間。"</string>
+    <!-- no translation found for credentials_configure_lock_screen_hint (6816970208840577219) -->
+    <skip />
     <string name="emergency_tone_title" msgid="1055954530111587114">"緊急警示音"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"設定撥打緊急電話時的運作方式"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"隱私設定"</string>
diff --git a/res/values-zu-nokeys/strings.xml b/res/values-zu-nokeys/strings.xml
new file mode 100644
index 0000000..7b465fc
--- /dev/null
+++ b/res/values-zu-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="6616938758022986257">"Phatha izinhlelo zokusebenza"</string>
+</resources>
diff --git a/res/values-zu/arrays.xml b/res/values-zu/arrays.xml
new file mode 100644
index 0000000..98ea245
--- /dev/null
+++ b/res/values-zu/arrays.xml
@@ -0,0 +1,205 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2007 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item msgid="5296756001147094692">"i-America"</item>
+    <item msgid="3005562397632768392">"i-Europe"</item>
+    <item msgid="5696915123093701218">"i-Afrika"</item>
+    <item msgid="4439789052790868249">"i-Asia"</item>
+    <item msgid="956915953069815961">"i-Australia"</item>
+    <item msgid="5345178126174698955">"Iphasifiki"</item>
+    <item msgid="8392017019801393511">"Konke"</item>
+  </string-array>
+  <string-array name="animations_entries">
+    <item msgid="207790005475613429">"Akukho ukugqwayiza"</item>
+    <item msgid="6291186755504776720">"Okunye ukugqwayiza"</item>
+    <item msgid="3856065399819979491">"Konke ukugqwayiza"</item>
+  </string-array>
+  <string-array name="animations_summaries">
+    <item msgid="4569165952409350897">"Cha ukugqwayiza kwewindi kuyabonisa"</item>
+    <item msgid="4460915688877708508">"Okunye ukugqwayiza kwewindi kubonisiwe"</item>
+    <item msgid="488968798204105119">"Konke ukugqwayiza kwewindi kuyabonisa"</item>
+  </string-array>
+    <!-- no translation found for screen_timeout_entries:6 (6864027152847611413) -->
+    <!-- no translation found for dream_timeout_entries:0 (3149294732238283185) -->
+    <!-- no translation found for dream_timeout_entries:1 (2194151041885903260) -->
+    <!-- no translation found for dream_timeout_entries:2 (5892295237131074341) -->
+    <!-- no translation found for dream_timeout_entries:3 (3538441365970038213) -->
+    <!-- no translation found for dream_timeout_entries:4 (412343871668955639) -->
+    <!-- no translation found for dream_timeout_entries:5 (5076853889688991690) -->
+    <!-- no translation found for dream_timeout_entries:6 (1903860996174927898) -->
+    <!-- no translation found for dream_timeout_entries:7 (6415509612413178727) -->
+    <!-- no translation found for lock_after_timeout_entries:6 (49888496216106852) -->
+    <!-- no translation found for lock_after_timeout_entries:7 (9002737361305019353) -->
+    <!-- no translation found for lock_after_timeout_entries:8 (4322676235684793329) -->
+    <!-- no translation found for entries_font_size:0 (2722636506084795405) -->
+    <!-- no translation found for entries_font_size:1 (383133849547816572) -->
+    <!-- no translation found for entries_font_size:2 (6490061470416867723) -->
+    <!-- no translation found for entries_font_size:3 (3579015730662088893) -->
+    <!-- no translation found for entries_font_size:4 (1678068858001018666) -->
+    <!-- no translation found for entries_font_size:5 (490158884605093126) -->
+    <!-- no translation found for entries_font_size:6 (2123802548987439763) -->
+    <!-- no translation found for entryvalues_font_size:0 (8122189478379706788) -->
+    <!-- no translation found for entryvalues_font_size:1 (186029675505810577) -->
+    <!-- no translation found for entryvalues_font_size:2 (5864822191921585498) -->
+    <!-- no translation found for entryvalues_font_size:3 (5580820036923893743) -->
+    <!-- no translation found for entryvalues_font_size:4 (5106590751949630532) -->
+    <!-- no translation found for entryvalues_font_size:5 (1803159594904488544) -->
+    <!-- no translation found for entryvalues_font_size:6 (7410681469566563300) -->
+  <string-array name="tts_rate_entries">
+    <item msgid="6041212618892492920">"Phansi kakhulu"</item>
+    <item msgid="2361722960903353554">"Phansi"</item>
+    <item msgid="1145554631248513562">"Kuvamile"</item>
+    <item msgid="7553665153391107454">"Sheshayo"</item>
+    <item msgid="2538100882620724753">"Kushesha kakhulu"</item>
+  </string-array>
+  <string-array name="tts_pitch_entries">
+    <item msgid="7526050907652687351">"Phansi kakhulu"</item>
+    <item msgid="2692137425242433765">"Phansi"</item>
+    <item msgid="3332408460740717754">"Kuvamile"</item>
+    <item msgid="4907380534957572531">"Phezulu"</item>
+    <item msgid="4699640516390840297">"Phezulu kakhulu"</item>
+  </string-array>
+  <string-array name="tts_lang_entries">
+    <item msgid="478030717868306353">"isi-American English"</item>
+    <item msgid="5192284521396794598">"isi-Brittish English"</item>
+    <item msgid="3000262452051711991">"isi-French"</item>
+    <item msgid="9214080387341763401">"isi-German"</item>
+    <item msgid="5972100016440094433">"isi-Italian"</item>
+    <item msgid="5811378076054402537">"isi-Spanish"</item>
+  </string-array>
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Iyathwebula..."</item>
+    <item msgid="8513729475867537913">"Iyaxhuma kwi-inthanethi..."</item>
+    <item msgid="515055375277271756">"Iyaqinisekisa..."</item>
+    <item msgid="1943354004029184381">"Ithola ikheli le-IP..."</item>
+    <item msgid="4221763391123233270">"Ixhunyiwe kwi-inthanethi"</item>
+    <item msgid="624838831631122137">"Kumiswe okwesikhashana"</item>
+    <item msgid="7979680559596111948">"Inqamula uxhumano kwi-inthanethi..."</item>
+    <item msgid="1634960474403853625">"Ayixhunyiwe"</item>
+    <item msgid="746097431216080650">"Akuphumelelanga"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"Iyathwebula..."</item>
+    <item msgid="355508996603873860">"Ixhuma ku-<xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="554971459996405634">"Iqinisekisa nge <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="7928343808033020343">"Ithola ikheli le-IP kusuka <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="8937994881315223448">"Ixhumeke ku-<xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="1330262655415760617">"Kumiswe okwesikhashana"</item>
+    <item msgid="7698638434317271902">"Inqamula kusuka <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="197508606402264311">"Ayixhunyiwe kwi-inthanethi"</item>
+    <item msgid="8578370891960825148">"Akuphumelelanga"</item>
+  </string-array>
+  <string-array name="wifi_security">
+    <item msgid="1435933968767043814">"Vula"</item>
+    <item msgid="6318432659048829665">"I-WEP"</item>
+    <item msgid="2966395706508338179">"I-WPA/WPA2 PSK"</item>
+    <item msgid="9098390198768443435">"802.1x EAP"</item>
+  </string-array>
+  <string-array name="wifi_eap_method">
+    <item msgid="1160193392455075561">"I-PEAP"</item>
+    <item msgid="7981731051382306293">"i-TLS"</item>
+    <item msgid="2892994535305020162">"i-TTLS"</item>
+  </string-array>
+    <!-- no translation found for bluetooth_visibility_timeout_entries:0 (1106621950288502195) -->
+    <!-- no translation found for bluetooth_visibility_timeout_entries:1 (5780349442819375570) -->
+    <!-- no translation found for bluetooth_visibility_timeout_entries:2 (1166466894270177580) -->
+    <!-- no translation found for bluetooth_visibility_timeout_entries:3 (9032073376232198148) -->
+  <string-array name="wifi_signal">
+    <item msgid="2245412278046491293">"Akukuhle"</item>
+    <item msgid="5615082285463430971">"Kulungile"</item>
+    <item msgid="3565079809875324621">"Kuhle"</item>
+    <item msgid="5702329417707689835">"Kuhle kakhulu"</item>
+  </string-array>
+  <string-array name="wifi_sleep_policy_entries">
+    <!-- outdated translation 3804733751095821976 -->     <item msgid="643915340724070374">"Lapho isikrini sivala"</item>
+    <item msgid="1549288661423279207">"Akusoze uma kuxhunyiwe"</item>
+    <!-- outdated translation 1986753720941888596 -->     <item msgid="6592896328877671197">"Akusoze"</item>
+  </string-array>
+    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:0 (2659922042905569057) -->
+    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:1 (8137861573803398334) -->
+    <!-- no translation found for wifi_sleep_policy_entries_wifi_only:2 (5996547094658157629) -->
+    <!-- no translation found for wifi_frequency_band_entries:0 (624340809384223320) -->
+    <!-- no translation found for wifi_frequency_band_entries:1 (6670588712989942178) -->
+    <!-- no translation found for wifi_frequency_band_entries:2 (2715516524973207876) -->
+  <string-array name="usage_stats_display_order_types">
+    <item msgid="9077371706468756228">"Isikhathi sokusetshenziswa"</item>
+    <item msgid="1908750532762193304">"Qalisa ukubala"</item>
+    <item msgid="1213951670006606353">"Igama Lohlelo Lokusebenza"</item>
+  </string-array>
+  <string-array name="wifi_eap_entries">
+    <item msgid="8615575908717909498">"I-PEAP"</item>
+    <item msgid="8667872640594311615">"I-TLS"</item>
+    <item msgid="7182812872984827322">"I-TTLS"</item>
+  </string-array>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="1818786254010764570">"Lutho"</item>
+    <item msgid="6189918678874123056">"I-PAP"</item>
+    <item msgid="1524112260493662517">"I-MSCHAP"</item>
+    <item msgid="5923246669412752932">"I-MSCHAPV2"</item>
+    <item msgid="8651992560135239389">"I-GTC"</item>
+  </string-array>
+    <!-- no translation found for wifi_network_setup:2 (7131487972018976724) -->
+    <!-- no translation found for wifi_network_setup:3 (4809199848225172977) -->
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"i-DHCP"</item>
+    <item msgid="628395202971532382">"Isibalo"</item>
+  </string-array>
+    <!-- no translation found for wifi_proxy_settings:0 (4473276491748503377) -->
+    <!-- no translation found for wifi_proxy_settings:1 (8673874894887358090) -->
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Valiwe"</item>
+    <item msgid="3165868966179561687">"Isaziso"</item>
+    <item msgid="6038758039030476855">"Dlidliza"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="3856896061242872146">"Lutho"</item>
+    <item msgid="5756844015743664882">"i-PAP"</item>
+    <item msgid="535934025797984365">"i-CHAP"</item>
+    <item msgid="8383098660619805783">"i-PAP noma i-CHAP"</item>
+  </string-array>
+    <!-- no translation found for apn_protocol_entries:0 (4852355456199302715) -->
+    <!-- no translation found for apn_protocol_entries:1 (4394161344888484571) -->
+    <!-- no translation found for apn_protocol_entries:2 (8084938354605535381) -->
+  <string-array name="app_install_location_entries">
+    <item msgid="8151497958991952759">"Ukugcina idivaysi yangaphakathi"</item>
+    <item msgid="3738430123799803530">"Khipha ikhadi le-SD"</item>
+    <item msgid="4498124044785815005">"Vumela isistimu inqume"</item>
+  </string-array>
+  <string-array name="vibrate_entries">
+    <item msgid="3388952299521009213">"Njalo"</item>
+    <item msgid="6293147072807231256">"Akusoze"</item>
+    <item msgid="1276641209451816572">"Kwimodi Ethulile kuphela"</item>
+    <item msgid="8418930333779132418">"Kuphela lapho ingekho kwimodi Ethulile"</item>
+  </string-array>
+    <!-- no translation found for long_press_timeout_selector_titles:0 (3511504869290423954) -->
+    <!-- no translation found for long_press_timeout_selector_titles:1 (2560532955514699713) -->
+    <!-- no translation found for long_press_timeout_selector_titles:2 (2372711992605524591) -->
+    <!-- no translation found for hdcp_checking_titles:0 (441827799230089869) -->
+    <!-- no translation found for hdcp_checking_titles:1 (6042769699089883931) -->
+    <!-- no translation found for hdcp_checking_titles:2 (9174900380056846820) -->
+    <!-- no translation found for hdcp_checking_summaries:0 (505558545611516707) -->
+    <!-- no translation found for hdcp_checking_summaries:1 (3878793616631049349) -->
+    <!-- no translation found for hdcp_checking_summaries:2 (45075631231212732) -->
+</resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
new file mode 100644
index 0000000..b84ffdb
--- /dev/null
+++ b/res/values-zu/strings.xml
@@ -0,0 +1,2090 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="yes" msgid="4676390750360727396">"Yebo"</string>
+    <string name="no" msgid="6731231425810196216">"Cha"</string>
+    <!-- no translation found for device_info_default (7847265875578739287) -->
+    <skip />
+    <!-- no translation found for turn_on_radio (8706561489788373676) -->
+    <skip />
+    <!-- no translation found for turn_off_radio (1820294552893884115) -->
+    <skip />
+    <!-- no translation found for radioInfo_menu_viewADN (8743377494429930831) -->
+    <skip />
+    <!-- no translation found for radioInfo_menu_viewFDN (7934301566925610318) -->
+    <skip />
+    <!-- no translation found for radioInfo_menu_viewSDN (7130280686244955669) -->
+    <skip />
+    <!-- no translation found for radioInfo_menu_getPDP (560610293888406317) -->
+    <skip />
+    <!-- no translation found for radioInfo_service_in (1915416319177520020) -->
+    <skip />
+    <!-- no translation found for radioInfo_service_out (5238736759641916278) -->
+    <skip />
+    <!-- no translation found for radioInfo_service_emergency (2485604591272668370) -->
+    <skip />
+    <!-- no translation found for radioInfo_service_off (1434084741785525415) -->
+    <skip />
+    <!-- no translation found for radioInfo_roaming_in (9045363884600341051) -->
+    <skip />
+    <!-- no translation found for radioInfo_roaming_not (2851853244069662307) -->
+    <skip />
+    <!-- no translation found for radioInfo_phone_idle (7489244938838742820) -->
+    <skip />
+    <!-- no translation found for radioInfo_phone_ringing (4883724645684297895) -->
+    <skip />
+    <!-- no translation found for radioInfo_phone_offhook (4174402846862780998) -->
+    <skip />
+    <!-- no translation found for radioInfo_data_disconnected (1959735267890719418) -->
+    <skip />
+    <!-- no translation found for radioInfo_data_connecting (8404571440697917823) -->
+    <skip />
+    <!-- no translation found for radioInfo_data_connected (7074301157399238697) -->
+    <skip />
+    <!-- no translation found for radioInfo_data_suspended (5315325487890334196) -->
+    <skip />
+    <!-- no translation found for radioInfo_unknown (737385314432468266) -->
+    <skip />
+    <!-- no translation found for radioInfo_display_packets (8654359809877290639) -->
+    <skip />
+    <!-- no translation found for radioInfo_display_bytes (4018206969492931883) -->
+    <skip />
+    <!-- no translation found for radioInfo_display_dbm (3621221793699882781) -->
+    <skip />
+    <!-- no translation found for radioInfo_display_asu (1422248392727818082) -->
+    <skip />
+    <!-- no translation found for radioInfo_lac (8415219164758307156) -->
+    <skip />
+    <!-- no translation found for radioInfo_cid (4362599198392643138) -->
+    <skip />
+    <!-- no translation found for sdcard_unmount (6325292633327972272) -->
+    <skip />
+    <!-- no translation found for sdcard_unmount (3364184561355611897) -->
+    <skip />
+    <!-- outdated translation 362497552060004057 -->     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Fometha ikhadi le-SD"</string>
+    <!-- outdated translation 362497552060004057 -->     <string name="sdcard_format" product="default" msgid="6713185532039187532">"Fometha ikhadi le-SD"</string>
+    <!-- no translation found for small_font (2295331917424072635) -->
+    <skip />
+    <!-- no translation found for medium_font (2068475425515133701) -->
+    <skip />
+    <!-- no translation found for large_font (599055175160971446) -->
+    <skip />
+    <!-- no translation found for font_size_save (3450855718056759095) -->
+    <skip />
+    <!-- no translation found for sdcard_setting (8281011784066476192) -->
+    <skip />
+    <!-- no translation found for sdcard_setting (5922637503871474866) -->
+    <skip />
+    <!-- no translation found for battery_info_status_label (8109155295509700309) -->
+    <skip />
+    <string name="battery_info_power_label" msgid="7465140230991349382">"Ukuxhuma amandla:"</string>
+    <!-- no translation found for battery_info_scale_label (3649763192389778437) -->
+    <skip />
+    <!-- no translation found for battery_info_level_label (8706526709307788737) -->
+    <skip />
+    <!-- no translation found for battery_info_health_label (6416051542741886958) -->
+    <skip />
+    <!-- no translation found for battery_info_technology_label (788304533220748681) -->
+    <skip />
+    <!-- no translation found for battery_info_voltage_label (8971764146757637863) -->
+    <skip />
+    <!-- no translation found for battery_info_voltage_units (8658490792208288107) -->
+    <skip />
+    <!-- no translation found for battery_info_temperature_label (1968383098818648037) -->
+    <skip />
+    <!-- no translation found for battery_info_temperature_units (9098950587249987550) -->
+    <skip />
+    <!-- no translation found for battery_info_uptime (5548545143573527992) -->
+    <skip />
+    <!-- no translation found for battery_info_awake_battery (2557725975486185849) -->
+    <skip />
+    <!-- no translation found for battery_info_awake_plugged (176716874713478188) -->
+    <skip />
+    <!-- no translation found for battery_info_screen_on (376277447175613889) -->
+    <skip />
+    <!-- no translation found for battery_info_status_unknown (196130600938058547) -->
+    <skip />
+    <!-- no translation found for battery_info_status_charging (1705179948350365604) -->
+    <skip />
+    <!-- no translation found for battery_info_status_charging_ac (5874340256342956252) -->
+    <skip />
+    <!-- no translation found for battery_info_status_charging_usb (4059070156126770959) -->
+    <skip />
+    <!-- no translation found for battery_info_status_discharging (6222697503392774475) -->
+    <skip />
+    <!-- no translation found for battery_info_status_not_charging (2820070506621483576) -->
+    <skip />
+    <!-- no translation found for battery_info_status_full (2824614753861462808) -->
+    <skip />
+    <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Okumonxuliwe"</string>
+    <string name="battery_info_power_ac" msgid="6808516193001604634">"I-AC"</string>
+    <string name="battery_info_power_usb" msgid="8012931702516331797">"I-USB"</string>
+    <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"I-AC+USB"</string>
+    <string name="battery_info_power_unknown" msgid="7344115502868899881">"Akwaziwa"</string>
+    <!-- no translation found for battery_info_health_unknown (5664295556921944255) -->
+    <skip />
+    <!-- no translation found for battery_info_health_good (8070356565806711806) -->
+    <skip />
+    <!-- no translation found for battery_info_health_overheat (8442959549291368806) -->
+    <skip />
+    <!-- no translation found for battery_info_health_dead (1725917445762829059) -->
+    <skip />
+    <!-- no translation found for battery_info_health_over_voltage (2420269351664490121) -->
+    <skip />
+    <!-- no translation found for battery_info_health_unspecified_failure (6347021103185471590) -->
+    <skip />
+    <!-- no translation found for battery_info_health_cold (3835692786176707318) -->
+    <skip />
+    <!-- no translation found for bluetooth (5549625000628014477) -->
+    <skip />
+    <!-- no translation found for bluetooth_visibility (2930835434091839916) -->
+    <skip />
+    <string name="bluetooth_is_discoverable" msgid="1205694503775884903">"Itholakala amasekhondi angu-<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>..."</string>
+    <!-- no translation found for bluetooth_is_discoverable_always (8573385118329733931) -->
+    <skip />
+    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Yenza idivaysi itholakale"</string>
+    <!-- no translation found for bluetooth_visibility_timeout (6634508002347847278) -->
+    <skip />
+    <!-- no translation found for bluetooth_visibility_timeout_summary (6483353842671501585) -->
+    <skip />
+    <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Vala ukudayela ngezwi"</string>
+    <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Gwema ukusebenzisa isidayeli se-bluetooth lapho isikrini sivaliwe"</string>
+    <!-- no translation found for bluetooth_devices (1886018064039454227) -->
+    <skip />
+    <!-- no translation found for bluetooth_device_name (8415828355207423800) -->
+    <skip />
+    <!-- no translation found for bluetooth_name_not_set (2653752006416027426) -->
+    <skip />
+    <!-- no translation found for bluetooth_scan_for_devices (9214184305566815727) -->
+    <skip />
+    <string name="bluetooth_disconnect_blank" msgid="8102076504922229274">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> izonqanyulwa."</string>
+    <!-- no translation found for bluetooth_connected (6038755206916626419) -->
+    <skip />
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Ayixhunyiwe"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Inqamula uxhumano kwi-inthanethi..."</string>
+    <!-- no translation found for bluetooth_connecting (8555009514614320497) -->
+    <skip />
+    <string name="bluetooth_unknown" msgid="644716244548801421"></string>
+    <!-- no translation found for bluetooth_not_connected (3389882907500605937) -->
+    <skip />
+    <!-- no translation found for bluetooth_pairing (1426882272690346242) -->
+    <skip />
+    <string name="bluetooth_paired" msgid="1247541089000057726">"Kubhangqiwe kodwa akuxhunyiwe"</string>
+    <!-- no translation found for bluetooth_device (6873461446424952003) -->
+    <skip />
+    <!-- no translation found for progress_scanning (3760897655335759141) -->
+    <skip />
+    <!-- no translation found for bluetooth_notif_ticker (4726721390078512173) -->
+    <skip />
+    <string name="bluetooth_notif_title" msgid="2485175521845371514">"Isicelo sokubhangqa"</string>
+    <!-- no translation found for bluetooth_notif_message (618099089987569242) -->
+    <skip />
+    <!-- no translation found for bluetooth_show_received_files_title (816172853268536399) -->
+    <skip />
+    <!-- no translation found for bluetooth_show_received_files_summary (7322193220909480775) -->
+    <skip />
+    <string name="device_picker" msgid="8721012448931226323">"Isithathi sedivaysi ye-Bluetooth"</string>
+    <string name="bluetooth_permission_request" msgid="1523129741266262748">"Isicelo semvume ye-Bluetooth"</string>
+    <!-- outdated translation 2342558978033892004 -->     <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Uhlelo lokusebenza efonini yakho lucela imvume yokuvula i-Bluetooth. Ingabe ufuna ukwenza lokhu?"</string>
+    <!-- no translation found for bluetooth_ask_discovery (5950965604673262829) -->
+    <skip />
+    <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Uhlelo lokusebenza efonini yakho lucela imvume yokwenza ifoni yakho itholwe amanye amadivaysi e-Bluetooth ngamasekhondi angu-<xliff:g id="TIMEOUT">%1$d</xliff:g>. Ingabe ufuna ukwenza lokhu?"</string>
+    <!-- no translation found for bluetooth_ask_lasting_discovery (1680661751413856600) -->
+    <skip />
+    <!-- no translation found for bluetooth_ask_lasting_discovery (3413855805411554871) -->
+    <skip />
+    <!-- no translation found for bluetooth_ask_enablement_and_discovery (5716077575971497298) -->
+    <skip />
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Uhlelo lokusebenza efonini yakho lucela imvume yokuvula i-Bluetooth nokwenza ifoni yakho itholwe amanye amadivaysi ngamasekhondi angu- <xliff:g id="TIMEOUT">%1$d</xliff:g>. Ingabe ufuna ukwenza lokhu?"</string>
+    <!-- no translation found for bluetooth_ask_enablement_and_lasting_discovery (6132824454823539873) -->
+    <skip />
+    <!-- no translation found for bluetooth_ask_enablement_and_lasting_discovery (7471195931669103553) -->
+    <skip />
+    <string name="bluetooth_turning_on" msgid="3107102168379705771">"Ivula i-Bluetooth..."</string>
+    <!-- no translation found for bluetooth_auto_connect (8013003320667198460) -->
+    <skip />
+    <!-- no translation found for date_and_time (4114084177056654663) -->
+    <skip />
+    <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00 pm"</string>
+    <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
+    <!-- no translation found for choose_timezone (7762866468013985022) -->
+    <skip />
+    <string name="normal_date_format" msgid="1982904221918374153">"Kuvamile (<xliff:g id="DATE">%s</xliff:g>)"</string>
+    <!-- no translation found for display_preview_label (1127597250917274792) -->
+    <skip />
+    <!-- no translation found for display_font_size_label (8941851418397475389) -->
+    <skip />
+    <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
+    <skip />
+    <string name="intent_sender_sendbroadcast_text" msgid="1415735148895872715">"Thumela <xliff:g id="BROADCAST">broadcast</xliff:g>"</string>
+    <string name="intent_sender_action_label" msgid="616458370005452389">"<xliff:g id="ACTION">Action</xliff:g>:"</string>
+    <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Qala <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
+    <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
+    <string name="intent_sender_account_label" msgid="465210404475603404">"I-Akhawunti:"</string>
+    <!-- no translation found for proxy_settings_title (5912878565897294401) -->
+    <skip />
+    <string name="proxy_settings_summary" msgid="7898928000758321486">"Misa iphrokzi jikelele ye-HTTP nohlu lokukhishwayo"</string>
+    <!-- no translation found for proxy_clear_text (5555400754952012657) -->
+    <skip />
+    <!-- no translation found for proxy_port_label (5655276502233453400) -->
+    <skip />
+    <!-- outdated translation 204409815790850313 -->     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Akekho Ummeli we-"</string>
+    <!-- no translation found for proxy_exclusionlist_hint (6084099226687226948) -->
+    <skip />
+    <!-- no translation found for proxy_defaultView_text (6387985519141433291) -->
+    <skip />
+    <string name="proxy_action_text" msgid="2957063145357903951">"Kwenziwe"</string>
+    <!-- no translation found for proxy_hostname_label (8490171412999373362) -->
+    <skip />
+    <!-- no translation found for proxy_hostname_hint (2076157057003936176) -->
+    <skip />
+    <!-- no translation found for proxy_error (8926675299638611451) -->
+    <skip />
+    <!-- no translation found for proxy_error_dismiss (4993171795485460060) -->
+    <skip />
+    <!-- no translation found for proxy_error_invalid_host (9120776460063182119) -->
+    <skip />
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"Uhlu lokukhishwayo oluthayiphile alufomethiwe kahle. Sicela ufake uhlu oluhlukaniswe ngofeleba lwezizinda ezingahlanganisiwe"</string>
+    <!-- no translation found for proxy_error_empty_port (3525734169948795417) -->
+    <skip />
+    <!-- no translation found for proxy_error_empty_host_set_port (2451694104858226781) -->
+    <skip />
+    <!-- no translation found for proxy_error_invalid_port (1816315605424943626) -->
+    <skip />
+    <!-- no translation found for proxy_warning_limited_support (7442676587591460854) -->
+    <skip />
+    <!-- no translation found for radio_info_signal_location_label (16475158265551708) -->
+    <skip />
+    <!-- no translation found for radio_info_neighboring_location_label (2385625674055934880) -->
+    <skip />
+    <!-- no translation found for radio_info_data_attempts_label (1731106244577323381) -->
+    <skip />
+    <!-- no translation found for radio_info_gprs_service_label (2331818110375395364) -->
+    <skip />
+    <!-- no translation found for radio_info_roaming_label (6141505430275138647) -->
+    <skip />
+    <!-- no translation found for radio_info_imei_label (1220524224732944192) -->
+    <skip />
+    <!-- no translation found for radio_info_call_redirect_label (1654674226961476872) -->
+    <skip />
+    <!-- no translation found for radio_info_ppp_resets_label (3241667824729310546) -->
+    <skip />
+    <!-- no translation found for radio_info_gsm_disconnects_label (1683069665736339820) -->
+    <skip />
+    <!-- no translation found for radio_info_current_network_label (3256402602440102610) -->
+    <skip />
+    <!-- no translation found for radio_info_data_successes_label (4417894113689054945) -->
+    <skip />
+    <!-- no translation found for radio_info_ppp_received_label (3345184342444878849) -->
+    <skip />
+    <!-- no translation found for radio_info_gsm_service_label (2082332114596916985) -->
+    <skip />
+    <!-- no translation found for radio_info_signal_strength_label (1931937920896925766) -->
+    <skip />
+    <!-- no translation found for radio_info_call_status_label (4896238900685510883) -->
+    <skip />
+    <!-- no translation found for radio_info_ppp_sent_label (5009102250704375687) -->
+    <skip />
+    <!-- no translation found for radio_info_radio_resets_label (9211343458143291617) -->
+    <skip />
+    <!-- no translation found for radio_info_message_waiting_label (6981842420058672207) -->
+    <skip />
+    <!-- no translation found for radio_info_phone_number_label (7192944627907412169) -->
+    <skip />
+    <!-- no translation found for radio_info_band_mode_label (441469694142042022) -->
+    <skip />
+    <!-- no translation found for radio_info_network_type_label (3706382548257257987) -->
+    <skip />
+    <!-- no translation found for radio_info_set_perferred_label (9039200405863503267) -->
+    <skip />
+    <!-- no translation found for radio_info_ping_ipaddr (498747917793263530) -->
+    <skip />
+    <!-- no translation found for radio_info_ping_hostname (3054888474808217853) -->
+    <skip />
+    <!-- no translation found for radio_info_http_client_test (5733604021077701555) -->
+    <skip />
+    <!-- no translation found for ping_test_label (7255376471490860631) -->
+    <skip />
+    <!-- no translation found for radio_info_smsc_label (6399460520126501354) -->
+    <skip />
+    <!-- no translation found for radio_info_smsc_update_label (7258686760358791539) -->
+    <skip />
+    <!-- no translation found for radio_info_smsc_refresh_label (6902302130315125102) -->
+    <skip />
+    <string name="radio_info_toggle_dns_check_label" msgid="8292252930563286858">"Guqula ukuhlola i-DNS"</string>
+    <string name="oem_radio_info_label" msgid="6163141792477958941">"Ulwazi oucacile kwe-OEM/Izilungiselelo"</string>
+    <!-- no translation found for band_mode_title (954174198903776205) -->
+    <skip />
+    <!-- no translation found for band_mode_loading (548764766363847336) -->
+    <skip />
+    <!-- no translation found for band_mode_set (5730560180249458484) -->
+    <skip />
+    <!-- no translation found for band_mode_failed (1495968863884716379) -->
+    <skip />
+    <!-- no translation found for band_mode_succeeded (2701016190055887575) -->
+    <skip />
+    <!-- no translation found for sdcard_changes_instructions (1364712901180556244) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_screen_mass_storage_text (3741220147296482474) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_total_bytes_label (9184160745785062144) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_not_present_status (2902787003418172125) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_not_present_status (6666688653496819947) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_available_bytes_label (763232429899373001) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_mass_storage_status (2736378870889777857) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_mass_storage_status (4786433969313661655) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_unmounted_status (7503300818792750913) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_unmounted_status (3812022095683863087) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_bad_removal_status (7761390725880773697) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_bad_removal_status (5145797653495907970) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_used_bytes_label (8820289486001170836) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_scanning_status (7503429447676219564) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_scanning_status (2763464949274455656) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_read_only_status (3771783090621312312) -->
+    <skip />
+    <!-- no translation found for sdcard_settings_read_only_status (5706115860484118911) -->
+    <skip />
+    <string name="skip_label" msgid="47510779345218297">"Yeqa"</string>
+    <!-- no translation found for next_label (4693520878012668114) -->
+    <skip />
+    <string name="language_picker_title" msgid="5349877711342869319">"Ulimi"</string>
+    <!-- no translation found for activity_picker_label (4910700713930693329) -->
+    <skip />
+    <!-- no translation found for device_info_label (6551553813651711205) -->
+    <skip />
+    <!-- no translation found for battery_info_label (4132685016148679403) -->
+    <skip />
+    <!-- no translation found for display_label (8074070940506840792) -->
+    <skip />
+    <!-- no translation found for phone_info_label (7820855350955963628) -->
+    <skip />
+    <!-- no translation found for phone_info_label (2127552523124277664) -->
+    <skip />
+    <!-- no translation found for sd_card_settings_label (8101475181301178428) -->
+    <skip />
+    <!-- no translation found for sd_card_settings_label (5743100901106177102) -->
+    <skip />
+    <!-- no translation found for proxy_settings_label (3271174136184391743) -->
+    <skip />
+    <!-- no translation found for cancel (6859253417269739139) -->
+    <skip />
+    <!-- no translation found for settings_label (1626402585530130914) -->
+    <skip />
+    <string name="settings_label_launcher" msgid="8344735489639482340">"Izilungiselelo"</string>
+    <!-- outdated translation 3672145147925639262 -->     <string name="settings_shortcut" msgid="8597387747077828217">"Izilungiselelo"</string>
+    <!-- no translation found for airplane_mode (8837269988154128601) -->
+    <skip />
+    <string name="airplane_mode_summary" msgid="3154817401368780988">"Vimbela uxhumano olungenantambo"</string>
+    <!-- no translation found for airplane_mode_turning_on (8871739222526957255) -->
+    <skip />
+    <!-- no translation found for airplane_mode_turning_off (3393168549611505996) -->
+    <skip />
+    <string name="radio_controls_title" msgid="5868688473587168882">"Okungenantambo &amp; amanethiwekhi"</string>
+    <!-- outdated translation 149274247949769551 -->     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Okungenantambo &amp; izilungiselelo zenethiwekhi"</string>
+    <string name="radio_controls_summary" msgid="2998818677094465517">"Phatha i-Wi-Fi, i-Bluetooth, imodi yendiza, amanethiwekhi eselula, &amp; ama-VPN"</string>
+    <!-- no translation found for roaming (3596055926335478572) -->
+    <skip />
+    <!-- no translation found for roaming_enable (3737380951525303961) -->
+    <skip />
+    <!-- no translation found for roaming_disable (1295279574370898378) -->
+    <skip />
+    <!-- no translation found for roaming_reenable_message (9141007271031717369) -->
+    <skip />
+    <!-- no translation found for roaming_turn_it_on_button (4387601818162120589) -->
+    <skip />
+    <!-- no translation found for roaming_warning (1269870211689178511) -->
+    <skip />
+    <!-- no translation found for roaming_reenable_title (7626425894611573131) -->
+    <skip />
+    <!-- no translation found for networks (6333316876545927039) -->
+    <skip />
+    <!-- no translation found for sum_carrier_select (6648929373316748020) -->
+    <skip />
+    <!-- no translation found for date_and_time_settings_title (3350640463596716780) -->
+    <skip />
+    <!-- no translation found for date_and_time_settings_title_setup_wizard (2391530758339384324) -->
+    <skip />
+    <!-- no translation found for date_and_time_settings_summary (2435705040205950381) -->
+    <skip />
+    <string name="date_time_auto" msgid="7076906458515908345">"Idethi zenzakalelayo &amp; isikhathi"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Sebenzisa isikhathi esinikeziwe senethiwekhi"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Sebenzisa isikhathi esinikeziwe senethiwekhi"</string>
+    <string name="zone_auto" msgid="334783869352026648">"Umkhawulo wesikhathi ozenzakalelayo"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Sebenzisa umkhawulo wesikhathi esinikeziwe senethiwekhi"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Sebenzisa isikhathi somkhawulo esinikeziwe senethiwekhi"</string>
+    <!-- no translation found for date_time_24hour (1193032284921000063) -->
+    <skip />
+    <!-- no translation found for date_time_set_time (5716856602742530696) -->
+    <skip />
+    <string name="date_time_set_timezone" msgid="5045627174274377814">"Khetha umkhawulo wesikhathi"</string>
+    <!-- no translation found for date_time_set_date (7021491668550232105) -->
+    <skip />
+    <!-- no translation found for date_time_date_format (436706100255870967) -->
+    <skip />
+    <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Hlunga ngama-alfabethi"</string>
+    <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Hlunga ngesikhathi somkhawulo"</string>
+    <!-- no translation found for date_picker_title (1338210036394128512) -->
+    <skip />
+    <!-- no translation found for time_picker_title (483460752287255019) -->
+    <skip />
+    <!-- no translation found for lock_after_timeout (940509402681580537) -->
+    <skip />
+    <!-- no translation found for lock_after_timeout_summary (4726009794344934278) -->
+    <skip />
+    <!-- no translation found for show_owner_info_on_lockscreen_label (5074906168357568434) -->
+    <skip />
+    <!-- no translation found for owner_info_settings_title (2723190010708381889) -->
+    <skip />
+    <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
+    <!-- no translation found for owner_info_settings_edit_text_hint (2382525043173672857) -->
+    <skip />
+    <string name="security_settings_title" msgid="5168491784222013179">"Indawo &amp; ukuphepha"</string>
+    <string name="location_security_settings_title" msgid="4624434296446625554">"Indawo &amp; izilungiselelo zokuphepha"</string>
+    <string name="security_settings_summary" msgid="967393342537986570">"Hlela Indawo Yami, ukuvula isikrini, ukuvala ikhadi le-SIM, ukuvala ukugcina ukuqinisekisa"</string>
+    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Hlela Indawo Yami, ukuvula isikrini, ukuvala ukugcina iziqinisekiso"</string>
+    <!-- no translation found for security_passwords_title (2930627259125138363) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_settings_title (4219233835490520414) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_encrypt_title (1060273569887301457) -->
+    <skip />
+    <!-- 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_desc (2150571569618349332) -->
+    <skip />
+    <!-- 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_low_charge_text (5920622844033087792) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_unplugged_text (3360883915598669748) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_dialog_need_password_title (4058971800557767) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_dialog_need_password_message (17076329416977176) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_confirm_title (3637925350381905012) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (2496639211575162172) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_final_desc (3248595818246515395) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_setup_title (1783951453124244969) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_setup_description (5317479293244660361) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_setup_description (8166730416836285875) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_cooldown (685210918307862395) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_enter_password (1492603008983893532) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_title (1166918236711686187) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (1075638996134310507) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_failed_summary (3394708817932222518) -->
+    <skip />
+    <!-- outdated translation 3973555216065628262 -->     <string name="lock_settings_picker_title" msgid="8665454308380158195">"Ukuphepha kokuvula isikrini"</string>
+    <!-- outdated translation 1129684221223017902 -->     <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Hlela ukuvala isikrini"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"Shintsha ukukhiya isikrini"</string>
+    <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Shintsha noma vimbela iphathini, i-PIN, noma ukuphepha kwephasiwedi"</string>
+    <!-- no translation found for unlock_set_unlock_launch_picker_enable_summary (4791110798817242301) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_off_title (1613932765246180079) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_off_summary (2791013557563587655) -->
+    <skip />
+    <!-- outdated translation 3760684669884671990 -->     <string name="unlock_set_unlock_none_title" msgid="7560817055143323842">"Lutho"</string>
+    <!-- outdated translation 2658550480388272618 -->     <string name="unlock_set_unlock_none_summary" msgid="2609139908913114644">"Vimbela ukuphepha kokuvula isikrini"</string>
+    <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Iphathini"</string>
+    <!-- outdated translation 3018395214738645405 -->     <string name="unlock_set_unlock_pattern_summary" msgid="8467282436608077882">"Kumelwe udwebe iphathini ukuze uvule isikrini"</string>
+    <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"i-PIN"</string>
+    <!-- outdated translation 4131169672844263316 -->     <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Faka i-PIN yezinombolo ukuvula isikrini"</string>
+    <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Iphasiwedi"</string>
+    <!-- outdated translation 4623254789833899286 -->     <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Faka iphasiwedi ukuvula isikrini"</string>
+    <!-- outdated translation 736557879526940324 -->     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Ivimbelwe umphathi wefoni okude"</string>
+    <!-- no translation found for unlock_set_unlock_mode_off (378729687629105388) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_mode_none (7137296704741184239) -->
+    <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_disable_lock_title" msgid="1427036227416979120">"Cima ukuvala isikrini"</string>
+    <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Khipha iphathini yokuvula"</string>
+    <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Khipha ukuvala i-PIN"</string>
+    <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Khipha iphasiwedi yokuvula"</string>
+    <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Shintsha iphathini yokuvula"</string>
+    <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Shintsha i-PIN yokuvula"</string>
+    <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Shintsha iphasiwedi yokuvula"</string>
+    <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Iphasiwedi kumele okungenani ibe nezinhlamvu ezingu-%d"</string>
+    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"I-PIN kumele okungenani ibe izinhlamvu ezingu-%d"</string>
+    <string name="lockpassword_press_continue" msgid="122706614386757182">"Thinta Qhubeka uma usuqedile"</string>
+    <string name="lockpassword_continue_label" msgid="4602203784934526940">"Qhubeka"</string>
+    <!-- no translation found for lockpassword_password_too_long (5487426077939378487) -->
+    <skip />
+    <!-- no translation found for lockpassword_pin_too_long (6382649850551200693) -->
+    <skip />
+    <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"I-PIN kumele ibe namadijithi kuphela asuka  ku- 0-9"</string>
+    <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Umphathi wedivaysi unqabela ukusebenzisa i-PIN yakamuva"</string>
+    <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Iphasiwedi inohlamvu olungekho emthethweni"</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"Iphasiwedi kumele okungenani ibe nohlamvu olulodwa"</string>
+    <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"Iphasiwedi kumele okungenani ibe nedijiti eyodwa"</string>
+    <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"Iphasiwedi kumele okungenani ibe nesimbuli eyodwa"</string>
+  <plurals name="lockpassword_password_requires_letters">
+    <item quantity="one" msgid="1462968118065694590">"Iphasiwedi okungenani kumele ibe negama elingu-1"</item>
+    <item quantity="other" msgid="7278096339907683541">"Iphasiwedi kumele okungenani ibe namagama angu-%d"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_lowercase">
+    <item quantity="one" msgid="2048653993044269649">"Iphasiwedi kumele okungenani ibe negama lombhalo elingafelebisiwe elingu-1"</item>
+    <item quantity="other" msgid="588499075580432178">"Iphasiwedi kumele ibe okungenani namagama ezinhlamvu ezingafelebisiwe ze-%d"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_uppercase">
+    <item quantity="one" msgid="7677454174080582601">"Iphasiwedi kumele ibe okungenani negama lofeleba olungu-1"</item>
+    <item quantity="other" msgid="2183090598541826806">"Iphasiwedi kumele okungenani namagama ofeleba e-%d"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_numeric">
+    <item quantity="one" msgid="8585088032818933985">"Iphasiwedi kumele okungenani ibe nedijithi yenombolo engu-1"</item>
+    <item quantity="other" msgid="995673409754935278">"Iphasiwedi kumele ibe okungenani amadijithi ezinombolo angu-%d"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_symbols">
+    <item quantity="one" msgid="3930886641317826293">"Iphasiwedi kumele okungenani ibe nohlamvu olukhethekile olungu-1"</item>
+    <item quantity="other" msgid="3047460862484105274">"Iphasiwedi kumele ibe nezinhlamvu ezikhethekile ezingu-%d"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_nonletter">
+    <item quantity="one" msgid="1716355580615489062">"Iphasiwedi kumele okungenani ibe nohlamvu olungelona igama olungui-1"</item>
+    <item quantity="other" msgid="5574191164708145973">"Iphasiwedi kumele okungenani ibe nezinhlamvu ezingewona amagama ezingu-%d"</item>
+  </plurals>
+    <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"Umphathi wedivaysi unqabela ukusebenzisa iphasiwedi yakamuva"</string>
+    <string name="lockpassword_ok_label" msgid="313822574062553672">"KULUNGILE"</string>
+    <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Khansela"</string>
+    <!-- no translation found for lockpattern_tutorial_cancel_label (6431583477570493261) -->
+    <skip />
+    <!-- no translation found for lockpattern_tutorial_continue_label (3559793618653400434) -->
+    <skip />
+    <string name="device_admin_title" msgid="3562216873644263804">"Ukuphatha idivaysi"</string>
+    <!-- outdated translation 3864120111085199551 -->     <string name="manage_device_admin" msgid="5059296715271077278">"Khetha abaphathi bedivaysi"</string>
+    <!-- outdated translation 915390201809231575 -->     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Yengeza noma khipha abaphathi bedivaysi"</string>
+    <!-- no translation found for bluetooth_quick_toggle_title (1037056952714061893) -->
+    <skip />
+    <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Vula i-Bluetooth"</string>
+    <!-- no translation found for bluetooth_settings (2725796451253089609) -->
+    <skip />
+    <!-- no translation found for bluetooth_settings_title (2824020086246268296) -->
+    <skip />
+    <!-- no translation found for bluetooth_settings_summary (2091062709530570462) -->
+    <skip />
+    <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Isicelo sokubhanqa i-Bluetooth"</string>
+    <!-- no translation found for bluetooth_enter_pin_msg (1499285355129256289) -->
+    <skip />
+    <!-- no translation found for bluetooth_enter_passkey_msg (8301499416158195044) -->
+    <skip />
+    <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"Ukubhangqa ne \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\", qinisekisa ukuthi kubonisa ukhiye wokudlula: <xliff:g id="PASSKEY">%2$s</xliff:g>."</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1076613564387784476">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n" ufuna ukubhangqa."</string>
+    <!-- no translation found for bluetooth_display_passkey_pin_msg (9139892462102104755) -->
+    <skip />
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Bhangqa"</string>
+    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"Ungabhangqi"</string>
+    <string name="bluetooth_remote_device" msgid="2406662802908395389">"idivaysi ye-bluetooth"</string>
+    <string name="bluetooth_error_title" msgid="538287072376677166">"Ukunaka"</string>
+    <string name="bluetooth_pairing_error_message" msgid="2852744547246910349">"Kube nenkinga yokubhangqa ne-<xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="6065697229258906937">"Kube nenkinga yokubhangqa ne- <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ngoba i-PIN noma ukhiye Wokudlula awulungile."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="6688215193824686741">"Ayikwazi ukuthola uxhumano ne <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Ukubhangqa kunqatshelwe i-<xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"Kube nenkinga yokuxhuma kwi<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Thwebula amadivaysi"</string>
+    <!-- no translation found for bluetooth_preference_find_nearby_title (5087410003465463318) -->
+    <skip />
+    <!-- no translation found for bluetooth_preference_device_settings (907776049862799122) -->
+    <skip />
+    <!-- no translation found for bluetooth_preference_paired_devices (1970524193086791964) -->
+    <skip />
+    <!-- no translation found for bluetooth_preference_found_devices (3133019331974936204) -->
+    <skip />
+    <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Xhuma kwi-inthanethi"</string>
+    <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Nqamula"</string>
+    <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Bhangqa &amp; xhuma"</string>
+    <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Ungabhangqi"</string>
+    <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Nqamula &amp; ungabhangqi"</string>
+    <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Okukhethwayo..."</string>
+    <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Xhuma kwi..."</string>
+    <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"Imidiya"</string>
+    <!-- outdated translation 1874975688666658946 -->     <string name="bluetooth_profile_headset" msgid="81844079120986198">"Ifoni"</string>
+    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Dlulisa"</string>
+    <string name="bluetooth_profile_hid" msgid="3000858580917633478">"Idivaysi Yokufakwayo"</string>
+    <!-- outdated translation 4225813400648547154 -->     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Ukusebenzisa ifoni njengemodemu"</string>
+    <!-- no translation found for bluetooth_disconnect_a2dp_profile (3524648279150937177) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_headset_profile (8635908811168780720) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_hid_profile (3282295189719352075) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_pan_user_profile (8037627994382458698) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_pan_nap_profile (5455448395850929200) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_pan_nap_profile (5266851881175033601) -->
+    <skip />
+    <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> okukhethwa kukho"</string>
+    <!-- no translation found for bluetooth_device_advanced_device_actions_title (3793430949811946844) -->
+    <skip />
+    <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Xhuma"</string>
+    <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Xhuma kwidivaysi ye-Bluetooth"</string>
+    <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"Amaphrofayli"</string>
+    <!-- no translation found for bluetooth_device_advanced_rename_device (350508394033808532) -->
+    <skip />
+    <!-- no translation found for bluetooth_device_advanced_enable_opp_title (8222550640371627365) -->
+    <skip />
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Ixhume emsindweni wemidiya"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Ixhunywe kumsindo wefoni"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Ixhunywe kwiseva yokudlulisa ifayela"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Ayixhunyiwe kwiseva sokudlulisa ifayela"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Ixhunywe kwidivaysi yokufakwayo"</string>
+    <!-- no translation found for bluetooth_pan_user_profile_summary_connected (4602294638909590612) -->
+    <skip />
+    <!-- no translation found for bluetooth_pan_nap_profile_summary_connected (1561383706411975199) -->
+    <skip />
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Sebenzisela umsindo wemidiya"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Sebenziselwa umsindo wefoni"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Sebenziselwa ukudlulisa ifayela"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Isetshenziselwa okufakwayo"</string>
+    <!-- no translation found for bluetooth_pan_profile_summary_use_for (5664884523822068653) -->
+    <skip />
+    <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Dokha Izilungiselelo"</string>
+    <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Sebenzisa ukubeka ingxenye komsindo"</string>
+    <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Njenge sipikhafoni"</string>
+    <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Komculo nemidiya"</string>
+    <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Khumbula izilungiselelo"</string>
+    <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"i-NFC"</string>
+    <!-- no translation found for nfc_quick_toggle_summary (1988408027741447231) -->
+    <skip />
+    <!-- no translation found for nfc_toggle_error (2233172102497535522) -->
+    <!-- no translation found for nfc_toggle_error (8998642457947607263) -->
+    <skip />
+    <!-- no translation found for wifi_quick_toggle_title (874495178395350104) -->
+    <skip />
+    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Vula i-Wi-Fi"</string>
+    <!-- no translation found for wifi_settings (4746946030627213196) -->
+    <skip />
+    <!-- no translation found for wifi_settings_category (2810363951104753710) -->
+    <skip />
+    <!-- no translation found for wifi_settings_summary (668767638556052820) -->
+    <skip />
+    <!-- no translation found for wifi_starting (6710266609710860129) -->
+    <skip />
+    <!-- no translation found for wifi_stopping (5952909472548218348) -->
+    <skip />
+    <!-- no translation found for wifi_error (3207971103917128179) -->
+    <skip />
+    <string name="wifi_in_airplane_mode" msgid="7618393787965366655">"Kwimodi yendiza"</string>
+    <string name="wifi_fail_to_scan" msgid="6194542252808587669">"Ayikwazi ukuthwebula amanethiwekhi"</string>
+    <!-- no translation found for wifi_notify_open_networks (3755768188029653293) -->
+    <skip />
+    <!-- no translation found for wifi_notify_open_networks_summary (3038290727701553612) -->
+    <skip />
+    <!-- outdated translation 1367731352485585528 -->     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Inqubomgomo yokulala kwe-Wi-Fi"</string>
+    <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Cacisa ukuthi ushintshele nini kusuka kwi-Wi-Fi kuya kwidatha yeselula."</string>
+    <!-- no translation found for wifi_setting_sleep_policy_summary_wifi_only (5025244230722670496) -->
+    <skip />
+    <!-- outdated translation 5103670439972135148 -->     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Kube nenkinga yokuhlela inqubomgomo yokulala."</string>
+    <string name="wifi_add_network" msgid="1671334951296205616">"Yengeza inethiwekhi ye-Wi-Fi"</string>
+    <!-- no translation found for wifi_add_network_summary (6345544206968025811) -->
+    <skip />
+    <!-- no translation found for wifi_access_points (2664629396767022441) -->
+    <skip />
+    <string name="wifi_menu_scan" msgid="1470911530412095868">"Thwebula"</string>
+    <!-- no translation found for wifi_menu_advanced (7522252991919573664) -->
+    <skip />
+    <string name="wifi_menu_connect" msgid="4996220309848349408">"Xhuma kwinethiwekhi"</string>
+    <string name="wifi_menu_forget" msgid="8736964302477327114">"Khohlwa inethiwekhi"</string>
+    <string name="wifi_menu_modify" msgid="2068554918652440105">"Guqula inethiwekhi"</string>
+    <string name="wifi_network_setup" msgid="7974851890019344870">"Ukumisa Inethiwekhi"</string>
+    <string name="wifi_wps_pin" msgid="5471842298708321115">"Faka i-pin kusuka kwindayo yokungena"</string>
+    <!-- no translation found for wifi_wps_setup_title (150518971269252336) -->
+    <skip />
+    <!-- no translation found for wifi_wps_pin_output (8682102965680650853) -->
+    <skip />
+    <!-- no translation found for wifi_wps_in_progress (2776555137392461525) -->
+    <skip />
+    <!-- no translation found for wifi_wps_failed (2277409652621482331) -->
+    <skip />
+    <string name="wifi_ssid" msgid="641393708309146745">"i-SSID Yenethiwekhi"</string>
+    <!-- no translation found for wifi_security (6603611185592956936) -->
+    <skip />
+    <string name="wifi_signal" msgid="5514120261628065287">"Amandla esiginali"</string>
+    <!-- no translation found for wifi_status (4824568012414605414) -->
+    <skip />
+    <string name="wifi_speed" msgid="3526198708812322037">"Isivinini sokuhlanganisa"</string>
+    <!-- no translation found for wifi_ip_address (1440054061044402918) -->
+    <skip />
+    <string name="wifi_eap_method" msgid="8529436133640730382">"Indlela ye-EAP"</string>
+    <string name="please_select_phase2" msgid="5231074529772044898">"Isigaba 2 sokuqinisekisa"</string>
+    <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Isitifiketi se-CA"</string>
+    <string name="wifi_eap_user_cert" msgid="1291089413368160789">"Isitifiketi somsebenzisi"</string>
+    <string name="wifi_eap_identity" msgid="4359453783379679103">"Ukuhlonza"</string>
+    <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Ukuhlonza okungaziwe"</string>
+    <string name="wifi_password" msgid="5948219759936151048">"Iphasiwedi"</string>
+    <string name="wifi_show_password" msgid="6461249871236968884">"Bonisa iphasiwedi"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"Izilungiselelo ze-IP"</string>
+    <string name="wifi_unchanged" msgid="3410422020930397102">"(akushintshiwe)"</string>
+    <string name="wifi_unspecified" msgid="5431501214192991253">"(okungacacisiwe)"</string>
+    <string name="wifi_remembered" msgid="8426719916135950136">"Khunjuliwe"</string>
+    <string name="wifi_disabled" msgid="2104752038187543712">"Akusebenzi"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Ayikho ebubanzini"</string>
+    <!-- no translation found for wifi_open_with_wps (2606968531452521147) -->
+    <skip />
+    <string name="wifi_secured" msgid="6759903183748011566">"Ivikelwe nge- <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_with_wps" msgid="1822538701086256007">"Ivikelwe nge- <xliff:g id="WIFI_SECURITY">%1$s</xliff:g> (i-WPS iyatholakala)"</string>
+    <string name="wifi_secured_with_status" msgid="6489317496506267302">"<xliff:g id="WIFI_STATUS">%2$s</xliff:g>, ivikelwe nge- <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
+    <string name="wifi_connect" msgid="1076622875777072845">"Xhuma kwi-inthanethi"</string>
+    <string name="wifi_forget" msgid="8168174695608386644">"Khohlwa"</string>
+    <string name="wifi_save" msgid="3331121567988522826">"Londoloza"</string>
+    <string name="wifi_cancel" msgid="6763568902542968964">"Khansela"</string>
+    <!-- no translation found for wifi_wps_overlap_error (6820987241637459748) -->
+    <skip />
+    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Thuthukisiwe"</string>
+    <!-- no translation found for wifi_setting_frequency_band_title (7493768705046080060) -->
+    <skip />
+    <!-- no translation found for wifi_setting_frequency_band_summary (3250740757118009784) -->
+    <skip />
+    <!-- no translation found for wifi_setting_frequency_band_error (837281974489794378) -->
+    <skip />
+    <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Ikheli le-MAC"</string>
+    <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Ikheli le-IP"</string>
+    <!-- no translation found for wifi_ip_settings_titlebar (4345739031248760326) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_menu_save (7296724066102908366) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_menu_cancel (6582567330136502340) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_ip_address (6387653152103405443) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_gateway (6383012465511093067) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_dns (3428867750550854065) -->
+    <skip />
+    <!-- no translation found for wifi_ip_settings_invalid_network_prefix_length (8145730615716855433) -->
+    <skip />
+    <!-- no translation found for wifi_dns1 (7344118050720080045) -->
+    <skip />
+    <!-- no translation found for wifi_dns2 (1368601006824882659) -->
+    <skip />
+    <!-- no translation found for wifi_gateway (163914742461092086) -->
+    <skip />
+    <!-- no translation found for wifi_network_prefix_length (3028785234245085998) -->
+    <skip />
+    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Indawo ephathekayo ye-Wi-Fi"</string>
+    <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Indawo ephathekayo <xliff:g id="NETWORK_SSID">%1$s</xliff:g> iyasebenza"</string>
+    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Iphutha lendawo le-Wi-Fi ephathekayo"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="3474995108398156258">"Misa indawo ye-Wi-Fi"</string>
+    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g><xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> indawo ye-Wi-Fi ephathekayo"</string>
+    <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Indawo ye-Android"</string>
+    <string name="sound_settings_title" msgid="8735891486683305886">"Umsindo"</string>
+    <!-- outdated translation 1708697328627382561 -->     <string name="display_settings_title" msgid="2378894265964357591">"Bonisa"</string>
+    <!-- no translation found for sound_settings (5007659014828162881) -->
+    <skip />
+    <!-- no translation found for silent_mode_title (3181479108593217704) -->
+    <skip />
+    <string name="silent_mode_summary" msgid="3309650676072917899">"Thulisa yonke imisindo ngaphandle kwemimidya &amp; ama-alamu"</string>
+    <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"Yonke imisindo ngaphandle kwemidiya ithulisiwe"</string>
+    <!-- no translation found for ringtone_title (7037881886694206550) -->
+    <skip />
+    <string name="ringtone_summary" msgid="2630023412632683493"></string>
+    <string name="all_volume_title" msgid="8741571721868253103">"Ivolumu"</string>
+    <!-- no translation found for ring_volume_title (7938706566797464165) -->
+    <skip />
+    <string name="ring_volume_summary" msgid="7055497624193116879"></string>
+    <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Idlidliza uma ithulile"</string>
+    <string name="vibrate_in_silent_summary" msgid="3312600513070076281">"Vumela impendulo yokudlidliza kwimodi ethulile"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"Dlidliza"</string>
+    <string name="vibrate_summary" msgid="7378130397830790458">"Impendulo edlidlizayo yamakholi nezaziso"</string>
+    <!-- no translation found for notification_sound_title (6316316069880531693) -->
+    <skip />
+    <string name="notification_sound_summary" msgid="2953599929394109819"></string>
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Ukukhanya kwesaziso sephalsi"</string>
+    <string name="notification_pulse_summary" msgid="6899220780534617152">"Ukukhanya kwebhola lokuthola iphalsi kuphindiselwe izaziso ezintsha"</string>
+    <string name="incoming_call_volume_title" msgid="8073714801365904099">"Iringithoni"</string>
+    <string name="notification_volume_title" msgid="2012640760341080408">"Isaziso"</string>
+    <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Sebenzisa ivolumu yocingo olungenayo yezaziso"</string>
+    <!-- no translation found for notification_sound_dialog_title (7057274209079144726) -->
+    <skip />
+    <string name="media_volume_title" msgid="3576565767317118106">"Imidiya"</string>
+    <!-- no translation found for media_volume_summary (5363248930648849974) -->
+    <skip />
+    <string name="alarm_volume_title" msgid="2285597478377758706">"i-Alamu"</string>
+    <string name="dock_settings_summary" msgid="455802113668982481">"Izilungiselelo zomsindo zokubeka ingxenye okunamathiselwe"</string>
+    <!-- no translation found for dtmf_tone_enable_title (1453831168789523185) -->
+    <skip />
+    <!-- no translation found for dtmf_tone_enable_summary_on (3028201873989887327) -->
+    <skip />
+    <!-- no translation found for dtmf_tone_enable_summary_off (7791065951268525678) -->
+    <skip />
+    <!-- no translation found for sound_effects_enable_title (3197313718929122833) -->
+    <skip />
+    <!-- no translation found for sound_effects_enable_summary_on (6154141289879491329) -->
+    <skip />
+    <!-- no translation found for sound_effects_enable_summary_off (3447739581759560125) -->
+    <skip />
+    <string name="lock_sounds_enable_title" msgid="1575990840389107141">"Imisindo yokuvala isikrini"</string>
+    <string name="lock_sounds_enable_summary_on" msgid="145741024028391473">"Idlala umsindo lapho uvala noma uvula isikrini"</string>
+    <string name="lock_sounds_enable_summary_off" msgid="8481243116223542804">"Dlala imisindo lapho uvala futhi uvula isikrini"</string>
+    <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"Impendulo ye-Haptic"</string>
+    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"Dlidliza lapho ucindezela ukhiye othambile futhi kokunye ukuhlangana"</string>
+    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Dlidlizisa lapho ucindezela okhiye abathambile futhi ekuhlanganyeleni okuthize kwe-UI"</string>
+    <string name="audio_record_proc_title" msgid="4271091199976457534">"Ukukhansela umsindo"</string>
+    <string name="audio_record_proc_summary" msgid="8113628457499616498">"Vimbela umsindo wasemuva lapho ukhuluma noma urekhoda."</string>
+    <string name="dock_settings" msgid="1820107306693002541">"Dokha"</string>
+    <string name="dock_settings_title" msgid="9161438664257429372">"Dokha izilungiselelo"</string>
+    <string name="dock_audio_settings_title" msgid="3324750259959570305">"Umsindo"</string>
+    <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Izilungiselelo zokudokha ideskithophu okunamathiselwe"</string>
+    <string name="dock_audio_summary_car" msgid="6740897586006248450">"Izilungiselelo zokudokha imoto enamathiselwe"</string>
+    <!-- outdated translation 289909253741048784 -->     <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"Ifoni edokhiwe"</string>
+    <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Ifoni edokhiwe"</string>
+    <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Izilungiselelo zokudokha okunamathiselwe"</string>
+    <string name="dock_not_found_title" msgid="3290961741828952424">"Ukudokha akutholiwe"</string>
+    <!-- outdated translation 3035260358985111855 -->     <string name="dock_not_found_text" product="tablet" msgid="7935403744079168804">"Ifoni kumele ibekwe ingxenye ukumisa umsindo wokubeka ingxenye"</string>
+    <string name="dock_not_found_text" product="default" msgid="3035260358985111855">"Ifoni kumele ibekwe ingxenye ukumisa umsindo wokubeka ingxenye"</string>
+    <string name="dock_sounds_enable_title" msgid="3659084028644948905">"Dokha ingxenye umsindo wokufaka"</string>
+    <!-- outdated translation 8491180514199743771 -->     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Dlala umsindo lapho ufaka noma ukhipha ifoni kudokhi"</string>
+    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Dlala umsindo lapho ufaka noma ukhipha ifoni kudokhi"</string>
+    <!-- outdated translation 3151046599205265919 -->     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Ungadlali umsindo lapho ufaka noma ukhipha ifoni ekubekeni ingxenye"</string>
+    <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Ungadlali umsindo lapho ufaka noma ukhipha ifoni ekubekeni ingxenye"</string>
+    <string name="sync_settings" msgid="9186125469300013491">"Ama-akhawunti &amp; ukuvumelanisa"</string>
+    <string name="sync_settings_summary" msgid="2962179505214965667">"Faka noma khipha ama-akhawunti ezilungiselelo ze-akhawunti"</string>
+    <string name="search_settings" msgid="1910951467596035063">"Sesha"</string>
+    <string name="search_settings_summary" msgid="9205656546570654169">"Phatha izilungiselelo zokusesha nomlando"</string>
+    <!-- no translation found for display_settings (5947830029420609057) -->
+    <skip />
+    <string name="animations_title" msgid="1062189037402346023">"Isithombe esinyakazayo"</string>
+    <string name="animations_summary_on" msgid="8843613112130484436">"Bonisa ukugqwayiza lapho uvula &amp; uvala amawindi"</string>
+    <string name="animations_summary_off" msgid="2777026828025551983">"Bonisa ukugqwayiza lapho uvula &amp; ivala amawindi"</string>
+    <string name="accelerometer_title" msgid="7854608399547349157">"Ukuzulazula kweskrini okuzenzakalelayo"</string>
+    <!-- outdated translation 1133737282813048021 -->     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Shintsha ukujikeleleza ngokuzenzakalela lapho ujikelezisa ifoni"</string>
+    <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Shintsha ukujikeleleza ngokuzenzakalela lapho ujikelezisa ifoni"</string>
+    <!-- outdated translation 5485489363715740761 -->     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Shintsha ukujikeleza ngokuzenzakalelayo lapho ujikelezisa ifoni"</string>
+    <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Shintsha ukujikeleza ngokuzenzakalelayo lapho ujikelezisa ifoni"</string>
+    <!-- no translation found for brightness (2354961343555249270) -->
+    <skip />
+    <string name="brightness_summary" msgid="838917350127550703">"Lungisa ukukhanya kwesikrini"</string>
+    <!-- no translation found for screen_timeout (6962654593018319466) -->
+    <skip />
+    <!-- no translation found for screen_timeout_summary (4471347210332380587) -->
+    <skip />
+    <!-- no translation found for dream_settings_title (6536876013377446805) -->
+    <skip />
+    <!-- no translation found for dream_settings_summary (6809871648071408259) -->
+    <skip />
+    <!-- no translation found for dream_component_title (505229894674572578) -->
+    <skip />
+    <!-- no translation found for dream_timeout_title (1385909618566514628) -->
+    <skip />
+    <!-- no translation found for dream_timeout_summary (6721955887728454226) -->
+    <skip />
+    <!-- no translation found for dream_timeout_zero_summary (2450290346381400092) -->
+    <skip />
+    <!-- no translation found for dream_test (5968002644622194481) -->
+    <skip />
+    <string name="automatic_brightness" msgid="5014143533884135461">"Ukukhanya okuzenzakalelayo"</string>
+    <!-- no translation found for title_font_size (4405544325522105222) -->
+    <skip />
+    <!-- no translation found for summary_font_size (7548243392515500554) -->
+    <skip />
+    <!-- no translation found for dialog_title_font_size (4503471078477715461) -->
+    <skip />
+    <!-- no translation found for sim_lock_settings (3392331196873564292) -->
+    <skip />
+    <!-- no translation found for sim_lock_settings_category (5136244267576697004) -->
+    <skip />
+    <!-- no translation found for sim_lock_settings_title (9018585580955414596) -->
+    <skip />
+    <!-- no translation found for sim_pin_toggle (1742123478029451888) -->
+    <skip />
+    <!-- no translation found for sim_lock_on (5058355081270397764) -->
+    <skip />
+    <!-- no translation found for sim_lock_on (2503536505568814324) -->
+    <skip />
+    <!-- no translation found for sim_lock_off (2813800553917012356) -->
+    <skip />
+    <!-- no translation found for sim_lock_off (258981978215428916) -->
+    <skip />
+    <string name="sim_pin_change" msgid="6311414184279932368">"Shintsha i-PIN ye-SIM"</string>
+    <string name="sim_enter_pin" msgid="6608715137008508432">"I-SIM PIN"</string>
+    <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Vala ikhadi le-SIM"</string>
+    <string name="sim_disable_sim_lock" msgid="7664729528754784824">"Vula ikhadi le-SIM"</string>
+    <string name="sim_enter_old" msgid="6074196344494634348">"I-SIM PIN endala"</string>
+    <string name="sim_enter_new" msgid="8742727032729243562">"I-SIM PIN entsha"</string>
+    <!-- no translation found for sim_reenter_new (3178510434642201544) -->
+    <skip />
+    <string name="sim_change_pin" msgid="7328607264898359112">"I-SIM PIN"</string>
+    <!-- no translation found for sim_bad_pin (2746201276896134075) -->
+    <skip />
+    <string name="sim_pins_dont_match" msgid="4664611595579163214">"Ama-PIN awafani!"</string>
+    <string name="sim_change_failed" msgid="4823538458798362222">"Ayikwazi ukushintsha i-PIN."\n"Mhlawumbe i-PIN engalungile"</string>
+    <!-- no translation found for sim_change_succeeded (8556135413096489627) -->
+    <skip />
+    <string name="sim_lock_failed" msgid="6676748290838006404">"Ayikwazi ukushintsha isimo sokuvala ikhadi le-SIM."\n"Kungenzeka i-PIN engalungile."</string>
+    <!-- no translation found for sim_enter_ok (6475946836899218919) -->
+    <skip />
+    <!-- no translation found for sim_enter_cancel (6240422158517208036) -->
+    <skip />
+    <!-- no translation found for device_info_settings (1119755927536987178) -->
+    <skip />
+    <!-- no translation found for device_info_settings (475872867864762157) -->
+    <skip />
+    <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Izibuyekezo zohlelo"</string>
+    <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
+    <string name="firmware_version" msgid="4801135784886859972">"Inguqulo ye-Android"</string>
+    <!-- no translation found for model_number (3765737700545384794) -->
+    <skip />
+    <!-- no translation found for baseband_version (1848990160763524801) -->
+    <skip />
+    <!-- no translation found for kernel_version (9192574954196167602) -->
+    <skip />
+    <!-- no translation found for build_number (3075795840572241758) -->
+    <skip />
+    <!-- no translation found for device_info_not_available (8062521887156825182) -->
+    <skip />
+    <string name="device_status_activity_title" msgid="1411201799384697904">"Isimo"</string>
+    <!-- no translation found for device_status (607405385799807324) -->
+    <skip />
+    <!-- outdated translation 2599162787451519618 -->     <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Inombolo yocingo, isiginali, nokunye."</string>
+    <string name="device_status_summary" product="default" msgid="2599162787451519618">"Inombolo yocingo, isiginali, nokunye."</string>
+    <string name="storage_settings" msgid="4211799979832404953">"Ukugcina"</string>
+    <string name="storage_settings_title" msgid="8746016738388094064">"Izilungiselelo zokugcina"</string>
+    <!-- no translation found for storage_settings_summary (3543813623294870759) -->
+    <skip />
+    <!-- no translation found for storage_settings_summary (9176693537325988610) -->
+    <skip />
+    <!-- outdated translation 5123197324870153205 -->     <string name="status_number" product="tablet" msgid="1138837891091222272">"Inombolo yami yocingo"</string>
+    <string name="status_number" product="default" msgid="5123197324870153205">"Inombolo yami yocingo"</string>
+    <string name="status_min_number" msgid="3519504522179420597">"Okuncane"</string>
+    <string name="status_prl_version" msgid="8499039751817386529">"Inguqulo ye-PRL"</string>
+    <!-- outdated translation 1751442889111731088 -->     <string name="status_meid_number" msgid="2037549729230058915">"I-MEID"</string>
+    <string name="status_network_type" msgid="3279383550222116235">"Uhlobo lwenethiwekhi yeselula"</string>
+    <string name="status_data_state" msgid="5503181397066522950">"Isimo senethiwekhi yeselula"</string>
+    <!-- no translation found for status_service_state (2323931627519429503) -->
+    <skip />
+    <!-- no translation found for status_signal_strength (3732655254188304547) -->
+    <skip />
+    <!-- no translation found for status_roaming (2638800467430913403) -->
+    <skip />
+    <!-- no translation found for status_operator (2274875196954742087) -->
+    <skip />
+    <!-- no translation found for status_wifi_mac_address (33109409206264790) -->
+    <skip />
+    <!-- no translation found for status_bt_address (4195174192087439720) -->
+    <skip />
+    <!-- no translation found for status_serial_number (2257111183374628137) -->
+    <skip />
+    <!-- no translation found for status_unavailable (7862009036663793314) -->
+    <skip />
+    <!-- no translation found for status_up_time (7294859476816760399) -->
+    <skip />
+    <!-- no translation found for status_awake_time (2393949909051183652) -->
+    <skip />
+    <!-- no translation found for internal_memory (9129595691484260784) -->
+    <skip />
+    <!-- no translation found for sd_memory (2510246194083052841) -->
+    <skip />
+    <!-- no translation found for sd_memory (151871913888051515) -->
+    <skip />
+    <!-- no translation found for memory_available (5052397223077021181) -->
+    <skip />
+    <!-- no translation found for memory_size (6629067715017232195) -->
+    <skip />
+    <!-- no translation found for memory_calculating_size (2188358544203768588) -->
+    <skip />
+    <!-- no translation found for memory_apps_usage (9079237985722858506) -->
+    <skip />
+    <!-- no translation found for memory_media_usage (3738830697707880405) -->
+    <skip />
+    <!-- no translation found for memory_downloads_usage (3755173051677533027) -->
+    <skip />
+    <!-- no translation found for memory_dcim_usage (6679615808140067136) -->
+    <skip />
+    <!-- no translation found for memory_music_usage (4040027367622874108) -->
+    <skip />
+    <!-- no translation found for memory_media_misc_usage (235452944021647124) -->
+    <skip />
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Yehlisa ukugcina okwabelene"</string>
+    <string name="sd_eject" product="default" msgid="6915293408836853020">"Khipha ikhadi le-SD"</string>
+    <!-- outdated translation 3315557796211542962 -->     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Khipha ikhadi le-SD ngokukhipha okuphephile"</string>
+    <!-- outdated translation 3315557796211542962 -->     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Khipha ikhadi le-SD ngokukhipha okuphephile"</string>
+    <!-- outdated translation 2048640010381803841 -->     <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Faka ikhadi le-SD lokukhuphula"</string>
+    <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Faka ikhadi le-SD lokukhuphula"</string>
+    <!-- outdated translation 5940523765187704135 -->     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Khweza ikhadi le-SD"</string>
+    <string name="sd_mount" product="default" msgid="5940523765187704135">"Khweza ikhadi le-SD"</string>
+    <string name="sd_mount_summary" product="nosdcard" msgid="4673411327373419641"></string>
+    <string name="sd_mount_summary" product="default" msgid="4673411327373419641"></string>
+    <!-- outdated translation 5448738337382712203 -->     <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"Fometha ikhadi le-SD"</string>
+    <!-- outdated translation 5448738337382712203 -->     <string name="sd_format" product="default" msgid="2576054280507119870">"Fometha ikhadi le-SD"</string>
+    <!-- outdated translation 6616491027883134004 -->     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Fometha (sula) ikhadi le-SD"</string>
+    <!-- outdated translation 6616491027883134004 -->     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Fometha (sula) ikhadi le-SD"</string>
+    <!-- no translation found for read_only (6702420168629076340) -->
+    <skip />
+    <!-- outdated translation 8612140627310646730 -->     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"Khipha ikhadi le-SD"</string>
+    <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"Khipha ikhadi le-SD"</string>
+    <!-- outdated translation 5851214273718817727 -->     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"Uma wehlisa ikhadi le-SD, ezinye izinhlelo zokusebenza ozisebenzisayo zizoma futhi kungase zingatholakali kuze kube yilapho ukhwelisa ikhadi le-SD."</string>
+    <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Uma wehlisa ikhadi le-SD, ezinye izinhlelo zokusebenza ozisebenzisayo zizoma futhi kungase zingatholakali kuze kube yilapho ukhwelisa ikhadi le-SD."</string>
+    <!-- outdated translation 4004106918266783081 -->     <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"Khipha ikhadi le-SD"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"Khipha ikhadi le-SD"</string>
+    <!-- outdated translation 9188972789897713180 -->     <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"Ayikwazi ukwehlisa ikhadi le-SD. Zama futhi emva kwesikhathi."</string>
+    <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"Ayikwazi ukwehlisa ikhadi le-SD. Zama futhi emva kwesikhathi."</string>
+    <!-- outdated translation 1904212716075458402 -->     <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"Ikhadi le-SD lizokwehliswa."</string>
+    <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"Ikhadi le-SD lizokwehliswa."</string>
+    <string name="sd_ejecting_title" msgid="8824572198034365468">"Yehlisa"</string>
+    <string name="sd_ejecting_summary" msgid="2028753069184908491">"Ukwehlisa kuyaqhubeka"</string>
+    <!-- no translation found for battery_status_title (9159414319574976203) -->
+    <skip />
+    <!-- no translation found for battery_level_title (2965679202786873272) -->
+    <skip />
+    <!-- no translation found for apn_settings (3743170484827528406) -->
+    <skip />
+    <!-- no translation found for apn_edit (1354715499708424718) -->
+    <skip />
+    <!-- no translation found for apn_not_set (7422262558097875757) -->
+    <skip />
+    <!-- no translation found for apn_name (4115580098369824123) -->
+    <skip />
+    <!-- no translation found for apn_apn (2479425126733513353) -->
+    <skip />
+    <!-- no translation found for apn_http_proxy (1826885957243696354) -->
+    <skip />
+    <!-- no translation found for apn_http_port (3763259523984976226) -->
+    <skip />
+    <!-- no translation found for apn_user (455637547356117761) -->
+    <skip />
+    <!-- no translation found for apn_password (5412301994998250968) -->
+    <skip />
+    <!-- no translation found for apn_server (2436185314756372858) -->
+    <skip />
+    <!-- no translation found for apn_mmsc (3670124402105585737) -->
+    <skip />
+    <!-- no translation found for apn_mms_proxy (5374082621073999275) -->
+    <skip />
+    <!-- no translation found for apn_mms_port (4074188088199243040) -->
+    <skip />
+    <!-- no translation found for apn_mcc (4258628382260674636) -->
+    <skip />
+    <!-- no translation found for apn_mnc (8629374076888809874) -->
+    <skip />
+    <string name="apn_auth_type" msgid="6167205395676037015">"Uhlobo lokuqinisekisa"</string>
+    <string name="apn_auth_type_none" msgid="5069592676845549926">"Lutho"</string>
+    <string name="apn_auth_type_pap" msgid="1666934536996033383">"I-PAP"</string>
+    <string name="apn_auth_type_chap" msgid="3369626283789068360">"I-CHAP"</string>
+    <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"I-PAP noma i-CHAP"</string>
+    <!-- no translation found for apn_type (469613123902220544) -->
+    <skip />
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
+    <!-- no translation found for menu_delete (6981294422841124659) -->
+    <skip />
+    <!-- no translation found for menu_new (3014205883303921729) -->
+    <skip />
+    <!-- no translation found for menu_save (8109345640668285399) -->
+    <skip />
+    <!-- no translation found for menu_cancel (2194502410474697474) -->
+    <skip />
+    <!-- no translation found for error_title (1319225301794168762) -->
+    <skip />
+    <!-- no translation found for error_name_empty (1498238337687930558) -->
+    <skip />
+    <!-- no translation found for error_apn_empty (1513892291812404310) -->
+    <skip />
+    <!-- no translation found for error_mcc_not3 (4560171714156251661) -->
+    <skip />
+    <!-- no translation found for error_mnc_not23 (8418177072458379439) -->
+    <skip />
+    <string name="restore_default_apn" msgid="2724583218635739913">"Ibuyisela izilungiselelo ezizenzakalelayo ku-APN"</string>
+    <string name="menu_restore" msgid="8260067415075573273">"Hlela kabusha kube okuzenzakalelayo"</string>
+    <string name="restore_default_apn_completed" msgid="3990449939234957281">"Ukuhlela okumisiwe izilungiselelo ze-APN kuqedile"</string>
+    <!-- no translation found for master_clear_title (5907939616087039756) -->
+    <skip />
+    <!-- no translation found for master_clear_summary (4036344100254678429) -->
+    <skip />
+    <!-- no translation found for master_clear_summary (4986154238001088492) -->
+    <skip />
+    <!-- unknown placeholder BREAK_10 in master_clear_desc -->
+    <skip />
+    <!-- no translation found for master_clear_desc (590799767511283567) -->
+    <skip />
+    <!-- unknown placeholder BREAK_10 in master_clear_desc -->
+    <skip />
+    <!-- no translation found for master_clear_desc (3251400937758241249) -->
+    <skip />
+    <!-- no translation found for master_clear_accounts (6412857499147999073) -->
+    <skip />
+    <!-- no translation found for master_clear_desc_also_erases_external (1903185203791274237) -->
+    <skip />
+    <!-- no translation found for master_clear_desc_erase_external_storage (4740866328425123395) -->
+    <skip />
+    <!-- no translation found for master_clear_desc_erase_external_storage (7339100478676372901) -->
+    <skip />
+    <!-- no translation found for erase_external_storage (969364037450286809) -->
+    <skip />
+    <!-- no translation found for erase_external_storage (1397239046334307625) -->
+    <skip />
+    <!-- no translation found for erase_external_storage_description (444834593696342279) -->
+    <skip />
+    <!-- no translation found for erase_external_storage_description (46603515218075174) -->
+    <skip />
+    <!-- no translation found for master_clear_button_text (3130786116528304116) -->
+    <skip />
+    <!-- no translation found for master_clear_button_text (7550632653343157971) -->
+    <skip />
+    <string name="master_clear_final_desc" msgid="6917971132484622696">"Sula lonke ulwazi lomuntu siqu nanoma iziphi izinhlelo ezisusiwe? Akwenzeki ukubuyisela emuva lesi senzo!"</string>
+    <!-- no translation found for master_clear_final_button_text (5390908019019242910) -->
+    <skip />
+    <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Dweba iphathini yakho yokuvula"</string>
+    <!-- no translation found for master_clear_gesture_explanation (2234954758550554549) -->
+    <skip />
+    <!-- no translation found for master_clear_failed (8655202125010189406) -->
+    <skip />
+    <!-- no translation found for master_clear_confirm_title (4845794266129586839) -->
+    <skip />
+    <!-- outdated translation 4671276096695789895 -->     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Fometha ikhadi le-SD."</string>
+    <!-- outdated translation 4671276096695789895 -->     <string name="media_format_title" product="default" msgid="4427528440306787972">"Fometha ikhadi le-SD."</string>
+    <!-- outdated translation 3805714639375830120 -->     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Isula yonke idatha ekhadini le-SD"</string>
+    <string name="media_format_summary" product="default" msgid="3805714639375830120">"Isula yonke idatha ekhadini le-SD"</string>
+    <!-- outdated translation 1142563222357820834 -->     <string name="media_format_desc" product="nosdcard" msgid="4553860683952763905">"Lesi senzo sizosusa ikhadi le-SD efonini. Uzolahlekelwa yiyo YONKE idatha ekhadini!"</string>
+    <!-- outdated translation 1142563222357820834 -->     <string name="media_format_desc" product="default" msgid="1598627584181935513">"Lesi senzo sizosusa ikhadi le-SD efonini. Uzolahlekelwa yiyo YONKE idatha ekhadini!"</string>
+    <!-- outdated translation 370856400090190151 -->     <string name="media_format_button_text" product="nosdcard" msgid="6293669371185352810">"Fometha ikhadi le-SD"</string>
+    <!-- outdated translation 370856400090190151 -->     <string name="media_format_button_text" product="default" msgid="6721544380069373626">"Fometha ikhadi le-SD"</string>
+    <!-- outdated translation 1776666694910717198 -->     <string name="media_format_final_desc" product="nosdcard" msgid="8094635533378487255">"Fometha ikhadi le-SD, isula imidiya yakho konke? Isenzo asikwazi ukubuyiselwa!"</string>
+    <!-- outdated translation 1776666694910717198 -->     <string name="media_format_final_desc" product="default" msgid="9015504991522581434">"Fometha ikhadi le-SD, isula imidiya yakho konke? Isenzo asikwazi ukubuyiselwa!"</string>
+    <string name="media_format_final_button_text" msgid="4881713344315923175">"Sula yonke into"</string>
+    <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Dweba iphathini yokuvula"</string>
+    <!-- outdated translation 4239529439389660159 -->     <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Kumele udwebe iphathini yakho yokuvula ukuqinisekisa ifomethi yekhadi le-SD."</string>
+    <!-- outdated translation 4239529439389660159 -->     <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Kumele udwebe iphathini yakho yokuvula ukuqinisekisa ifomethi yekhadi le-SD."</string>
+    <!-- no translation found for call_settings_title (5188713413939232801) -->
+    <skip />
+    <!-- no translation found for call_settings_summary (7291195704801002886) -->
+    <skip />
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"Ukusebenzisa i-USB"</string>
+    <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Indawo ephathekayo"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Ukusebenzisa i-Bluetooth"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Ukusebenzisa ifoni njengemodemu"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"Ukusebenzisa njengemodemu &amp; indawo ephathekayo"</string>
+    <!-- outdated translation 3562431455625637370 -->     <string name="tether_settings_summary_usb" product="tablet" msgid="785883365108362248">"Yabelana noxhumano lwedatha yefoni yakho nge-USB"</string>
+    <string name="tether_settings_summary_usb" product="default" msgid="3562431455625637370">"Yabelana noxhumano lwedatha yefoni yakho nge-USB"</string>
+    <!-- outdated translation 4690912027002467246 -->     <string name="tether_settings_summary_wifi" msgid="5474383125137372164">"Yabelana noxhumano lwenombolo yefoni yakho njengendawo ye-Wi-Fi ephathekayo"</string>
+    <!-- no translation found for tether_settings_summary_bluetooth (2407506656353819750) -->
+    <skip />
+    <!-- outdated translation 3700323208282018772 -->     <string name="tether_settings_summary_usb_wifi" product="tablet" msgid="3834674129575844910">"Yabelana noxhuano lwedatha yefoni nge-USB noma njengendawo ye-Wi-Fi ephathekayo"</string>
+    <string name="tether_settings_summary_usb_wifi" product="default" msgid="3700323208282018772">"Yabelana noxhuano lwedatha yefoni nge-USB noma njengendawo ye-Wi-Fi ephathekayo"</string>
+    <!-- outdated translation 4008195891276675882 -->     <string name="tether_settings_summary_usb_bluetooth" product="tablet" msgid="1245080236509560839">"Yabelana noxhumano lwedatha yefoni yakho nge-USB noma i-Bluetooth"</string>
+    <string name="tether_settings_summary_usb_bluetooth" product="default" msgid="4008195891276675882">"Yabelana noxhumano lwedatha yefoni yakho nge-USB noma i-Bluetooth"</string>
+    <!-- outdated translation 2753904149495692201 -->     <string name="tether_settings_summary_wifi_bluetooth" product="tablet" msgid="1924576461932311140">"Yabelana noxhumano lwedatha yefoni yakho ne-Bluetooth noma njengendawo ephathekayo ye-Wi-Fi"</string>
+    <string name="tether_settings_summary_wifi_bluetooth" product="default" msgid="2753904149495692201">"Yabelana noxhumano lwedatha yefoni yakho ne-Bluetooth noma njengendawo ephathekayo ye-Wi-Fi"</string>
+    <!-- outdated translation 1171769255924636665 -->     <string name="tether_settings_summary_all" product="tablet" msgid="6612660164315153427">"Yabelana noxhumano lwedatha yefoni yakho nge-USB, i-Wi-Fi noma i-Bluetooth"</string>
+    <string name="tether_settings_summary_all" product="default" msgid="1171769255924636665">"Yabelana noxhumano lwedatha yefoni yakho nge-USB, i-Wi-Fi noma i-Bluetooth"</string>
+    <string name="usb_title" msgid="7483344855356312510">"I-USB"</string>
+    <string name="usb_tethering_button_text" msgid="585829947108007917">"Ukusebenzisa i-USB njengemodemu"</string>
+    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"I-USB ixhunyiwe, hlola ukusebenzisa njengemodemu"</string>
+    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Kusebenziswe ifoni njengemodemu"</string>
+    <string name="usb_tethering_storage_active_subtext" msgid="6608933594288072573">"Ayikwazi ukusebenzisa njengemodemu lapho ukugcina nge-USB kusebenza"</string>
+    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"i-USB ayixhunyiwe"</string>
+    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Iphutha lokusebenzisa ifoni njengemodemu le-USB"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Ukusebenzisa i-Bluetooth"</string>
+    <!-- outdated translation 3317112145693933963 -->     <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Ukusebenzisa i-Bluetooth kuvuliwe, kodwa akuxhunyiwe"</string>
+    <!-- outdated translation 3317112145693933963 -->     <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Ukusebenzisa i-Bluetooth kuvuliwe, kodwa akuxhunyiwe"</string>
+    <!-- no translation found for bluetooth_tethering_device_connected_subtext (2730938191906597896) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_device_connected_subtext (1666736165420290466) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_devices_connected_subtext (1180765608259580143) -->
+    <skip />
+    <!-- no translation found for bluetooth_tethering_devices_connected_subtext (8248942539362173005) -->
+    <skip />
+    <!-- outdated translation 1798863866978968964 -->     <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Ukusebenzisa i-Bluetooth njengemodemu kuvaliwe"</string>
+    <!-- outdated translation 1798863866978968964 -->     <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Ukusebenzisa i-Bluetooth njengemodemu kuvaliwe"</string>
+    <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Iphutha lokusebenzisa i-Bluetooth njengemodemu"</string>
+    <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"Ayikwazi ukusebenzisa ifoni njengemodemu kumadivaysi adlula angu-<xliff:g id="MAXCONNECTION">%1$d</xliff:g>"</string>
+    <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ngeke kusebenziswe ifoni njengemodemu"</string>
+    <string name="tethering_help_button_text" msgid="656117495547173630">"Usizo"</string>
+    <!-- no translation found for network_settings_title (7967552516440151852) -->
+    <skip />
+    <!-- no translation found for network_settings_summary (5149750850846813553) -->
+    <skip />
+    <string name="location_title" msgid="1029961368397484576">"Indawo Yami"</string>
+    <!-- no translation found for location_network_based (8815705866861993344) -->
+    <skip />
+    <!-- no translation found for location_networks_disabled (2708968452901433980) -->
+    <skip />
+    <!-- no translation found for location_neighborhood_level (4656658097932515921) -->
+    <skip />
+    <!-- no translation found for location_neighborhood_level_wifi (7457348712272184793) -->
+    <skip />
+    <string name="location_gps" msgid="6296125378829097831">"Sebenzisa amasethalathi e-GPS"</string>
+    <string name="location_street_level" msgid="7456259025474443314">"Lapho uthalo, kunembe nezinga lesitaladi"</string>
+    <!-- no translation found for location_gps_disabled (6632537158777308128) -->
+    <skip />
+    <string name="assisted_gps" msgid="4649317129586736885">"Sebenzisa ama-GPS asiziwe"</string>
+    <string name="assisted_gps_enabled" msgid="8751899609589792803">"Sebenzisa iseva ukusiza i-GPS (ungahloli ukwehlisa ukusebenzisa inethiwekhi)"</string>
+    <string name="assisted_gps_disabled" msgid="6982698333968010748">"Sebenzisa iseva ukusiza i-GPS (ungahloli ukuthuthukisa ukusebenza kwe-GPS)"</string>
+    <!-- outdated translation 5447030582538504247 -->     <string name="use_location_title" msgid="3659340070401464551">"Sebenzisa Indawo Yami"</string>
+    <!-- no translation found for use_location_summary_disabled (6518008620918354403) -->
+    <skip />
+    <!-- no translation found for use_location_summary_enabled (8110246289085796179) -->
+    <skip />
+    <!-- no translation found for about_settings (593457295516533765) -->
+    <skip />
+    <!-- no translation found for about_settings (1743378368185371685) -->
+    <skip />
+    <!-- no translation found for about_settings_summary (3371517697156165959) -->
+    <skip />
+    <!-- no translation found for legal_information (5769301644270604095) -->
+    <skip />
+    <!-- no translation found for contributors_title (5917703088825286504) -->
+    <skip />
+    <!-- no translation found for copyright_title (865906688917260647) -->
+    <skip />
+    <!-- no translation found for license_title (1990487604356037871) -->
+    <skip />
+    <!-- no translation found for terms_title (7697580845616764642) -->
+    <skip />
+    <string name="system_tutorial_list_item_title" msgid="9082844446660969729">"Isifundo sohlelo"</string>
+    <!-- outdated translation 3861815254521030201 -->     <string name="system_tutorial_list_item_summary" product="tablet" msgid="3341504384445734067">"Funda indlela yokusebenzisa ifoni yakho"</string>
+    <string name="system_tutorial_list_item_summary" product="default" msgid="3861815254521030201">"Funda indlela yokusebenzisa ifoni yakho"</string>
+    <!-- no translation found for settings_license_activity_title (7553683406244228650) -->
+    <skip />
+    <!-- no translation found for settings_license_activity_unavailable (4210539215951487627) -->
+    <skip />
+    <!-- no translation found for settings_license_activity_loading (3337535809093591740) -->
+    <skip />
+    <string name="settings_safetylegal_title" msgid="1289483965535937431">"Ulwazi lokuvikeleka"</string>
+    <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Ulwazi lokuvikeleka"</string>
+    <!-- no translation found for settings_safetylegal_activity_unreachable (170670055116721810) -->
+    <skip />
+    <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Iyalayisha…"</string>
+    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Khetha iphasiwedi yakho"</string>
+    <!-- no translation found for lockpassword_choose_your_pattern_header (6949761069941694050) -->
+    <skip />
+    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Khetha i-PIN yakho"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Qinisekisa iphasiwedi yakho"</string>
+    <!-- no translation found for lockpassword_confirm_your_pattern_header (7543433733032330821) -->
+    <skip />
+    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Qinisekisa i-PIN yakho"</string>
+    <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"Amaphasiwedi awafani"</string>
+    <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"Ama-PIN awafani"</string>
+    <!-- no translation found for lockpassword_choose_lock_generic_header (3811438094903786145) -->
+    <skip />
+    <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Iphasiwedi imisiwe"</string>
+    <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"i-PIN imisiwe"</string>
+    <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Iphathini imisiwe"</string>
+    <!-- outdated translation 975088518210629938 -->     <string name="lock_settings_title" msgid="8943058958424073651">"Ukuvula isikrini"</string>
+    <!-- no translation found for lockpattern_change_lock_pattern_label (5679630792003440352) -->
+    <skip />
+    <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Shintsha ukuvula i-PIN"</string>
+    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Qinisekisa iphathini egciniwe"</string>
+    <!-- no translation found for lockpattern_need_to_unlock_wrong (5629093548611791080) -->
+    <skip />
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Dweba iphathini yokuvula"</string>
+    <!-- no translation found for lockpattern_recording_intro_footer (1118579101409152113) -->
+    <skip />
+    <!-- no translation found for lockpattern_recording_inprogress (4622772178078818425) -->
+    <skip />
+    <!-- no translation found for lockpattern_recording_incorrect_too_short (3103250430366718996) -->
+    <skip />
+    <!-- no translation found for lockpattern_pattern_entered_header (5012716272001299362) -->
+    <skip />
+    <!-- no translation found for lockpattern_need_to_confirm (5144676887162575050) -->
+    <skip />
+    <!-- no translation found for lockpattern_pattern_confirmed_header (2223856038485537716) -->
+    <skip />
+    <!-- no translation found for lockpattern_confirm_button_text (1128204343957002841) -->
+    <skip />
+    <!-- no translation found for lockpattern_restart_button_text (3337574403350953926) -->
+    <skip />
+    <!-- no translation found for lockpattern_retry_button_text (1949847413862309134) -->
+    <skip />
+    <!-- no translation found for lockpattern_continue_button_text (4723771754714471410) -->
+    <skip />
+    <!-- no translation found for lockpattern_settings_title (3207750489460466680) -->
+    <skip />
+    <!-- no translation found for lockpattern_settings_enable_title (6920616873671115281) -->
+    <skip />
+    <!-- no translation found for lockpattern_settings_enable_summary (1165707416664252167) -->
+    <skip />
+    <!-- no translation found for lockpattern_settings_enable_visible_pattern_title (104851667540971729) -->
+    <skip />
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="972174133075372341">"Sebenzisa impendulo ethintekayo"</string>
+    <!-- no translation found for lockpattern_settings_choose_lock_pattern (1652352830005653447) -->
+    <skip />
+    <!-- no translation found for lockpattern_settings_change_lock_pattern (1123908306116495545) -->
+    <skip />
+    <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Udweba kanjani phathini yokuvula"</string>
+    <!-- no translation found for lockpattern_too_many_failed_confirmation_attempts_header (819903817323783498) -->
+    <skip />
+    <!-- no translation found for lockpattern_too_many_failed_confirmation_attempts_footer (6759029360597122873) -->
+    <skip />
+    <!-- no translation found for skip_button_label (8680422740354436943) -->
+    <skip />
+    <!-- no translation found for next_button_label (8890792540116568321) -->
+    <skip />
+    <!-- no translation found for lock_title (2909697418179419990) -->
+    <skip />
+    <!-- no translation found for lock_title (4059246467204273930) -->
+    <skip />
+    <!-- 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="default" msgid="9100785646737118042"><font size="17">"Vikela ifoni yakho ekusetshenzisweni okungavumelekile ngokwenza iphathini yokuvula isikrini."\n<font height="17">\n</font><b>"1"</b>" Esikrinini esilandelayo, bheka ngenkathi iphathini eyisibonelo idwetshwa. "\n<font height="17">\n</font><b>"2"</b>" Uma usukulungele, dweba iphathini yakho siqu yokuvula. Bona amaphathini ahlukene kodwa xhuma okungenani amachashazi amane."\n<font height="17">\n</font><b>"3"</b>" Dweba futhi iphathini yakho ukuqinisekisa. "\n<font height="17">\n</font><b>"Ukulungele ukuqalisa? Thinta \"Okulandelayo\""</b>". "\n<font height="3">\n</font>"Ukushiya ifoni yakho ingavikeliwe, thinta \"Khansela\"."</font></string>
+    <!-- no translation found for manageapplications_settings_title (5712405848153426706) -->
+    <skip />
+    <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Phatha futhi ukhiphe izinhlelo zokusebenza ezifakiwe"</string>
+    <!-- no translation found for applications_settings (3736173521008476946) -->
+    <skip />
+    <!-- no translation found for applications_settings_summary (2714215108369119717) -->
+    <skip />
+    <!-- no translation found for applications_settings_header (6018266337275422250) -->
+    <skip />
+    <!-- no translation found for install_applications (4872012136210802181) -->
+    <skip />
+    <string name="install_unknown_applications" msgid="6612824788917283662">"Vumela ukufaka izinhlelo zokusebenza ezingezona eze-Market."</string>
+    <!-- outdated translation 1923717607319933741 -->     <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"Ifoni yakho nedatha yangasese zisemathubeni okuhlaselwa izinhlelo zokusebenza kwimithombo engaziwe. Uyavuma ukuthi unecala lanoma yikuphi ukonakala efonini yakho noma ukulahleka kwedatha okungahilela ekusebenziseni lezi zinhlelo zokusebenza."</string>
+    <string name="install_all_warning" product="default" msgid="1923717607319933741">"Ifoni yakho nedatha yangasese zisemathubeni okuhlaselwa izinhlelo zokusebenza kwimithombo engaziwe. Uyavuma ukuthi unecala lanoma yikuphi ukonakala efonini yakho noma ukulahleka kwedatha okungahilela ekusebenziseni lezi zinhlelo zokusebenza."</string>
+    <!-- no translation found for advanced_settings (1777249286757067969) -->
+    <skip />
+    <!-- no translation found for advanced_settings_summary (145134386044169043) -->
+    <skip />
+    <!-- no translation found for application_info_label (1150486628158409543) -->
+    <skip />
+    <!-- no translation found for storage_label (8700867073480107253) -->
+    <skip />
+    <!-- no translation found for auto_launch_label (3012617472833815382) -->
+    <skip />
+    <!-- no translation found for screen_compatibility_label (663250687205465394) -->
+    <skip />
+    <!-- no translation found for permissions_label (2605296874922726203) -->
+    <skip />
+    <string name="cache_header_label" msgid="1877197634162461830">"Isilondolozi sesikhashana"</string>
+    <string name="clear_cache_btn_text" msgid="5756314834291116325">"Sula inqolobane"</string>
+    <string name="cache_size_label" msgid="7505481393108282913">"Isilondolozi sesikhashana"</string>
+    <string name="controls_label" msgid="7611113077086853799">"Izilawuli"</string>
+    <string name="force_stop" msgid="7435006169872876756">"Phoqelela ukuma"</string>
+    <!-- no translation found for total_size_label (1048676419552557254) -->
+    <skip />
+    <!-- no translation found for application_size_label (5055196275624686382) -->
+    <skip />
+    <!-- no translation found for data_size_label (8679376373625710107) -->
+    <skip />
+    <!-- no translation found for external_size_label (4465530017830945766) -->
+    <skip />
+    <!-- no translation found for external_size_label (2107155737635944440) -->
+    <skip />
+    <!-- no translation found for uninstall_text (3644892466144802466) -->
+    <skip />
+    <string name="disable_text" msgid="6544054052049395202">"Valiwe"</string>
+    <string name="enable_text" msgid="9217362512327828987">"Vumela"</string>
+    <!-- no translation found for clear_user_data_text (5597622864770098388) -->
+    <skip />
+    <string name="app_factory_reset" msgid="6635744722502563022">"Khipha izibuyekezo"</string>
+    <!-- no translation found for auto_launch_enable_text (2630656657744196691) -->
+    <skip />
+    <!-- no translation found for auto_launch_disable_text (7800385822185540166) -->
+    <skip />
+    <!-- no translation found for clear_activities (7408923511535174430) -->
+    <skip />
+    <!-- no translation found for screen_compatibility_text (2398570332021220651) -->
+    <skip />
+    <!-- no translation found for ask_compatibility (7225195569089607846) -->
+    <skip />
+    <!-- no translation found for enable_compatibility (3257284255974065538) -->
+    <skip />
+    <!-- no translation found for unknown (1592123443519355854) -->
+    <skip />
+    <string name="sort_order_alpha" msgid="1410278099123670628">"Hlunga ngegama"</string>
+    <string name="sort_order_size" msgid="7024513286636502362">"Hlunga ngosayizi"</string>
+    <!-- no translation found for show_running_services (5736278767975544570) -->
+    <skip />
+    <!-- no translation found for show_background_processes (2009840211972293429) -->
+    <skip />
+    <!-- no translation found for manage_space_text (8852711522447794676) -->
+    <skip />
+    <string name="filter" msgid="2018011724373033887">"Hlunga"</string>
+    <string name="filter_dlg_title" msgid="6507663329723966854">"Khetha okukhethwa kukho kokuhlunga"</string>
+    <string name="filter_apps_all" msgid="5142129378749391876">"Konke"</string>
+    <string name="filter_apps_third_party" msgid="7786348047690140979">"Landiwe"</string>
+    <string name="filter_apps_running" msgid="7767071454371350486">"Iyasebenza"</string>
+    <!-- outdated translation 1477351142334784771 -->     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Ekhadini le-SD"</string>
+    <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Ekhadini le-SD"</string>
+    <string name="disabled" msgid="9206776641295849915">"Akusebenzi"</string>
+    <string name="no_applications" msgid="5190227407135243904">"Azikho izinhlelo zokusebenza."</string>
+    <!-- no translation found for internal_storage (1584700623164275282) -->
+    <skip />
+    <!-- no translation found for sd_card_storage (2673203150465132465) -->
+    <skip />
+    <!-- no translation found for sd_card_storage (7623513618171928235) -->
+    <skip />
+    <!-- no translation found for recompute_size (7722567982831691718) -->
+    <skip />
+    <!-- no translation found for clear_data_dlg_title (4470209520936375508) -->
+    <skip />
+    <string name="clear_data_dlg_text" msgid="8368035073300828451">"Yonke le datha yohlelo lokusebenza izosuswa ngokuphelele. Lokhu kuhlanganisa wonke amafayela,  izilungiselelo, ama-akhawunti, izizinda zemininingwane nokunye."</string>
+    <!-- no translation found for dlg_ok (2402639055725653590) -->
+    <skip />
+    <!-- no translation found for dlg_cancel (1674753358972975911) -->
+    <skip />
+    <!-- no translation found for app_not_found_dlg_title (8458335716378083713) -->
+    <skip />
+    <string name="app_not_found_dlg_text" msgid="2980271680333341554">"Uhlelo lokusebenza alutholakalanga ohlwini lwezinhlelo zokusebenza ezifakiwe."</string>
+    <!-- no translation found for clear_data_failed (581956197586913865) -->
+    <skip />
+    <string name="app_factory_reset_dlg_title" msgid="6116199391150388147">"Khipha izibuyekezo"</string>
+    <string name="app_factory_reset_dlg_text" msgid="438395129140568893">"Ingabe ufuna ukukhipha zonke izibuyekezo kulolu hlelo lokusebenza lohlelo lwe-Android System?"</string>
+    <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Sula idatha"</string>
+    <string name="clear_failed_dlg_text" msgid="7943411157007320290">"Yehlulekile ukusula idatha yohlelo lokusebenza"</string>
+    <!-- outdated translation 3116027624526915561 -->     <string name="security_settings_desc" product="tablet" msgid="6158636779728455276">"Lolu hlelo lokusebenza lungafinyelela okulandelayo efonini yakho:"</string>
+    <string name="security_settings_desc" product="default" msgid="3116027624526915561">"Lolu hlelo lokusebenza lungafinyelela okulandelayo efonini yakho:"</string>
+    <string name="computing_size" msgid="1599186977475211186">"Iyakhompyutha..."</string>
+    <string name="invalid_size_value" msgid="1901940003700269523">"Ayikwazi ukwenza usayizi wephakheji"</string>
+    <string name="empty_list_msg" msgid="2901049162265094971">"Awunazo izinhlelo zokusebenza zelingu langaphandle ezifakiwe."</string>
+    <string name="version_text" msgid="9189073826278676425">"Inguqulo <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
+    <string name="move_app" msgid="5042838441401731346">"Hambisa"</string>
+    <!-- outdated translation 3895430471913858185 -->     <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Hambisa kwifoni"</string>
+    <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Hambisa kwifoni"</string>
+    <!-- outdated translation 1143379049903056407 -->     <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Hambisa ekhadini le-SD"</string>
+    <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Hambisa ekhadini le-SD"</string>
+    <string name="moving" msgid="6431016143218876491">"Ukukhipha"</string>
+    <string name="insufficient_storage" msgid="8566913062094452962">"Akukho ukugcina okwanele okusele"</string>
+    <string name="does_not_exist" msgid="837163572898468245">"Othintana naye akekho."</string>
+    <string name="app_forward_locked" msgid="5747805144210389585">"Lolu hlelo lokusebenza luyikhophi evikelwe."</string>
+    <string name="invalid_location" msgid="4934491353200240499">"Indawo yokufaka ecacisiwe ayilungile."</string>
+    <string name="system_package" msgid="1030561474413022831">"Izibuyekezo zesistimu azikwazi ukufakwa kwimidiya yangaphandle"</string>
+    <string name="force_stop_dlg_title" msgid="4289453224368188476">"Phoqelela ukumisa"</string>
+    <string name="force_stop_dlg_text" msgid="5157374701213502922">"Ukumisa ngokuphoqelela uhlelo lokusebenza kungabangela ukuba ingaziphathi kahle. Uqinisekile?"</string>
+    <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Hambisa uhlelo lokusebenza"</string>
+    <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Yehlulekile ukuhambisa uhlelo lokusebenza. <xliff:g id="REASON">%1$s</xliff:g>"</string>
+    <string name="app_install_location_title" msgid="2068975150026852168">"Indawo yokufaka ekhethwayo"</string>
+    <string name="app_install_location_summary" msgid="879753854530300436">"Shintsha indawo yokufaka efiswayo yezinhlelo zokusebenza ezintsha"</string>
+    <string name="storageuse_settings_title" msgid="5657014373502630403">"Ukugcina kuyasebenza"</string>
+    <string name="storageuse_settings_summary" msgid="2556057379120846792">"Buka ukugcina okusebenzisa izinhlelo zokusebenza"</string>
+    <string name="runningservices_settings_title" msgid="8097287939865165213">"Izinsizakalo ezisebenzayo"</string>
+    <string name="runningservices_settings_summary" msgid="854608995821032748">"Buka futhi ulawule izinsizakalo ezisebenzayo okwamanje"</string>
+    <string name="service_restarting" msgid="2242747937372354306">"Iqalisa phansi"</string>
+    <!-- no translation found for cached (1059590879740175019) -->
+    <skip />
+    <string name="no_running_services" msgid="2059536495597645347">"Akukho okusebenzayo."</string>
+    <string name="service_started_by_app" msgid="6575184738671598131">"Iqaliswe uhlelo lokusebenza."</string>
+    <!-- no translation found for service_client_name (4037193625611815517) -->
+    <skip />
+    <!-- no translation found for service_background_processes (6844156253576174488) -->
+    <skip />
+    <!-- no translation found for service_foreground_processes (7583975676795574276) -->
+    <skip />
+    <!-- no translation found for memory (6609961111091483458) -->
+    <skip />
+    <!-- no translation found for service_process_name (4098932168654826656) -->
+    <skip />
+    <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> inqubo <xliff:g id="NUMSERVICES">%2$d</xliff:g> nensizakalo"</string>
+    <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> izinqubo <xliff:g id="NUMSERVICES">%2$d</xliff:g> nezinsizakalo"</string>
+    <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> izinqubo kanye <xliff:g id="NUMSERVICES">%2$d</xliff:g> nensizakalo"</string>
+    <string name="running_processes_item_description_p_p" msgid="1607384595790852782">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> izinqubo <xliff:g id="NUMSERVICES">%2$d</xliff:g> nezinsizakalo"</string>
+    <string name="runningservicedetails_settings_title" msgid="6188692418986988288">"Uhlelo lokusebenza olusebenzayo"</string>
+    <string name="no_services" msgid="7133900764462288263">"Akusebenzi"</string>
+    <string name="runningservicedetails_services_title" msgid="391168243725357375">"Izinsizakalo"</string>
+    <string name="runningservicedetails_processes_title" msgid="928115582044655268">"Izinqubo"</string>
+    <string name="service_stop" msgid="6369807553277527248">"Misa"</string>
+    <string name="service_manage" msgid="1876642087421959194">"Izilungiselelo"</string>
+    <string name="service_stop_description" msgid="3261798282116866961">"Lensizakalo iqaliswe uhlelo lwayo lokusebenza. Ukuyimisa kungase kubangele ukuba uhlelo lwehluleke."</string>
+    <string name="heavy_weight_stop_description" msgid="6855241582643136019">"Lolu hlelo lokusebenza alukwazi ukumisa ngokuphephile. Ukwenza kanjalo kungase kulahle okunye komsebenzi wakho wamanje."</string>
+    <!-- no translation found for background_process_stop_description (1728354083304746737) -->
+    <skip />
+    <string name="service_manage_description" msgid="7050092269951613102">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: okwamanje iyasebenza. Thinta izilungiselelo ukuyilawula."</string>
+    <string name="main_running_process_description" msgid="929204645380391397">"Inqubo eyinhloko esebenzayo"</string>
+    <string name="process_service_in_use_description" msgid="8993335064403217080">"Insizakalo <xliff:g id="COMP_NAME">%1$s</xliff:g> iyasebenza"</string>
+    <string name="process_provider_in_use_description" msgid="5586603325677678940">"Umhlinzeki <xliff:g id="COMP_NAME">%1$s</xliff:g> uyasebenza."</string>
+    <!-- no translation found for runningservicedetails_stop_dlg_title (4253292537154337233) -->
+    <skip />
+    <!-- no translation found for runningservicedetails_stop_dlg_text (5420033091144016389) -->
+    <skip />
+    <!-- no translation found for runningservicedetails_stop_dlg_text (6929716497425738387) -->
+    <skip />
+    <!-- outdated translation 502219872342167227 -->     <string name="language_settings" msgid="5292716747264442359">"Ulimi &amp; ikhibhodi"</string>
+    <!-- outdated translation 3455826933385341107 -->     <string name="language_keyboard_settings_title" msgid="243220021717425813">"Ulimi &amp; izilungiselelo zekhibhodi"</string>
+    <string name="language_settings_category" msgid="2288258489940617043">"Izilungiselelo zolimi"</string>
+    <string name="keyboard_settings_category" msgid="7060453865544070642">"Izilungiselelo zekhibhodi"</string>
+    <!-- outdated translation 2138384312336494991 -->     <string name="phone_language" msgid="1165758957501090679">"Khetha isici sakho"</string>
+    <string name="phone_language_summary" msgid="3871309445655554211"></string>
+    <!-- no translation found for auto_replace (6199184757891937822) -->
+    <skip />
+    <!-- no translation found for auto_replace_summary (370288728200084466) -->
+    <skip />
+    <!-- no translation found for auto_caps (6379232078052591265) -->
+    <skip />
+    <!-- no translation found for auto_caps_summary (6358102538315261466) -->
+    <skip />
+    <!-- no translation found for auto_punctuate (4595367243950425833) -->
+    <skip />
+    <string name="hardkeyboard_category" msgid="5957168411305769899">"Izilungiselelo zokwakheka kwangampela kwekhibhodi"</string>
+    <!-- no translation found for auto_punctuate_summary (4372126865670574837) -->
+    <skip />
+    <!-- no translation found for show_password (2198798062604049206) -->
+    <skip />
+    <!-- no translation found for show_password_summary (3806709974395178121) -->
+    <skip />
+    <string name="ime_security_warning" msgid="812267421486877917">"Indlela yokufakwayo ingase ikwazi ukuqoqa wonke umbhalo owuthayiphayo, kuhlanganise idatha yomuntu siqu njengamaphasiwedi nezinombolo zekhadi lesikoloto. Iphuma kuhlelo lokusebenza <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Sebenzisa indlela yokufaka?"</string>
+    <!-- no translation found for pointer_settings_category (6090176550039035130) -->
+    <skip />
+    <!-- no translation found for pointer_speed (1221342330217861616) -->
+    <skip />
+    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Sebenzisa isichazamazwi"</string>
+    <!-- no translation found for user_dict_single_settings_title (5454855286173849284) -->
+    <skip />
+    <!-- no translation found for user_dict_multiple_settings_title (326583195525296750) -->
+    <skip />
+    <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
+    <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Engeza"</string>
+    <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Faka kwisichazamazwi"</string>
+    <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Hlela igama"</string>
+    <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Hlela"</string>
+    <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Susa"</string>
+    <!-- outdated translation 6209268025109242806 -->     <string name="user_dict_settings_empty_text" product="tablet" msgid="1766522102636921529">"Awunawo amagama kwisichazamazwi somsebenzisi. Ungafaka igama ngemenyu."</string>
+    <string name="user_dict_settings_empty_text" product="default" msgid="6209268025109242806">"Awunawo amagama kwisichazamazwi somsebenzisi. Ungafaka igama ngemenyu."</string>
+    <!-- no translation found for user_dict_settings_all_languages (7713910347678213719) -->
+    <skip />
+    <!-- no translation found for testing (6584352735303604146) -->
+    <skip />
+    <!-- no translation found for testing_phone_info (193561832258534798) -->
+    <skip />
+    <!-- no translation found for testing_phone_info (8656693364332840056) -->
+    <skip />
+    <!-- no translation found for testing_battery_info (3497865525976497848) -->
+    <skip />
+    <!-- no translation found for quick_launch_title (7904609846945905306) -->
+    <skip />
+    <!-- no translation found for quick_launch_summary (3453825712466417452) -->
+    <skip />
+    <!-- no translation found for quick_launch_assign_application (4521368464929956350) -->
+    <skip />
+    <!-- no translation found for quick_launch_no_shortcut (5998005833838278693) -->
+    <skip />
+    <!-- no translation found for quick_launch_shortcut (5090405067413522300) -->
+    <skip />
+    <!-- no translation found for quick_launch_clear_dialog_title (5546543501250320220) -->
+    <skip />
+    <!-- no translation found for quick_launch_clear_dialog_message (3921015601470260722) -->
+    <skip />
+    <!-- no translation found for quick_launch_clear_ok_button (2634568926597586716) -->
+    <skip />
+    <!-- no translation found for quick_launch_clear_cancel_button (1892854652197747064) -->
+    <skip />
+    <!-- no translation found for quick_launch_display_mode_applications (3748789806447639039) -->
+    <skip />
+    <!-- no translation found for quick_launch_display_mode_shortcuts (4177934019174169042) -->
+    <skip />
+    <string name="input_methods_settings_title" msgid="6800066636850553887">"Okufakwayo kombhalo"</string>
+    <string name="input_method" msgid="5434026103176856164">"Indlela yokufaka"</string>
+    <!-- no translation found for current_input_method (2146807723398303917) -->
+    <skip />
+    <!-- no translation found for input_method_selector (4311213129681430709) -->
+    <skip />
+    <!-- no translation found for input_method_selector_show_automatically_title (1001612945471546158) -->
+    <skip />
+    <!-- no translation found for input_method_selector_always_show_title (3891824124222371634) -->
+    <skip />
+    <!-- no translation found for input_method_selector_always_hide_title (7699647095118680424) -->
+    <skip />
+    <!-- no translation found for configure_input_method (7773992829158322455) -->
+    <skip />
+    <!-- no translation found for input_method_settings (5801295625486269553) -->
+    <skip />
+    <!-- no translation found for active_input_method_subtypes (3596398805424733238) -->
+    <skip />
+    <!-- no translation found for use_system_language_to_select_input_method_subtypes (3346751753141428573) -->
+    <skip />
+    <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> izilungiselelo"</string>
+    <!-- no translation found for input_methods_and_subtype_enabler_title (4018402267502337338) -->
+    <skip />
+    <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Izilungiselelo zekhibhodi ekwiskrini"</string>
+    <!-- outdated translation 5274990495405941804 -->     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Ikhibhodi eyakhelwe ngaphakathi"</string>
+    <!-- outdated translation 7990296351888096836 -->     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Izilungiselelo ezakhelwe phakathi, ukwakheka kwekhibhodi"</string>
+    <!-- no translation found for development_settings_title (6719732334835420989) -->
+    <skip />
+    <string name="development_settings_summary" msgid="2151320488701538355">"Hlela okukhethwayo kwentuthuko yohlelo lokusebenza"</string>
+    <!-- no translation found for enable_adb (7982306934419797485) -->
+    <skip />
+    <!-- no translation found for enable_adb_summary (4881186971746056635) -->
+    <skip />
+    <!-- no translation found for keep_screen_on (1146389631208760344) -->
+    <skip />
+    <!-- no translation found for keep_screen_on_summary (2173114350754293009) -->
+    <skip />
+    <string name="allow_mock_location" msgid="2787962564578664888">"Vumela izindawo mbumbulu"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Vumela izindawo mbumbulu"</string>
+    <string name="adb_warning_title" msgid="6234463310896563253">"Vumela ukulungisa iphutha le-USB?"</string>
+    <string name="adb_warning_message" msgid="5352555112049663033">"Ukulungisa iphutha le-USB kuhloselwe izinjongo zokuthuthukisa kuphela. Ingasebenziselwa ukukopisha idatha phakathi kwekhompyutha yakho nedivaysi yakho, faka izinhlelo zokusebenza kwidivaysi yakho ngaphandle kwesaziso, bese ufunda idatha yefayela lokungena."</string>
+    <string name="gadget_picker_title" msgid="98374951396755811">"Khetha igajethi"</string>
+    <string name="widget_picker_title" msgid="9130684134213467557">"Khetha isinqunjwana"</string>
+    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>usuku <xliff:g id="HOURS">%2$d</xliff:g>ihora <xliff:g id="MINUTES">%3$d</xliff:g>iminithi <xliff:g id="SECONDS">%4$d</xliff:g>isekhondi"</string>
+    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> ihora <xliff:g id="MINUTES">%2$d</xliff:g> amaminithi <xliff:g id="SECONDS">%3$d</xliff:g> amasekhondi"</string>
+    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>amaminithi <xliff:g id="SECONDS">%2$d</xliff:g>amasekhondi"</string>
+    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>s"</string>
+    <string name="usage_stats_label" msgid="5890846333487083609">"Izibalo zokusetshenziswa"</string>
+    <string name="testing_usage_stats" msgid="7823048598893937339">"Izibalo zokusetshenziswa"</string>
+    <string name="display_order_text" msgid="8592776965827565271">"Hlunga nge:"</string>
+    <string name="app_name_label" msgid="2000949925256858308">"Uhlelo lokusebenza"</string>
+    <string name="launch_count_label" msgid="4019444833263957024">"Bala"</string>
+    <string name="usage_time_label" msgid="295954901452833058">"Isikhathi sokusetshenziswa"</string>
+    <string name="accessibility_settings" msgid="3975902491934816215">"Ukufinyeleleka"</string>
+    <string name="accessibility_settings_title" msgid="2130492524656204459">"Izilungiselelo zokufinyelela"</string>
+    <string name="accessibility_settings_summary" msgid="8185181964847149507">"Phatha okukhethwayo kokufinyelela"</string>
+    <string name="toggle_accessibility_title" msgid="650839277066574497">"Ukufinyeleleka"</string>
+    <string name="accessibility_services_category" msgid="8127851026323672607">"Izinsizakalo zokufinyeleleka"</string>
+    <string name="no_accessibility_services_summary" msgid="694578333333808159">"Azikho izinsizakalo ezifinyelekayo ezifakiwe"</string>
+    <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Insizakalo yokufinyelela ingase ikwazi ukuqoqa wonke umbhalo owuthayiphayo, kuhlanganise idatha yezinombolo zekhadi lesikoloto ngaphandle kwephasiwedi. Ingase futhi ingene ekuhlanganyeleni komsebenzisi. Kuphuma kuhlelo lokusebenza <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Sebenzisa lensizakalo yokufinyelela?"</string>
+    <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Vimbela ukufinyelela?"</string>
+    <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"Azikho izinhlelo zokusebenza ezihlobene nokufinyelela ezitholakele"</string>
+    <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"Awunazo izinhlelo zokusebenza ezihlobene nokufinyelela ezifakiwe."\n\n"Ungalanda isifundi sesikrini sedivaysi yakho e-Android Market."\n\n"Qhafaza KULUNGILE ukufaka isifundi sesikrini."</string>
+    <string name="accessibility_script_injection_category" msgid="8649951751131431904">"Ukufinyeleleka kokulotshiwe"</string>
+    <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"Landa ukufinyelela okulotshiwe"</string>
+    <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"Vumela uhlelo lokusebenza ukulanda okulotshiwe kokufinyeleleka kwi-Google"</string>
+    <!-- outdated translation 9078893361741942109 -->     <string name="accessibility_script_injection_security_warning" product="tablet" msgid="1113600871264359828">"Ezinye izinhlelo zokusebenza zingase zitshele i-Google ukuthi ilande okulotshiwe efonini yakho okwenza okuqukethwe kufinyeleleke kalula. Uqinisekile ukuthi ufuna ukuvumela i-Google ukufaka okulotshiwe okufinyelelekayo efonini yakho?"</string>
+    <string name="accessibility_script_injection_security_warning" product="default" msgid="9078893361741942109">"Ezinye izinhlelo zokusebenza zingase zitshele i-Google ukuthi ilande okulotshiwe efonini yakho okwenza okuqukethwe kufinyeleleke kalula. Uqinisekile ukuthi ufuna ukuvumela i-Google ukufaka okulotshiwe okufinyelelekayo efonini yakho?"</string>
+    <string name="accessibility_power_button_category" msgid="8545885236482339928">"Inkinobho yamandla"</string>
+    <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"Inkinobho yamandla imisa ikholi"</string>
+    <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"Phakathi nekholi, ukucindezela Amandla kumisa ucingo kunokuba kuvale isikrini"</string>
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <skip />
+    <!-- no translation found for touchscreen_gestures_category (3109869155350859625) -->
+    <skip />
+    <!-- no translation found for long_press_timeout_selector_title (1396876537252863044) -->
+    <skip />
+    <!-- no translation found for long_press_timeout_selector_summary (2261114502740278996) -->
+    <skip />
+    <string name="power_usage_summary_title" msgid="5180282911164282324">"Ukusebenzisa ibhetri"</string>
+    <string name="power_usage_summary" msgid="7237084831082848168">"Yini ekade isebenzisa ibhetri"</string>
+    <!-- no translation found for power_usage_not_available (3583407442633768046) -->
+    <skip />
+    <string name="battery_since_unplugged" msgid="338073389740738437">"Ukusebenzisa ibhetri kusukela inqamuliwe"</string>
+    <string name="battery_since_reset" msgid="7464546661121187045">"Ukusebenzisa ibhetri kusukela ekuhleleni futhi"</string>
+    <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> kwibhetri"</string>
+    <string name="battery_stats_duration" msgid="7464501326709469282">"<xliff:g id="TIME">%1$s</xliff:g> kusukela kungaxhunyiwe"</string>
+    <string name="battery_stats_charging_label" msgid="4223311142875178785">"Iyashaja"</string>
+    <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Isikrini sivuliwe"</string>
+    <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"i-GPS ivuliwe"</string>
+    <!-- no translation found for battery_stats_wifi_running_label (3093545080361658269) -->
+    <skip />
+    <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Phaphama"</string>
+    <!-- outdated translation 6822042940376636775 -->     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Isiginali yefoni"</string>
+    <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
+    <skip />
+    <string name="awake" msgid="387122265874485088">"Isikhathi sokuvuka kwedivaysi"</string>
+    <!-- outdated translation 4630925382578609056 -->     <string name="wifi_on_time" msgid="6310209835617490616">"I-Wi-Fi esesikhathini"</string>
+    <!-- outdated translation 4478515071957280711 -->     <string name="bluetooth_on_time" msgid="6157799524996162271">"I-Wi-Fi isesikhathini"</string>
+    <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
+    <!-- no translation found for history_details_title (3608240585315506067) -->
+    <skip />
+    <!-- outdated translation 7564809986329021063 -->     <string name="details_title" msgid="3792801565213935385">"Imininingwane yokusebenzisa ibhetri"</string>
+    <string name="details_subtitle" msgid="32593908269911734">"Sebenzisa imininingwane"</string>
+    <string name="controls_subtitle" msgid="390468421138288702">"Lungisa amandla okusebenza"</string>
+    <string name="packages_subtitle" msgid="4736416171658062768">"Amaphakheji ahlanganisiwe"</string>
+    <!-- outdated translation 2353149143338929583 -->     <string name="power_screen" msgid="3023346080675904613">"Bonisa"</string>
+    <string name="power_wifi" msgid="2382791137776486974">"I-Wi-Fi"</string>
+    <string name="power_bluetooth" msgid="4373329044379008289">"I-Bluetooth"</string>
+    <string name="power_cell" msgid="6596471490976003056">"Iseli elindile"</string>
+    <string name="power_phone" msgid="5392641106474567277">"Amakholi ezwi"</string>
+    <!-- outdated translation 9055659695602194990 -->     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Ifoni ayenzi lutho"</string>
+    <string name="power_idle" product="default" msgid="9055659695602194990">"Ifoni ayenzi lutho"</string>
+    <string name="usage_type_cpu" msgid="715162150698338714">"Inani le-CPU"</string>
+    <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Ingaphambili le-CPU"</string>
+    <string name="usage_type_wake_lock" msgid="5125438890233677880">"Gcina kuphapheme"</string>
+    <string name="usage_type_gps" msgid="7989688715128160790">"I-GPS"</string>
+    <string name="usage_type_wifi_running" msgid="8234997940652067049">"i-Wi-Fi iyasebenza"</string>
+    <!-- outdated translation 9108247984998041853 -->     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Ifoni"</string>
+    <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Ifoni"</string>
+    <string name="usage_type_data_send" msgid="2857401966985425427">"Idatha ithunyelwe"</string>
+    <string name="usage_type_data_recv" msgid="7251090882025234185">"Idatha etholiwe"</string>
+    <string name="usage_type_audio" msgid="6957269406840886290">"Umsindo"</string>
+    <string name="usage_type_video" msgid="4295357792078579944">"Ividiyo"</string>
+    <string name="usage_type_on_time" msgid="3351200096173733159">"Isikhathi sivuliwe"</string>
+    <string name="usage_type_no_coverage" msgid="3797004252954385053">"Isikhathi esingena siginali"</string>
+    <string name="battery_action_stop" msgid="649958863744041872">"Phoqelela ukuma"</string>
+    <string name="battery_action_app_details" msgid="3275013531871113681">"Ukwaziswa kohlelo lokusebenza"</string>
+    <string name="battery_action_app_settings" msgid="350562653472577250">"Izilungiselelo zohlelo lokusebenza"</string>
+    <!-- outdated translation 5302763261448580102 -->     <string name="battery_action_display" msgid="7338551244519110831">"Bonisa izilungiselelo"</string>
+    <!-- outdated translation 5452076674659927993 -->     <string name="battery_action_wifi" msgid="2272741639606146903">"Izilungiselelo ze-WiFi"</string>
+    <string name="battery_action_bluetooth" msgid="8374789049507723142">"Izilungiselelo ze-Bluetooth"</string>
+    <string name="battery_desc_voice" msgid="8980322055722959211">"Ibhetri esebenziswe izincingo zezwi"</string>
+    <!-- outdated translation 3009080001948091424 -->     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Ibhetri esebenziswe lapho ifoni ingenzi lutho"</string>
+    <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Ibhetri esebenziswe lapho ifoni ingenzi lutho"</string>
+    <string name="battery_desc_radio" msgid="5479196477223185367">"Ibhetri esetshenziswe umsakazo weseli"</string>
+    <string name="battery_sugg_radio" msgid="8211336978326295047">"Shintshela kwimodi yendiza ukulondoloza amandla ezindaweni ezingenayo inethiwekhi yeseli."</string>
+    <string name="battery_desc_display" msgid="5432795282958076557">"Ibhetri isebenziswa ukubonisa nokukhanya kwasemuva"</string>
+    <string name="battery_sugg_display" msgid="3370202402045141760">"Yehlisa ukukhanya kwesikrini futhi/noma ukuphela kwesikhathi sesikrini"</string>
+    <string name="battery_desc_wifi" msgid="1702486494565080431">"Ibhetri esebenziswe i-Wi-Fi"</string>
+    <string name="battery_sugg_wifi" msgid="7542345142282261691">"Vala i-Wi-Fi lapho uyisebenzisa noma lapho ingatholakali"</string>
+    <string name="battery_desc_bluetooth" msgid="7535520658674621902">"Ibhetri isebenziswa i-bluetooth"</string>
+    <string name="battery_sugg_bluetooth_basic" msgid="817276933922157788">"Vula i-bluetooth lapho ungayisebenzisi"</string>
+    <string name="battery_sugg_bluetooth_headset" msgid="8214816222115517479">"Zama ukuxhuma kwidivaysi ye-bluetooth ehlukile"</string>
+    <string name="battery_desc_apps" msgid="6665712811746233450">"Ibhetri esetshenziselwe uhlelo lokusebenza"</string>
+    <string name="battery_sugg_apps_info" msgid="6065882899391322442">"Misa noma khipha uhlelo"</string>
+    <string name="battery_sugg_apps_gps" msgid="4545056413090932541">"Lawula  ngesandla i-GPS ukugwema uhlelo lokusebenza ukuyisebenzisa"</string>
+    <string name="battery_sugg_apps_settings" msgid="8021302847272481168">"Uhlelo lokusebenza lunganikeza izilungiselelo ukwehlisa ukusebenzisa ibhetri"</string>
+    <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> kusukelwa kungaxhunyiwe"</string>
+    <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Ngenkathi igcinwe ukunqamulwa kwe <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
+    <string name="menu_stats_total" msgid="8973377864854807854">"Inani lokusetshenziswa"</string>
+    <string name="menu_stats_refresh" msgid="1676215433344981075">"Qala kabusha"</string>
+    <string name="process_kernel_label" msgid="3916858646836739323">"I-Android OS"</string>
+    <string name="process_mediaserver_label" msgid="6500382062945689285">"Iseva yemidiya"</string>
+    <string name="voice_input_output_settings" msgid="1336135218350444783">"Okufakwayo kwezi &amp; okukhishwayo"</string>
+    <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Okufakwayo kwezwi &amp; izilungiselelo zokukhishwayo"</string>
+    <string name="voice_search_settings_title" msgid="2775469246913196536">"Ukusesha ngezwi"</string>
+    <string name="keyboard_settings_title" msgid="5080115226780201234">"Ikhibhodi ye-Android"</string>
+    <string name="voice_input_category" msgid="1589318440824204736">"Okufakwayo kwezwi"</string>
+    <string name="voice_output_category" msgid="2624538587784986229">"Okukhishwayo kwezwi"</string>
+    <string name="recognizer_title" msgid="3231385184559054457">"Isiqapheli sezwi"</string>
+    <string name="recognizer_settings_title" msgid="6038598099039717232">"Izilungiselelo zokuqaphela izwi"</string>
+    <string name="recognizer_settings_summary" msgid="4472287934134546902">"Izilungiselelo ze- \'<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\'"</string>
+    <string name="tts_settings" msgid="8186971894801348327">"Umbhalo wezilungiselelo zamagama"</string>
+    <string name="tts_settings_title" msgid="4182348653053000933">"Bhalela izilungiselelo zamazwi"</string>
+    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Sebenzisa njalo izilungiselelo zami"</string>
+    <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"Izilungiselelo ezizenzakalelayo ngenzansi kwezilungiselelo zohlelo lokusebenza"</string>
+    <string name="tts_default_settings_section" msgid="5787915620218907443">"Izilungiselelo ezizenzakalalelayo"</string>
+    <string name="tts_default_synth_title" msgid="29467896463371992">"Injini Ezenzakalelayo"</string>
+    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Ihlela injini yokuthola izinhlelo zamagama ukusebenziselwa umbhalo okhulunyiwe"</string>
+    <string name="tts_default_rate_title" msgid="6030550998379310088">"Ukukala izwi"</string>
+    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Isivinini leso umbhalo okhulunywe ngaso"</string>
+    <string name="tts_default_pitch_title" msgid="6135942113172488671">"Ukuphakama"</string>
+    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Ithinta ithoni yombhalo okhulunyiwe"</string>
+    <string name="tts_default_lang_title" msgid="8018087612299820556">"Ulimi"</string>
+    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Ihlela izwi lolimi oluthize lombhalo okhulunyiwe"</string>
+    <string name="tts_play_example_title" msgid="7094780383253097230">"Lalela isibonelo"</string>
+    <string name="tts_play_example_summary" msgid="8029071615047894486">"Dlala umboniso omfushane wamazwi"</string>
+    <string name="tts_install_data_title" msgid="4264378440508149986">"Faka idatha yezwi"</string>
+    <string name="tts_install_data_summary" msgid="5742135732511822589">"Faka idatha yezwi edingekayo yamazwi ngamanye"</string>
+    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Amazwi adingekayo ezwi kakade afakwe kahle"</string>
+    <string name="tts_demo" msgid="405357591189935876">"Lesi isibonelo sezwi"</string>
+    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Izilungiselelo zakho zishintshile. Lesi isibonelo sokuthi zizwakala kanjani."</string>
+    <string name="tts_engine_error" msgid="5513288178403066867">"Injini oyikhethile ayikwazi ukusebenza"</string>
+    <string name="tts_engine_error_config" msgid="5820525416624637313">"Misa"</string>
+    <string name="tts_engine_error_reselect" msgid="3071453963296013376">"Khetha enye injini"</string>
+    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Lenjini yokuqaphela amagama ingase ikwazi ukuqoqa wonke umbhalo ozokhulunywa, kuhlanganise idatha yomuntu siqu njengamaphasiwedi nezinombolo zekhadi lesikoloto. Iphuma <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> kwinjini. Vumela ukusebenzisa lenjini yokuqaphela amagama?"</string>
+    <string name="tts_engines_section" msgid="7515470972378742429">"Izinjini"</string>
+    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> izilungiselelo"</string>
+    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> ivunyelwe"</string>
+    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> kuvimbelwe"</string>
+    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Izilimi namazwi"</string>
+    <string name="pico_installed" msgid="2452546687858267414">"Kufakiwe"</string>
+    <string name="pico_not_installed" msgid="6266845418419994311">"Akufakiwe"</string>
+    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Owesifazane"</string>
+    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Owesilisa"</string>
+    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Injini yokuqaphela amagama ifakiwe"</string>
+    <string name="tts_notif_engine_install_message" msgid="5304661142202662693">"Vumela injini entsha ngaphambi kokusebenzisa"</string>
+    <string name="gadget_title" msgid="7455548605888590466">"Ukulawula Amandla"</string>
+    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Ibuyekeza ilungiselelo le-Wi-Fi"</string>
+    <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Ibuyekeza ilungiselelo le-Bluetooth"</string>
+    <string name="vpn_settings_activity_title" msgid="7276864950701612579">"Izilungiselelo ze-VPN"</string>
+    <string name="vpn_connect_to" msgid="2541409082892684362">"Xhuma kwi <xliff:g id="NAME">%s</xliff:g>"</string>
+    <string name="vpn_username_colon" msgid="7854930370861306247">"Igama lomsebenzisi:"</string>
+    <string name="vpn_password_colon" msgid="5716278710848606626">"Iphasiwedi:"</string>
+    <string name="vpn_a_username" msgid="6664733641993968692">"igama lomsebenzisi"</string>
+    <string name="vpn_a_password" msgid="1537213632501483753">"iphasiwedi"</string>
+    <string name="vpn_save_username" msgid="1408415289165970790">"Khumbula igama lomsebenzisi"</string>
+    <string name="vpn_connect_button" msgid="1699007212602470655">"Xhuma kwi-inthanethi"</string>
+    <string name="vpn_yes_button" msgid="8034531001149843119">"Yebo"</string>
+    <string name="vpn_no_button" msgid="7620339571187119107">"Cha"</string>
+    <string name="vpn_back_button" msgid="192036339792734970">"Phindela emuva"</string>
+    <string name="vpn_mistake_button" msgid="1683383660912491270">"Cha"</string>
+    <string name="vpn_menu_done" msgid="93528279226907926">"Londoloza"</string>
+    <string name="vpn_menu_cancel" msgid="7234451214611202868">"Khansela"</string>
+    <string name="vpn_menu_revert" msgid="4407762442281467659">"Buyela emuva"</string>
+    <string name="vpn_menu_connect" msgid="1089399414463784218">"Xhuma kwinethiwekhi"</string>
+    <string name="vpn_menu_disconnect" msgid="8254492450022562235">"Nqamula kwinethiwekhi"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"Hlela inethiwekhi"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"Susa inethiwekhi"</string>
+    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"Kumele ufake <xliff:g id="CODE">%s</xliff:g>."</string>
+    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"Kumele ukhethe <xliff:g id="OPTION">%s</xliff:g>."</string>
+    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"Igama le-VPN \'<xliff:g id="NAME">%s</xliff:g>\' likhona kakade. Thola elinye igama."</string>
+    <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"Unesiqiniseko sokuthi ufuna ukususa lesi siteshi?"</string>
+    <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"Uqinisekile ukuthi ufuna ukudala le phrofayli?"</string>
+    <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"Uqinisekile ukuthi ufuna ukulahla izinguquko ezenziwe kule phrofayli?"</string>
+    <string name="vpn_confirm_reconnect" msgid="5748535476278674296">"Ayikwazi ukuxhuma kwinethiwekhi. Ingabe ufuna ukuzama futhi?"</string>
+    <string name="vpn_reconnect_from_lost" msgid="2442844155623372118">"Uxhumano lulahlekile. Ingabe ufuna ukuxhuma futhi?"</string>
+    <string name="vpn_unknown_server_dialog_msg" msgid="3080742299823671319">"Igama leseva alikwazi ukuxazululwa. Ingabe ufuna ukuhlola ilungiselelo legama leseva sakho?"</string>
+    <string name="vpn_challenge_error_dialog_msg" msgid="6174901754230038601">"Iphutha elinzima. Ingabe ufuna ukuhlola ilungiselelo lakho lemfihlo?"</string>
+    <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"Imfihlo eyodwa noma ezengeziwe zilahlekile kulokhu kumisa kwe-VPN. Ingabe ufuna ukuhlola uhlelo lwakho lwemfihlo?"</string>
+    <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"Igama lomsebenzisi noma iphasiwedi oyifakile ayilungile. Ingabe ufuna ukuzama futhi?"</string>
+    <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"Iseva ivalile. Igama lomsebenzisi noma iphasiwedi oyifakile kungenzeka ayilungile. Ingabe ufuna ukuzama futhi?"</string>
+    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"Iseva ivalile. Kungenzeka ukuthi usemuva nesivimbamlilo esigwema ukuba ungaxhumi kwisiphakeli. Ingabe ufuna ukuzama futhi?"</string>
+    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"Ukukhulumisana kweseva kwehlulekile. Iseva  singase singavumelani nokukhethwayo kwakho kombhalo wemfihlo. Ingabe ufuna ukuhlola ilungiselelo lombhalo wemfihlo?"</string>
+    <string name="vpn_type_title" msgid="6392933604218676224">"Faka i-VPN"</string>
+    <string name="vpn_add_new_vpn" msgid="5438260689052714550">"Faka i-VPN"</string>
+    <!-- no translation found for vpn_details_title (418806440938510331) -->
+    <skip />
+    <string name="vpn_edit_title_add" msgid="2121313217989682890">"Faka <xliff:g id="NAME">%s</xliff:g> i-VPN"</string>
+    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"<xliff:g id="NAME">%s</xliff:g>imininingwane"</string>
+    <string name="vpns" msgid="3148141862835492816">"Ama-VPN"</string>
+    <string name="vpn_connecting" msgid="8039521381692090116">"Iyaxhuma..."</string>
+    <string name="vpn_disconnecting" msgid="7748050200708257066">"Inqamula uxhumano kwi-inthanethi"</string>
+    <string name="vpn_connected" msgid="7641723116362845781">"Ixhunyiwe kwi-inthanethi"</string>
+    <string name="vpn_connect_hint" msgid="7442898962925875181">"Xhuma kwinethiwekhi"</string>
+    <string name="vpn_name" msgid="1550918148476193076">"Igama le-VPN"</string>
+    <string name="vpn_a_name" msgid="8445736942405283509">"Igama le-VPN"</string>
+    <string name="vpn_profile_added" msgid="9061017910337129840">"\'<xliff:g id="NAME">%s</xliff:g>\' kufakiwe"</string>
+    <string name="vpn_profile_replaced" msgid="587435576816273815">"Izinguquko zenzelwe ku \'<xliff:g id="NAME">%s</xliff:g>\'"</string>
+    <string name="vpn_user_certificate_title" msgid="6812545893924071742">"Hlela isitifikethi somsebenzisi"</string>
+    <string name="vpn_user_certificate" msgid="949322691686938888">"Sebenzisa isitifikethi"</string>
+    <string name="vpn_a_user_certificate" msgid="8943983437956898649">"isitifikethi somsebenzisi"</string>
+    <string name="vpn_ca_certificate_title" msgid="7846466160795589985">"Hlela isitifikethi se-CA"</string>
+    <string name="vpn_ca_certificate" msgid="465085144064264742">"Imvume yesitifikethi (CA) isitifikethi"</string>
+    <string name="vpn_a_ca_certificate" msgid="3374242520974884295">"Isitifikethi se-CA"</string>
+    <string name="vpn_l2tp_secret_string_title" msgid="5039677186748940987">"Hlela imfihlo ye-L2TP"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"Imfihlo ye-L2TP"</string>
+    <string name="vpn_a_l2tp_secret" msgid="6612042930810981845">"imfihlo ye-L2TP"</string>
+    <string name="vpn_pptp_encryption_title" msgid="2236795167467896499">"umbhalo wemfihlo"</string>
+    <string name="vpn_pptp_encryption" msgid="2602329949737259686">"umbhalo wemfihlo we-PPTP"</string>
+    <string name="vpn_ipsec_presharedkey_title" msgid="2184060087690539175">"Hlela ukhiye owabelane ngaphambili we-IPSec"</string>
+    <string name="vpn_ipsec_presharedkey" msgid="5434316521616673741">"Ukhiye owabelene ngaphambili we-IPSec"</string>
+    <string name="vpn_a_ipsec_presharedkey" msgid="1255301923217898418">"ukhiye owabelane ngaphambili we-IPSec"</string>
+    <string name="vpn_vpn_server_title" msgid="8897005887420358913">"Hlela iseva se-VPN"</string>
+    <string name="vpn_vpn_server" msgid="1141754908824209260">"Iseva ye-VPN"</string>
+    <string name="vpn_a_vpn_server" msgid="5960906152125045853">"Iseva ye-VPN"</string>
+    <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"Igama leseva ye-VPN"</string>
+    <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"Izizinda zokusesha i-DNS"</string>
+    <string name="vpn_dns_search_list" msgid="4230034234026605360">"Izizinda zokusesha ze-DNS"</string>
+    <string name="vpn_field_is_set" msgid="7137320847812992243">"<xliff:g id="VALUE">%s</xliff:g> ihleliwe"</string>
+    <string name="vpn_field_not_set" msgid="2972519243515893804">"<xliff:g id="VALUE">%s</xliff:g> ayihleliwe"</string>
+    <string name="vpn_field_not_set_optional" msgid="8840557698252556791">"<xliff:g id="VALUE">%s</xliff:g> ayihleliwe (okokuzikhethela)"</string>
+    <string name="vpn_enable_field" msgid="3700967675854517191">"Vumela <xliff:g id="OPTION">%s</xliff:g>"</string>
+    <string name="vpn_disable_field" msgid="6905658811179634005">"Vimbela <xliff:g id="OPTION">%s</xliff:g>"</string>
+    <string name="vpn_is_enabled" msgid="1266304230417098877">"<xliff:g id="OPTION">%s</xliff:g> ivimbelwe"</string>
+    <string name="vpn_is_disabled" msgid="2013622485867806167">"<xliff:g id="OPTION">%s</xliff:g> ivimbelwe"</string>
+    <string name="vpn_settings_title" msgid="7327468307909556719">"Izilungiselelo ze-VPN"</string>
+    <string name="vpn_settings_summary" msgid="8849924181594963972">"Hlela &amp; phatha Amanethiwekhi Ayimfihlo Okulungiswa (ama-VPN"</string>
+    <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(akushintshiwe)"</string>
+    <string name="vpn_secret_not_set" msgid="1037792636371641845">"(akuhleliwe)"</string>
+    <!-- no translation found for credentials_title (4446234003860769883) -->
+    <skip />
+    <!-- no translation found for credentials_install (466093273825150847) -->
+    <skip />
+    <!-- no translation found for credentials_install (953914549998062317) -->
+    <skip />
+    <!-- no translation found for credentials_install_summary (4220422806818210676) -->
+    <skip />
+    <!-- no translation found for credentials_install_summary (5737658257407822713) -->
+    <skip />
+    <!-- outdated translation 9170150870552453457 -->     <string name="credentials_reset" msgid="3239382277144980418">"Sula ukugcina"</string>
+    <!-- outdated translation 1530388094693731636 -->     <string name="credentials_reset_summary" msgid="3369361230171260282">"Sula ukugcina ukuqinisekisa kwakho konke okuqukethwe bese uhlela futhi iphasiwedi yayo."</string>
+    <string name="credentials_unlock" msgid="1463040326264133844">"Faka iphasiwedi"</string>
+    <!-- outdated translation 594679530407918031 -->     <string name="credentials_unlock_hint" msgid="5889551635843338639">"Faka iphasiwedi yokugcina ukuqinisekisa"</string>
+    <string name="credentials_old_password" msgid="7553393815538684028">"Iphasiwedi yamanje:"</string>
+    <!-- outdated translation 819990295796804516 -->     <string name="credentials_reset_hint" msgid="1566409057833618877">"Uqinisekile ukuthi ufuna ukusula zonke iziqinisekiso bese uhlela futhi iphasiwedi yokugcina ukuqinisekisa?"</string>
+    <string name="credentials_password_too_short" msgid="7502749986405522663">"Okungenani iphasiwedi kumele ibe nezinhlamvu ezingu-8."</string>
+    <!-- outdated translation 7525192410790152041 -->     <string name="credentials_wrong_password" msgid="2541932597104054807">"Sicela ufake iphasiwedi elungile."</string>
+    <!-- outdated translation 6392481296673345268 -->     <string name="credentials_reset_warning" msgid="5320653011511797600">"Sicela ufake iphasiwedi elungile. Unokuzama okukodwa kokufaka iphasiwedi elungile ngaphambi kokuba ukugcina isiqinisekiso kusulwe."</string>
+    <!-- no translation found for credentials_reset_warning_plural (6514085665301095279) -->
+    <skip />
+    <!-- outdated translation 7700309135582200849 -->     <string name="credentials_erased" msgid="2907836028586342969">"Ukugcina ukuqinisekisa kusuliwe."</string>
+    <!-- no translation found for credentials_not_erased (397954733557821269) -->
+    <skip />
+    <string name="credentials_enabled" msgid="7588607413349978930">"Ukugcina ukuqinisekisa kuvunyelwe."</string>
+    <!-- no translation found for credentials_configure_lock_screen_hint (6816970208840577219) -->
+    <skip />
+    <string name="emergency_tone_title" msgid="1055954530111587114">"Ithoni ephuthumayo"</string>
+    <string name="emergency_tone_summary" msgid="722259232924572153">"Hlela ukuziphatha lapho ikholi oluphuthumayo lwenziwa"</string>
+    <string name="privacy_settings" msgid="9206631214140954954">"Ubumfihlo"</string>
+    <string name="privacy_settings_title" msgid="1987089301293213705">"Izilungiselelo zangasese"</string>
+    <string name="backup_section_title" msgid="8856083167469467588">"Sekela ngokulondoloza futhi buyisela esimweni"</string>
+    <string name="personal_data_section_title" msgid="7815209034443782061">"Idatha yomuntu siqu"</string>
+    <string name="backup_data_title" msgid="1239105919852668016">"Sekela ngokulondoloza idatha yami"</string>
+    <!-- outdated translation 5662190190240860035 -->     <string name="backup_data_summary" msgid="6515285107793232815">"Sekela ngokulondoloza izilungiselelo nenye idatha yohlelo lokusebenza"</string>
+    <!-- no translation found for backup_configure_account_title (3790872965773196615) -->
+    <skip />
+    <!-- no translation found for backup_configure_account_default_summary (2436933224764745553) -->
+    <skip />
+    <string name="auto_restore_title" msgid="5397528966329126506">"Ukubuyisela esimweni okuzenzakalelayo"</string>
+    <!-- outdated translation 6867766474057290177 -->     <string name="auto_restore_summary" msgid="83177150536734378">"Uma ngifaka kabusha uhlelo lokusebenza, buyisela esimweni izilungiselelo ezisekelwe ngokulondoloza noma enye idatha."</string>
+    <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Sekela ngokulondoloza"</string>
+    <!-- outdated translation 2948090854996352245 -->     <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Uqinisekile ukuthi ufuna ukumisa ukusekela ngokulondoloza izilungiselelo zakho kanye nedatha yohlelo lokusebenza futhi usule wonke amakhophi akwiziphakeli ze-Google?"</string>
+    <string name="device_admin_settings_title" msgid="1335557832906433309">"Izilungiselelo zomphathi wedivaysi"</string>
+    <string name="active_device_admin_msg" msgid="6930903262612422111">"Umphathi wedivaysi"</string>
+    <string name="remove_device_admin" msgid="3596845261596451437">"Ungenzi kusebenze"</string>
+    <string name="select_device_admin_msg" msgid="2645509057946368094">"Abaphathi bedivaysi"</string>
+    <string name="no_device_admins" msgid="702695100241728775">"Abekho abaphathi bedivaysi abatholakalayo"</string>
+    <string name="add_device_admin_msg" msgid="6246742476064507965">"Yenza umphathi wedivaysi asebenze"</string>
+    <string name="add_device_admin" msgid="7133327675884827091">"Yenza kusebenze"</string>
+    <string name="device_admin_add_title" msgid="7705551449705676363">"Umphathi wedivaysi"</string>
+    <string name="device_admin_warning" msgid="1149471041373876923">"Ukwenza lomphathi asebenze kuzovumela uhlelo lokusebenza <xliff:g id="APP_NAME">%1$s</xliff:g> ukwenza imisebenzi elandelayo:"</string>
+    <string name="device_admin_status" msgid="7169948053970923035">"Lomphathi uyasebenza futhi uvumela uhlelo lokusebenza <xliff:g id="APP_NAME">%1$s</xliff:g> ukwenza imisebenzi elandelayo."</string>
+    <string name="untitled_apn" msgid="1230060359198685513">"Akunasihloko"</string>
+    <string name="sound_category_sound_title" msgid="1488759370067953996">"Okuvamile"</string>
+    <string name="sound_category_calls_title" msgid="3688531959256239012">"Amakhooli angenayo"</string>
+    <string name="sound_category_notification_title" msgid="3502115998790286943">"Izaziso"</string>
+    <string name="sound_category_feedback_title" msgid="4399742321363475393">"Impendulo"</string>
+    <!-- no translation found for wifi_setup_title (661074868726906436) -->
+    <skip />
+    <!-- no translation found for wifi_setup_title_editing_network (7304321031985059969) -->
+    <skip />
+    <!-- no translation found for wifi_setup_title_connecting_network (2408378435027118687) -->
+    <skip />
+    <!-- no translation found for wifi_setup_title_connected_network (209755856836003839) -->
+    <skip />
+    <!-- no translation found for wifi_setup_title_add_network (6932651000151032301) -->
+    <skip />
+    <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Akuxhunyiwe"</string>
+    <string name="wifi_setup_add_network" msgid="5939624680150051807">"Yengeza inethiwekhi"</string>
+    <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Vuselela uhlu"</string>
+    <string name="wifi_setup_skip" msgid="6661541841684895522">"Yeqa"</string>
+    <string name="wifi_setup_next" msgid="3388694784447820477">"Okulandelayo"</string>
+    <!-- no translation found for wifi_setup_back (144777383739164044) -->
+    <skip />
+    <!-- no translation found for wifi_setup_detail (2336990478140503605) -->
+    <skip />
+    <!-- no translation found for wifi_setup_connect (7954456989590237049) -->
+    <skip />
+    <!-- no translation found for wifi_setup_forget (2562847595567347526) -->
+    <skip />
+    <!-- no translation found for wifi_setup_save (3659235094218508211) -->
+    <skip />
+    <!-- no translation found for wifi_setup_cancel (3185216020264410239) -->
+    <skip />
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"Ithwebula amanethiwekhi..."</string>
+    <!-- no translation found for wifi_setup_status_select_network (7519563569903137003) -->
+    <skip />
+    <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Xhuma kwinethiwekhi"</string>
+    <!-- no translation found for wifi_setup_status_unsecured_network (8143046977328718252) -->
+    <skip />
+    <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"Faka ukumisa inethiwekhi"</string>
+    <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Xhuma kwinethiwekhi"</string>
+    <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Iyaxhuma..."</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Qhubekela kusinyathelo esilandelayo"</string>
+    <!-- no translation found for wifi_setup_status_eap_not_supported (3196386445567501484) -->
+    <skip />
+    <!-- no translation found for wifi_setup_eap_not_supported (683540356393542939) -->
+    <skip />
+    <!-- no translation found for wifi_setup_description_connecting (1884664966455980182) -->
+    <skip />
+    <!-- no translation found for wifi_setup_description_connected (5235991893829582459) -->
+    <skip />
+    <!-- no translation found for account_sync_settings_title (4578227872921044660) -->
+    <skip />
+    <!-- no translation found for sync_is_failing (1591561768344128377) -->
+    <skip />
+    <string name="add_account_label" msgid="7811707265834013767">"Yengeza  i-akhawunti"</string>
+    <string name="header_general_sync_settings" msgid="3487451896424238469">"Izilungiselelo zokuvumelanisa okuvamile"</string>
+    <string name="background_data" msgid="5779592891375473817">"Idatha yasemuva"</string>
+    <string name="background_data_summary" msgid="3630389249212620467">"Izinhlelo zokusebenza zingavumelanisa, zithumele, futhi zithole idatha nganoma isiphi isikhathi"</string>
+    <string name="background_data_dialog_title" msgid="745974259246047425">"Ukunaka"</string>
+    <string name="background_data_dialog_message" msgid="9155730118215371308">"Ukuvimbela idatha yasemuva kwandisa ukuphila kwebhetri futhi kwehlisa ukusebenzisa idatha. Ezinye izinhlelo zokusebenza zingase zisebenzise idatha yasemuva."</string>
+    <!-- no translation found for sync_automatically (7558810110682562376) -->
+    <skip />
+    <string name="sync_automatically_summary" msgid="6662623174608419931">"Izinhlelo zokusebenza zivumelanisa idatha ngokuzenzakalelayo"</string>
+    <string name="header_manage_accounts" msgid="6869002423884539607">"Phatha ama-akhawunti"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"Ukuvumelanisa KUVULIWE"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"Ukuvumelanisa KUVALIWE"</string>
+    <string name="sync_error" msgid="5060969083117872149">"Iphutha lokuvumelanisa"</string>
+    <!-- no translation found for settings_backup (2274732978260797031) -->
+    <skip />
+    <!-- no translation found for settings_backup_summary (7916877705938054035) -->
+    <skip />
+    <!-- no translation found for sync_menu_sync_now (6154608350395805683) -->
+    <skip />
+    <!-- no translation found for sync_menu_sync_cancel (8292379009626966949) -->
+    <skip />
+    <!-- no translation found for sync_one_time_sync (6766593624598183090) -->
+    <skip />
+    <!-- no translation found for sync_gmail (714886122098006477) -->
+    <skip />
+    <!-- no translation found for sync_calendar (9056527206714733735) -->
+    <skip />
+    <!-- no translation found for sync_contacts (9174914394377828043) -->
+    <skip />
+    <!-- no translation found for sync_plug (5952575609349860569) -->
+    <skip />
+    <!-- no translation found for header_application_sync_settings (5514539555293976035) -->
+    <skip />
+    <!-- no translation found for header_data_and_synchronization (5165024023936509896) -->
+    <skip />
+    <!-- no translation found for preference_change_password_title (8955581790270130056) -->
+    <skip />
+    <!-- no translation found for header_account_settings (5382475087121880626) -->
+    <skip />
+    <!-- no translation found for remove_account_label (5921986026504804119) -->
+    <skip />
+    <!-- no translation found for header_add_an_account (756108499532023798) -->
+    <skip />
+    <!-- no translation found for finish_button_label (481587707657751116) -->
+    <skip />
+    <!-- no translation found for really_remove_account_title (6574643117748564960) -->
+    <skip />
+    <!-- no translation found for really_remove_account_message (4448645571715719563) -->
+    <skip />
+    <!-- no translation found for really_remove_account_message (1005751790899989319) -->
+    <skip />
+    <!-- no translation found for remove_account_failed (1093911989149396624) -->
+    <skip />
+    <!-- no translation found for remove_account_failed (9174390193652391412) -->
+    <skip />
+    <!-- no translation found for provider_label (7724593781904508866) -->
+    <skip />
+    <!-- no translation found for sync_item_title (1931551540462877488) -->
+    <skip />
+    <!-- no translation found for cant_sync_dialog_title (7185199796123573317) -->
+    <skip />
+    <!-- no translation found for cant_sync_dialog_message (2372359241135295930) -->
+    <skip />
+    <!-- no translation found for enter_password (3268224850821675915) -->
+    <skip />
+    <!-- no translation found for try_again (5904121494468643129) -->
+    <skip />
+    <!-- no translation found for service_busy (225227519012409130) -->
+    <skip />
+    <!-- no translation found for delete (4219243412325163003) -->
+    <skip />
+    <!-- no translation found for misc_files (6298643430106707497) -->
+    <skip />
+    <!-- no translation found for misc_files_selected_count (4647048020823912088) -->
+    <skip />
+    <!-- no translation found for misc_files_selected_count_bytes (2876232009069114352) -->
+    <skip />
+    <!-- no translation found for select_all (6783085295161532497) -->
+    <skip />
+    <!-- no translation found for hdcp_checking_title (8605478913544273282) -->
+    <skip />
+    <!-- no translation found for hdcp_checking_dialog_title (5141305530923283) -->
+    <skip />
+</resources>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 482830c..3f2fc23 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -101,6 +101,38 @@
         <item>1800000</item>
     </string-array>
     
+    <!-- Display settings.  The delay in inactivity before the dream is shown. These are shown in a list dialog. -->
+    <string-array name="dream_timeout_entries">
+        <item>Never</item>
+        <item>15 seconds</item>
+        <item>30 seconds</item>
+        <item>1 minute</item>
+        <item>2 minutes</item>
+        <item>5 minutes</item>
+        <item>10 minutes</item>
+        <item>30 minutes</item>
+    </string-array>
+
+    <!-- Do not translate. -->
+    <string-array name="dream_timeout_values" translatable="false">
+        <!-- Do not translate. -->
+        <item>0</item>
+        <!-- Do not translate. -->
+        <item>15000</item>
+        <!-- Do not translate. -->
+        <item>30000</item>
+        <!-- Do not translate. -->
+        <item>60000</item>
+        <!-- Do not translate. -->
+        <item>120000</item>
+        <!-- Do not translate. -->
+        <item>300000</item>
+        <!-- Do not translate. -->
+        <item>600000</item>
+        <!-- Do not translate. -->
+        <item>1800000</item>
+    </string-array>
+    
     <!-- Security settings.  The delay after screen is turned off until device locks. 
          These are shown in a list dialog. -->
     <string-array name="lock_after_timeout_entries">
@@ -137,6 +169,26 @@
         <item>1800000</item>
     </string-array>
     
+    <string-array name="entries_font_size">
+        <item>Extremely Small</item>
+        <item>Extra Small</item>
+        <item>Small</item>
+        <item>Normal</item>
+        <item>Large</item>
+        <item>Extra Large</item>
+        <item>Extremely Large</item>
+    </string-array>
+
+    <string-array name="entryvalues_font_size">
+        <item>0.70</item>
+        <item>0.85</item>
+        <item>0.95</item>
+        <item>1.0</item>
+        <item>1.05</item>
+        <item>1.15</item>
+        <item>1.30</item>
+    </string-array>
+    
     <!-- TTS settings -->
 
     <!-- Default speech rate choices -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 92b355f..eaacf44 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -744,8 +744,8 @@
     <!-- Title for preference that guides the user through creating an unlock password [CHAR LIMIT=45] -->
     <string name="unlock_set_unlock_password_summary">Require a password to unlock the screen</string>
 
-    <!-- Summary for preference that has been disabled by DevicePolicyAdmin [CHAR LIMIT=50] -->
-    <string name="unlock_set_unlock_disabled_summary">Disabled by administrator or encryption policy</string>
+    <!-- Summary for preference that has been disabled by because of the DevicePolicyAdmin, or because device encryption is enabled, or because there are credentials in the credential storage [CHAR LIMIT=50] -->
+    <string name="unlock_set_unlock_disabled_summary">Disabled by administrator, encryption policy, or credential storage</string>
 
     <!-- Summary for "Configure lockscreen" when lock screen is off [CHAR LIMIT=45] -->
     <string name="unlock_set_unlock_mode_off">Off</string>
@@ -1062,6 +1062,8 @@
     <string name="wifi_setting_sleep_policy_error">There was a problem changing the setting</string>
     <!-- Action message to manually add a wifi network -->
     <string name="wifi_add_network">Add Wi-Fi network</string>
+    <!-- Summary for add wifi network setting [CHAR LIMIT=50]-->
+    <string name="wifi_add_network_summary">Configure a non-broadcast network</string>
     <!-- Header for the list of wifi networks-->
     <string name="wifi_access_points">Wi-Fi networks</string>
     <!-- Menu option to scan Wi-Fi networks -->
@@ -1448,8 +1450,28 @@
     <string name="screen_timeout">Timeout</string>
     <!-- Sound & display settings screen, setting option summary to change screen timeout -->
     <string name="screen_timeout_summary">Screen turns off automatically after <xliff:g id="timeout_description">%1$s</xliff:g></string>
+    <!-- Display settings screen, trigger for screen saver options -->
+    <string name="dream_settings_title">Android Dreams</string>
+    <!-- Display settings screen, summary for screen saver options -->
+    <string name="dream_settings_summary">Screen savers and other idle diversions</string>
+    <!-- Screen saver settings, setting option name to select a module -->
+    <string name="dream_component_title">Selected dream</string>
+    <!-- Screen saver settings, setting option name to change activation timeout -->
+    <string name="dream_timeout_title">When to activate</string>
+    <!-- Screen saver settings, setting option summary to change activation timeout -->
+    <string name="dream_timeout_summary">After <xliff:g id="timeout_description">%1$s</xliff:g> spent idle</string>
+    <!-- Screen saver settings, setting option summary to change activation timeout, shown when disabled -->
+    <string name="dream_timeout_zero_summary">Never</string>
+    <!-- Screen saver settings, button allowing the user to test/try the current module -->
+    <string name="dream_test">Try it!</string>
     <!-- Sound & display settings screen, setting option name to change whether the screen adjusts automatically based on lighting conditions -->
     <string name="automatic_brightness">Automatic brightness</string>
+    <!-- [CHAR LIMIT=30] Sound & display settings screen, setting option name to change font size -->
+    <string name="title_font_size">Font size</string>
+    <!-- [CHAR LIMIT=40] Sound & display settings screen, setting option summary to change font size -->
+    <string name="summary_font_size">Overall size of fonts</string>
+    <!-- [CHAR LIMIT=40] Sound & display settings screen, title of dialog for picking font size -->
+    <string name="dialog_title_font_size">Select font size</string>
 
     <!-- SIM lock settings title -->
     <string name="sim_lock_settings">SIM card lock settings</string>
@@ -2102,6 +2124,10 @@
  from unknown sources. You agree that you are solely responsible for any
  damage to your phone or loss of data that may result from using
  these applications.</string>
+    <!-- Applications settings screen, setting check box title. If checked, applications show more settings options. -->
+    <string name="advanced_settings">Advanced settings</string>
+    <!-- Applications settings screen, setting check box summary.  This is the summary for "Advanced settings" checkbox  -->
+    <string name="advanced_settings_summary">Enable more settings options.</string>
     <!-- Manage applications, individual application info screen title. For example, if they click on "Browser" in "Manage applications", the title of the next screen will be this -->
     <string name="application_info_label">Application info</string>
     <!-- Manage applications, individual application info screen, section heading for stuff relating to an app's storage settings. -->
@@ -2394,8 +2420,10 @@
     <!-- User dictionary settings --><skip />
     <!-- User dictionary settings, The titlebar text of the User dictionary settings screen. -->
     <string name="user_dict_settings_titlebar">User dictionary</string>
-    <!-- User dictionary settings, The title of the list item to go into the User dictionary settings screen. -->
-    <string name="user_dict_settings_title">User dictionary</string>
+    <!-- User dictionary settings, The title of the list item to go into the User dictionary settings screen when there is only one user dictionary. -->
+    <string name="user_dict_single_settings_title">User dictionary</string>
+    <!-- User dictionary settings, The title of the list item to go into the User dictionary list when there are several user dictionaries. -->
+    <string name="user_dict_multiple_settings_title">Manage user dictionaries</string>
     <!-- User dictionary settings.  The summary of the listem item to go into the User dictionary settings screen. -->
     <string name="user_dict_settings_summary">""</string>
     <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
@@ -2412,6 +2440,8 @@
     <string name="user_dict_settings_empty_text" product="tablet">You do not have any words in the user dictionary. You can add a word by touching the Add ( + ) button.</string>
     <!-- User dictionary settings. The text to show when there are no user-defined words in the dictionary  [CHAR LIMIT=200] -->
     <string name="user_dict_settings_empty_text" product="default">You do not have any words in the user dictionary. You can add a word through the menu.</string>
+    <!-- User dictionary settings. The text to show to describe the dictionary common to all languages -->
+    <string name="user_dict_settings_all_languages">All languages</string>
 
     <!-- This is for diagnostics screen. The title of a screen with various items realted to launching screens that will giev the user info. For example, it contains "Phone information" and "Battery information" -->
     <string name="testing">Testing</string>
@@ -2594,6 +2624,9 @@
     <!-- Accessibility settings: power button behavior summary text -->
     <string name="accessibility_power_button_ends_call_summary">During a call, pressing Power ends call instead of turning off screen</string>
 
+    <!-- Accessibility settings: button for lauching settings for an accessibility service -->
+    <string name="settings_button">Settings</string>
+
     <!-- Setting interaction category [CHAR LIMIT=35] -->
     <string name="touchscreen_gestures_category">Touchscreen gestures</string>
     <!-- Title for setting the long-press timeout [CHAR LIMIT=35] -->
@@ -3007,10 +3040,6 @@
 
     <!-- Title of preference group for credential storage settings [CHAR LIMIT=30] -->
     <string name="credentials_title">Credential storage</string>
-    <!-- Title of preference to enable/dislable access to credential storage [CHAR LIMIT=30] -->
-    <string name="credentials_access">Use secure credentials</string>
-    <!-- Summary of preference to enable/dislable access to credential storage [CHAR LIMIT=NONE] -->
-    <string name="credentials_access_summary">Allow applications to access secure certificates and other credentials</string>
     <!-- Title of preference to install certificates from SD card [CHAR LIMIT=30] -->
     <string name="credentials_install" product="nosdcard">Install from storage</string>
     <!-- Title of preference to install certificates from SD card [CHAR LIMIT=30] -->
@@ -3019,31 +3048,19 @@
     <string name="credentials_install_summary" product="nosdcard">Install certificates from storage</string>
     <!-- Summary of preference to install certificates from SD card [CHAR LIMIT=NONE] -->
     <string name="credentials_install_summary" product="default">Install certificates from SD card</string>
-    <!-- Title of preference to set the password for credential storage [CHAR LIMIT=30] -->
-    <string name="credentials_set_password">Set password</string>
-    <!-- Summary of preference to set the password for credential storage [CHAR LIMIT=NONE] -->
-    <string name="credentials_set_password_summary">Set or change the password for credential storage</string>
     <!-- Title of preference to reset credential storage [CHAR LIMIT=30] -->
     <string name="credentials_reset">Clear credentials</string>
     <!-- Summary of preference to reset credential storage [CHAR LIMIT=NONE] -->
-    <string name="credentials_reset_summary">Remove all the contents and reset the password</string>
+    <string name="credentials_reset_summary">Remove all certificates</string>
 
     <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
     <string name="credentials_unlock">Enter password</string>
     <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
     <string name="credentials_unlock_hint">Enter the password for credential storage.</string>
-    <!-- Description of dialog to set the password for credential storage [CHAR LIMIT=NONE] -->
-    <string name="credentials_password_hint">Set the password for credential storage. It must have at least 8 characters.</string>
     <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
     <string name="credentials_old_password">Current password:</string>
-    <!-- Description of the input box for the new password [CHAR LIMIT=30] -->
-    <string name="credentials_new_password">New password:</string>
-    <!-- Description of the input box to confirm the new password [CHAR LIMIT=30] -->
-    <string name="credentials_confirm_password">Confirm new password:</string>
     <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
-    <string name="credentials_reset_hint">All the contents will be removed, and the password will be reset. Are you sure about that?</string>
-    <!-- Error message [CHAR LIMIT=NONE] -->
-    <string name="credentials_passwords_mismatch">Passwords do not match.</string>
+    <string name="credentials_reset_hint">All the contents will be removed. Are you sure about that?</string>
     <string name="credentials_password_too_short">The password must have at least 8 characters.</string>
     <!-- Error message [CHAR LIMIT=NONE] -->
     <string name="credentials_wrong_password">Incorrect password.</string>
@@ -3053,8 +3070,12 @@
     <string name="credentials_reset_warning_plural">Incorrect password. You have <xliff:g id="number" example="5">%1$d</xliff:g> more chances before credential storage is erased.</string>
     <!-- Toast message [CHAR LIMIT=30] -->
     <string name="credentials_erased">Credential storage is erased.</string>
+    <!-- Toast message [CHAR LIMIT=30] when credential storage containing private keys and certificates could not be erased (opposite of string credentials_erased) -->
+    <string name="credentials_not_erased">Credential storage could not be erased.</string>
     <!-- Toast message [CHAR LIMIT=30] -->
     <string name="credentials_enabled">Credential storage is enabled.</string>
+    <!-- Description of dialog to explain that a lock screen password is required to use credential storage [CHAR LIMIT=NONE] -->
+    <string name="credentials_configure_lock_screen_hint">You must set a lock screen PIN or password before you can use credential storage. Would you like to do that now?</string>
 
     <!-- Sound settings screen, setting check box label -->
     <string name="emergency_tone_title">Emergency tone</string>
@@ -3337,4 +3358,8 @@
     <string name="hdcp_checking_title">HDCP checking</string>
     <!-- HDCP checking dialog title, used for debug purposes only. [CHAR LIMIT=25] -->
     <string name="hdcp_checking_dialog_title">Set HDCP checking behavior</string>
+
+    <!-- Activity title for network data usage summary. [CHAR LIMIT=25] -->
+    <string name="data_usage_summary_title">Data usage</string>
+
 </resources>
diff --git a/res/xml/application_settings.xml b/res/xml/application_settings.xml
index 4e77a93..3ad1e5d 100644
--- a/res/xml/application_settings.xml
+++ b/res/xml/application_settings.xml
@@ -54,6 +54,13 @@
             android:summaryOn="@string/install_unknown_applications"
             android:persistent="false" />
 
+    <CheckBoxPreference
+            android:key="toggle_advanced_settings"
+            android:title="@string/advanced_settings"
+            android:summaryOff="@string/advanced_settings_summary"
+            android:summaryOn="@string/advanced_settings_summary"
+            android:persistent="false" />
+
     <ListPreference
         android:key="app_install_location"
         android:title="@string/app_install_location_title"
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index 7fe7f76..03d9641 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -41,4 +41,20 @@
                 android:persistent="false"
                 android:entries="@array/screen_timeout_entries"
                 android:entryValues="@array/screen_timeout_values" />
+                
+        <PreferenceScreen 
+                android:title="@string/dream_settings_title" 
+                android:summary="@string/dream_settings_summary"
+                android:fragment="com.android.settings.DreamSettings"
+                >
+        </PreferenceScreen>
+
+        <ListPreference
+                android:key="font_size"
+                android:title="@string/title_font_size"
+                android:summary="@string/summary_font_size"
+                android:entries="@array/entries_font_size"
+                android:entryValues="@array/entryvalues_font_size"
+                android:dialogTitle="@string/dialog_title_font_size" />
+
 </PreferenceScreen>
diff --git a/res/xml/dream_settings.xml b/res/xml/dream_settings.xml
new file mode 100644
index 0000000..1fbb3e9
--- /dev/null
+++ b/res/xml/dream_settings.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/dream_settings_title"
+        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
+
+    <com.android.settings.DreamComponentPreference
+            android:key="dream_component"
+            android:title="@string/dream_component_title"
+            android:persistent="false"
+            />
+
+    <ListPreference
+            android:key="dream_timeout"
+            android:title="@string/dream_timeout_title"
+            android:summary="@string/dream_timeout_summary"
+            android:persistent="false"
+            android:entries="@array/dream_timeout_entries"
+            android:entryValues="@array/dream_timeout_values" />
+    
+    <com.android.settings.DreamTesterPreference
+            android:key="dream_test"
+            android:title="@string/dream_test"
+            android:persistent="false"
+            />
+
+</PreferenceScreen>
diff --git a/res/xml/language_settings.xml b/res/xml/language_settings.xml
index 37d4661..1b5f039 100644
--- a/res/xml/language_settings.xml
+++ b/res/xml/language_settings.xml
@@ -19,19 +19,18 @@
         android:title="@string/language_keyboard_settings_title">
 
     <PreferenceCategory android:key="language_settings_category"
-            android:title="@string/language_settings_category" />
+            android:title="@string/language_settings_category">
 
-    <PreferenceScreen
-       android:fragment="com.android.settings.LocalePicker"
-       android:key="phone_language"
-       android:title="@string/phone_language">
-    </PreferenceScreen>
+        <PreferenceScreen
+                 android:fragment="com.android.settings.LocalePicker"
+                 android:key="phone_language"
+                 android:title="@string/phone_language"/>
 
-    <PreferenceScreen
-        android:fragment="com.android.settings.UserDictionarySettings"
-        android:title="@string/user_dict_settings_title"
-        android:summary="@string/user_dict_settings_summary">
-    </PreferenceScreen>
+        <!-- User dictionary preference title and fragment will be set programmatically. -->
+        <PreferenceScreen
+                 android:key="key_user_dictionary_settings" />
+
+    </PreferenceCategory>
 
     <PreferenceCategory android:key="voice_input_category"
             android:title="@string/voice_input_category" >
diff --git a/res/xml/security_settings_misc.xml b/res/xml/security_settings_misc.xml
index 68ee8c0..95b2aca 100644
--- a/res/xml/security_settings_misc.xml
+++ b/res/xml/security_settings_misc.xml
@@ -47,11 +47,6 @@
 
     <PreferenceCategory android:title="@string/credentials_title"
             android:persistent="false">
-        <CheckBoxPreference android:key="enable_credentials"
-                android:title="@string/credentials_access"
-                android:summary="@string/credentials_access_summary"
-                android:persistent="false"/>
-
         <Preference android:title="@string/credentials_install"
                 android:summary="@string/credentials_install_summary"
                 android:persistent="false">
@@ -60,14 +55,6 @@
                     android:targetClass="com.android.certinstaller.CertInstallerMain"/>
         </Preference>
 
-        <Preference android:title="@string/credentials_set_password"
-                android:summary="@string/credentials_set_password_summary"
-                android:persistent="false">
-            <intent android:action="com.android.credentials.SET_PASSWORD"
-                    android:targetPackage="com.android.settings"
-                    android:targetClass="com.android.settings.CredentialStorage"/>
-        </Preference>
-
         <Preference android:key="reset_credentials"
                 android:title="@string/credentials_reset"
                 android:summary="@string/credentials_reset_summary"
diff --git a/res/xml/wifi_settings.xml b/res/xml/wifi_settings.xml
index 24f4432..0707030 100644
--- a/res/xml/wifi_settings.xml
+++ b/res/xml/wifi_settings.xml
@@ -49,6 +49,7 @@
             android:key="add_network"
             android:dependency="enable_wifi"
             android:title="@string/wifi_add_network"
+            android:summary="@string/wifi_add_network_summary"
             android:persistent="false" />
 
 </PreferenceScreen>
diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml
index 466df7b..321facb 100644
--- a/res/xml/wireless_settings.xml
+++ b/res/xml/wireless_settings.xml
@@ -89,4 +89,9 @@
         android:summary="@string/proxy_settings_summary" >
     </PreferenceScreen>
 
+    <PreferenceScreen
+        android:fragment="com.android.settings.DataUsageSummary"
+        android:key="data_usage_summary"
+        android:title="@string/data_usage_summary_title" />
+
 </PreferenceScreen>
diff --git a/src/com/android/settings/AccessibilitySettings.java b/src/com/android/settings/AccessibilitySettings.java
index 826410d..9a0db5d 100644
--- a/src/com/android/settings/AccessibilitySettings.java
+++ b/src/com/android/settings/AccessibilitySettings.java
@@ -16,6 +16,7 @@
 
 package com.android.settings;
 
+import android.accessibilityservice.AccessibilityServiceInfo;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.Service;
@@ -78,7 +79,7 @@
 
     private CheckBoxPreference mToggleAccessibilityCheckBox;
     private CheckBoxPreference mToggleScriptInjectionCheckBox;
-    private CheckBoxPreference mToggleAccessibilityServiceCheckBox;
+    private SettingsCheckBoxPreference mToggleAccessibilityServiceCheckBox;
 
     private PreferenceCategory mPowerButtonCategory;
     private CheckBoxPreference mPowerButtonEndsCallCheckBox;
@@ -87,8 +88,8 @@
 
     private ListPreference mLongPressTimeoutListPreference;
 
-    private Map<String, ServiceInfo> mAccessibilityServices =
-        new LinkedHashMap<String, ServiceInfo>();
+    private Map<String, AccessibilityServiceInfo> mAccessibilityServices =
+        new LinkedHashMap<String, AccessibilityServiceInfo>();
 
     private TextUtils.SimpleStringSplitter mStringColonSplitter =
         new TextUtils.SimpleStringSplitter(':');
@@ -157,7 +158,7 @@
             }
         }
 
-        Map<String, ServiceInfo> accessibilityServices = mAccessibilityServices;
+        Map<String, AccessibilityServiceInfo> accessibilityServices = mAccessibilityServices;
 
         for (String key : accessibilityServices.keySet()) {
             CheckBoxPreference preference = (CheckBoxPreference) findPreference(key);
@@ -230,9 +231,9 @@
                 throw new IllegalArgumentException(
                         KEY_TOGGLE_ACCESSIBILITY_SERVICE_CHECKBOX
                                 + " must be mapped to an instance of a "
-                                + CheckBoxPreference.class.getName());
+                                + SettingsCheckBoxPreference.class.getName());
             }
-            mToggleAccessibilityServiceCheckBox = (CheckBoxPreference) preference;
+            mToggleAccessibilityServiceCheckBox = (SettingsCheckBoxPreference) preference;
         }
     }
 
@@ -274,7 +275,7 @@
         } else if (TOGGLE_ACCESSIBILITY_SCRIPT_INJECTION_CHECKBOX.equals(key)) {
             handleToggleAccessibilityScriptInjection((CheckBoxPreference) preference);
         } else if (preference instanceof CheckBoxPreference) {
-            handleEnableAccessibilityServiceStateChange((CheckBoxPreference) preference);
+            handleEnableAccessibilityServiceStateChange((SettingsCheckBoxPreference) preference);
         }
 
         return super.onPreferenceTreeClick(preferenceScreen, preference);
@@ -318,7 +319,8 @@
      *
      * @param preference The preference.
      */
-    private void handleEnableAccessibilityServiceStateChange(CheckBoxPreference preference) {
+    private void handleEnableAccessibilityServiceStateChange(
+            SettingsCheckBoxPreference preference) {
         if (preference.isChecked()) {
             mToggleAccessibilityServiceCheckBox = preference;
             // set right enabled state since the user may press back
@@ -357,7 +359,8 @@
         AccessibilityManager accessibilityManager =
             (AccessibilityManager) getSystemService(Service.ACCESSIBILITY_SERVICE);
 
-        List<ServiceInfo> installedServices = accessibilityManager.getAccessibilityServiceList();
+        List<AccessibilityServiceInfo> installedServices =
+            accessibilityManager.getInstalledAccessibilityServiceList();
 
         if (installedServices.isEmpty()) {
             getPreferenceScreen().removePreference(mAccessibilityServicesCategory);
@@ -367,12 +370,22 @@
         getPreferenceScreen().addPreference(mAccessibilityServicesCategory);
 
         for (int i = 0, count = installedServices.size(); i < count; ++i) {
-            ServiceInfo serviceInfo = installedServices.get(i);
-            String key = serviceInfo.packageName + "/" + serviceInfo.name;
+            AccessibilityServiceInfo accessibilityServiceInfo = installedServices.get(i);
+            String key = accessibilityServiceInfo.getId();
 
-            if (mAccessibilityServices.put(key, serviceInfo) == null) {
-                CheckBoxPreference preference = new CheckBoxPreference(getActivity());
+            if (mAccessibilityServices.put(key, accessibilityServiceInfo) == null) {
+                String settingsActivityName = accessibilityServiceInfo.getSettingsActivityName();
+                Intent settingsIntent = null;
+                if (!TextUtils.isEmpty(settingsActivityName)) {
+                    String packageName = accessibilityServiceInfo.getResolveInfo()
+                        .serviceInfo.packageName;
+                    settingsIntent = new Intent(Intent.ACTION_MAIN);
+                    settingsIntent.setClassName(packageName, settingsActivityName);
+                }
+                SettingsCheckBoxPreference preference = new SettingsCheckBoxPreference(
+                        getActivity(), settingsIntent);
                 preference.setKey(key);
+                ServiceInfo serviceInfo = accessibilityServiceInfo.getResolveInfo().serviceInfo;
                 preference.setTitle(serviceInfo.loadLabel(getActivity().getPackageManager()));
                 mAccessibilityServicesCategory.addPreference(preference);
             }
@@ -424,7 +437,8 @@
                     .setMessage(getResources().getString(
                             R.string.accessibility_service_security_warning,
                             mAccessibilityServices.get(mToggleAccessibilityServiceCheckBox.getKey())
-                            .applicationInfo.loadLabel(getActivity().getPackageManager())))
+                            .getResolveInfo().serviceInfo.applicationInfo.loadLabel(
+                                    getActivity().getPackageManager())))
                     .setCancelable(true)
                     .setPositiveButton(android.R.string.ok,
                             new DialogInterface.OnClickListener() {
diff --git a/src/com/android/settings/ApplicationSettings.java b/src/com/android/settings/ApplicationSettings.java
index da417ec..15eb840 100644
--- a/src/com/android/settings/ApplicationSettings.java
+++ b/src/com/android/settings/ApplicationSettings.java
@@ -18,6 +18,7 @@
 
 import android.app.AlertDialog;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.content.res.Configuration;
 import android.os.Bundle;
 import android.preference.CheckBoxPreference;
@@ -26,11 +27,13 @@
 import android.preference.PreferenceScreen;
 import android.preference.Preference.OnPreferenceChangeListener;
 import android.provider.Settings;
+import android.util.Log;
 
 public class ApplicationSettings extends SettingsPreferenceFragment implements
         DialogInterface.OnClickListener {
     
     private static final String KEY_TOGGLE_INSTALL_APPLICATIONS = "toggle_install_applications";
+    private static final String KEY_TOGGLE_ADVANCED_SETTINGS = "toggle_advanced_settings";
     private static final String KEY_APP_INSTALL_LOCATION = "app_install_location";
 
     // App installation location. Default is ask the user.
@@ -43,9 +46,8 @@
     private static final String APP_INSTALL_AUTO_ID = "auto";
     
     private CheckBoxPreference mToggleAppInstallation;
-
+    private CheckBoxPreference mToggleAdvancedSettings;
     private ListPreference mInstallLocation;
-
     private DialogInterface mWarnInstallApps;
 
     @Override
@@ -54,9 +56,20 @@
 
         addPreferencesFromResource(R.xml.application_settings);
 
-        mToggleAppInstallation = (CheckBoxPreference) findPreference(KEY_TOGGLE_INSTALL_APPLICATIONS);
+        mToggleAppInstallation = (CheckBoxPreference)findPreference(
+                KEY_TOGGLE_INSTALL_APPLICATIONS);
         mToggleAppInstallation.setChecked(isNonMarketAppsAllowed());
 
+        mToggleAdvancedSettings = (CheckBoxPreference)findPreference(
+                KEY_TOGGLE_ADVANCED_SETTINGS);
+        mToggleAdvancedSettings.setChecked(isAdvancedSettingsEnabled());
+        getPreferenceScreen().removePreference(mToggleAdvancedSettings);
+
+        // not ready for prime time yet
+        if (false) {
+            getPreferenceScreen().removePreference(mInstallLocation);
+        }
+
         mInstallLocation = (ListPreference) findPreference(KEY_APP_INSTALL_LOCATION);
         // Is app default install location set?
         boolean userSetInstLocation = (Settings.System.getInt(getContentResolver(),
@@ -110,6 +123,9 @@
             } else {
                 setNonMarketAppsAllowed(false);
             }
+        } else if (preference == mToggleAdvancedSettings) {
+            boolean value = mToggleAdvancedSettings.isChecked();
+            setAdvancedSettingsEnabled(value);
         }
 
         return super.onPreferenceTreeClick(preferenceScreen, preference);
@@ -127,7 +143,23 @@
         Settings.Secure.putInt(getContentResolver(), Settings.Secure.INSTALL_NON_MARKET_APPS, 
                                 enabled ? 1 : 0);
     }
-    
+
+    private boolean isAdvancedSettingsEnabled() {
+        return Settings.System.getInt(getContentResolver(), 
+                                      Settings.System.ADVANCED_SETTINGS,
+                                      Settings.System.ADVANCED_SETTINGS_DEFAULT) > 0;
+    }
+
+    private void setAdvancedSettingsEnabled(boolean enabled) {
+        int value = enabled ? 1 : 0;
+        // Change the system setting
+        Settings.Secure.putInt(getContentResolver(), Settings.System.ADVANCED_SETTINGS, value);
+        // TODO: the settings thing should broadcast this for thread safety purposes.
+        Intent intent = new Intent(Intent.ACTION_ADVANCED_SETTINGS_CHANGED);
+        intent.putExtra("state", value);
+        getActivity().sendBroadcast(intent);
+    }
+
     private boolean isNonMarketAppsAllowed() {
         return Settings.Secure.getInt(getContentResolver(), 
                                       Settings.Secure.INSTALL_NON_MARKET_APPS, 0) > 0;
diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index 118bc6f..8311c4a 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -27,6 +27,7 @@
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceCategory;
 import android.preference.PreferenceScreen;
+import android.security.KeyStore;
 
 public class ChooseLockGeneric extends PreferenceActivity {
 
@@ -48,9 +49,11 @@
         private static final int CONFIRM_EXISTING_REQUEST = 100;
         private static final String PASSWORD_CONFIRMED = "password_confirmed";
         private static final String CONFIRM_CREDENTIALS = "confirm_credentials";
+        public static final String MINIMUM_QUALITY_KEY = "minimum_quality";
 
         private ChooseLockSettingsHelper mChooseLockSettingsHelper;
         private DevicePolicyManager mDPM;
+        private KeyStore mKeyStore;
         private boolean mPasswordConfirmed = false;
 
         @Override
@@ -58,6 +61,7 @@
             super.onCreate(savedInstanceState);
 
             mDPM = (DevicePolicyManager) getSystemService(Context.DEVICE_POLICY_SERVICE);
+            mKeyStore = KeyStore.getInstance();
             mChooseLockSettingsHelper = new ChooseLockSettingsHelper(this.getActivity());
 
             if (savedInstanceState != null) {
@@ -126,8 +130,8 @@
                     .getIntExtra(LockPatternUtils.PASSWORD_TYPE_KEY, -1);
             if (quality == -1) {
                 // If caller didn't specify password quality, show UI and allow the user to choose.
-                quality = mDPM.getPasswordQuality(null);
-                quality = upgradeQualityForEncryption(quality);
+                quality = getActivity().getIntent().getIntExtra(MINIMUM_QUALITY_KEY, -1);
+                quality = upgradeQuality(quality);
                 final PreferenceScreen prefScreen = getPreferenceScreen();
                 if (prefScreen != null) {
                     prefScreen.removeAll();
@@ -135,11 +139,26 @@
                 addPreferencesFromResource(R.xml.security_settings_picker);
                 disableUnusablePreferences(quality);
             } else {
-                quality = upgradeQualityForEncryption(quality);
                 updateUnlockMethodAndFinish(quality, false);
             }
         }
 
+        private int upgradeQuality(int quality) {
+            quality = upgradeQualityForDPM(quality);
+            quality = upgradeQualityForEncryption(quality);
+            quality = upgradeQualityForKeyStore(quality);
+            return quality;
+        }
+
+        private int upgradeQualityForDPM(int quality) {
+            // Compare min allowed password quality
+            int minQuality = mDPM.getPasswordQuality(null);
+            if (quality < minQuality) {
+                quality = minQuality;
+            }
+            return quality;
+        }
+
         /**
          * Mix in "encryption minimums" to any given quality value.  This prevents users
          * from downgrading the pattern/pin/password to a level below the minimums.
@@ -152,8 +171,17 @@
             boolean encrypted = (encryptionStatus == DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE)
                     || (encryptionStatus == DevicePolicyManager.ENCRYPTION_STATUS_ACTIVATING);
             if (encrypted) {
-                if (quality < DevicePolicyManager.PASSWORD_QUALITY_NUMERIC) {
-                    quality = DevicePolicyManager.PASSWORD_QUALITY_NUMERIC;
+                if (quality < CryptKeeperSettings.MIN_PASSWORD_QUALITY) {
+                    quality = CryptKeeperSettings.MIN_PASSWORD_QUALITY;
+                }
+            }
+            return quality;
+        }
+
+        private int upgradeQualityForKeyStore(int quality) {
+            if (!mKeyStore.isEmpty()) {
+                if (quality < CredentialStorage.MIN_PASSWORD_QUALITY) {
+                    quality = CredentialStorage.MIN_PASSWORD_QUALITY;
                 }
             }
             return quality;
@@ -208,13 +236,7 @@
                 throw new IllegalStateException("Tried to update password without confirming it");
             }
 
-            // Compare min allowed password quality and launch appropriate security setting method
-            int minQuality = mDPM.getPasswordQuality(null);
-            if (quality < minQuality) {
-                quality = minQuality;
-            }
-            quality = upgradeQualityForEncryption(quality);
-
+            quality = upgradeQuality(quality);
             if (quality >= DevicePolicyManager.PASSWORD_QUALITY_NUMERIC) {
                 int minLength = mDPM.getPasswordMinimumLength(null);
                 if (minLength < MIN_PASSWORD_LENGTH) {
diff --git a/src/com/android/settings/ChooseLockPassword.java b/src/com/android/settings/ChooseLockPassword.java
index a0f2346..96255eb 100644
--- a/src/com/android/settings/ChooseLockPassword.java
+++ b/src/com/android/settings/ChooseLockPassword.java
@@ -405,8 +405,10 @@
         }
 
         public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-            // Check if this was the result of hitting the enter key
-            if (actionId == EditorInfo.IME_NULL && event.getAction() == KeyEvent.ACTION_DOWN) {
+            // Check if this was the result of hitting the enter or "done" key
+            if (actionId == EditorInfo.IME_NULL
+                    || actionId == EditorInfo.IME_ACTION_DONE
+                    || actionId == EditorInfo.IME_ACTION_NEXT) {
                 handleNext();
                 return true;
             }
diff --git a/src/com/android/settings/ChooseLockSettingsHelper.java b/src/com/android/settings/ChooseLockSettingsHelper.java
index d31fe3b..a069712 100644
--- a/src/com/android/settings/ChooseLockSettingsHelper.java
+++ b/src/com/android/settings/ChooseLockSettingsHelper.java
@@ -23,7 +23,10 @@
 import android.app.admin.DevicePolicyManager;
 import android.content.Intent;
 
-public class ChooseLockSettingsHelper {
+public final class ChooseLockSettingsHelper {
+
+    static final String EXTRA_KEY_PASSWORD = "password";
+
     private LockPatternUtils mLockPatternUtils;
     private Activity mActivity;
     private Fragment mFragment;
@@ -49,8 +52,7 @@
      * @return true if one exists and we launched an activity to confirm it
      * @see #onActivityResult(int, int, android.content.Intent)
      */
-    protected boolean launchConfirmationActivity(int request,
-            CharSequence message, CharSequence details) {
+    boolean launchConfirmationActivity(int request, CharSequence message, CharSequence details) {
         boolean launched = false;
         switch (mLockPatternUtils.getKeyguardStoredPasswordQuality()) {
             case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING:
diff --git a/src/com/android/settings/ConfirmLockPassword.java b/src/com/android/settings/ConfirmLockPassword.java
index 3f4a4f3..1229046 100644
--- a/src/com/android/settings/ConfirmLockPassword.java
+++ b/src/com/android/settings/ConfirmLockPassword.java
@@ -27,13 +27,16 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.preference.PreferenceActivity;
+import android.text.Editable;
 import android.text.InputType;
+import android.text.TextWatcher;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
+import android.widget.Button;
 import android.widget.TextView;
 import android.widget.TextView.OnEditorActionListener;
 
@@ -58,7 +61,7 @@
     }
 
     public static class ConfirmLockPasswordFragment extends Fragment implements OnClickListener,
-            OnEditorActionListener {
+            OnEditorActionListener, TextWatcher {
         private static final long ERROR_MESSAGE_TIMEOUT = 3000;
         private TextView mPasswordEntry;
         private LockPatternUtils mLockPatternUtils;
@@ -66,6 +69,7 @@
         private Handler mHandler = new Handler();
         private PasswordEntryKeyboardHelper mKeyboardHelper;
         private PasswordEntryKeyboardView mKeyboardView;
+        private Button mContinueButton;
 
 
         // required constructor for fragments
@@ -87,9 +91,14 @@
             // Disable IME on our window since we provide our own keyboard
 
             view.findViewById(R.id.cancel_button).setOnClickListener(this);
-            view.findViewById(R.id.next_button).setOnClickListener(this);
+            mContinueButton = (Button) view.findViewById(R.id.next_button);
+            mContinueButton.setOnClickListener(this);
+            mContinueButton.setEnabled(false); // disable until the user enters at least one char
+
             mPasswordEntry = (TextView) view.findViewById(R.id.password_entry);
             mPasswordEntry.setOnEditorActionListener(this);
+            mPasswordEntry.addTextChangedListener(this);
+
             mKeyboardView = (PasswordEntryKeyboardView) view.findViewById(R.id.keyboard);
             mHeaderText = (TextView) view.findViewById(R.id.headerText);
             final boolean isAlpha = DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC == storedQuality
@@ -140,7 +149,7 @@
             if (mLockPatternUtils.checkPassword(pin)) {
 
                 Intent intent = new Intent();
-                intent.putExtra("password", pin);
+                intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD, pin);
 
                 getActivity().setResult(RESULT_OK, intent);
                 getActivity().finish();
@@ -172,13 +181,27 @@
             }, ERROR_MESSAGE_TIMEOUT);
         }
 
+        // {@link OnEditorActionListener} methods.
         public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-            // Check if this was the result of hitting the enter key
-            if (actionId == EditorInfo.IME_NULL) {
+            // Check if this was the result of hitting the enter or "done" key
+            if (actionId == EditorInfo.IME_NULL
+                    || actionId == EditorInfo.IME_ACTION_DONE
+                    || actionId == EditorInfo.IME_ACTION_NEXT) {
                 handleNext();
                 return true;
             }
             return false;
         }
+
+        // {@link TextWatcher} methods.
+        public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+        }
+
+        public void onTextChanged(CharSequence s, int start, int before, int count) {
+        }
+
+        public void afterTextChanged(Editable s) {
+            mContinueButton.setEnabled(mPasswordEntry.getText().length() > 0);
+        }
     }
 }
diff --git a/src/com/android/settings/ConfirmLockPattern.java b/src/com/android/settings/ConfirmLockPattern.java
index 0653d3f..2892930 100644
--- a/src/com/android/settings/ConfirmLockPattern.java
+++ b/src/com/android/settings/ConfirmLockPattern.java
@@ -256,7 +256,12 @@
 
             public void onPatternDetected(List<LockPatternView.Cell> pattern) {
                 if (mLockPatternUtils.checkPattern(pattern)) {
-                    getActivity().setResult(Activity.RESULT_OK);
+
+                    Intent intent = new Intent();
+                    intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD,
+                                    LockPatternUtils.patternToString(pattern));
+
+                    getActivity().setResult(Activity.RESULT_OK, intent);
                     getActivity().finish();
                 } else {
                     if (pattern.size() >= LockPatternUtils.MIN_PATTERN_REGISTER_FAIL &&
diff --git a/src/com/android/settings/CredentialStorage.java b/src/com/android/settings/CredentialStorage.java
index 9d5a603..e246fce 100644
--- a/src/com/android/settings/CredentialStorage.java
+++ b/src/com/android/settings/CredentialStorage.java
@@ -18,213 +18,417 @@
 
 import android.app.Activity;
 import android.app.AlertDialog;
+import android.app.admin.DevicePolicyManager;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.res.Resources;
+import android.os.AsyncTask;
 import android.os.Bundle;
+import android.os.RemoteException;
+import android.security.KeyChain.KeyChainConnection;
+import android.security.KeyChain;
 import android.security.KeyStore;
 import android.text.Editable;
+import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
 import android.widget.Toast;
+import com.android.internal.widget.LockPatternUtils;
 
-import java.io.UnsupportedEncodingException;
-
-public class CredentialStorage extends Activity implements TextWatcher,
-        DialogInterface.OnClickListener, DialogInterface.OnDismissListener {
-
-    public static final String ACTION_UNLOCK = "com.android.credentials.UNLOCK";
-    public static final String ACTION_SET_PASSWORD = "com.android.credentials.SET_PASSWORD";
-    public static final String ACTION_INSTALL = "com.android.credentials.INSTALL";
-    public static final String ACTION_RESET = "com.android.credentials.RESET";
+/**
+ * CredentialStorage handles KeyStore reset, unlock, and install.
+ *
+ * CredentialStorage has a pretty convoluted state machine to migrate
+ * from the old style separate keystore password to a new key guard
+ * based password, as well as to deal with setting up the key guard if
+ * necessary.
+ *
+ * KeyStore: UNINITALIZED
+ * KeyGuard: OFF
+ * Action:   set up key guard
+ * Notes:    factory state
+ *
+ * KeyStore: UNINITALIZED
+ * KeyGuard: ON
+ * Action:   confirm key guard
+ * Notes:    user had key guard but no keystore and upgraded from pre-ICS
+ *           OR user had key guard and pre-ICS keystore password which was then reset
+ *
+ * KeyStore: LOCKED
+ * KeyGuard: OFF/ON
+ * Action:   old unlock dialog
+ * Notes:    assume old password, need to use it to unlock.
+ *           if unlock, ensure key guard before install.
+ *           if reset, treat as UNINITALIZED/OFF
+ *
+ * KeyStore: UNLOCKED
+ * KeyGuard: OFF
+ * Action:   set up key guard
+ * Notes:    ensure key guard, then proceed
+ *
+ * KeyStore: UNLOCKED
+ * keyguard: ON
+ * Action:   normal unlock/install
+ * Notes:    this is the common case
+ */
+public final class CredentialStorage extends Activity {
 
     private static final String TAG = "CredentialStorage";
 
-    private KeyStore mKeyStore = KeyStore.getInstance();
-    private boolean mSubmit = false;
-    private Bundle mBundle;
+    public static final String ACTION_UNLOCK = "com.android.credentials.UNLOCK";
+    public static final String ACTION_INSTALL = "com.android.credentials.INSTALL";
+    public static final String ACTION_RESET = "com.android.credentials.RESET";
 
-    private TextView mOldPassword;
-    private TextView mNewPassword;
-    private TextView mConfirmPassword;
-    private TextView mError;
-    private Button mButton;
+    // This is the minimum acceptable password quality.  If the current password quality is
+    // lower than this, keystore should not be activated.
+    static final int MIN_PASSWORD_QUALITY = DevicePolicyManager.PASSWORD_QUALITY_SOMETHING;
 
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
+    private static final int CONFIRM_KEY_GUARD_REQUEST = 1;
+
+    private final KeyStore mKeyStore = KeyStore.getInstance();
+
+    /**
+     * When non-null, the bundle containing credentials to install.
+     */
+    private Bundle mInstallBundle;
+
+    /**
+     * After unsuccessful KeyStore.unlock, the number of unlock
+     * attempts remaining before the KeyStore will reset itself.
+     *
+     * Reset to -1 on successful unlock or reset.
+     */
+    private int mRetriesRemaining = -1;
+
+    @Override protected void onResume() {
+        super.onResume();
 
         Intent intent = getIntent();
         String action = intent.getAction();
-        int state = mKeyStore.test();
 
         if (ACTION_RESET.equals(action)) {
-            showResetDialog();
-        } else if (ACTION_SET_PASSWORD.equals(action)) {
-            showPasswordDialog(state == KeyStore.UNINITIALIZED);
+            new ResetDialog();
         } else {
             if (ACTION_INSTALL.equals(action) &&
                     "com.android.certinstaller".equals(getCallingPackage())) {
-                mBundle = intent.getExtras();
+                mInstallBundle = intent.getExtras();
             }
-            if (state == KeyStore.UNINITIALIZED) {
-                showPasswordDialog(true);
-            } else if (state == KeyStore.LOCKED) {
-                showUnlockDialog();
-            } else {
-                install();
-                finish();
+            // ACTION_UNLOCK also handled here in addition to ACTION_INSTALL
+            handleUnlockOrInstall();
+        }
+    }
+
+    /**
+     * Based on the current state of the KeyStore and key guard, try to
+     * make progress on unlocking or installing to the keystore.
+     */
+    private void handleUnlockOrInstall() {
+        // something already decided we are done, do not proceed
+        if (isFinishing()) {
+            return;
+        }
+        switch (mKeyStore.state()) {
+            case UNINITIALIZED: {
+                ensureKeyGuard();
+                return;
             }
-        }
-    }
-
-    private void install() {
-        if (mBundle != null && !mBundle.isEmpty()) {
-            try {
-                for (String key : mBundle.keySet()) {
-                    byte[] value = mBundle.getByteArray(key);
-                    if (value != null && !mKeyStore.put(key.getBytes("UTF-8"), value)) {
-                        Log.e(TAG, "Failed to install " + key);
-                        return;
-                    }
-                }
-                setResult(RESULT_OK);
-            } catch (UnsupportedEncodingException e) {
-                // Should never happen.
-                throw new RuntimeException(e);
+            case LOCKED: {
+                new UnlockDialog();
+                return;
             }
-        }
-    }
-
-    private void showResetDialog() {
-        AlertDialog dialog = new AlertDialog.Builder(this)
-                .setTitle(android.R.string.dialog_alert_title)
-                .setIcon(android.R.drawable.ic_dialog_alert)
-                .setMessage(R.string.credentials_reset_hint)
-                .setNeutralButton(android.R.string.ok, this)
-                .setNegativeButton(android.R.string.cancel, this)
-                .create();
-        dialog.setOnDismissListener(this);
-        dialog.show();
-    }
-
-    private void showPasswordDialog(boolean firstTime) {
-        View view = View.inflate(this, R.layout.credentials_dialog, null);
-
-        ((TextView) view.findViewById(R.id.hint)).setText(R.string.credentials_password_hint);
-        if (!firstTime) {
-            view.findViewById(R.id.old_password_prompt).setVisibility(View.VISIBLE);
-            mOldPassword = (TextView) view.findViewById(R.id.old_password);
-            mOldPassword.setVisibility(View.VISIBLE);
-            mOldPassword.addTextChangedListener(this);
-        }
-        view.findViewById(R.id.new_passwords).setVisibility(View.VISIBLE);
-        mNewPassword = (TextView) view.findViewById(R.id.new_password);
-        mNewPassword.addTextChangedListener(this);
-        mConfirmPassword = (TextView) view.findViewById(R.id.confirm_password);
-        mConfirmPassword.addTextChangedListener(this);
-        mError = (TextView) view.findViewById(R.id.error);
-
-        AlertDialog dialog = new AlertDialog.Builder(this)
-                .setView(view)
-                .setTitle(R.string.credentials_set_password)
-                .setPositiveButton(android.R.string.ok, this)
-                .setNegativeButton(android.R.string.cancel, this)
-                .create();
-        dialog.setOnDismissListener(this);
-        dialog.show();
-        mButton = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
-        mButton.setEnabled(false);
-    }
-
-    private void showUnlockDialog() {
-        View view = View.inflate(this, R.layout.credentials_dialog, null);
-
-        ((TextView) view.findViewById(R.id.hint)).setText(R.string.credentials_unlock_hint);
-        mOldPassword = (TextView) view.findViewById(R.id.old_password);
-        mOldPassword.setVisibility(View.VISIBLE);
-        mOldPassword.addTextChangedListener(this);
-        mError = (TextView) view.findViewById(R.id.error);
-
-        AlertDialog dialog = new AlertDialog.Builder(this)
-                .setView(view)
-                .setTitle(R.string.credentials_unlock)
-                .setPositiveButton(android.R.string.ok, this)
-                .setNegativeButton(android.R.string.cancel, this)
-                .create();
-        dialog.setOnDismissListener(this);
-        dialog.show();
-        mButton = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
-        mButton.setEnabled(false);
-    }
-
-    public void afterTextChanged(Editable editable) {
-        if ((mOldPassword == null || mOldPassword.getText().length() > 0) &&
-            (mNewPassword == null || mNewPassword.getText().length() >= 8) &&
-            (mConfirmPassword == null || mConfirmPassword.getText().length() >= 8)) {
-            mButton.setEnabled(true);
-        } else {
-            mButton.setEnabled(false);
-        }
-    }
-
-    public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-    }
-
-    public void onTextChanged(CharSequence s,int start, int before, int count) {
-    }
-
-    public void onClick(DialogInterface dialog, int button) {
-        mSubmit = (button == DialogInterface.BUTTON_POSITIVE);
-        if (button == DialogInterface.BUTTON_NEUTRAL) {
-            mKeyStore.reset();
-            Toast.makeText(this, R.string.credentials_erased, Toast.LENGTH_SHORT).show();
-        }
-    }
-
-    public void onDismiss(DialogInterface dialog) {
-        if (mSubmit) {
-            mSubmit = false;
-            mError.setVisibility(View.VISIBLE);
-
-            if (mNewPassword == null) {
-                mKeyStore.unlock(mOldPassword.getText().toString());
-            } else {
-                String newPassword = mNewPassword.getText().toString();
-                String confirmPassword = mConfirmPassword.getText().toString();
-
-                if (!newPassword.equals(confirmPassword)) {
-                    mError.setText(R.string.credentials_passwords_mismatch);
-                    ((AlertDialog) dialog).show();
+            case UNLOCKED: {
+                if (!checkKeyGuardQuality()) {
+                    new ConfigureKeyGuardDialog();
                     return;
-                } else if (mOldPassword == null) {
-                    mKeyStore.password(newPassword);
-                } else {
-                    mKeyStore.password(mOldPassword.getText().toString(), newPassword);
                 }
-            }
-
-            int error = mKeyStore.getLastError();
-            if (error == KeyStore.NO_ERROR) {
-                Toast.makeText(this, R.string.credentials_enabled, Toast.LENGTH_SHORT).show();
-                install();
-            } else if (error == KeyStore.UNINITIALIZED) {
-                Toast.makeText(this, R.string.credentials_erased,  Toast.LENGTH_SHORT).show();
-            } else if (error >= KeyStore.WRONG_PASSWORD) {
-                int count = error - KeyStore.WRONG_PASSWORD + 1;
-                if (count > 3) {
-                    mError.setText(R.string.credentials_wrong_password);
-                } else if (count == 1) {
-                    mError.setText(R.string.credentials_reset_warning);
-                } else {
-                    mError.setText(getString(R.string.credentials_reset_warning_plural, count));
-                }
-                ((AlertDialog) dialog).show();
+                installIfAvailable();
+                finish();
                 return;
             }
         }
+    }
+
+    /**
+     * Make sure the user enters the key guard to set or change the
+     * keystore password. This can be used in UNINITIALIZED to set the
+     * keystore password or UNLOCKED to change the password (as is the
+     * case after unlocking with an old-style password).
+     */
+    private void ensureKeyGuard() {
+        if (!checkKeyGuardQuality()) {
+            // key guard not setup, doing so will initialize keystore
+            new ConfigureKeyGuardDialog();
+            // will return to onResume after Activity
+            return;
+        }
+        // force key guard confirmation
+        if (confirmKeyGuard()) {
+            // will return password value via onActivityResult
+            return;
+        }
         finish();
     }
+
+    /**
+     * Returns true if the currently set key guard matches our minimum quality requirements.
+     */
+    private boolean checkKeyGuardQuality() {
+        int quality = new LockPatternUtils(this).getActivePasswordQuality();
+        return (quality >= MIN_PASSWORD_QUALITY);
+    }
+
+    /**
+     * Install credentials if available, otherwise do nothing.
+     */
+    private void installIfAvailable() {
+        if (mInstallBundle != null && !mInstallBundle.isEmpty()) {
+            Bundle bundle = mInstallBundle;
+            mInstallBundle = null;
+            for (String key : bundle.keySet()) {
+                byte[] value = bundle.getByteArray(key);
+                if (value != null && !mKeyStore.put(key, value)) {
+                    Log.e(TAG, "Failed to install " + key);
+                    return;
+                }
+            }
+            setResult(RESULT_OK);
+        }
+    }
+
+    /**
+     * Prompt for reset confirmation, resetting on confirmation, finishing otherwise.
+     */
+    private class ResetDialog
+            implements DialogInterface.OnClickListener, DialogInterface.OnDismissListener
+    {
+        private boolean mResetConfirmed;
+
+        private ResetDialog() {
+            AlertDialog dialog = new AlertDialog.Builder(CredentialStorage.this)
+                    .setTitle(android.R.string.dialog_alert_title)
+                    .setIcon(android.R.drawable.ic_dialog_alert)
+                    .setMessage(R.string.credentials_reset_hint)
+                    .setPositiveButton(android.R.string.ok, this)
+                    .setNegativeButton(android.R.string.cancel, this)
+                    .create();
+            dialog.setOnDismissListener(this);
+            dialog.show();
+        }
+
+        @Override public void onClick(DialogInterface dialog, int button) {
+            mResetConfirmed = (button == DialogInterface.BUTTON_POSITIVE);
+        }
+
+        @Override public void onDismiss(DialogInterface dialog) {
+            if (mResetConfirmed) {
+                mResetConfirmed = false;
+                new ResetKeyStoreAndKeyChain().execute();
+                return;
+            }
+            finish();
+        }
+    }
+
+    /**
+     * Background task to handle reset of both keystore and user installed CAs.
+     */
+    private class ResetKeyStoreAndKeyChain extends AsyncTask<Void, Void, Boolean> {
+
+        @Override protected Boolean doInBackground(Void... unused) {
+
+            mKeyStore.reset();
+
+            try {
+                KeyChainConnection keyChainConnection = KeyChain.bind(CredentialStorage.this);
+                try {
+                    return keyChainConnection.getService().reset();
+                } catch (RemoteException e) {
+                    return false;
+                } finally {
+                    keyChainConnection.close();
+                }
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+                return false;
+            }
+        }
+
+        @Override protected void onPostExecute(Boolean success) {
+            if (success) {
+                Toast.makeText(CredentialStorage.this,
+                               R.string.credentials_erased, Toast.LENGTH_SHORT).show();
+            } else {
+                Toast.makeText(CredentialStorage.this,
+                               R.string.credentials_not_erased, Toast.LENGTH_SHORT).show();
+            }
+            finish();
+        }
+    }
+
+    /**
+     * Prompt for key guard configuration confirmation.
+     */
+    private class ConfigureKeyGuardDialog
+            implements DialogInterface.OnClickListener, DialogInterface.OnDismissListener
+    {
+        private boolean mConfigureConfirmed;
+
+        private ConfigureKeyGuardDialog() {
+            AlertDialog dialog = new AlertDialog.Builder(CredentialStorage.this)
+                    .setTitle(android.R.string.dialog_alert_title)
+                    .setIcon(android.R.drawable.ic_dialog_alert)
+                    .setMessage(R.string.credentials_configure_lock_screen_hint)
+                    .setPositiveButton(android.R.string.ok, this)
+                    .setNegativeButton(android.R.string.cancel, this)
+                    .create();
+            dialog.setOnDismissListener(this);
+            dialog.show();
+        }
+
+        @Override public void onClick(DialogInterface dialog, int button) {
+            mConfigureConfirmed = (button == DialogInterface.BUTTON_POSITIVE);
+        }
+
+        @Override public void onDismiss(DialogInterface dialog) {
+            if (mConfigureConfirmed) {
+                mConfigureConfirmed = false;
+                Intent intent = new Intent(DevicePolicyManager.ACTION_SET_NEW_PASSWORD);
+                intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.MINIMUM_QUALITY_KEY,
+                                MIN_PASSWORD_QUALITY);
+                startActivity(intent);
+                return;
+            }
+            finish();
+        }
+    }
+
+    /**
+     * Confirm existing key guard, returning password via onActivityResult.
+     */
+    private boolean confirmKeyGuard() {
+        Resources res = getResources();
+        boolean launched = new ChooseLockSettingsHelper(this)
+                .launchConfirmationActivity(CONFIRM_KEY_GUARD_REQUEST,
+                                            res.getText(R.string.master_clear_gesture_prompt),
+                                            res.getText(R.string.master_clear_gesture_explanation));
+        return launched;
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        /**
+         * Receive key guard password initiated by confirmKeyGuard.
+         */
+        if (requestCode == CONFIRM_KEY_GUARD_REQUEST) {
+            if (resultCode == Activity.RESULT_OK) {
+                String password = data.getStringExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD);
+                if (!TextUtils.isEmpty(password)) {
+                    // success
+                    mKeyStore.password(password);
+                    // return to onResume
+                    return;
+                }
+            }
+            // failed confirmation, bail
+            finish();
+        }
+    }
+
+    /**
+     * Prompt for unlock with old-style password.
+     *
+     * On successful unlock, ensure migration to key guard before continuing.
+     * On unsuccessful unlock, retry by calling handleUnlockOrInstall.
+     */
+    private class UnlockDialog implements TextWatcher,
+            DialogInterface.OnClickListener, DialogInterface.OnDismissListener
+    {
+        private boolean mUnlockConfirmed;
+
+        private final Button mButton;
+        private final TextView mOldPassword;
+        private final TextView mError;
+
+        private UnlockDialog() {
+            View view = View.inflate(CredentialStorage.this, R.layout.credentials_dialog, null);
+
+            CharSequence text;
+            if (mRetriesRemaining == -1) {
+                text = getResources().getText(R.string.credentials_unlock_hint);
+            } else if (mRetriesRemaining > 3) {
+                text = getResources().getText(R.string.credentials_wrong_password);
+            } else if (mRetriesRemaining == 1) {
+                text = getResources().getText(R.string.credentials_reset_warning);
+            } else {
+                text = getString(R.string.credentials_reset_warning_plural, mRetriesRemaining);
+            }
+
+            ((TextView) view.findViewById(R.id.hint)).setText(text);
+            mOldPassword = (TextView) view.findViewById(R.id.old_password);
+            mOldPassword.setVisibility(View.VISIBLE);
+            mOldPassword.addTextChangedListener(this);
+            mError = (TextView) view.findViewById(R.id.error);
+
+            AlertDialog dialog = new AlertDialog.Builder(CredentialStorage.this)
+                    .setView(view)
+                    .setTitle(R.string.credentials_unlock)
+                    .setPositiveButton(android.R.string.ok, this)
+                    .setNegativeButton(android.R.string.cancel, this)
+                    .create();
+            dialog.setOnDismissListener(this);
+            dialog.show();
+            mButton = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
+            mButton.setEnabled(false);
+        }
+
+        @Override public void afterTextChanged(Editable editable) {
+            mButton.setEnabled(mOldPassword == null || mOldPassword.getText().length() > 0);
+        }
+
+        @Override public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+        }
+
+        @Override public void onTextChanged(CharSequence s,int start, int before, int count) {
+        }
+
+        @Override public void onClick(DialogInterface dialog, int button) {
+            mUnlockConfirmed = (button == DialogInterface.BUTTON_POSITIVE);
+        }
+
+        @Override public void onDismiss(DialogInterface dialog) {
+            if (mUnlockConfirmed) {
+                mUnlockConfirmed = false;
+                mError.setVisibility(View.VISIBLE);
+                mKeyStore.unlock(mOldPassword.getText().toString());
+                int error = mKeyStore.getLastError();
+                if (error == KeyStore.NO_ERROR) {
+                    mRetriesRemaining = -1;
+                    Toast.makeText(CredentialStorage.this,
+                                   R.string.credentials_enabled,
+                                   Toast.LENGTH_SHORT).show();
+                    // aha, now we are unlocked, switch to key guard.
+                    // we'll end up back in onResume to install
+                    ensureKeyGuard();
+                } else if (error == KeyStore.UNINITIALIZED) {
+                    mRetriesRemaining = -1;
+                    Toast.makeText(CredentialStorage.this,
+                                   R.string.credentials_erased,
+                                   Toast.LENGTH_SHORT).show();
+                    // we are reset, we can now set new password with key guard
+                    handleUnlockOrInstall();
+                } else if (error >= KeyStore.WRONG_PASSWORD) {
+                    // we need to try again
+                    mRetriesRemaining = error - KeyStore.WRONG_PASSWORD + 1;
+                    handleUnlockOrInstall();
+                }
+                return;
+            }
+            finish();
+        }
+    }
 }
diff --git a/src/com/android/settings/CryptKeeperSettings.java b/src/com/android/settings/CryptKeeperSettings.java
index 10fa8ac..a9002fa 100644
--- a/src/com/android/settings/CryptKeeperSettings.java
+++ b/src/com/android/settings/CryptKeeperSettings.java
@@ -37,16 +37,6 @@
 import android.view.ViewGroup;
 import android.widget.Button;
 
-/**
- * Confirm and execute a reset of the device to a clean "just out of the box"
- * state.  Multiple confirmations are required: first, a general "are you sure
- * you want to do this?" prompt, followed by a keyguard pattern trace if the user
- * has defined one, followed by a final strongly-worded "THIS WILL ERASE EVERYTHING
- * ON THE PHONE" prompt.  If at any time the phone is allowed to go to sleep, is
- * locked, et cetera, then the confirmation sequence is abandoned.
- *
- * This is the initial screen.
- */
 public class CryptKeeperSettings extends Fragment {
     private static final String TAG = "CryptKeeper";
 
@@ -54,7 +44,7 @@
 
     // This is the minimum acceptable password quality.  If the current password quality is
     // lower than this, encryption should not be activated.
-    private static final int MIN_PASSWORD_QUALITY = DevicePolicyManager.PASSWORD_QUALITY_NUMERIC;
+    static final int MIN_PASSWORD_QUALITY = DevicePolicyManager.PASSWORD_QUALITY_NUMERIC;
 
     // Minimum battery charge level (in percent) to launch encryption.  If the battery charge is
     // lower than this, encryption should not be activated.
@@ -163,7 +153,7 @@
      */
     private boolean runKeyguardConfirmation(int request) {
         // 1.  Confirm that we have a sufficient PIN/Password to continue
-        int quality = new LockPatternUtils(getActivity()).getKeyguardStoredPasswordQuality();
+        int quality = new LockPatternUtils(getActivity()).getActivePasswordQuality();
         if (quality < MIN_PASSWORD_QUALITY) {
             return false;
         }
@@ -186,7 +176,7 @@
         // If the user entered a valid keyguard trace, present the final
         // confirmation prompt; otherwise, go back to the initial state.
         if (resultCode == Activity.RESULT_OK && data != null) {
-            String password = data.getStringExtra("password");
+            String password = data.getStringExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD);
             if (!TextUtils.isEmpty(password)) {
                 showFinalConfirmation(password);
             }
diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
new file mode 100644
index 0000000..b9d1929
--- /dev/null
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -0,0 +1,353 @@
+/*
+ * 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.
+ */
+
+package com.android.settings;
+
+import static com.android.settings.widget.ChartView.buildChartParams;
+import static com.android.settings.widget.ChartView.buildSweepParams;
+
+import android.app.Fragment;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.graphics.Color;
+import android.net.INetworkStatsService;
+import android.net.NetworkStats;
+import android.net.NetworkStatsHistory;
+import android.net.TrafficStats;
+import android.os.Bundle;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.text.format.DateUtils;
+import android.text.format.Formatter;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import com.android.settings.widget.ChartAxis;
+import com.android.settings.widget.ChartGridView;
+import com.android.settings.widget.ChartNetworkSeriesView;
+import com.android.settings.widget.ChartSweepView;
+import com.android.settings.widget.ChartSweepView.OnSweepListener;
+import com.android.settings.widget.ChartView;
+import com.android.settings.widget.InvertedChartAxis;
+import com.google.android.collect.Lists;
+
+import java.util.ArrayList;
+import java.util.Collections;
+
+public class DataUsageSummary extends Fragment {
+    private static final String TAG = "DataUsage";
+
+    // TODO: teach about wifi-vs-mobile data with tabs
+
+    private static final long KB_IN_BYTES = 1024;
+    private static final long MB_IN_BYTES = KB_IN_BYTES * 1024;
+    private static final long GB_IN_BYTES = MB_IN_BYTES * 1024;
+
+    private INetworkStatsService mStatsService;
+
+    private ViewGroup mChartContainer;
+    private ListView mList;
+
+    private ChartAxis mAxisTime;
+    private ChartAxis mAxisData;
+
+    private ChartView mChart;
+    private ChartNetworkSeriesView mSeries;
+
+    private ChartSweepView mSweepTime1;
+    private ChartSweepView mSweepTime2;
+    private ChartSweepView mSweepDataWarn;
+    private ChartSweepView mSweepDataLimit;
+
+    private DataUsageAdapter mAdapter;
+
+    // TODO: persist warning/limit into policy service
+    private static final long DATA_WARN = (long) 3.2 * GB_IN_BYTES;
+    private static final long DATA_LIMIT = (long) 4.8 * GB_IN_BYTES;
+
+    @Override
+    public View onCreateView(
+            LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+
+        final Context context = inflater.getContext();
+        final long now = System.currentTimeMillis();
+
+        mStatsService = INetworkStatsService.Stub.asInterface(
+                ServiceManager.getService(Context.NETWORK_STATS_SERVICE));
+
+        mAxisTime = new TimeAxis();
+        mAxisData = new InvertedChartAxis(new DataAxis());
+
+        mChart = new ChartView(context, mAxisTime, mAxisData);
+        mChart.setPadding(20, 20, 20, 20);
+
+        mChart.addView(new ChartGridView(context, mAxisTime, mAxisData), buildChartParams());
+
+        mSeries = new ChartNetworkSeriesView(context, mAxisTime, mAxisData);
+        mChart.addView(mSeries, buildChartParams());
+
+        mSweepTime1 = new ChartSweepView(context, mAxisTime, now - DateUtils.DAY_IN_MILLIS * 14,
+                Color.parseColor("#ffffff"));
+        mSweepTime2 = new ChartSweepView(context, mAxisTime, now - DateUtils.DAY_IN_MILLIS * 7,
+                Color.parseColor("#ffffff"));
+        mSweepDataWarn = new ChartSweepView(
+                context, mAxisData, DATA_WARN, Color.parseColor("#f7931d"));
+        mSweepDataLimit = new ChartSweepView(
+                context, mAxisData, DATA_LIMIT, Color.parseColor("#be1d2c"));
+
+        mChart.addView(mSweepTime1, buildSweepParams());
+        mChart.addView(mSweepTime2, buildSweepParams());
+        mChart.addView(mSweepDataWarn, buildSweepParams());
+        mChart.addView(mSweepDataLimit, buildSweepParams());
+
+        mSeries.bindSweepRange(mSweepTime1, mSweepTime2);
+
+        mSweepTime1.addOnSweepListener(mSweepListener);
+        mSweepTime2.addOnSweepListener(mSweepListener);
+
+        mAdapter = new DataUsageAdapter();
+
+        final View view = inflater.inflate(R.layout.data_usage_summary, container, false);
+
+        mChartContainer = (ViewGroup) view.findViewById(R.id.chart_container);
+        mChartContainer.addView(mChart);
+
+        mList = (ListView) view.findViewById(R.id.list);
+        mList.setAdapter(mAdapter);
+
+        return view;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        updateSummaryData();
+        updateDetailData();
+
+    }
+
+    private void updateSummaryData() {
+        try {
+            final NetworkStatsHistory history = mStatsService.getHistoryForNetwork(
+                    TrafficStats.TEMPLATE_MOBILE_ALL);
+            mSeries.bindNetworkStats(history);
+        } catch (RemoteException e) {
+            Log.w(TAG, "problem reading stats");
+        }
+    }
+
+    private void updateDetailData() {
+        final long sweep1 = mSweepTime1.getValue();
+        final long sweep2 = mSweepTime2.getValue();
+
+        final long start = Math.min(sweep1, sweep2);
+        final long end = Math.max(sweep1, sweep2);
+
+        try {
+            final NetworkStats stats = mStatsService.getSummaryForAllUid(
+                    start, end, TrafficStats.TEMPLATE_MOBILE_ALL);
+            mAdapter.bindStats(stats);
+        } catch (RemoteException e) {
+            Log.w(TAG, "problem reading stats");
+        }
+    }
+
+    private OnSweepListener mSweepListener = new OnSweepListener() {
+        public void onSweep(ChartSweepView sweep, boolean sweepDone) {
+            // always update graph clip region
+            mSeries.invalidate();
+
+            // update detail list only when done sweeping
+            if (sweepDone) {
+                updateDetailData();
+            }
+        }
+    };
+
+
+    /**
+     * Adapter of applications, sorted by total usage descending.
+     */
+    public static class DataUsageAdapter extends BaseAdapter {
+        private ArrayList<UsageRecord> mData = Lists.newArrayList();
+
+        private static class UsageRecord implements Comparable<UsageRecord> {
+            public int uid;
+            public long total;
+
+            /** {@inheritDoc} */
+            public int compareTo(UsageRecord another) {
+                return Long.compare(another.total, total);
+            }
+        }
+
+        public void bindStats(NetworkStats stats) {
+            mData.clear();
+
+            for (int i = 0; i < stats.length(); i++) {
+                final UsageRecord record = new UsageRecord();
+                record.uid = stats.uid[i];
+                record.total = stats.rx[i] + stats.tx[i];
+                mData.add(record);
+            }
+
+            Collections.sort(mData);
+            notifyDataSetChanged();
+        }
+
+        @Override
+        public int getCount() {
+            return mData.size();
+        }
+
+        @Override
+        public Object getItem(int position) {
+            return mData.get(position);
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return position;
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            if (convertView == null) {
+                convertView = LayoutInflater.from(parent.getContext()).inflate(
+                        android.R.layout.simple_list_item_2, parent, false);
+            }
+
+            final Context context = parent.getContext();
+            final PackageManager pm = context.getPackageManager();
+
+            final TextView text1 = (TextView) convertView.findViewById(android.R.id.text1);
+            final TextView text2 = (TextView) convertView.findViewById(android.R.id.text2);
+
+            final UsageRecord record = mData.get(position);
+            text1.setText(pm.getNameForUid(record.uid));
+            text2.setText(Formatter.formatFileSize(context, record.total));
+
+            return convertView;
+        }
+
+    }
+
+
+    public static class TimeAxis implements ChartAxis {
+        private static final long TICK_INTERVAL = DateUtils.DAY_IN_MILLIS * 7;
+
+        private long mMin;
+        private long mMax;
+        private float mSize;
+
+        public TimeAxis() {
+            // TODO: hook up these ranges to policy service
+            mMax = System.currentTimeMillis();
+            mMin = mMax - DateUtils.DAY_IN_MILLIS * 30;
+        }
+
+        /** {@inheritDoc} */
+        public void setSize(float size) {
+            this.mSize = size;
+        }
+
+        /** {@inheritDoc} */
+        public float convertToPoint(long value) {
+            return (mSize * (value - mMin)) / (mMax - mMin);
+        }
+
+        /** {@inheritDoc} */
+        public long convertToValue(float point) {
+            return (long) (mMin + ((point * (mMax - mMin)) / mSize));
+        }
+
+        /** {@inheritDoc} */
+        public CharSequence getLabel(long value) {
+            // TODO: convert to string
+            return Long.toString(value);
+        }
+
+        /** {@inheritDoc} */
+        public float[] getTickPoints() {
+            // tick mark for every week
+            final int tickCount = (int) ((mMax - mMin) / TICK_INTERVAL);
+            final float[] tickPoints = new float[tickCount];
+            for (int i = 0; i < tickCount; i++) {
+                tickPoints[i] = convertToPoint(mMax - (TICK_INTERVAL * i));
+            }
+            return tickPoints;
+        }
+
+    }
+
+    // TODO: make data axis log-scale
+
+    public static class DataAxis implements ChartAxis {
+        private long mMin;
+        private long mMax;
+        private float mSize;
+
+        public DataAxis() {
+            // TODO: adapt ranges to show when history >5GB, and handle 4G
+            // interfaces with higher limits.
+            mMin = 0;
+            mMax = 5 * GB_IN_BYTES;
+        }
+
+        /** {@inheritDoc} */
+        public void setSize(float size) {
+            this.mSize = size;
+        }
+
+        /** {@inheritDoc} */
+        public float convertToPoint(long value) {
+            return (mSize * (value - mMin)) / (mMax - mMin);
+        }
+
+        /** {@inheritDoc} */
+        public long convertToValue(float point) {
+            return (long) (mMin + ((point * (mMax - mMin)) / mSize));
+        }
+
+        /** {@inheritDoc} */
+        public CharSequence getLabel(long value) {
+            // TODO: convert to string
+            return Long.toString(value);
+        }
+
+        /** {@inheritDoc} */
+        public float[] getTickPoints() {
+            final float[] tickPoints = new float[16];
+
+            long value = mMax;
+            float mult = 0.8f;
+            for (int i = 0; i < tickPoints.length; i++) {
+                tickPoints[i] = convertToPoint(value);
+                value = (long) (value * mult);
+                mult *= 0.9;
+            }
+            return tickPoints;
+        }
+    }
+
+
+}
diff --git a/src/com/android/settings/DateTimeSettingsSetupWizard.java b/src/com/android/settings/DateTimeSettingsSetupWizard.java
index 685ee00..08204b6 100644
--- a/src/com/android/settings/DateTimeSettingsSetupWizard.java
+++ b/src/com/android/settings/DateTimeSettingsSetupWizard.java
@@ -31,7 +31,6 @@
 import android.preference.PreferenceFragment;
 import android.provider.Settings;
 import android.provider.Settings.SettingNotFoundException;
-import android.text.format.DateFormat;
 import android.util.Log;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -46,6 +45,7 @@
 import android.widget.LinearLayout;
 import android.widget.ListPopupWindow;
 import android.widget.SimpleAdapter;
+import android.widget.TextView;
 import android.widget.TimePicker;
 
 import java.util.Calendar;
@@ -129,8 +129,6 @@
 
         mAutoDateTimeButton = (CompoundButton)findViewById(R.id.date_time_auto_button);
         mAutoDateTimeButton.setChecked(autoDateTimeEnabled);
-        mAutoDateTimeButton.setText(autoDateTimeEnabled ? R.string.date_time_auto_summaryOn :
-                R.string.date_time_auto_summaryOff);
         mAutoDateTimeButton.setOnCheckedChangeListener(this);
 
         mTimePicker = (TimePicker)findViewById(R.id.time_picker);
diff --git a/src/com/android/settings/DefaultRingtonePreference.java b/src/com/android/settings/DefaultRingtonePreference.java
index 0933d62..0801b1f 100644
--- a/src/com/android/settings/DefaultRingtonePreference.java
+++ b/src/com/android/settings/DefaultRingtonePreference.java
@@ -23,7 +23,6 @@
 import android.net.Uri;
 import android.preference.RingtonePreference;
 import android.util.AttributeSet;
-import android.util.Config;
 import android.util.Log;
 
 public class DefaultRingtonePreference extends RingtonePreference {
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index cdb0147..682184e 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -18,9 +18,17 @@
 
 import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;
 
+import android.app.ActivityManagerNative;
 import android.app.admin.DevicePolicyManager;
 import android.content.ContentResolver;
 import android.content.Context;
+import android.content.res.Configuration;
+
+import android.app.ActivityManagerNative;
+import android.app.admin.DevicePolicyManager;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.res.Configuration;
 import android.database.ContentObserver;
 import android.os.Bundle;
 import android.os.Handler;
@@ -46,11 +54,15 @@
     private static final String KEY_SCREEN_TIMEOUT = "screen_timeout";
     private static final String KEY_ANIMATIONS = "animations";
     private static final String KEY_ACCELEROMETER = "accelerometer";
+    private static final String KEY_FONT_SIZE = "font_size";
 
     private ListPreference mAnimations;
     private CheckBoxPreference mAccelerometer;
     private float[] mAnimationScales;
+    private ListPreference mFontSizePref;
 
+    private final Configuration mCurConfig = new Configuration();
+    
     private IWindowManager mWindowManager;
 
     private ListPreference mScreenTimeoutPreference;
@@ -70,6 +82,12 @@
 
         addPreferencesFromResource(R.xml.display_settings);
 
+        // Fetch this once before attaching a listener for changes.
+        try {
+            mAnimationScales = mWindowManager.getAnimationScales();
+        } catch (RemoteException e) {
+            // Shouldn't happen and not much can be done anyway.
+        }
         mAnimations = (ListPreference) findPreference(KEY_ANIMATIONS);
         mAnimations.setOnPreferenceChangeListener(this);
         mAccelerometer = (CheckBoxPreference) findPreference(KEY_ACCELEROMETER);
@@ -81,22 +99,42 @@
         mScreenTimeoutPreference.setValue(String.valueOf(currentTimeout));
         mScreenTimeoutPreference.setOnPreferenceChangeListener(this);
         disableUnusableTimeouts(mScreenTimeoutPreference);
-        updateTimeoutPreferenceDescription(resolver, currentTimeout);
+        updateTimeoutPreferenceDescription(resolver, mScreenTimeoutPreference,
+                R.string.screen_timeout_summary, currentTimeout);
+
+        mFontSizePref = (ListPreference) findPreference(KEY_FONT_SIZE);
+        mFontSizePref.setOnPreferenceChangeListener(this);
     }
 
-    private void updateTimeoutPreferenceDescription(ContentResolver resolver, long currentTimeout) {
-        final CharSequence[] entries = mScreenTimeoutPreference.getEntries();
-        final CharSequence[] values = mScreenTimeoutPreference.getEntryValues();
-        int best = 0;
-        for (int i = 0; i < values.length; i++) {
-            long timeout = Long.valueOf(values[i].toString());
-            if (currentTimeout >= timeout) {
-                best = i;
+    private void updateTimeoutPreferenceDescription(
+            ContentResolver resolver,
+            ListPreference pref, 
+            int summaryStrings,
+            long currentTimeout) {
+        updateTimeoutPreferenceDescription(resolver, pref, summaryStrings, 0, currentTimeout);
+    }
+    private void updateTimeoutPreferenceDescription(
+            ContentResolver resolver,
+            ListPreference pref, 
+            int summaryStrings,
+            int zeroString,
+            long currentTimeout) {
+        String summary;
+        if (currentTimeout == 0) {
+            summary = pref.getContext().getString(zeroString);
+        } else {
+            final CharSequence[] entries = pref.getEntries();
+            final CharSequence[] values = pref.getEntryValues();
+            int best = 0;
+            for (int i = 0; i < values.length; i++) {
+                long timeout = Long.valueOf(values[i].toString());
+                if (currentTimeout >= timeout) {
+                    best = i;
+                }
             }
+            summary = pref.getContext().getString(summaryStrings, entries[best]);
         }
-        String summary = mScreenTimeoutPreference.getContext()
-                .getString(R.string.screen_timeout_summary, entries[best]);
-        mScreenTimeoutPreference.setSummary(summary);
+        pref.setSummary(summary);
     }
 
     private void disableUnusableTimeouts(ListPreference screenTimeoutPreference) {
@@ -135,6 +173,29 @@
         screenTimeoutPreference.setEnabled(revisedEntries.size() > 0);
     }
 
+    int floatToIndex(float val, int resid) {
+        String[] indices = getResources().getStringArray(resid);
+        float lastVal = Float.parseFloat(indices[0]);
+        for (int i=1; i<indices.length; i++) {
+            float thisVal = Float.parseFloat(indices[i]);
+            if (val < (lastVal + (thisVal-lastVal)*.5f)) {
+                return i-1;
+            }
+            lastVal = thisVal;
+        }
+        return indices.length-1;
+    }
+    
+    public void readFontSizePreference(ListPreference pref) {
+        try {
+            mCurConfig.updateFrom(
+                ActivityManagerNative.getDefault().getConfiguration());
+        } catch (RemoteException e) {
+        }
+        pref.setValueIndex(floatToIndex(mCurConfig.fontScale,
+                R.array.entryvalues_font_size));
+    }
+    
     @Override
     public void onResume() {
         super.onResume();
@@ -157,6 +218,7 @@
         try {
             mAnimationScales = mWindowManager.getAnimationScales();
         } catch (RemoteException e) {
+            // Shouldn't happen and not much can be done anyway.
         }
         if (mAnimationScales != null) {
             if (mAnimationScales.length >= 1) {
@@ -179,6 +241,7 @@
         mAnimations.setValueIndex(idx);
         updateAnimationsSummary(mAnimations.getValue());
         updateAccelerometerRotationCheckbox();
+        readFontSizePreference(mFontSizePref);
     }
 
     private void updateAccelerometerRotationCheckbox() {
@@ -200,6 +263,14 @@
         }
     }
 
+    public void writeFontSizePreference(Object objValue) {
+        try {
+            mCurConfig.fontScale = Float.parseFloat(objValue.toString());
+            ActivityManagerNative.getDefault().updateConfiguration(mCurConfig);
+        } catch (RemoteException e) {
+        }
+    }
+    
     @Override
     public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
         if (preference == mAccelerometer) {
@@ -207,7 +278,7 @@
                     Settings.System.ACCELEROMETER_ROTATION,
                     mAccelerometer.isChecked() ? 1 : 0);
         }
-        return true;
+        return super.onPreferenceTreeClick(preferenceScreen, preference);
     }
 
     public boolean onPreferenceChange(Preference preference, Object objValue) {
@@ -236,11 +307,15 @@
             try {
                 Settings.System.putInt(getContentResolver(),
                         SCREEN_OFF_TIMEOUT, value);
-                updateTimeoutPreferenceDescription(getContentResolver(), value);
+                updateTimeoutPreferenceDescription(getContentResolver(), mScreenTimeoutPreference,
+                        R.string.screen_timeout_summary, value);
             } catch (NumberFormatException e) {
                 Log.e(TAG, "could not persist screen timeout setting", e);
             }
         }
+        if (KEY_FONT_SIZE.equals(key)) {
+            writeFontSizePreference(objValue);
+        }
 
         return true;
     }
diff --git a/src/com/android/settings/DreamComponentPreference.java b/src/com/android/settings/DreamComponentPreference.java
new file mode 100644
index 0000000..3bc0eb4
--- /dev/null
+++ b/src/com/android/settings/DreamComponentPreference.java
@@ -0,0 +1,139 @@
+/*
+ * 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.
+ */
+
+package com.android.settings;
+
+import static android.provider.Settings.Secure.DREAM_COMPONENT;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.ComponentName;
+import android.content.ContentResolver;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.res.Resources;
+import android.preference.Preference;
+import android.provider.Settings;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.ListView;
+import android.widget.BaseAdapter;
+import android.widget.ImageView;
+import android.widget.ListAdapter;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DreamComponentPreference extends Preference {
+    private static final String TAG = "DreamComponentPreference";
+    
+    private final PackageManager pm;
+    private final ContentResolver resolver;
+
+    public DreamComponentPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        pm = getContext().getPackageManager();
+        resolver = getContext().getContentResolver();
+
+        refreshFromSettings();
+    }
+
+    private void refreshFromSettings() {
+        String component = Settings.Secure.getString(resolver, DREAM_COMPONENT);
+        if (component != null) {
+            ComponentName cn = ComponentName.unflattenFromString(component);
+            try {
+                setSummary(pm.getActivityInfo(cn, 0).loadLabel(pm));
+            } catch (PackageManager.NameNotFoundException ex) {
+                setSummary("(unknown)");
+            }
+        }
+    }
+
+    public class DreamListAdapter extends BaseAdapter implements ListAdapter {
+        private ArrayList<ResolveInfo> results;
+        private final LayoutInflater inflater;
+
+        public DreamListAdapter(Context context) {
+            Intent choosy = new Intent(Intent.ACTION_MAIN)
+                        .addCategory("android.intent.category.DREAM");
+
+            inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+            results = new ArrayList<ResolveInfo>(pm.queryIntentActivities(choosy, 0));
+        }
+
+        @Override
+        public int getCount() {
+            return results.size();
+        }
+
+        @Override
+        public Object getItem(int position) {
+            return results.get(position);
+        }
+
+        @Override
+        public long getItemId (int position) {
+            return (long) position;
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            View row = (convertView != null) 
+                ? convertView
+                : inflater.inflate(R.layout.dream_picker_row, parent, false);
+            ResolveInfo ri = results.get(position);
+            ((TextView)row.findViewById(R.id.title)).setText(ri.loadLabel(pm));
+            ((ImageView)row.findViewById(R.id.icon)).setImageDrawable(ri.loadIcon(pm));
+            return row;
+        }
+    }
+
+    @Override
+    protected void onClick() {
+        final DreamListAdapter list = new DreamListAdapter(getContext());
+        AlertDialog alert = new AlertDialog.Builder(getContext())
+            .setAdapter(
+                list,
+                new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        ResolveInfo ri = (ResolveInfo)list.getItem(which);
+                        ActivityInfo act = ri.activityInfo;
+                        ComponentName cn = new ComponentName(
+                            act.applicationInfo.packageName,
+                            act.name);
+                        Intent intent = new Intent(Intent.ACTION_MAIN).setComponent(cn);
+                        
+                        setSummary(ri.loadLabel(pm));
+                        //getContext().startActivity(intent);
+                        
+                        Settings.Secure.putString(resolver, DREAM_COMPONENT, cn.flattenToString());
+                    }
+                })
+            .create();
+        alert.show();
+    }
+}
diff --git a/src/com/android/settings/DreamSettings.java b/src/com/android/settings/DreamSettings.java
new file mode 100644
index 0000000..7ddab31
--- /dev/null
+++ b/src/com/android/settings/DreamSettings.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings;
+
+import static android.provider.Settings.Secure.DREAM_TIMEOUT;
+
+import android.app.ActivityManagerNative;
+import android.app.admin.DevicePolicyManager;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.res.Configuration;
+import android.database.ContentObserver;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.preference.CheckBoxPreference;
+import android.preference.ListPreference;
+import android.preference.Preference;
+import android.preference.PreferenceScreen;
+import android.provider.Settings;
+import android.util.Log;
+import android.view.IWindowManager;
+
+import java.util.ArrayList;
+
+public class DreamSettings extends SettingsPreferenceFragment implements
+        Preference.OnPreferenceChangeListener {
+    private static final String TAG = "DreamSettings";
+
+    private static final String KEY_DREAM_TIMEOUT = "dream_timeout";
+
+    private ListPreference mScreenTimeoutPreference;
+    private ListPreference mDreamTimeoutPreference;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        ContentResolver resolver = getActivity().getContentResolver();
+
+        addPreferencesFromResource(R.xml.dream_settings);
+
+        mDreamTimeoutPreference = (ListPreference) findPreference(KEY_DREAM_TIMEOUT);
+        final long currentSaverTimeout = Settings.Secure.getLong(resolver, DREAM_TIMEOUT,
+                0);
+        mDreamTimeoutPreference.setValue(String.valueOf(currentSaverTimeout));
+        mDreamTimeoutPreference.setOnPreferenceChangeListener(this);
+        updateTimeoutPreferenceDescription(resolver, mDreamTimeoutPreference,
+                R.string.dream_timeout_summary,
+                R.string.dream_timeout_zero_summary,
+                currentSaverTimeout);
+    }
+
+    private void updateTimeoutPreferenceDescription(
+            ContentResolver resolver,
+            ListPreference pref, 
+            int summaryStrings,
+            long currentTimeout) {
+        updateTimeoutPreferenceDescription(resolver, pref, summaryStrings, 0, currentTimeout);
+    }
+    private void updateTimeoutPreferenceDescription(
+            ContentResolver resolver,
+            ListPreference pref, 
+            int summaryStrings,
+            int zeroString,
+            long currentTimeout) {
+        String summary;
+        if (currentTimeout == 0) {
+            summary = pref.getContext().getString(zeroString);
+        } else {
+            final CharSequence[] entries = pref.getEntries();
+            final CharSequence[] values = pref.getEntryValues();
+            int best = 0;
+            for (int i = 0; i < values.length; i++) {
+                long timeout = Long.valueOf(values[i].toString());
+                if (currentTimeout >= timeout) {
+                    best = i;
+                }
+            }
+            summary = pref.getContext().getString(summaryStrings, entries[best]);
+        }
+        pref.setSummary(summary);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+    }
+
+    public boolean onPreferenceChange(Preference preference, Object objValue) {
+        final String key = preference.getKey();
+        if (KEY_DREAM_TIMEOUT.equals(key)) {
+            int value = Integer.parseInt((String) objValue);
+            try {
+                Settings.Secure.putInt(getContentResolver(),
+                        DREAM_TIMEOUT, value);
+                updateTimeoutPreferenceDescription(getContentResolver(),
+                        mDreamTimeoutPreference,
+                        R.string.dream_timeout_summary, 
+                        R.string.dream_timeout_zero_summary, 
+                        value);
+            } catch (NumberFormatException e) {
+                Log.e(TAG, "could not persist dream timeout setting", e);
+            }
+        }
+
+        return true;
+    }
+}
diff --git a/src/com/android/settings/DreamTesterPreference.java b/src/com/android/settings/DreamTesterPreference.java
new file mode 100644
index 0000000..7ff5667
--- /dev/null
+++ b/src/com/android/settings/DreamTesterPreference.java
@@ -0,0 +1,75 @@
+/*
+ * 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.
+ */
+
+package com.android.settings;
+
+import static android.provider.Settings.Secure.DREAM_COMPONENT;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.ComponentName;
+import android.content.ContentResolver;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.res.Resources;
+import android.preference.Preference;
+import android.provider.Settings;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.ListView;
+import android.widget.BaseAdapter;
+import android.widget.ImageView;
+import android.widget.ListAdapter;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DreamTesterPreference extends Preference {
+    private static final String TAG = "DreamTesterPreference";
+    
+    private final PackageManager pm;
+    private final ContentResolver resolver;
+
+    public DreamTesterPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        pm = getContext().getPackageManager();
+        resolver = getContext().getContentResolver();
+    }
+
+    @Override
+    protected void onClick() {
+        String component = Settings.Secure.getString(resolver, DREAM_COMPONENT);
+        if (component != null) {
+            ComponentName cn = ComponentName.unflattenFromString(component);
+            Intent intent = new Intent(Intent.ACTION_MAIN)
+                .setComponent(cn)
+                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
+                    | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS
+                    | Intent.FLAG_ACTIVITY_SINGLE_TOP)
+                .putExtra("android.dreams.TEST", true);
+            getContext().startActivity(intent);
+        }
+    }
+}
diff --git a/src/com/android/settings/RadioInfo.java b/src/com/android/settings/RadioInfo.java
index ba07fb5..d45616e 100644
--- a/src/com/android/settings/RadioInfo.java
+++ b/src/com/android/settings/RadioInfo.java
@@ -24,11 +24,11 @@
 import android.content.res.Resources;
 import android.net.ConnectivityManager;
 import android.net.LinkProperties;
+import android.net.TrafficStats;
 import android.net.Uri;
 import android.os.AsyncResult;
 import android.os.Bundle;
 import android.os.Handler;
-import android.os.INetStatService;
 import android.os.Message;
 import android.os.RemoteException;
 import android.os.ServiceManager;
@@ -133,7 +133,6 @@
     private TelephonyManager mTelephonyManager;
     private Phone phone = null;
     private PhoneStateIntentReceiver mPhoneStateReceiver;
-    private INetStatService netstat;
 
     private String mPingIpAddrResult;
     private String mPingHostnameResult;
@@ -311,8 +310,6 @@
         phone.getNeighboringCids(
                 mHandler.obtainMessage(EVENT_QUERY_NEIGHBORING_CIDS_DONE));
 
-        netstat = INetStatService.Stub.asInterface(ServiceManager.getService("netstat"));
-
         CellLocation.requestLocationUpdate();
     }
 
@@ -625,19 +622,16 @@
     private final void updateDataStats2() {
         Resources r = getResources();
 
-        try {
-            long txPackets = netstat.getMobileTxPackets();
-            long rxPackets = netstat.getMobileRxPackets();
-            long txBytes   = netstat.getMobileTxBytes();
-            long rxBytes   = netstat.getMobileRxBytes();
+        long txPackets = TrafficStats.getMobileTxPackets();
+        long rxPackets = TrafficStats.getMobileRxPackets();
+        long txBytes   = TrafficStats.getMobileTxBytes();
+        long rxBytes   = TrafficStats.getMobileRxBytes();
 
-            String packets = r.getString(R.string.radioInfo_display_packets);
-            String bytes   = r.getString(R.string.radioInfo_display_bytes);
+        String packets = r.getString(R.string.radioInfo_display_packets);
+        String bytes   = r.getString(R.string.radioInfo_display_bytes);
 
-            sent.setText(txPackets + " " + packets + ", " + txBytes + " " + bytes);
-            received.setText(rxPackets + " " + packets + ", " + rxBytes + " " + bytes);
-        } catch (RemoteException e) {
-        }
+        sent.setText(txPackets + " " + packets + ", " + txBytes + " " + bytes);
+        received.setText(rxPackets + " " + packets + ", " + rxBytes + " " + bytes);
     }
 
     /**
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index dc4c42b..5d77e53 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -70,7 +70,6 @@
     // Misc Settings
     private static final String KEY_SIM_LOCK = "sim_lock";
     private static final String KEY_SHOW_PASSWORD = "show_password";
-    private static final String KEY_ENABLE_CREDENTIALS = "enable_credentials";
     private static final String KEY_RESET_CREDENTIALS = "reset_credentials";
 
     private static final String TAG = "SecuritySettings";
@@ -98,7 +97,6 @@
 
     private CheckBoxPreference mShowPassword;
 
-    private CheckBoxPreference mEnableCredentials;
     private Preference mResetCredentials;
 
     @Override
@@ -239,8 +237,6 @@
         mShowPassword = (CheckBoxPreference) root.findPreference(KEY_SHOW_PASSWORD);
 
         // Credential storage
-        mEnableCredentials = (CheckBoxPreference) root.findPreference(KEY_ENABLE_CREDENTIALS);
-        mEnableCredentials.setOnPreferenceChangeListener(this);
         mResetCredentials = root.findPreference(KEY_RESET_CREDENTIALS);
 
         return root;
@@ -337,10 +333,8 @@
         mShowPassword.setChecked(Settings.System.getInt(getContentResolver(),
                 Settings.System.TEXT_SHOW_PASSWORD, 1) != 0);
 
-        int state = KeyStore.getInstance().test();
-        mEnableCredentials.setChecked(state == KeyStore.NO_ERROR);
-        mEnableCredentials.setEnabled(state != KeyStore.UNINITIALIZED);
-        mResetCredentials.setEnabled(state != KeyStore.UNINITIALIZED);
+        KeyStore.State state = KeyStore.getInstance().state();
+        mResetCredentials.setEnabled(state != KeyStore.State.UNINITIALIZED);
     }
 
     @Override
@@ -430,13 +424,6 @@
             // activity will be restated and the new value re-read, so the checkbox will get its
             // new value then.
             return false;
-        } else if (preference == mEnableCredentials) {
-            if (value != null && (Boolean) value) {
-                getActivity().startActivity(new Intent(CredentialStorage.ACTION_UNLOCK));
-                return false;
-            } else {
-                KeyStore.getInstance().lock();
-            }
         }
         return true;
     }
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 2532747..6d314ac 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -229,6 +229,15 @@
         return super.onGetInitialHeader();
     }
 
+    @Override
+    public Intent onBuildStartFragmentIntent(String fragmentName, Bundle args,
+            int titleRes, int shortTitleRes) {
+        Intent intent = super.onBuildStartFragmentIntent(fragmentName, args,
+                titleRes, shortTitleRes);
+        intent.setClass(this, SubSettings.class);
+        return intent;
+    }
+    
     /**
      * Populate the activity with the top-level headers.
      */
@@ -334,4 +343,5 @@
     public static class AccountSyncSettingsInAddAccountActivity extends Settings { }
     public static class CryptKeeperSettingsActivity extends Settings { }
     public static class DeviceAdminSettingsActivity extends Settings { }
+    public static class DataUsageSummaryActivity extends Settings { }
 }
diff --git a/src/com/android/settings/SettingsCheckBoxPreference.java b/src/com/android/settings/SettingsCheckBoxPreference.java
new file mode 100644
index 0000000..6acdfe8
--- /dev/null
+++ b/src/com/android/settings/SettingsCheckBoxPreference.java
@@ -0,0 +1,91 @@
+/*
+ * 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.
+ */
+
+package com.android.settings;
+
+import android.content.Context;
+import android.content.Intent;
+import android.preference.CheckBoxPreference;
+import android.util.TypedValue;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.CheckBox;
+import android.widget.ImageView;
+
+/**
+ * CheckBox preference that optionally shows an icon for launching a settings
+ * {@link android.app.Activity}. The settings activity, if intent for launching
+ * it was provided, can be stared only if the CheckBox in is checked.
+ */
+public class SettingsCheckBoxPreference extends CheckBoxPreference {
+
+    // Integer.MIN_VALUE means not initalized
+    private static int sDimAlpha = Integer.MIN_VALUE;
+
+    private final Intent mSettingsIntent;
+
+    /**
+     * Creates a new instance.
+     *
+     * @param context Context for accessing resources.
+     * @param settingsIntent Intent to use as settings for the item represented by
+     *        this preference. Pass <code>null</code> if there is no associated 
+     *        settings activity.
+     */
+    public SettingsCheckBoxPreference(Context context, Intent settingsIntent) {
+        super(context);
+
+        if (sDimAlpha == Integer.MIN_VALUE) {
+            TypedValue outValue = new TypedValue();
+            context.getTheme().resolveAttribute(android.R.attr.disabledAlpha, outValue, true);
+            sDimAlpha = (int) (outValue.getFloat() * 255);
+        }
+
+        mSettingsIntent = settingsIntent;
+        setWidgetLayoutResource(R.layout.preference_settings_checkbox_widget);
+    }
+
+    @Override
+    protected void onBindView(View view) {
+        super.onBindView(view);
+
+        ImageView settingsButton = (ImageView) view.findViewById(R.id.settings_button);
+        if (settingsButton == null) {
+            return;
+        }
+        if (mSettingsIntent != null) {
+            CheckBox checkbox = (CheckBox) view.findViewById(com.android.internal.R.id.checkbox);
+            if (checkbox == null) {
+                return;
+            }
+            if (checkbox.isChecked()) {
+                settingsButton.setOnClickListener(new OnClickListener() {
+                    public void onClick(View view) {
+                        getContext().startActivity(mSettingsIntent);
+                    }
+                });
+            }
+            settingsButton.setVisibility(View.VISIBLE);
+            if (checkbox.isChecked() && isEnabled()) {
+                settingsButton.setAlpha(255);
+            } else {
+                settingsButton.setAlpha(sDimAlpha);
+            }
+        } else {
+            settingsButton.setVisibility(View.GONE);
+        }
+    }
+}
diff --git a/src/com/android/settings/SettingsLicenseActivity.java b/src/com/android/settings/SettingsLicenseActivity.java
index 99828ce..2960180 100644
--- a/src/com/android/settings/SettingsLicenseActivity.java
+++ b/src/com/android/settings/SettingsLicenseActivity.java
@@ -21,7 +21,6 @@
 import android.os.Message;
 import android.os.SystemProperties;
 import android.text.TextUtils;
-import android.util.Config;
 import android.util.Log;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
@@ -46,7 +45,7 @@
 public class SettingsLicenseActivity extends Activity {
 
     private static final String TAG = "SettingsLicenseActivity";
-    private static final boolean LOGV = false || Config.LOGV;
+    private static final boolean LOGV = false || false;
 
     private static final String DEFAULT_LICENSE_PATH = "/system/etc/NOTICE.html.gz";
     private static final String PROPERTY_LICENSE_PATH = "ro.config.license_path";
diff --git a/src/com/android/settings/SubSettings.java b/src/com/android/settings/SubSettings.java
new file mode 100644
index 0000000..9cd3c31
--- /dev/null
+++ b/src/com/android/settings/SubSettings.java
@@ -0,0 +1,24 @@
+/*
+ * 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.
+ */
+
+package com.android.settings;
+
+/**
+ * Stub class for showing sub-settings; we can't use the main Settings class
+ * since for our app it is a special singleTask class.
+ */
+public class SubSettings extends Settings {
+}
diff --git a/src/com/android/settings/TestingSettingsBroadcastReceiver.java b/src/com/android/settings/TestingSettingsBroadcastReceiver.java
index c6cd7e1..cea12c5 100644
--- a/src/com/android/settings/TestingSettingsBroadcastReceiver.java
+++ b/src/com/android/settings/TestingSettingsBroadcastReceiver.java
@@ -6,7 +6,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.BroadcastReceiver;
-import android.util.Config;
 import android.util.Log;
 import android.view.KeyEvent;
 
diff --git a/src/com/android/settings/TextToSpeechSettings.java b/src/com/android/settings/TextToSpeechSettings.java
index 62edac9..1a63272 100644
--- a/src/com/android/settings/TextToSpeechSettings.java
+++ b/src/com/android/settings/TextToSpeechSettings.java
@@ -24,25 +24,23 @@
 import static android.provider.Settings.Secure.TTS_ENABLED_PLUGINS;
 import static android.provider.Settings.Secure.TTS_USE_DEFAULTS;
 
-import android.app.Activity;
 import android.app.AlertDialog;
+import android.content.ActivityNotFoundException;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
 import android.os.Bundle;
 import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
-import android.preference.PreferenceGroup;
-import android.preference.PreferenceScreen;
 import android.preference.Preference.OnPreferenceClickListener;
+import android.preference.PreferenceGroup;
 import android.provider.Settings;
 import android.provider.Settings.SettingNotFoundException;
 import android.speech.tts.TextToSpeech;
+import android.text.TextUtils;
 import android.util.Log;
 
 import java.util.ArrayList;
@@ -54,9 +52,9 @@
         Preference.OnPreferenceChangeListener, Preference.OnPreferenceClickListener,
         TextToSpeech.OnInitListener {
 
+    private static final boolean DBG = true;
     private static final String TAG = "TextToSpeechSettings";
 
-    private static final String SYSTEM_TTS = "com.svox.pico";
     private static final String KEY_TTS_PLAY_EXAMPLE = "tts_play_example";
     private static final String KEY_TTS_INSTALL_DATA = "tts_install_data";
     private static final String KEY_TTS_USE_DEFAULT = "toggle_use_default_tts_settings";
@@ -65,6 +63,7 @@
     private static final String KEY_TTS_DEFAULT_COUNTRY = "tts_default_country";
     private static final String KEY_TTS_DEFAULT_VARIANT = "tts_default_variant";
     private static final String KEY_TTS_DEFAULT_SYNTH = "tts_default_synth";
+    private static final String KEY_TTS_ENGINES = "tts_engines_section";
 
     private static final String KEY_PLUGIN_ENABLED_PREFIX = "ENABLED_";
     private static final String KEY_PLUGIN_SETTINGS_PREFIX = "SETTINGS_";
@@ -76,19 +75,17 @@
 
     private static final String LOCALE_DELIMITER = "-";
 
-    private static final String FALLBACK_TTS_DEFAULT_SYNTH =
-            TextToSpeech.Engine.DEFAULT_SYNTH;
-
     private Preference         mPlayExample = null;
     private Preference         mInstallData = null;
     private CheckBoxPreference mUseDefaultPref = null;
     private ListPreference     mDefaultRatePref = null;
     private ListPreference     mDefaultLocPref = null;
     private ListPreference     mDefaultSynthPref = null;
+    private PreferenceGroup    mEnginesGroup;
+
     private String             mDefaultLanguage = null;
     private String             mDefaultCountry = null;
     private String             mDefaultLocVariant = null;
-    private String             mDefaultEng = "";
     private int                mDefaultRate = TextToSpeech.Engine.DEFAULT_RATE;
 
     // Index of the current string to use for the demo.
@@ -112,10 +109,7 @@
         super.onCreate(savedInstanceState);
         addPreferencesFromResource(R.xml.tts_settings);
 
-        final Activity activity = getActivity();
-        addEngineSpecificSettings(activity);
-
-        activity.setVolumeControlStream(TextToSpeech.Engine.DEFAULT_STREAM);
+        getActivity().setVolumeControlStream(TextToSpeech.Engine.DEFAULT_STREAM);
 
         mEnableDemo = false;
         mTtsStarted = false;
@@ -125,10 +119,24 @@
         mDefaultCountry = currentLocale.getISO3Country();
         mDefaultLocVariant = currentLocale.getVariant();
 
-        mTts = new TextToSpeech(activity, this);
-        initClickers();
-    }
+        mPlayExample = findPreference(KEY_TTS_PLAY_EXAMPLE);
+        mPlayExample.setOnPreferenceClickListener(this);
 
+        mInstallData = findPreference(KEY_TTS_INSTALL_DATA);
+        mInstallData.setOnPreferenceClickListener(this);
+
+        mUseDefaultPref = (CheckBoxPreference) findPreference(KEY_TTS_USE_DEFAULT);
+        mDefaultSynthPref = (ListPreference) findPreference(KEY_TTS_DEFAULT_SYNTH);
+        mDefaultRatePref = (ListPreference) findPreference(KEY_TTS_DEFAULT_RATE);
+        mDefaultLocPref = (ListPreference) findPreference(KEY_TTS_DEFAULT_LANG);
+
+        mEnginesGroup = (PreferenceGroup) findPreference(KEY_TTS_ENGINES);
+
+        mTts = new TextToSpeech(getActivity().getApplicationContext(), this);
+
+        initDefaultSettings();
+        addEngineSpecificSettings();
+    }
 
     @Override
     public void onStart() {
@@ -142,7 +150,6 @@
         }
     }
 
-
     @Override
     public void onDestroy() {
         super.onDestroy();
@@ -165,64 +172,53 @@
         }
     }
 
-    private void addEngineSpecificSettings(Context context) {
-        PreferenceGroup enginesCategory = (PreferenceGroup) findPreference("tts_engines_section");
-        Intent intent = new Intent("android.intent.action.START_TTS_ENGINE");
-        ResolveInfo[] enginesArray = new ResolveInfo[0];
-        PackageManager pm = getPackageManager();
-        enginesArray = pm.queryIntentActivities(intent, 0).toArray(enginesArray);
-        for (int i = 0; i < enginesArray.length; i++) {
+    private void addEngineSpecificSettings() {
+        Context context = getActivity();
+        List<TextToSpeech.EngineInfo> engines = mTts.getEngines();
+        for (TextToSpeech.EngineInfo engine : engines) {
             String prefKey = "";
-            final String pluginPackageName = enginesArray[i].activityInfo.packageName;
-            if (!enginesArray[i].activityInfo.packageName.equals(SYSTEM_TTS)) {
-                CheckBoxPreference chkbxPref = new CheckBoxPreference(context);
-                prefKey = KEY_PLUGIN_ENABLED_PREFIX + pluginPackageName;
-                chkbxPref.setKey(prefKey);
-                chkbxPref.setTitle(enginesArray[i].loadLabel(pm));
-                enginesCategory.addPreference(chkbxPref);
+            final String engineName = engine.name;
+            if (!engineName.equals(TextToSpeech.Engine.DEFAULT_ENGINE)) {
+                CheckBoxPreference enablePref = new CheckBoxPreference(context);
+                prefKey = KEY_PLUGIN_ENABLED_PREFIX + engineName;
+                enablePref.setKey(prefKey);
+                enablePref.setTitle(engine.label);
+                enablePref.setOnPreferenceClickListener(this);
+                mEnginesGroup.addPreference(enablePref);
             }
-            if (pluginHasSettings(pluginPackageName)) {
+            if (engineHasSettings(engineName)) {
                 Preference pref = new Preference(context);
-                prefKey = KEY_PLUGIN_SETTINGS_PREFIX + pluginPackageName;
+                prefKey = KEY_PLUGIN_SETTINGS_PREFIX + engineName;
                 pref.setKey(prefKey);
-                pref.setTitle(enginesArray[i].loadLabel(pm));
+                pref.setTitle(engine.label);
                 CharSequence settingsLabel = getResources().getString(
-                        R.string.tts_engine_name_settings, enginesArray[i].loadLabel(pm));
+                        R.string.tts_engine_name_settings, engine.label);
                 pref.setSummary(settingsLabel);
-                pref.setOnPreferenceClickListener(new OnPreferenceClickListener(){
-                            public boolean onPreferenceClick(Preference preference){
+                // TODO: Add a new API for this.
+                pref.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+                            public boolean onPreferenceClick(Preference preference) {
                                 Intent i = new Intent();
-                                i.setClassName(pluginPackageName,
-                                        pluginPackageName + ".EngineSettings");
+                                i.setClassName(engineName,
+                                        engineName + ".EngineSettings");
                                 startActivity(i);
                                 return true;
                             }
                         });
-                enginesCategory.addPreference(pref);
+                mEnginesGroup.addPreference(pref);
             }
         }
     }
 
-    private boolean pluginHasSettings(String pluginPackageName) {
+    private boolean engineHasSettings(String enginePackageName) {
         PackageManager pm = getPackageManager();
         Intent i = new Intent();
-        i.setClassName(pluginPackageName, pluginPackageName + ".EngineSettings");
+        i.setClassName(enginePackageName, enginePackageName + ".EngineSettings");
         if (pm.resolveActivity(i, PackageManager.MATCH_DEFAULT_ONLY) != null){
             return true;
         }
         return false;
     }
 
-
-    private void initClickers() {
-        mPlayExample = findPreference(KEY_TTS_PLAY_EXAMPLE);
-        mPlayExample.setOnPreferenceClickListener(this);
-
-        mInstallData = findPreference(KEY_TTS_INSTALL_DATA);
-        mInstallData.setOnPreferenceClickListener(this);
-    }
-
-
     private void initDefaultSettings() {
         ContentResolver resolver = getContentResolver();
 
@@ -230,32 +226,16 @@
         // settings if they are not found.
 
         // "Use Defaults"
-        int useDefault = 0;
-        mUseDefaultPref = (CheckBoxPreference) findPreference(KEY_TTS_USE_DEFAULT);
-        try {
-            useDefault = Settings.Secure.getInt(resolver, TTS_USE_DEFAULTS);
-        } catch (SettingNotFoundException e) {
-            // "use default" setting not found, initialize it
-            useDefault = TextToSpeech.Engine.USE_DEFAULTS;
-            Settings.Secure.putInt(resolver, TTS_USE_DEFAULTS, useDefault);
-        }
+        int useDefault = Settings.Secure.getInt(resolver, TTS_USE_DEFAULTS,
+                TextToSpeech.Engine.USE_DEFAULTS);
         mUseDefaultPref.setChecked(useDefault == 1);
         mUseDefaultPref.setOnPreferenceChangeListener(this);
 
         // Default synthesis engine
-        mDefaultSynthPref = (ListPreference) findPreference(KEY_TTS_DEFAULT_SYNTH);
         loadEngines();
         mDefaultSynthPref.setOnPreferenceChangeListener(this);
-        String engine = Settings.Secure.getString(resolver, TTS_DEFAULT_SYNTH);
-        if (engine == null) {
-            // TODO move FALLBACK_TTS_DEFAULT_SYNTH to TextToSpeech
-            engine = FALLBACK_TTS_DEFAULT_SYNTH;
-            Settings.Secure.putString(resolver, TTS_DEFAULT_SYNTH, engine);
-        }
-        mDefaultEng = engine;
 
         // Default rate
-        mDefaultRatePref = (ListPreference) findPreference(KEY_TTS_DEFAULT_RATE);
         try {
             mDefaultRate = Settings.Secure.getInt(resolver, TTS_DEFAULT_RATE);
         } catch (SettingNotFoundException e) {
@@ -265,34 +245,27 @@
         }
         mDefaultRatePref.setValue(String.valueOf(mDefaultRate));
         mDefaultRatePref.setOnPreferenceChangeListener(this);
-        // apply the default rate so the TTS demo in the Settings screen uses it, even if
-        // the use of default settings is not enforced
-        mTts.setSpeechRate(mDefaultRate/100.0f);
 
         // Default language / country / variant : these three values map to a single ListPref
         // representing the matching Locale
-        mDefaultLocPref = (ListPreference) findPreference(KEY_TTS_DEFAULT_LANG);
         initDefaultLang();
         mDefaultLocPref.setOnPreferenceChangeListener(this);
     }
 
-
     /**
      * Ask the current default engine to launch the matching CHECK_TTS_DATA activity
      * to check the required TTS files are properly installed.
      */
     private void checkVoiceData() {
-        PackageManager pm = getPackageManager();
-        Intent intent = new Intent();
-        intent.setAction(TextToSpeech.Engine.ACTION_CHECK_TTS_DATA);
-        List<ResolveInfo> resolveInfos = pm.queryIntentActivities(intent, 0);
-        // query only the package that matches that of the default engine
-        for (int i = 0; i < resolveInfos.size(); i++) {
-            ActivityInfo currentActivityInfo = resolveInfos.get(i).activityInfo;
-            if (mDefaultEng.equals(currentActivityInfo.packageName)) {
-                intent.setClassName(mDefaultEng, currentActivityInfo.name);
-                this.startActivityForResult(intent, VOICE_DATA_INTEGRITY_CHECK);
-            }
+        String defaultEngine = mTts.getDefaultEngine();
+        if (TextUtils.isEmpty(defaultEngine)) return;
+        Intent intent = new Intent(TextToSpeech.Engine.ACTION_CHECK_TTS_DATA);
+        intent.setPackage(defaultEngine);
+        try {
+            Log.v(TAG, "Checking voice data: " + intent.toUri(0));
+            startActivityForResult(intent, VOICE_DATA_INTEGRITY_CHECK);
+        } catch (ActivityNotFoundException ex) {
+            Log.e(TAG, "Failed to check TTS data, no acitivty found for " + intent + ")");
         }
     }
 
@@ -302,18 +275,16 @@
      * so the required TTS files are properly installed.
      */
     private void installVoiceData() {
-        PackageManager pm = getPackageManager();
-        Intent intent = new Intent();
-        intent.setAction(TextToSpeech.Engine.ACTION_INSTALL_TTS_DATA);
+        String defaultEngine = mTts.getDefaultEngine();
+        if (TextUtils.isEmpty(defaultEngine)) return;
+        Intent intent = new Intent(TextToSpeech.Engine.ACTION_INSTALL_TTS_DATA);
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        List<ResolveInfo> resolveInfos = pm.queryIntentActivities(intent, 0);
-        // query only the package that matches that of the default engine
-        for (int i = 0; i < resolveInfos.size(); i++) {
-            ActivityInfo currentActivityInfo = resolveInfos.get(i).activityInfo;
-            if (mDefaultEng.equals(currentActivityInfo.packageName)) {
-                intent.setClassName(mDefaultEng, currentActivityInfo.name);
-                this.startActivity(intent);
-            }
+        intent.setPackage(defaultEngine);
+        try {
+            Log.v(TAG, "Installing voice data: " + intent.toUri(0));
+            startActivity(intent);
+        } catch (ActivityNotFoundException ex) {
+            Log.e(TAG, "Failed to install TTS data, no acitivty found for " + intent + ")");
         }
     }
 
@@ -322,26 +293,21 @@
      * spoken to the user.
      */
     private void getSampleText() {
-        PackageManager pm = getPackageManager();
-        Intent intent = new Intent();
-        // TODO (clchen): Replace Intent string with the actual
-        // Intent defined in the list of platform Intents.
-        intent.setAction("android.speech.tts.engine.GET_SAMPLE_TEXT");
+        String defaultEngine = mTts.getDefaultEngine();
+        if (TextUtils.isEmpty(defaultEngine)) return;
+        Intent intent = new Intent(TextToSpeech.Engine.ACTION_GET_SAMPLE_TEXT);
         intent.putExtra("language", mDefaultLanguage);
         intent.putExtra("country", mDefaultCountry);
         intent.putExtra("variant", mDefaultLocVariant);
-        List<ResolveInfo> resolveInfos = pm.queryIntentActivities(intent, 0);
-        // query only the package that matches that of the default engine
-        for (int i = 0; i < resolveInfos.size(); i++) {
-            ActivityInfo currentActivityInfo = resolveInfos.get(i).activityInfo;
-            if (mDefaultEng.equals(currentActivityInfo.packageName)) {
-                intent.setClassName(mDefaultEng, currentActivityInfo.name);
-                this.startActivityForResult(intent, GET_SAMPLE_TEXT);
-            }
+        intent.setPackage(defaultEngine);
+        try {
+            Log.v(TAG, "Getting sample text: " + intent.toUri(0));
+            startActivityForResult(intent, GET_SAMPLE_TEXT);
+        } catch (ActivityNotFoundException ex) {
+            Log.e(TAG, "Failed to get sample text, no acitivty found for " + intent + ")");
         }
     }
 
-
     /**
      * Called when the TTS engine is initialized.
      */
@@ -358,7 +324,6 @@
                 mDefaultLocVariant = new String();
             }
             mTts.setLanguage(new Locale(mDefaultLanguage, mDefaultCountry, mDefaultLocVariant));
-            initDefaultSettings();
             updateWidgetState();
             checkVoiceData();
             mTtsStarted = true;
@@ -370,142 +335,155 @@
         updateWidgetState();
     }
 
-
     /**
      * Called when voice data integrity check returns
      */
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (requestCode == VOICE_DATA_INTEGRITY_CHECK) {
-            if (data == null){
-                // The CHECK_TTS_DATA activity for the plugin did not run properly;
-                // disable the preview and install controls and return.
-                mEnableDemo = false;
-                mVoicesMissing = false;
-                updateWidgetState();
-                return;
-            }
-            ArrayList<String> available =
-                    data.getStringArrayListExtra(TextToSpeech.Engine.EXTRA_AVAILABLE_VOICES);
-            ArrayList<String> unavailable =
-                    data.getStringArrayListExtra(TextToSpeech.Engine.EXTRA_UNAVAILABLE_VOICES);
-            if ((available == null) || (unavailable == null)){
-                // The CHECK_TTS_DATA activity for the plugin did not run properly;
-                // disable the preview and install controls and return.
-                mEnableDemo = false;
-                mVoicesMissing = false;
-                updateWidgetState();
-                return;
-            }
-            if (available.size() > 0){
-                if (mTts == null) {
-                    mTts = new TextToSpeech(getActivity(), this);
-                }
-                ListPreference ttsLanguagePref =
-                        (ListPreference) findPreference("tts_default_lang");
-                CharSequence[] entries = new CharSequence[available.size()];
-                CharSequence[] entryValues = new CharSequence[available.size()];
-                int selectedLanguageIndex = -1;
-                String selectedLanguagePref = mDefaultLanguage;
-                if (mDefaultCountry.length() > 0) {
-                    selectedLanguagePref = selectedLanguagePref + LOCALE_DELIMITER +
-                            mDefaultCountry;
-                }
-                if (mDefaultLocVariant.length() > 0) {
-                    selectedLanguagePref = selectedLanguagePref + LOCALE_DELIMITER +
-                            mDefaultLocVariant;
-                }
-                for (int i = 0; i < available.size(); i++) {
-                    String[] langCountryVariant = available.get(i).split("-");
-                    Locale loc = null;
-                    if (langCountryVariant.length == 1){
-                        loc = new Locale(langCountryVariant[0]);
-                    } else if (langCountryVariant.length == 2){
-                        loc = new Locale(langCountryVariant[0], langCountryVariant[1]);
-                    } else if (langCountryVariant.length == 3){
-                        loc = new Locale(langCountryVariant[0], langCountryVariant[1],
-                                         langCountryVariant[2]);
-                    }
-                    if (loc != null){
-                        entries[i] = loc.getDisplayName();
-                        entryValues[i] = available.get(i);
-                        if (entryValues[i].equals(selectedLanguagePref)) {
-                            selectedLanguageIndex = i;
-                        }
-                    }
-                }
-                ttsLanguagePref.setEntries(entries);
-                ttsLanguagePref.setEntryValues(entryValues);
-                if (selectedLanguageIndex > -1) {
-                    ttsLanguagePref.setValueIndex(selectedLanguageIndex);
-                }
-                mEnableDemo = true;
-                // Make sure that the default language can be used.
-                int languageResult = mTts.setLanguage(
-                        new Locale(mDefaultLanguage, mDefaultCountry, mDefaultLocVariant));
-                if (languageResult < TextToSpeech.LANG_AVAILABLE){
-                    Locale currentLocale = Locale.getDefault();
-                    mDefaultLanguage = currentLocale.getISO3Language();
-                    mDefaultCountry = currentLocale.getISO3Country();
-                    mDefaultLocVariant = currentLocale.getVariant();
-                    languageResult = mTts.setLanguage(
-                            new Locale(mDefaultLanguage, mDefaultCountry, mDefaultLocVariant));
-                    // If the default Locale isn't supported, just choose the first available
-                    // language so that there is at least something.
-                    if (languageResult < TextToSpeech.LANG_AVAILABLE){
-                        parseLocaleInfo(ttsLanguagePref.getEntryValues()[0].toString());
-                        mTts.setLanguage(
-                                new Locale(mDefaultLanguage, mDefaultCountry, mDefaultLocVariant));
-                    }
-                    ContentResolver resolver = getContentResolver();
-                    Settings.Secure.putString(resolver, TTS_DEFAULT_LANG, mDefaultLanguage);
-                    Settings.Secure.putString(resolver, TTS_DEFAULT_COUNTRY, mDefaultCountry);
-                    Settings.Secure.putString(resolver, TTS_DEFAULT_VARIANT, mDefaultLocVariant);
-                }
-            } else {
-                mEnableDemo = false;
-            }
-
-            if (unavailable.size() > 0){
-                mVoicesMissing = true;
-            } else {
-                mVoicesMissing = false;
-            }
-
-            updateWidgetState();
+            onVoiceDataIntegrityCheckDone(data);
         } else if (requestCode == GET_SAMPLE_TEXT) {
-            if (resultCode == TextToSpeech.LANG_AVAILABLE) {
-                String sample = getActivity().getString(R.string.tts_demo);
-                if ((data != null) && (data.getStringExtra("sampleText") != null)) {
-                    sample = data.getStringExtra("sampleText");
-                }
-                if (mTts != null) {
-                    mTts.speak(sample, TextToSpeech.QUEUE_FLUSH, null);
-                }
-            } else {
-                // TODO: Display an error here to the user.
-                Log.e(TAG, "Did not have a sample string for the requested language");
+            onSampleTextReceived(resultCode, data);
+        }
+    }
+
+    private void onVoiceDataIntegrityCheckDone(Intent data) {
+        if (data == null){
+            Log.e(TAG, "TTS data check failed data = null");
+            // The CHECK_TTS_DATA activity for the plugin did not run properly;
+            // disable the preview and install controls and return.
+            mEnableDemo = false;
+            mVoicesMissing = false;
+            updateWidgetState();
+            return;
+        }
+        Log.v(TAG, "TTS data check completed, data = " + data.toUri(0));
+        ArrayList<String> available =
+                data.getStringArrayListExtra(TextToSpeech.Engine.EXTRA_AVAILABLE_VOICES);
+        ArrayList<String> unavailable =
+                data.getStringArrayListExtra(TextToSpeech.Engine.EXTRA_UNAVAILABLE_VOICES);
+        if (available == null || unavailable == null){
+            Log.e(TAG, "TTS data check failed (available == == null)");
+            // The CHECK_TTS_DATA activity for the plugin did not run properly;
+            // disable the preview and install controls and return.
+            mEnableDemo = false;
+            mVoicesMissing = false;
+            updateWidgetState();
+            return;
+        }
+        if (available.size() > 0){
+            if (mTts == null) {
+                mTts = new TextToSpeech(getActivity(), this);
             }
+
+            updateDefaultLocPref(available);
+
+            mEnableDemo = true;
+            // Make sure that the default language can be used.
+            int languageResult = mTts.setLanguage(
+                    new Locale(mDefaultLanguage, mDefaultCountry, mDefaultLocVariant));
+            if (languageResult < TextToSpeech.LANG_AVAILABLE){
+                Locale currentLocale = Locale.getDefault();
+                mDefaultLanguage = currentLocale.getISO3Language();
+                mDefaultCountry = currentLocale.getISO3Country();
+                mDefaultLocVariant = currentLocale.getVariant();
+                languageResult = mTts.setLanguage(
+                        new Locale(mDefaultLanguage, mDefaultCountry, mDefaultLocVariant));
+                // If the default Locale isn't supported, just choose the first available
+                // language so that there is at least something.
+                if (languageResult < TextToSpeech.LANG_AVAILABLE){
+                    parseLocaleInfo(mDefaultLocPref.getEntryValues()[0].toString());
+                    mTts.setLanguage(
+                            new Locale(mDefaultLanguage, mDefaultCountry, mDefaultLocVariant));
+                }
+                ContentResolver resolver = getContentResolver();
+                Settings.Secure.putString(resolver, TTS_DEFAULT_LANG, mDefaultLanguage);
+                Settings.Secure.putString(resolver, TTS_DEFAULT_COUNTRY, mDefaultCountry);
+                Settings.Secure.putString(resolver, TTS_DEFAULT_VARIANT, mDefaultLocVariant);
+            }
+        } else {
+            mEnableDemo = false;
+        }
+
+        if (unavailable.size() > 0){
+            mVoicesMissing = true;
+        } else {
+            mVoicesMissing = false;
+        }
+
+        updateWidgetState();
+    }
+
+    private void updateDefaultLocPref(ArrayList<String> availableLangs) {
+        CharSequence[] entries = new CharSequence[availableLangs.size()];
+        CharSequence[] entryValues = new CharSequence[availableLangs.size()];
+        int selectedLanguageIndex = -1;
+        String selectedLanguagePref = mDefaultLanguage;
+        if (mDefaultCountry.length() > 0) {
+            selectedLanguagePref = selectedLanguagePref + LOCALE_DELIMITER +
+                    mDefaultCountry;
+        }
+        if (mDefaultLocVariant.length() > 0) {
+            selectedLanguagePref = selectedLanguagePref + LOCALE_DELIMITER +
+                    mDefaultLocVariant;
+        }
+        for (int i = 0; i < availableLangs.size(); i++) {
+            String[] langCountryVariant = availableLangs.get(i).split("-");
+            Locale loc = null;
+            if (langCountryVariant.length == 1){
+                loc = new Locale(langCountryVariant[0]);
+            } else if (langCountryVariant.length == 2){
+                loc = new Locale(langCountryVariant[0], langCountryVariant[1]);
+            } else if (langCountryVariant.length == 3){
+                loc = new Locale(langCountryVariant[0], langCountryVariant[1],
+                                 langCountryVariant[2]);
+            }
+            if (loc != null){
+                entries[i] = loc.getDisplayName();
+                entryValues[i] = availableLangs.get(i);
+                if (entryValues[i].equals(selectedLanguagePref)) {
+                    selectedLanguageIndex = i;
+                }
+            }
+        }
+        mDefaultLocPref.setEntries(entries);
+        mDefaultLocPref.setEntryValues(entryValues);
+        if (selectedLanguageIndex > -1) {
+            mDefaultLocPref.setValueIndex(selectedLanguageIndex);
+        }
+    }
+
+    private void onSampleTextReceived(int resultCode, Intent data) {
+        if (resultCode == TextToSpeech.LANG_AVAILABLE) {
+            String sample = getActivity().getString(R.string.tts_demo);
+            if (data != null && data.getStringExtra("sampleText") != null) {
+                sample = data.getStringExtra("sampleText");
+            }
+            Log.v(TAG, "Got sample text: " + sample);
+            if (mTts != null) {
+                mTts.speak(sample, TextToSpeech.QUEUE_FLUSH, null);
+            }
+        } else {
+            // TODO: Display an error here to the user.
+            Log.e(TAG, "Did not have a sample string for the requested language");
         }
     }
 
     public boolean onPreferenceChange(Preference preference, Object objValue) {
         if (KEY_TTS_USE_DEFAULT.equals(preference.getKey())) {
             // "Use Defaults"
-            int value = (Boolean)objValue ? 1 : 0;
-            Settings.Secure.putInt(getContentResolver(), TTS_USE_DEFAULTS,
-                    value);
-            Log.i(TAG, "TTS use default settings is "+objValue.toString());
+            int value = ((Boolean) objValue) ? 1 : 0;
+            Settings.Secure.putInt(getContentResolver(), TTS_USE_DEFAULTS, value);
+            Log.i(TAG, "TTS 'use default' settings changed, now " + value);
         } else if (KEY_TTS_DEFAULT_RATE.equals(preference.getKey())) {
             // Default rate
             mDefaultRate = Integer.parseInt((String) objValue);
             try {
-                Settings.Secure.putInt(getContentResolver(),
-                        TTS_DEFAULT_RATE, mDefaultRate);
+                Settings.Secure.putInt(getContentResolver(), TTS_DEFAULT_RATE, mDefaultRate);
                 if (mTts != null) {
-                    mTts.setSpeechRate(mDefaultRate/100.0f);
+                    mTts.setSpeechRate(mDefaultRate / 100.0f);
                 }
-                Log.i(TAG, "TTS default rate is " + mDefaultRate);
+                Log.v(TAG, "TTS default rate changed, now " + mDefaultRate);
             } catch (NumberFormatException e) {
                 Log.e(TAG, "could not persist default TTS rate setting", e);
             }
@@ -522,19 +500,19 @@
                 mTts.setLanguage(new Locale(mDefaultLanguage, mDefaultCountry, mDefaultLocVariant));
             }
             int newIndex = mDefaultLocPref.findIndexOfValue((String)objValue);
-            Log.v("Settings", " selected is " + newIndex);
+            Log.v(TAG, " selected is " + newIndex);
             mDemoStringIndex = newIndex > -1 ? newIndex : 0;
         } else if (KEY_TTS_DEFAULT_SYNTH.equals(preference.getKey())) {
-            mDefaultEng = objValue.toString();
-            Settings.Secure.putString(getContentResolver(), TTS_DEFAULT_SYNTH, mDefaultEng);
+            String defaultEng = objValue.toString();
+            Settings.Secure.putString(getContentResolver(), TTS_DEFAULT_SYNTH, defaultEng);
             if (mTts != null) {
-                mTts.setEngineByPackageName(mDefaultEng);
+                mTts.setEngineByPackageName(defaultEng);
                 mEnableDemo = false;
                 mVoicesMissing = false;
                 updateWidgetState();
                 checkVoiceData();
             }
-            Log.v("Settings", "The default synth is: " + objValue.toString());
+            Log.v(TAG, "The default synth is: " + objValue.toString());
         }
 
         return true;
@@ -550,58 +528,44 @@
             // the actual speaking
             getSampleText();
             return true;
-        }
-        if (preference == mInstallData) {
+        } else if (preference == mInstallData) {
             installVoiceData();
             // quit this activity so it needs to be restarted after installation of the voice data
             finish();
             return true;
-        }
-        return false;
-    }
-
-    @Override
-    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
-        if (Utils.isMonkeyRunning()) {
-            return false;
-        }
-
-        if (preference instanceof CheckBoxPreference) {
+        } else if (preference.getKey().startsWith(KEY_PLUGIN_ENABLED_PREFIX)) {
             final CheckBoxPreference chkPref = (CheckBoxPreference) preference;
-            if (!chkPref.getKey().equals(KEY_TTS_USE_DEFAULT)){
-                if (chkPref.isChecked()) {
-                    chkPref.setChecked(false);
-                    AlertDialog d = (new AlertDialog.Builder(getActivity()))
-                            .setTitle(android.R.string.dialog_alert_title)
-                            .setIcon(android.R.drawable.ic_dialog_alert)
-                            .setMessage(
-                                    getActivity().getString(R.string.tts_engine_security_warning,
-                                    chkPref.getTitle()))
-                            .setCancelable(true)
-                            .setPositiveButton(android.R.string.ok,
-                                    new DialogInterface.OnClickListener() {
-                                        public void onClick(DialogInterface dialog, int which) {
-                                            chkPref.setChecked(true);
-                                            loadEngines();
-                                        }
-                            })
-                            .setNegativeButton(android.R.string.cancel,
-                                    new DialogInterface.OnClickListener() {
-                                        public void onClick(DialogInterface dialog, int which) {
-                                        }
-                            })
-                            .create();
-                    d.show();
-                } else {
-                    loadEngines();
-                }
-                return true;
+            if (chkPref.isChecked()) {
+                chkPref.setChecked(false);
+                AlertDialog d = (new AlertDialog.Builder(getActivity()))
+                        .setTitle(android.R.string.dialog_alert_title)
+                        .setIcon(android.R.drawable.ic_dialog_alert)
+                        .setMessage(
+                                getActivity().getString(R.string.tts_engine_security_warning,
+                                chkPref.getTitle()))
+                        .setCancelable(true)
+                        .setPositiveButton(android.R.string.ok,
+                                new DialogInterface.OnClickListener() {
+                                    public void onClick(DialogInterface dialog, int which) {
+                                        chkPref.setChecked(true);
+                                        loadEngines();
+                                    }
+                        })
+                        .setNegativeButton(android.R.string.cancel,
+                                new DialogInterface.OnClickListener() {
+                                    public void onClick(DialogInterface dialog, int which) {
+                                    }
+                        })
+                        .create();
+                d.show();
+            } else {
+                loadEngines();
             }
+            return true;
         }
         return false;
     }
 
-
     private void updateWidgetState() {
         mPlayExample.setEnabled(mEnableDemo);
         mUseDefaultPref.setEnabled(mEnableDemo);
@@ -716,36 +680,23 @@
         Settings.Secure.putString(resolver, TTS_DEFAULT_VARIANT, DEFAULT_VARIANT_VAL);
     }
 
-
     private void loadEngines() {
-        mDefaultSynthPref = (ListPreference) findPreference(KEY_TTS_DEFAULT_SYNTH);
-
-        // TODO (clchen): Try to see if it is possible to be more efficient here
-        // and not search for plugins again.
-        Intent intent = new Intent("android.intent.action.START_TTS_ENGINE");
-        ResolveInfo[] enginesArray = new ResolveInfo[0];
-        PackageManager pm = getPackageManager();
-        enginesArray = pm.queryIntentActivities(intent, 0).toArray(enginesArray);
+        List<TextToSpeech.EngineInfo> engines = mTts.getEngines();
         ArrayList<CharSequence> entries = new ArrayList<CharSequence>();
         ArrayList<CharSequence> values = new ArrayList<CharSequence>();
-        String enabledEngines = "";
-        for (int i = 0; i < enginesArray.length; i++) {
-            String pluginPackageName = enginesArray[i].activityInfo.packageName;
-            if (pluginPackageName.equals(SYSTEM_TTS)) {
-                entries.add(enginesArray[i].loadLabel(pm));
-                values.add(pluginPackageName);
-            } else {
-                CheckBoxPreference pref = (CheckBoxPreference) findPreference(
-                        KEY_PLUGIN_ENABLED_PREFIX + pluginPackageName);
-                if ((pref != null) && pref.isChecked()){
-                    entries.add(enginesArray[i].loadLabel(pm));
-                    values.add(pluginPackageName);
-                    enabledEngines = enabledEngines + pluginPackageName + " ";
-                }
+        StringBuilder enabledEngines = new StringBuilder();
+
+        for (TextToSpeech.EngineInfo engine : engines) {
+            Log.v(TAG, "Engine: " + engine);
+            if (isEngineEnabled(engine.name)) {
+                entries.add(engine.label);
+                values.add(engine.name);
+                if (enabledEngines.length() > 0) enabledEngines.append(' ');
+                enabledEngines.append(engine.name);
             }
         }
         ContentResolver resolver = getContentResolver();
-        Settings.Secure.putString(resolver, TTS_ENABLED_PLUGINS, enabledEngines);
+        Settings.Secure.putString(resolver, TTS_ENABLED_PLUGINS, enabledEngines.toString());
 
         CharSequence entriesArray[] = new CharSequence[entries.size()];
         CharSequence valuesArray[] = new CharSequence[values.size()];
@@ -757,9 +708,18 @@
         String selectedEngine = Settings.Secure.getString(getContentResolver(), TTS_DEFAULT_SYNTH);
         int selectedEngineIndex = mDefaultSynthPref.findIndexOfValue(selectedEngine);
         if (selectedEngineIndex == -1){
-            selectedEngineIndex = mDefaultSynthPref.findIndexOfValue(SYSTEM_TTS);
+            selectedEngineIndex =
+                    mDefaultSynthPref.findIndexOfValue(TextToSpeech.Engine.DEFAULT_ENGINE);
         }
-        mDefaultSynthPref.setValueIndex(selectedEngineIndex);
+        if (selectedEngineIndex >= 0) {
+            mDefaultSynthPref.setValueIndex(selectedEngineIndex);
+        }
+    }
+
+    private boolean isEngineEnabled(String engineName) {
+        if (engineName.equals(TextToSpeech.Engine.DEFAULT_ENGINE)) return true;
+        String enginePref = KEY_PLUGIN_ENABLED_PREFIX + engineName;
+        return getPreferenceManager().getSharedPreferences().getBoolean(enginePref, false);
     }
 
 }
diff --git a/src/com/android/settings/UserDictionarySettings.java b/src/com/android/settings/UserDictionarySettings.java
index b13126a..22112d7 100644
--- a/src/com/android/settings/UserDictionarySettings.java
+++ b/src/com/android/settings/UserDictionarySettings.java
@@ -46,6 +46,7 @@
 
 import com.android.settings.SettingsPreferenceFragment.SettingsDialogFragment;
 
+import java.util.Arrays;
 import java.util.Locale;
 
 public class UserDictionarySettings extends ListFragment implements DialogCreatable {
@@ -63,23 +64,29 @@
 
     // Either the locale is empty (means the word is applicable to all locales)
     // or the word equals our current locale
-    private static final String QUERY_SELECTION = UserDictionary.Words.LOCALE + "=? OR "
-            + UserDictionary.Words.LOCALE + " is null";
+    private static final String QUERY_SELECTION =
+            UserDictionary.Words.LOCALE + "=?";
+    private static final String QUERY_SELECTION_ALL_LOCALES =
+            UserDictionary.Words.LOCALE + " is null";
 
     private static final String DELETE_SELECTION = UserDictionary.Words.WORD + "=?";
 
     private static final String EXTRA_WORD = "word";
-    
+
     private static final int OPTIONS_MENU_ADD = Menu.FIRST;
 
     private static final int DIALOG_ADD_OR_EDIT = 0;
-    
+
+    private static final int FREQUENCY_FOR_USER_DICTIONARY_ADDS = 250;
+
     /** The word being edited in the dialog (null means the user is adding a word). */
     private String mDialogEditingWord;
 
     private View mView;
     private Cursor mCursor;
-    
+
+    protected String mLocale;
+
     private boolean mAddedWordAlready;
     private boolean mAutoReturn;
 
@@ -101,7 +108,25 @@
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
-        mCursor = createCursor();
+        final Intent intent = getActivity().getIntent();
+        final String localeFromIntent =
+                null == intent ? null : intent.getStringExtra("locale");
+
+        final Bundle arguments = getArguments();
+        final String localeFromArguments =
+                null == arguments ? null : arguments.getString("locale");
+
+        final String locale;
+        if (null != localeFromArguments) {
+            locale = localeFromArguments;
+        } else if (null != localeFromIntent) {
+            locale = localeFromIntent;
+        } else {
+            locale = null;
+        }
+
+        mLocale = locale;
+        mCursor = createCursor(locale);
         TextView emptyView = (TextView)mView.findViewById(R.id.empty);
         emptyView.setText(R.string.user_dict_settings_empty_text);
 
@@ -117,12 +142,12 @@
             mAddedWordAlready = savedInstanceState.getBoolean(INSTANCE_KEY_ADDED_WORD, false);
         }
     }
-    
+
     @Override
     public void onResume() {
         super.onResume();
         final Intent intent = getActivity().getIntent();
-        if (!mAddedWordAlready 
+        if (!mAddedWordAlready
                 && intent.getAction().equals("com.android.settings.USER_DICTIONARY_INSERT")) {
             final String word = intent.getStringExtra(EXTRA_WORD);
             mAutoReturn = true;
@@ -139,12 +164,28 @@
         outState.putBoolean(INSTANCE_KEY_ADDED_WORD, mAddedWordAlready);
     }
 
-    private Cursor createCursor() {
-        String currentLocale = Locale.getDefault().toString();
-        // Case-insensitive sort
-        return getActivity().managedQuery(UserDictionary.Words.CONTENT_URI, QUERY_PROJECTION,
-                QUERY_SELECTION, new String[] { currentLocale },
-                "UPPER(" + UserDictionary.Words.WORD + ")");
+    private Cursor createCursor(final String locale) {
+        // Locale can be any of:
+        // - The string representation of a locale, as returned by Locale#toString()
+        // - The empty string. This means we want a cursor returning words valid for all locales.
+        // - null. This means we want a cursor for the current locale, whatever this is.
+        // Note that this contrasts with the data inside the database, where NULL means "all
+        // locales" and there should never be an empty string. The confusion is called by the
+        // historical use of null for "all locales".
+        // TODO: it should be easy to make this more readable by making the special values
+        // human-readable, like "all_locales" and "current_locales" strings, provided they
+        // can be guaranteed not to match locales that may exist.
+        if ("".equals(locale)) {
+            // Case-insensitive sort
+            return getActivity().managedQuery(UserDictionary.Words.CONTENT_URI, QUERY_PROJECTION,
+                    QUERY_SELECTION_ALL_LOCALES, null,
+                    "UPPER(" + UserDictionary.Words.WORD + ")");
+        } else {
+            final String queryLocale = null != locale ? locale : Locale.getDefault().toString();
+            return getActivity().managedQuery(UserDictionary.Words.CONTENT_URI, QUERY_PROJECTION,
+                    QUERY_SELECTION, new String[] { queryLocale },
+                    "UPPER(" + UserDictionary.Words.WORD + ")");
+        }
     }
 
     private ListAdapter createAdapter() {
@@ -153,7 +194,7 @@
                 new String[] { UserDictionary.Words.WORD, UserDictionary.Words._ID },
                 new int[] { android.R.id.text1, R.id.delete_button }, this);
     }
-    
+
     @Override
     public void onListItemClick(ListView l, View v, int position, long id) {
         String word = getWord(position);
@@ -235,13 +276,28 @@
             // The user was editing a word, so do a delete/add
             deleteWord(mDialogEditingWord);
         }
-        
+
         // Disallow duplicates
         deleteWord(word);
-        
+
         // TODO: present UI for picking whether to add word to all locales, or current.
-        UserDictionary.Words.addWord(getActivity(), word.toString(),
-                250, UserDictionary.Words.LOCALE_TYPE_ALL);
+        if (null == mLocale) {
+            // Null means insert with the default system locale.
+            UserDictionary.Words.addWord(getActivity(), word.toString(),
+                    FREQUENCY_FOR_USER_DICTIONARY_ADDS, UserDictionary.Words.LOCALE_TYPE_CURRENT);
+        } else if ("".equals(mLocale)) {
+            // Empty string means insert for all languages.
+            UserDictionary.Words.addWord(getActivity(), word.toString(),
+                    FREQUENCY_FOR_USER_DICTIONARY_ADDS, UserDictionary.Words.LOCALE_TYPE_ALL);
+        } else {
+            // TODO: fix the framework so that it can accept a locale when we add a word
+            // to the user dictionary instead of querying the system locale.
+            final Locale prevLocale = Locale.getDefault();
+            Locale.setDefault(Utils.createLocaleFromString(mLocale));
+            UserDictionary.Words.addWord(getActivity(), word.toString(),
+                    FREQUENCY_FOR_USER_DICTIONARY_ADDS, UserDictionary.Words.LOCALE_TYPE_CURRENT);
+            Locale.setDefault(prevLocale);
+        }
         if (!mCursor.requery()) {
             throw new IllegalStateException("can't requery on already-closed cursor.");
         }
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 18c6159..422ae90 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -36,8 +36,10 @@
 import android.text.TextUtils;
 
 import java.net.InetAddress;
+import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Locale;
 
 public class Utils {
 
@@ -308,4 +310,24 @@
         }
         return addresses;
     }
+
+    public static Locale createLocaleFromString(String localeStr) {
+        // TODO: is there a better way to actually construct a locale that will match?
+        // The main problem is, on top of Java specs, locale.toString() and
+        // new Locale(locale.toString()).toString() do not return equal() strings in
+        // many cases, because the constructor takes the only string as the language
+        // code. So : new Locale("en", "US").toString() => "en_US"
+        // And : new Locale("en_US").toString() => "en_us"
+        if (null == localeStr)
+            return Locale.getDefault();
+        String[] brokenDownLocale = localeStr.split("_", 3);
+        // split may not return a 0-length array.
+        if (1 == brokenDownLocale.length) {
+            return new Locale(brokenDownLocale[0]);
+        } else if (2 == brokenDownLocale.length) {
+            return new Locale(brokenDownLocale[0], brokenDownLocale[1]);
+        } else {
+            return new Locale(brokenDownLocale[0], brokenDownLocale[1], brokenDownLocale[2]);
+        }
+    }
 }
diff --git a/src/com/android/settings/accounts/AccountPreferenceBase.java b/src/com/android/settings/accounts/AccountPreferenceBase.java
index a84bece..a0d6a7f 100644
--- a/src/com/android/settings/accounts/AccountPreferenceBase.java
+++ b/src/com/android/settings/accounts/AccountPreferenceBase.java
@@ -32,6 +32,7 @@
 import android.content.SyncAdapterType;
 import android.content.SyncStatusObserver;
 import android.content.pm.PackageManager;
+import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.Handler;
@@ -113,7 +114,7 @@
                     mAccountTypeToAuthorities.put(sa.accountType, authorities);
                 }
                 if (Log.isLoggable(TAG, Log.VERBOSE)) {
-                    Log.d(TAG, "added authority " + sa.authority + " to accountType " 
+                    Log.d(TAG, "added authority " + sa.authority + " to accountType "
                             + sa.accountType);
                 }
                 authorities.add(sa.authority);
@@ -136,7 +137,10 @@
                 icon = authContext.getResources().getDrawable(desc.iconId);
             } catch (PackageManager.NameNotFoundException e) {
                 // TODO: place holder icon for missing account icons?
-                Log.w(TAG, "No icon for account type " + accountType);
+                Log.w(TAG, "No icon name for account type " + accountType);
+            } catch (Resources.NotFoundException e) {
+                // TODO: place holder icon for missing account icons?
+                Log.w(TAG, "No icon resource for account type " + accountType);
             }
         }
         return icon;
@@ -155,7 +159,9 @@
                 Context authContext = getActivity().createPackageContext(desc.packageName, 0);
                 label = authContext.getResources().getText(desc.labelId);
             } catch (PackageManager.NameNotFoundException e) {
-                Log.w(TAG, "No label for account type " + ", type " + accountType);
+                Log.w(TAG, "No label name for account type " + accountType);
+            } catch (Resources.NotFoundException e) {
+                Log.w(TAG, "No label icon for account type " + accountType);
             }
         }
         return label;
@@ -179,6 +185,8 @@
                 }
             } catch (PackageManager.NameNotFoundException e) {
                 Log.w(TAG, "Couldn't load preferences.xml file from " + desc.packageName);
+            } catch (Resources.NotFoundException e) {
+                Log.w(TAG, "Couldn't load preferences.xml file from " + desc.packageName);
             }
         }
         return prefs;
diff --git a/src/com/android/settings/accounts/ChooseAccountActivity.java b/src/com/android/settings/accounts/ChooseAccountActivity.java
index 9576dee..631fe47 100644
--- a/src/com/android/settings/accounts/ChooseAccountActivity.java
+++ b/src/com/android/settings/accounts/ChooseAccountActivity.java
@@ -23,6 +23,7 @@
 import android.content.Intent;
 import android.content.SyncAdapterType;
 import android.content.pm.PackageManager;
+import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.preference.Preference;
@@ -199,7 +200,10 @@
                 icon = authContext.getResources().getDrawable(desc.iconId);
             } catch (PackageManager.NameNotFoundException e) {
                 // TODO: place holder icon for missing account icons?
-                Log.w(TAG, "No icon for account type " + accountType);
+                Log.w(TAG, "No icon name for account type " + accountType);
+            } catch (Resources.NotFoundException e) {
+                // TODO: place holder icon for missing account icons?
+                Log.w(TAG, "No icon resource for account type " + accountType);
             }
         }
         return icon;
@@ -218,7 +222,9 @@
                 Context authContext = createPackageContext(desc.packageName, 0);
                 label = authContext.getResources().getText(desc.labelId);
             } catch (PackageManager.NameNotFoundException e) {
-                Log.w(TAG, "No label for account type " + ", type " + accountType);
+                Log.w(TAG, "No label name for account type " + accountType);
+            } catch (Resources.NotFoundException e) {
+                Log.w(TAG, "No label resource for account type " + accountType);
             }
         }
         return label;
diff --git a/src/com/android/settings/deviceinfo/PercentageBarChart.java b/src/com/android/settings/deviceinfo/PercentageBarChart.java
index 0c71c12..95973c4 100644
--- a/src/com/android/settings/deviceinfo/PercentageBarChart.java
+++ b/src/com/android/settings/deviceinfo/PercentageBarChart.java
@@ -71,20 +71,21 @@
 
         final int width = right - left;
 
-        int lastX = left;
+        float lastX = left;
 
         if (mEntries != null) {
             for (final Entry e : mEntries) {
-                final int entryWidth;
-                if (e.percentage == 0f) {
-                    entryWidth = 0;
+                final float entryWidth;
+                if (e.percentage == 0.0f) {
+                    entryWidth = 0.0f;
                 } else {
-                    entryWidth = Math.max(mMinTickWidth, (int) (width * e.percentage));
+                    entryWidth = Math.max(mMinTickWidth, width * e.percentage);
                 }
 
-                final int nextX = lastX + entryWidth;
-                if (nextX >= right) {
-                    break;
+                final float nextX = lastX + entryWidth;
+                if (nextX > right) {
+                    canvas.drawRect(lastX, top, right, bottom, e.paint);
+                    return;
                 }
 
                 canvas.drawRect(lastX, top, nextX, bottom, e.paint);
@@ -92,7 +93,7 @@
             }
         }
 
-        canvas.drawRect(lastX, top, lastX + width, bottom, mEmptyPaint);
+        canvas.drawRect(lastX, top, right, bottom, mEmptyPaint);
     }
 
     /**
diff --git a/src/com/android/settings/deviceinfo/UsageBarPreference.java b/src/com/android/settings/deviceinfo/UsageBarPreference.java
index e9909f1..5aeaef5 100644
--- a/src/com/android/settings/deviceinfo/UsageBarPreference.java
+++ b/src/com/android/settings/deviceinfo/UsageBarPreference.java
@@ -36,17 +36,17 @@
 
     public UsageBarPreference(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
-        setWidgetLayoutResource(R.layout.preference_memoryusage);
+        setLayoutResource(R.layout.preference_memoryusage);
     }
 
     public UsageBarPreference(Context context) {
         super(context);
-        setWidgetLayoutResource(R.layout.preference_memoryusage);
+        setLayoutResource(R.layout.preference_memoryusage);
     }
 
     public UsageBarPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
-        setWidgetLayoutResource(R.layout.preference_memoryusage);
+        setLayoutResource(R.layout.preference_memoryusage);
     }
 
     public void addEntry(float percentage, int color) {
diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
index 97ebf43..13a962d 100644
--- a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
+++ b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
@@ -368,9 +368,9 @@
                     }
                     if (rec.batteryLevel != lastLevel || pos == 1) {
                         lastLevel = rec.batteryLevel;
-                        lastInteresting = pos;
-                        mHistEnd = rec.time;
                     }
+                    lastInteresting = pos;
+                    mHistEnd = rec.time;
                     aggrStates |= rec.states;
                 }
             }
@@ -438,7 +438,13 @@
                 2, getResources().getDisplayMetrics());
         if (h > (textHeight*6)) {
             mLargeMode = true;
-            mLineWidth = textHeight/2;
+            if (h > (textHeight*15)) {
+                // Plenty of room for the chart.
+                mLineWidth = textHeight/2;
+            } else {
+                // Compress lines to make more room for chart.
+                mLineWidth = textHeight/3;
+            }
             mLevelTop = textHeight + mLineWidth;
             mScreenOnPaint.setARGB(255, 32, 64, 255);
             mGpsOnPaint.setARGB(255, 32, 64, 255);
@@ -472,7 +478,8 @@
             mWifiRunningOffset = mWakeLockOffset + barOffset;
             mGpsOnOffset = mWifiRunningOffset + (mHaveWifi ? barOffset : 0);
             mPhoneSignalOffset = mGpsOnOffset + (mHaveGps ? barOffset : 0);
-            mLevelOffset = mPhoneSignalOffset + (mHavePhoneSignal ? barOffset : 0) + mLineWidth;
+            mLevelOffset = mPhoneSignalOffset + (mHavePhoneSignal ? barOffset : 0)
+                    + ((mLineWidth*3)/2);
             if (mHavePhoneSignal) {
                 mPhoneSignalChart.init(w);
             }
@@ -670,8 +677,8 @@
         if (!mBatCriticalPath.isEmpty()) {
             canvas.drawPath(mBatCriticalPath, mBatteryCriticalPaint);
         }
-        int top = height - (mHavePhoneSignal ? mPhoneSignalOffset - (mLineWidth/2) : 0);
         if (mHavePhoneSignal) {
+            int top = height-mPhoneSignalOffset - (mLineWidth/2);
             mPhoneSignalChart.draw(canvas, top, mLineWidth);
         }
         if (!mScreenOnPath.isEmpty()) {
diff --git a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
index a4808b0..c72f0ba 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
@@ -18,9 +18,11 @@
 
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.UserDictionarySettings;
 import com.android.settings.Utils;
 import com.android.settings.VoiceInputOutputSettings;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.res.Configuration;
 import android.os.Bundle;
@@ -30,12 +32,17 @@
 import android.provider.Settings;
 import android.view.inputmethod.InputMethodManager;
 
+import java.util.Set;
+
 public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
         implements Preference.OnPreferenceChangeListener{
 
     private static final String KEY_PHONE_LANGUAGE = "phone_language";
     private static final String KEY_CURRENT_INPUT_METHOD = "current_input_method";
     private static final String KEY_INPUT_METHOD_SELECTOR = "input_method_selector";
+    private static final String KEY_LANGUAGE_SETTINGS_CATEGORY = "language_settings_category";
+    private static final String KEY_USER_DICTIONARY_SETTINGS = "key_user_dictionary_settings";
+
 
     private int mDefaultInputMethodSelectorVisibility = 0;
     private ListPreference mShowInputMethodSelectorPref;
@@ -77,6 +84,28 @@
         }
     }
 
+    private void updateUserDictionaryPreference(Preference userDictionaryPreference) {
+        final Activity activity = getActivity();
+        final Set<String> localeList = UserDictionaryList.getUserDictionaryLocalesList(activity);
+        if (localeList.size() <= 1) {
+            userDictionaryPreference.setTitle(R.string.user_dict_single_settings_title);
+            userDictionaryPreference.setFragment(UserDictionarySettings.class.getName());
+            // If the size of localeList is 0, we don't set the locale parameter in the
+            // extras. This will be interpreted by the UserDictionarySettings class as
+            // meaning "the current locale".
+            // Note that with the current code for UserDictionaryList#getUserDictionaryLocalesList()
+            // the locale list always has at least one element, since it always includes the current
+            // locale explicitly. @see UserDictionaryList.getUserDictionaryLocalesList().
+            if (localeList.size() == 1) {
+                final String locale = (String)localeList.toArray()[0];
+                userDictionaryPreference.getExtras().putString("locale", locale);
+            }
+        } else {
+            userDictionaryPreference.setTitle(R.string.user_dict_multiple_settings_title);
+            userDictionaryPreference.setFragment(UserDictionaryList.class.getName());
+        }
+    }
+
     @Override
     public void onResume() {
         super.onResume();
@@ -89,6 +118,7 @@
             }
         }
 
+        updateUserDictionaryPreference(findPreference(KEY_USER_DICTIONARY_SETTINGS));
         mShowInputMethodSelectorPref.setOnPreferenceChangeListener(this);
     }
 
diff --git a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java
index 6e1d4d1..43d54a2 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java
@@ -188,7 +188,8 @@
 
     private PreferenceScreen createPreferenceHierarchy() {
         // Root
-        PreferenceScreen root = getPreferenceManager().createPreferenceScreen(getActivity());
+        final PreferenceScreen root = getPreferenceManager().createPreferenceScreen(getActivity());
+        final Context context = getActivity();
 
         int N = (mInputMethodProperties == null ? 0 : mInputMethodProperties.size());
 
@@ -202,7 +203,7 @@
             if (!TextUtils.isEmpty(mInputMethodId) && !mInputMethodId.equals(imiId)) {
                 continue;
             }
-            PreferenceCategory keyboardSettingsCategory = new PreferenceCategory(getActivity());
+            PreferenceCategory keyboardSettingsCategory = new PreferenceCategory(context);
             root.addPreference(keyboardSettingsCategory);
             PackageManager pm = getPackageManager();
             CharSequence label = imi.loadLabel(pm);
@@ -210,31 +211,22 @@
             keyboardSettingsCategory.setTitle(label);
             keyboardSettingsCategory.setKey(imiId);
             // TODO: Use toggle Preference if images are ready.
-            CheckBoxPreference autoCB = new CheckBoxPreference(getActivity());
+            CheckBoxPreference autoCB = new CheckBoxPreference(context);
             autoCB.setTitle(R.string.use_system_language_to_select_input_method_subtypes);
             mSubtypeAutoSelectionCBMap.put(imiId, autoCB);
             keyboardSettingsCategory.addPreference(autoCB);
 
-            PreferenceCategory activeInputMethodsCategory = new PreferenceCategory(getActivity());
+            PreferenceCategory activeInputMethodsCategory = new PreferenceCategory(context);
             activeInputMethodsCategory.setTitle(R.string.active_input_method_subtypes);
             root.addPreference(activeInputMethodsCategory);
 
             ArrayList<Preference> subtypePreferences = new ArrayList<Preference>();
             if (subtypeCount > 0) {
                 for (int j = 0; j < subtypeCount; ++j) {
-                    InputMethodSubtype subtype = imi.getSubtypeAt(j);
-                    CharSequence subtypeLabel;
-                    int nameResId = subtype.getNameResId();
-                    if (nameResId != 0) {
-                        subtypeLabel = pm.getText(imi.getPackageName(), nameResId,
-                                imi.getServiceInfo().applicationInfo);
-                    } else {
-                        String mode = subtype.getMode();
-                        CharSequence language = subtype.getLocale();
-                        subtypeLabel = (mode == null ? "" : mode) + ","
-                                + (language == null ? "" : language);
-                    }
-                    CheckBoxPreference chkbxPref = new CheckBoxPreference(getActivity());
+                    final InputMethodSubtype subtype = imi.getSubtypeAt(j);
+                    final CharSequence subtypeLabel = subtype.getDisplayName(context,
+                            imi.getPackageName(), imi.getServiceInfo().applicationInfo);
+                    final CheckBoxPreference chkbxPref = new CheckBoxPreference(context);
                     chkbxPref.setKey(imiId + subtype.hashCode());
                     chkbxPref.setTitle(subtypeLabel);
                     activeInputMethodsCategory.addPreference(chkbxPref);
diff --git a/src/com/android/settings/inputmethod/InputMethodConfig.java b/src/com/android/settings/inputmethod/InputMethodConfig.java
index 2cfe35d..393292e 100644
--- a/src/com/android/settings/inputmethod/InputMethodConfig.java
+++ b/src/com/android/settings/inputmethod/InputMethodConfig.java
@@ -266,7 +266,6 @@
     private void updateActiveInputMethodsSummary() {
         final InputMethodManager imm =
                 (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-        final PackageManager pm = getPackageManager();
         for (InputMethodInfo imi: mActiveInputMethodsPrefMap.keySet()) {
             Preference pref = mActiveInputMethodsPrefMap.get(imi);
             List<InputMethodSubtype> subtypes = imm.getEnabledInputMethodSubtypeList(imi, true);
@@ -276,8 +275,9 @@
                 if (subtypeAdded) {
                     summary.append(", ");
                 }
-                summary.append(pm.getText(imi.getPackageName(), subtype.getNameResId(),
-                        imi.getServiceInfo().applicationInfo));
+                final CharSequence subtypeLabel = subtype.getDisplayName(getActivity(),
+                        imi.getPackageName(), imi.getServiceInfo().applicationInfo);
+                summary.append(subtypeLabel);
                 subtypeAdded = true;
             }
             pref.setSummary(summary.toString());
diff --git a/src/com/android/settings/inputmethod/UserDictionaryList.java b/src/com/android/settings/inputmethod/UserDictionaryList.java
new file mode 100644
index 0000000..5db2841
--- /dev/null
+++ b/src/com/android/settings/inputmethod/UserDictionaryList.java
@@ -0,0 +1,109 @@
+/*
+ * 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.
+ */
+
+package com.android.settings.inputmethod;
+
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.UserDictionarySettings;
+import com.android.settings.Utils;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.database.Cursor;
+import android.os.Bundle;
+import android.preference.Preference;
+import android.preference.PreferenceGroup;
+import android.provider.UserDictionary;
+
+import java.util.Locale;
+import java.util.Set;
+import java.util.TreeSet;
+
+public class UserDictionaryList extends SettingsPreferenceFragment {
+
+    private static final String USER_DICTIONARY_SETTINGS_INTENT_ACTION =
+            "android.settings.USER_DICTIONARY_SETTINGS";
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        setPreferenceScreen(getPreferenceManager().createPreferenceScreen(getActivity()));
+    }
+
+    static Set<String> getUserDictionaryLocalesList(Activity activity) {
+        final Cursor cursor = activity.managedQuery(UserDictionary.Words.CONTENT_URI,
+                new String[] { UserDictionary.Words.LOCALE },
+                null, null, null);
+        final Set<String> localeList = new TreeSet<String>();
+        if (cursor.moveToFirst()) {
+            final int columnIndex = cursor.getColumnIndex(UserDictionary.Words.LOCALE);
+            do {
+                String locale = cursor.getString(columnIndex);
+                localeList.add(null != locale ? locale : "");
+            } while (cursor.moveToNext());
+        }
+        localeList.add(Locale.getDefault().toString());
+        return localeList;
+    }
+
+    /**
+     * Creates the entries that allow the user to go into the user dictionary for each locale.
+     * @param userDictGroup The group to put the settings in.
+     */
+    protected void createUserDictSettings(PreferenceGroup userDictGroup) {
+        final Activity activity = getActivity();
+        userDictGroup.removeAll();
+        final Set<String> localeList = UserDictionaryList.getUserDictionaryLocalesList(activity);
+
+        if (localeList.isEmpty()) {
+            userDictGroup.addPreference(createUserDictionaryPreference(null, activity));
+        } else {
+            for (String locale : localeList) {
+                userDictGroup.addPreference(createUserDictionaryPreference(locale, activity));
+            }
+        }
+    }
+
+    /**
+     * Create a single User Dictionary Preference object, with its parameters set.
+     * @param locale The locale for which this user dictionary is for.
+     * @return The corresponding preference.
+     */
+    protected Preference createUserDictionaryPreference(String locale, Activity activity) {
+        final Preference newPref = new Preference(getActivity());
+        final Intent intent = new Intent(USER_DICTIONARY_SETTINGS_INTENT_ACTION);
+        if (null == locale) {
+            newPref.setTitle(Locale.getDefault().getDisplayName());
+        } else {
+            if ("".equals(locale))
+                newPref.setTitle(getString(R.string.user_dict_settings_all_languages));
+            else
+                newPref.setTitle(Utils.createLocaleFromString(locale).getDisplayName());
+            intent.putExtra("locale", locale);
+            newPref.getExtras().putString("locale", locale);
+        }
+        newPref.setIntent(intent);
+        newPref.setFragment(UserDictionarySettings.class.getName());
+        return newPref;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        createUserDictSettings(getPreferenceScreen());
+    }
+}
diff --git a/src/com/android/settings/vpn/VpnSettings.java b/src/com/android/settings/vpn/VpnSettings.java
index 5d75b6a..9b96761 100644
--- a/src/com/android/settings/vpn/VpnSettings.java
+++ b/src/com/android/settings/vpn/VpnSettings.java
@@ -55,6 +55,7 @@
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
+import java.nio.charset.Charsets;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -698,7 +699,7 @@
     }
 
     private boolean isKeyStoreUnlocked() {
-        return mKeyStore.test() == KeyStore.NO_ERROR;
+        return mKeyStore.state() == KeyStore.State.UNLOCKED;
     }
 
     // Returns true if the profile needs to access keystore
@@ -1034,7 +1035,7 @@
                 String presharedKey = pskProfile.getPresharedKey();
                 String key = KEY_PREFIX_IPSEC_PSK + p.getId();
                 if (!TextUtils.isEmpty(presharedKey) &&
-                        !mKeyStore.put(key, presharedKey)) {
+                        !mKeyStore.put(key, presharedKey.getBytes(Charsets.UTF_8))) {
                     Log.e(TAG, "keystore write failed: key=" + key);
                 }
                 pskProfile.setPresharedKey(key);
@@ -1046,7 +1047,7 @@
                 if (l2tpProfile.isSecretEnabled()) {
                     String secret = l2tpProfile.getSecretString();
                     if (!TextUtils.isEmpty(secret) &&
-                            !mKeyStore.put(key, secret)) {
+                            !mKeyStore.put(key, secret.getBytes(Charsets.UTF_8))) {
                         Log.e(TAG, "keystore write failed: key=" + key);
                     }
                     l2tpProfile.setSecretString(key);
diff --git a/src/com/android/settings/widget/ChartAxis.java b/src/com/android/settings/widget/ChartAxis.java
new file mode 100644
index 0000000..0b77ac6
--- /dev/null
+++ b/src/com/android/settings/widget/ChartAxis.java
@@ -0,0 +1,34 @@
+/*
+ * 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.
+ */
+
+package com.android.settings.widget;
+
+/**
+ * Axis along a {@link ChartView} that knows how to convert between raw point
+ * and screen coordinate systems.
+ */
+public interface ChartAxis {
+
+    public void setSize(float size);
+
+    public float convertToPoint(long value);
+    public long convertToValue(float point);
+
+    public CharSequence getLabel(long value);
+
+    public float[] getTickPoints();
+
+}
diff --git a/src/com/android/settings/widget/ChartGridView.java b/src/com/android/settings/widget/ChartGridView.java
new file mode 100644
index 0000000..be71890
--- /dev/null
+++ b/src/com/android/settings/widget/ChartGridView.java
@@ -0,0 +1,79 @@
+/*
+ * 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.
+ */
+
+package com.android.settings.widget;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Paint.Style;
+import android.view.View;
+
+import com.google.common.base.Preconditions;
+
+/**
+ * Background of {@link ChartView} that renders grid lines as requested by
+ * {@link ChartAxis#getTickPoints()}.
+ */
+public class ChartGridView extends View {
+
+    private final ChartAxis mHoriz;
+    private final ChartAxis mVert;
+
+    private final Paint mPaintHoriz;
+    private final Paint mPaintVert;
+
+    public ChartGridView(Context context, ChartAxis horiz, ChartAxis vert) {
+        super(context);
+
+        mHoriz = Preconditions.checkNotNull(horiz, "missing horiz");
+        mVert = Preconditions.checkNotNull(vert, "missing vert");
+
+        setWillNotDraw(false);
+
+        // TODO: convert these colors to resources
+        mPaintHoriz = new Paint();
+        mPaintHoriz.setColor(Color.parseColor("#667bb5"));
+        mPaintHoriz.setStrokeWidth(2.0f);
+        mPaintHoriz.setStyle(Style.STROKE);
+        mPaintHoriz.setAntiAlias(true);
+
+        mPaintVert = new Paint();
+        mPaintVert.setColor(Color.parseColor("#28262c"));
+        mPaintVert.setStrokeWidth(1.0f);
+        mPaintVert.setStyle(Style.STROKE);
+        mPaintVert.setAntiAlias(true);
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        final int width = getWidth();
+        final int height = getHeight();
+
+        final float[] vertTicks = mVert.getTickPoints();
+        for (float y : vertTicks) {
+            canvas.drawLine(0, y, width, y, mPaintVert);
+        }
+
+        final float[] horizTicks = mHoriz.getTickPoints();
+        for (float x : horizTicks) {
+            canvas.drawLine(x, 0, x, height, mPaintHoriz);
+        }
+
+        canvas.drawRect(0, 0, width, height, mPaintHoriz);
+    }
+}
diff --git a/src/com/android/settings/widget/ChartNetworkSeriesView.java b/src/com/android/settings/widget/ChartNetworkSeriesView.java
new file mode 100644
index 0000000..1008761
--- /dev/null
+++ b/src/com/android/settings/widget/ChartNetworkSeriesView.java
@@ -0,0 +1,183 @@
+/*
+ * 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.
+ */
+
+package com.android.settings.widget;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Paint.Style;
+import android.graphics.Path;
+import android.graphics.RectF;
+import android.net.NetworkStatsHistory;
+import android.util.Log;
+import android.view.View;
+
+import com.google.common.base.Preconditions;
+
+/**
+ * {@link NetworkStatsHistory} series to render inside a {@link ChartView},
+ * using {@link ChartAxis} to map into screen coordinates.
+ */
+public class ChartNetworkSeriesView extends View {
+    private static final String TAG = "ChartNetworkSeriesView";
+    private static final boolean LOGD = false;
+
+    private final ChartAxis mHoriz;
+    private final ChartAxis mVert;
+
+    private final Paint mPaintStroke;
+    private final Paint mPaintFill;
+    private final Paint mPaintFillDisabled;
+
+    private NetworkStatsHistory mStats;
+
+    private Path mPathStroke;
+    private Path mPathFill;
+
+    private ChartSweepView mSweep1;
+    private ChartSweepView mSweep2;
+
+    public ChartNetworkSeriesView(Context context, ChartAxis horiz, ChartAxis vert) {
+        super(context);
+
+        mHoriz = Preconditions.checkNotNull(horiz, "missing horiz");
+        mVert = Preconditions.checkNotNull(vert, "missing vert");
+
+        mPaintStroke = new Paint();
+        mPaintStroke.setStrokeWidth(6.0f);
+        mPaintStroke.setColor(Color.parseColor("#24aae1"));
+        mPaintStroke.setStyle(Style.STROKE);
+        mPaintStroke.setAntiAlias(true);
+
+        mPaintFill = new Paint();
+        mPaintFill.setColor(Color.parseColor("#c050ade5"));
+        mPaintFill.setStyle(Style.FILL);
+        mPaintFill.setAntiAlias(true);
+
+        mPaintFillDisabled = new Paint();
+        mPaintFillDisabled.setColor(Color.parseColor("#88566abc"));
+        mPaintFillDisabled.setStyle(Style.FILL);
+        mPaintFillDisabled.setAntiAlias(true);
+
+        mPathStroke = new Path();
+        mPathFill = new Path();
+    }
+
+    public void bindNetworkStats(NetworkStatsHistory stats) {
+        mStats = stats;
+    }
+
+    public void bindSweepRange(ChartSweepView sweep1, ChartSweepView sweep2) {
+        // TODO: generalize to support vertical sweeps
+        // TODO: enforce that both sweeps are along same dimension
+
+        mSweep1 = Preconditions.checkNotNull(sweep1, "missing sweep1");
+        mSweep2 = Preconditions.checkNotNull(sweep2, "missing sweep2");
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
+        generatePath();
+    }
+
+    /**
+     * Erase any existing {@link Path} and generate series outline based on
+     * currently bound {@link NetworkStatsHistory} data.
+     */
+    private void generatePath() {
+        mPathStroke.reset();
+        mPathFill.reset();
+
+        // bail when not enough stats to render
+        if (mStats == null || mStats.bucketCount < 2) return;
+
+        final int width = getWidth();
+        final int height = getHeight();
+
+        boolean started = false;
+        float firstX = 0;
+        float lastX = 0;
+        float lastY = 0;
+
+        long totalData = 0;
+
+        for (int i = 0; i < mStats.bucketCount; i++) {
+            final float x = mHoriz.convertToPoint(mStats.bucketStart[i]);
+            final float y = mVert.convertToPoint(totalData);
+
+            // skip until we find first stats on screen
+            if (i > 0 && !started && x > 0) {
+                mPathStroke.moveTo(lastX, lastY);
+                mPathFill.moveTo(lastX, lastY);
+                started = true;
+                firstX = x;
+            }
+
+            if (started) {
+                mPathStroke.lineTo(x, y);
+                mPathFill.lineTo(x, y);
+                totalData += mStats.rx[i] + mStats.tx[i];
+            }
+
+            // skip if beyond view
+            if (x > width) break;
+
+            lastX = x;
+            lastY = y;
+        }
+
+        if (LOGD) {
+            final RectF bounds = new RectF();
+            mPathFill.computeBounds(bounds, true);
+            Log.d(TAG, "onLayout() rendered with bounds=" + bounds.toString());
+        }
+
+        // drop to bottom of graph from current location
+        mPathFill.lineTo(lastX, height);
+        mPathFill.lineTo(firstX, height);
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+
+        // clip to sweep area
+        final float sweep1 = mSweep1.getPoint();
+        final float sweep2 = mSweep2.getPoint();
+        final float sweepLeft = Math.min(sweep1, sweep2);
+        final float sweepRight = Math.max(sweep1, sweep2);
+
+        int save;
+
+        save = canvas.save();
+        canvas.clipRect(0, 0, sweepLeft, getHeight());
+        canvas.drawPath(mPathFill, mPaintFillDisabled);
+        canvas.restoreToCount(save);
+
+        save = canvas.save();
+        canvas.clipRect(sweepRight, 0, getWidth(), getHeight());
+        canvas.drawPath(mPathFill, mPaintFillDisabled);
+        canvas.restoreToCount(save);
+
+        save = canvas.save();
+        canvas.clipRect(sweepLeft, 0, sweepRight, getHeight());
+        canvas.drawPath(mPathFill, mPaintFill);
+        canvas.drawPath(mPathStroke, mPaintStroke);
+        canvas.restoreToCount(save);
+
+    }
+}
diff --git a/src/com/android/settings/widget/ChartSweepView.java b/src/com/android/settings/widget/ChartSweepView.java
new file mode 100644
index 0000000..e3130ce
--- /dev/null
+++ b/src/com/android/settings/widget/ChartSweepView.java
@@ -0,0 +1,165 @@
+/*
+ * 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.
+ */
+
+package com.android.settings.widget;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Paint.Style;
+import android.view.MotionEvent;
+import android.view.View;
+
+import com.google.common.base.Preconditions;
+
+/**
+ * Sweep across a {@link ChartView} at a specific {@link ChartAxis} value, which
+ * a user can drag.
+ */
+public class ChartSweepView extends View {
+
+    private final Paint mPaintSweep;
+    private final Paint mPaintShadow;
+
+    private final ChartAxis mAxis;
+    private long mValue;
+
+    public interface OnSweepListener {
+        public void onSweep(ChartSweepView sweep, boolean sweepDone);
+    }
+
+    private OnSweepListener mListener;
+
+    private boolean mHorizontal;
+    private MotionEvent mTracking;
+
+    public ChartSweepView(Context context, ChartAxis axis, long value, int color) {
+        super(context);
+
+        mAxis = Preconditions.checkNotNull(axis, "missing axis");
+        mValue = value;
+
+        mPaintSweep = new Paint();
+        mPaintSweep.setColor(color);
+        mPaintSweep.setStrokeWidth(3.0f);
+        mPaintSweep.setStyle(Style.FILL_AND_STROKE);
+        mPaintSweep.setAntiAlias(true);
+
+        mPaintShadow = new Paint();
+        mPaintShadow.setColor(Color.BLACK);
+        mPaintShadow.setStrokeWidth(6.0f);
+        mPaintShadow.setStyle(Style.FILL_AND_STROKE);
+        mPaintShadow.setAntiAlias(true);
+
+    }
+
+    public void addOnSweepListener(OnSweepListener listener) {
+        mListener = listener;
+    }
+
+    private void dispatchOnSweep(boolean sweepDone) {
+        if (mListener != null) {
+            mListener.onSweep(this, sweepDone);
+        }
+    }
+
+    public ChartAxis getAxis() {
+        return mAxis;
+    }
+
+    public long getValue() {
+        return mValue;
+    }
+
+    public float getPoint() {
+        return mAxis.convertToPoint(mValue);
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        final View parent = (View) getParent();
+        switch (event.getAction()) {
+            case MotionEvent.ACTION_DOWN: {
+                mTracking = event.copy();
+                return true;
+            }
+            case MotionEvent.ACTION_MOVE: {
+                if (mHorizontal) {
+                    setTranslationY(event.getRawY() - mTracking.getRawY());
+                    final float point = (getTop() + getTranslationY() + (getHeight() / 2))
+                            - parent.getPaddingTop();
+                    mValue = mAxis.convertToValue(point);
+                    dispatchOnSweep(false);
+                } else {
+                    setTranslationX(event.getRawX() - mTracking.getRawX());
+                    final float point = (getLeft() + getTranslationX() + (getWidth() / 2))
+                            - parent.getPaddingLeft();
+                    mValue = mAxis.convertToValue(point);
+                    dispatchOnSweep(false);
+                }
+                return true;
+            }
+            case MotionEvent.ACTION_UP: {
+                mTracking = null;
+                setTranslationX(0);
+                setTranslationY(0);
+                requestLayout();
+                dispatchOnSweep(true);
+                return true;
+            }
+            default: {
+                return false;
+            }
+        }
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        // need at least 50px in each direction for grippies
+        // TODO: provide this value through params
+        setMeasuredDimension(50, 50);
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+
+        // draw line across larger dimension
+        final int width = getWidth();
+        final int height = getHeight();
+
+        mHorizontal = width > height;
+
+        if (mHorizontal) {
+            final int centerY = height / 2;
+            final int endX = width - height;
+
+            canvas.drawLine(0, centerY, endX, centerY, mPaintShadow);
+            canvas.drawLine(0, centerY, endX, centerY, mPaintSweep);
+            canvas.drawCircle(endX, centerY, 4.0f, mPaintShadow);
+            canvas.drawCircle(endX, centerY, 4.0f, mPaintSweep);
+        } else {
+            final int centerX = width / 2;
+            final int endY = height - width;
+
+            canvas.drawLine(centerX, 0, centerX, endY, mPaintShadow);
+            canvas.drawLine(centerX, 0, centerX, endY, mPaintSweep);
+            canvas.drawCircle(centerX, endY, 4.0f, mPaintShadow);
+            canvas.drawCircle(centerX, endY, 4.0f, mPaintSweep);
+        }
+    }
+
+}
diff --git a/src/com/android/settings/widget/ChartView.java b/src/com/android/settings/widget/ChartView.java
new file mode 100644
index 0000000..bcb54f0
--- /dev/null
+++ b/src/com/android/settings/widget/ChartView.java
@@ -0,0 +1,120 @@
+/*
+ * 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.
+ */
+
+package com.android.settings.widget;
+
+import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
+import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import android.content.Context;
+import android.graphics.Rect;
+import android.view.Gravity;
+import android.view.View;
+import android.widget.FrameLayout;
+
+/**
+ * Container for two-dimensional chart, drawn with a combination of
+ * {@link ChartGridView}, {@link ChartNetworkSeriesView} and {@link ChartSweepView}
+ * children. The entire chart uses {@link ChartAxis} to map between raw values
+ * and screen coordinates.
+ */
+public class ChartView extends FrameLayout {
+    private static final String TAG = "ChartView";
+
+    // TODO: extend something that supports two-dimensional scrolling
+
+    private final ChartAxis mHoriz;
+    private final ChartAxis mVert;
+
+    private Rect mContent = new Rect();
+
+    public ChartView(Context context, ChartAxis horiz, ChartAxis vert) {
+        super(context);
+
+        mHoriz = checkNotNull(horiz, "missing horiz");
+        mVert = checkNotNull(vert, "missing vert");
+
+        setClipToPadding(false);
+        setClipChildren(false);
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int l, int t, int r, int b) {
+        mContent.set(l + getPaddingLeft(), t + getPaddingTop(), r - getPaddingRight(),
+                b - getPaddingBottom());
+        final int width = mContent.width();
+        final int height = mContent.height();
+
+        // no scrolling yet, so tell dimensions to fill exactly
+        mHoriz.setSize(width);
+        mVert.setSize(height);
+
+        final Rect parentRect = new Rect();
+        final Rect childRect = new Rect();
+
+        for (int i = 0; i < getChildCount(); i++) {
+            final View child = getChildAt(i);
+            final LayoutParams params = (LayoutParams) child.getLayoutParams();
+
+            parentRect.set(mContent);
+
+            if (child instanceof ChartNetworkSeriesView || child instanceof ChartGridView) {
+                // series are always laid out to fill entire graph area
+                // TODO: handle scrolling for series larger than content area
+                Gravity.apply(params.gravity, width, height, parentRect, childRect);
+                child.layout(childRect.left, childRect.top, childRect.right, childRect.bottom);
+
+            } else if (child instanceof ChartSweepView) {
+                // sweep is always placed along specific dimension
+                final ChartSweepView sweep = (ChartSweepView) child;
+                final ChartAxis axis = sweep.getAxis();
+                final float point = sweep.getPoint();
+
+                if (axis == mHoriz) {
+                    parentRect.left = parentRect.right = (int) point + getPaddingLeft();
+                    parentRect.bottom += child.getMeasuredWidth();
+                    Gravity.apply(params.gravity, child.getMeasuredWidth(), parentRect.height(),
+                            parentRect, childRect);
+
+                } else if (axis == mVert) {
+                    parentRect.top = parentRect.bottom = (int) point + getPaddingTop();
+                    parentRect.right += child.getMeasuredHeight();
+                    Gravity.apply(params.gravity, parentRect.width(), child.getMeasuredHeight(),
+                            parentRect, childRect);
+
+                } else {
+                    throw new IllegalStateException("unexpected axis");
+                }
+            }
+
+            child.layout(childRect.left, childRect.top, childRect.right, childRect.bottom);
+        }
+    }
+
+    public static LayoutParams buildChartParams() {
+        final LayoutParams params = new LayoutParams(MATCH_PARENT, MATCH_PARENT);
+        params.gravity = Gravity.LEFT | Gravity.BOTTOM;
+        return params;
+    }
+
+    public static LayoutParams buildSweepParams() {
+        final LayoutParams params = new LayoutParams(WRAP_CONTENT, WRAP_CONTENT);
+        params.gravity = Gravity.CENTER;
+        return params;
+    }
+
+}
diff --git a/src/com/android/settings/widget/InvertedChartAxis.java b/src/com/android/settings/widget/InvertedChartAxis.java
new file mode 100644
index 0000000..2bda320
--- /dev/null
+++ b/src/com/android/settings/widget/InvertedChartAxis.java
@@ -0,0 +1,59 @@
+/*
+ * 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.
+ */
+
+package com.android.settings.widget;
+
+/**
+ * Utility to invert another {@link ChartAxis}.
+ */
+public class InvertedChartAxis implements ChartAxis {
+    private final ChartAxis mWrapped;
+    private float mSize;
+
+    public InvertedChartAxis(ChartAxis wrapped) {
+        mWrapped = wrapped;
+    }
+
+    /** {@inheritDoc} */
+    public void setSize(float size) {
+        mSize = size;
+        mWrapped.setSize(size);
+    }
+
+    /** {@inheritDoc} */
+    public float convertToPoint(long value) {
+        return mSize - mWrapped.convertToPoint(value);
+    }
+
+    /** {@inheritDoc} */
+    public long convertToValue(float point) {
+        return mWrapped.convertToValue(mSize - point);
+    }
+
+    /** {@inheritDoc} */
+    public CharSequence getLabel(long value) {
+        return mWrapped.getLabel(value);
+    }
+
+    /** {@inheritDoc} */
+    public float[] getTickPoints() {
+        final float[] points = mWrapped.getTickPoints();
+        for (int i = 0; i < points.length; i++) {
+            points[i] = mSize - points[i];
+        }
+        return points;
+    }
+}
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index ab5e686..a09c5c4 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -245,7 +245,7 @@
 
         getActivity().registerReceiver(mReceiver, mFilter);
         if (mKeyStoreNetworkId != INVALID_NETWORK_ID &&
-                KeyStore.getInstance().test() == KeyStore.NO_ERROR) {
+                KeyStore.getInstance().state() == KeyStore.State.UNLOCKED) {
             mWifiManager.connectNetwork(mKeyStoreNetworkId);
         }
         mKeyStoreNetworkId = INVALID_NETWORK_ID;
@@ -417,7 +417,7 @@
 
     private boolean requireKeyStore(WifiConfiguration config) {
         if (WifiConfigController.requireKeyStore(config) &&
-                KeyStore.getInstance().test() != KeyStore.NO_ERROR) {
+                KeyStore.getInstance().state() != KeyStore.State.UNLOCKED) {
             mKeyStoreNetworkId = config.networkId;
             Credentials.getInstance().unlock(getActivity());
             return true;
diff --git a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
index a73f96c..93d55d5 100644
--- a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
+++ b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
@@ -75,12 +75,6 @@
         sNetworkStateMap.put(DetailedState.FAILED, DetailedState.FAILED);
     }
 
-    /**
-     * Used with {@link Button#setTag(Object)} to remember "Connect" button is pressed in
-     * with "add network" flow.
-     */
-    private static final int CONNECT_BUTTON_TAG_ADD_NETWORK = 1;
-
     private WifiSettings mWifiSettings;
     private WifiManager mWifiManager;
 
@@ -166,7 +160,7 @@
 
         // At first, Wifi module doesn't return SCANNING state (it's too early), so we manually
         // show it.
-        showScanningProgressBar();
+        showScanningState();
     }
 
     private void initViews() {
@@ -291,17 +285,16 @@
 
         switch (state) {
         case SCANNING: {
-            // Let users know the device is working correctly though currently there's
-            // no visible network on the list.
-            if (mWifiSettings.getAccessPointsCount() == 0) {
-                showScanningState();
-            } else {
-                // Users already see available networks.
-                showDisconnectedProgressBar();
-                if (mScreenState == SCREEN_STATE_DISCONNECTED) {
+            if (mScreenState == SCREEN_STATE_DISCONNECTED) {
+                if (mWifiSettings.getAccessPointsCount() == 0) {
+                    showScanningState();                    
+                } else {
+                    showDisconnectedProgressBar();
                     mWifiSettingsFragmentLayout.setVisibility(View.VISIBLE);
                     mBottomPadding.setVisibility(View.GONE);
                 }
+            } else {
+                showDisconnectedProgressBar();
             }
             break;
         }
@@ -316,7 +309,8 @@
             break;
         }
         default:  // DISCONNECTED, FAILED
-            if (mScreenState != SCREEN_STATE_CONNECTED) {
+            if (mScreenState != SCREEN_STATE_CONNECTED &&
+                    mWifiSettings.getAccessPointsCount() > 0) {
                 showDisconnectedState(Summary.get(this, state));
             }
             break;
@@ -326,7 +320,8 @@
 
     private void showDisconnectedState(String stateString) {
         showDisconnectedProgressBar();
-        if (mScreenState == SCREEN_STATE_DISCONNECTED) {
+        if (mScreenState == SCREEN_STATE_DISCONNECTED &&
+                mWifiSettings.getAccessPointsCount() > 0) {
             mWifiSettingsFragmentLayout.setVisibility(View.VISIBLE);
             mBottomPadding.setVisibility(View.GONE);
         }
@@ -474,13 +469,11 @@
         parent.removeAllViews();
         mWifiConfig = new WifiConfigUiForSetupWizardXL(this, parent, selectedAccessPoint, edit);
 
-        // Tag will be updated in this method when needed.
-        mConnectButton.setTag(null);
         if (selectedAccessPoint == null) {  // "Add network" flow
             showAddNetworkTitle();
             mConnectButton.setVisibility(View.VISIBLE);
-            mConnectButton.setTag(CONNECT_BUTTON_TAG_ADD_NETWORK);
 
+            showDisconnectedProgressBar();
             showEditingButtonState();
         } else if (selectedAccessPoint.security == AccessPoint.SECURITY_NONE) {
             mNetworkName = selectedAccessPoint.getTitle().toString();
@@ -490,6 +483,7 @@
         } else {
             mNetworkName = selectedAccessPoint.getTitle().toString();
             showEditingTitle();
+            showDisconnectedProgressBar();
             showEditingButtonState();
             if (selectedAccessPoint.security == AccessPoint.SECURITY_EAP) {
                 onEapNetworkSelected();
@@ -645,8 +639,9 @@
             mAddNetworkButton.setEnabled(true);
             mRefreshButton.setEnabled(true);
             mSkipOrNextButton.setEnabled(true);
-            mWifiSettingsFragmentLayout.setVisibility(View.VISIBLE);
             showDisconnectedProgressBar();
+            mWifiSettingsFragmentLayout.setVisibility(View.VISIBLE);
+            mBottomPadding.setVisibility(View.GONE);
         }
 
         setPaddingVisibility(View.VISIBLE);
@@ -693,15 +688,7 @@
     }
 
     private void refreshAccessPoints(boolean disconnectNetwork) {
-        final Object tag = mConnectButton.getTag();
-        if (tag != null && (tag instanceof Integer) &&
-                ((Integer)tag == CONNECT_BUTTON_TAG_ADD_NETWORK)) {
-            // In "Add network" flow, we won't get DetaledState available for changing ProgressBar
-            // state. Instead we manually show previous status here.
-            showDisconnectedState(Summary.get(this, mPreviousNetworkState));
-        } else {
-            showScanningState();
-        }
+        showScanningState();
 
         if (disconnectNetwork) {
             mWifiManager.disconnect();
diff --git a/tests/res/values-am/strings.xml b/tests/res/values-am/strings.xml
new file mode 100644
index 0000000..d46a427
--- /dev/null
+++ b/tests/res/values-am/strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2009 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="discoverable" msgid="3169265480789026010">"መገኘት የሚችል"</string>
+    <string name="start_scan" msgid="6035699220942169744">"ቅኝት ጀምር"</string>
+    <string name="stop_scan" msgid="527546916633745779">"ቅኝት አቁም"</string>
+    <string name="operator_hello" msgid="292208161864910159">"ታዲያስ ከዋኝ!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"ከዋኝ"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"ከዋኝ የምርጫ እንቅስቃሴ ለመጀመር የሚያስችሉትን ያጣምራል።"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"ታዲያስ አምራች!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"አምራች"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"አምራች የምርጫ እንቅስቃሴ ለመጀመር የሚያስችሉትን ያጣምራል።"</string>
+</resources>
diff --git a/tests/res/values-sw/strings.xml b/tests/res/values-sw/strings.xml
new file mode 100644
index 0000000..1333d66
--- /dev/null
+++ b/tests/res/values-sw/strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2009 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="discoverable" msgid="3169265480789026010">"Inagunduliwa"</string>
+    <string name="start_scan" msgid="6035699220942169744">"Anza kusafisha"</string>
+    <string name="stop_scan" msgid="527546916633745779">"Komesha kusafisha"</string>
+    <string name="operator_hello" msgid="292208161864910159">"Kiendeshaji!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"Kiendeshaji"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"Kishikilio cha mtengenezaji ambayo inaweza kutumiwa kwa kuanza shughuli ya chaguo"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"Hello Mtengenezaji!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"Mtengenezaji"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"Kishikilio cha mtengenezaji ambayo inaweza kutumiwa kwa kuanza shughuli ya chaguo"</string>
+</resources>
diff --git a/tests/res/values-zu/strings.xml b/tests/res/values-zu/strings.xml
new file mode 100644
index 0000000..ea50f26
--- /dev/null
+++ b/tests/res/values-zu/strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2009 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="discoverable" msgid="3169265480789026010">"Iyatholakala"</string>
+    <string name="start_scan" msgid="6035699220942169744">"Qala ukuthwebula"</string>
+    <string name="stop_scan" msgid="527546916633745779">"Misa ukuthwebula"</string>
+    <string name="operator_hello" msgid="292208161864910159">"Sawubona Opheretha!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"u-Opheretha"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"Isihlanganisi so-opheretha esingasetshenziselwa ukuqalisa umsebenzi owuthandayo"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"Sawubona Mkhiqizi!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"Umkhiqizi"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"Ukuhlanganisa umkhiqizi kungasetshenziselwa umsebenzi owuthandayo"</string>
+</resources>