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 bc15121..9b33600 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>
@@ -143,8 +149,8 @@
                   android:windowSoftInputMode="adjustResize"
                   android:exported="true" />
 
-        <activity-alias android:name=".wifi.AdvancedSettings"
-                android:label="@string/wifi_ip_settings_titlebar"
+        <activity-alias android:name=".wifi.AdvancedWifiSettings"
+                android:label="@string/wifi_advanced_settings_label"
                 android:targetActivity="Settings"
                 >
             <intent-filter>
@@ -233,6 +239,18 @@
                 android:value="com.android.settings.Settings$WirelessSettingsActivity" />
         </activity>
 
+        <activity-alias android:name=".bluetooth.AdvancedBluetoothSettings"
+                android:label="@string/bluetooth_advanced_settings_label"
+                android:targetActivity="Settings"
+                >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.settings.BLUETOOTH_ADVANCED_SETTINGS" />
+                <category android:name="android.intent.category.VOICE_LAUNCH" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity-alias>
+
         <activity android:name=".bluetooth.DevicePickerActivity"
                 android:theme="@android:style/Theme.Holo.DialogWhenLarge"
                 android:label="@string/device_picker"
@@ -369,6 +387,18 @@
             </intent-filter>
         </activity>
 
+        <activity android:name=".inputmethod.InputMethodDialogActivity"
+                android:theme="@android:style/Theme.Holo"
+                android:clearTaskOnLaunch="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.settings.SHOW_INPUT_METHOD_PICKER" />
+                <category android:name="android.intent.category.VOICE_LAUNCH" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="com.android.settings.SHORTCUT" />
+            </intent-filter>
+        </activity>
+
         <activity android:name="Settings$InputMethodConfigActivity"
                 android:theme="@android:style/Theme.Holo"
                 android:label="@string/configure_input_method"
@@ -602,15 +632,33 @@
                 android:value="com.android.settings.Settings$ApplicationSettingsActivity" />
         </activity>
 
+        <activity android:name="Settings$LocationSettingsActivity"
+                android:theme="@android:style/Theme.Holo"
+                android:label="@string/location_settings_title"
+                android:configChanges="orientation|keyboardHidden"
+                android:clearTaskOnLaunch="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.settings.LOCATION_SOURCE_SETTINGS" />
+                <action android:name="android.credentials.UNLOCK" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.VOICE_LAUNCH" />
+                <category android:name="com.android.settings.SHORTCUT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.LocationSettings" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/location_settings" />
+        </activity>
+
         <activity android:name="Settings$SecuritySettingsActivity"
                 android:theme="@android:style/Theme.Holo"
-                android:label="@string/location_security_settings_title"
+                android:label="@string/security_settings_title"
                 android:configChanges="orientation|keyboardHidden"
                 android:clearTaskOnLaunch="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.SECURITY_SETTINGS" />
-                <action android:name="android.settings.LOCATION_SOURCE_SETTINGS" />
                 <action android:name="android.credentials.UNLOCK" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
@@ -645,7 +693,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>
@@ -667,7 +714,7 @@
             <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                 android:resource="@id/security_settings" />
             <meta-data android:name="com.android.settings.PARENT_FRAGMENT_TITLE"
-                android:resource="@string/location_security_settings_title" />
+                android:resource="@string/security_settings_title" />
             <meta-data android:name="com.android.settings.PARENT_FRAGMENT_CLASS"
                 android:value="com.android.settings.Settings$SecuritySettingsActivity" />
         </activity>
@@ -1124,10 +1171,28 @@
                 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" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
+                <!-- actions from NetworkPolicyManager notifications -->
+                <action android:name="android.intent.action.DATA_USAGE_WARNING" />
+                <action android:name="android.intent.action.DATA_USAGE_LIMIT" />
+                <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"
-                android:enabled="false">
+                android:enabled="@bool/has_powercontrol_widget">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
                 <action android:name="android.net.wifi.WIFI_STATE_CHANGED" />
@@ -1138,5 +1203,6 @@
             </intent-filter>
             <meta-data android:name="android.appwidget.provider" android:resource="@xml/appwidget_info" />
         </receiver>
+
     </application>
 </manifest>
diff --git a/res/drawable-hdpi/data_grid_border.9.png b/res/drawable-hdpi/data_grid_border.9.png
new file mode 100644
index 0000000..e0110b6
--- /dev/null
+++ b/res/drawable-hdpi/data_grid_border.9.png
Binary files differ
diff --git a/res/drawable-hdpi/data_grid_primary.9.png b/res/drawable-hdpi/data_grid_primary.9.png
new file mode 100644
index 0000000..a2b7b82
--- /dev/null
+++ b/res/drawable-hdpi/data_grid_primary.9.png
Binary files differ
diff --git a/res/drawable-hdpi/data_grid_secondary.9.png b/res/drawable-hdpi/data_grid_secondary.9.png
new file mode 100644
index 0000000..f13bf78
--- /dev/null
+++ b/res/drawable-hdpi/data_grid_secondary.9.png
Binary files differ
diff --git a/res/drawable-hdpi/data_sweep_left_activated.9.png b/res/drawable-hdpi/data_sweep_left_activated.9.png
new file mode 100644
index 0000000..e91ccf5
--- /dev/null
+++ b/res/drawable-hdpi/data_sweep_left_activated.9.png
Binary files differ
diff --git a/res/drawable-hdpi/data_sweep_left_default.9.png b/res/drawable-hdpi/data_sweep_left_default.9.png
new file mode 100644
index 0000000..76f33a5
--- /dev/null
+++ b/res/drawable-hdpi/data_sweep_left_default.9.png
Binary files differ
diff --git a/res/drawable-hdpi/data_sweep_limit_activated.9.png b/res/drawable-hdpi/data_sweep_limit_activated.9.png
new file mode 100644
index 0000000..4744037
--- /dev/null
+++ b/res/drawable-hdpi/data_sweep_limit_activated.9.png
Binary files differ
diff --git a/res/drawable-hdpi/data_sweep_limit_default.9.png b/res/drawable-hdpi/data_sweep_limit_default.9.png
new file mode 100644
index 0000000..dea3a0b
--- /dev/null
+++ b/res/drawable-hdpi/data_sweep_limit_default.9.png
Binary files differ
diff --git a/res/drawable-hdpi/data_sweep_right_activated.9.png b/res/drawable-hdpi/data_sweep_right_activated.9.png
new file mode 100644
index 0000000..afb15d6
--- /dev/null
+++ b/res/drawable-hdpi/data_sweep_right_activated.9.png
Binary files differ
diff --git a/res/drawable-hdpi/data_sweep_right_default.9.png b/res/drawable-hdpi/data_sweep_right_default.9.png
new file mode 100644
index 0000000..9d3808f
--- /dev/null
+++ b/res/drawable-hdpi/data_sweep_right_default.9.png
Binary files differ
diff --git a/res/drawable-hdpi/data_sweep_warning_activated.9.png b/res/drawable-hdpi/data_sweep_warning_activated.9.png
new file mode 100644
index 0000000..81a7aa8
--- /dev/null
+++ b/res/drawable-hdpi/data_sweep_warning_activated.9.png
Binary files differ
diff --git a/res/drawable-hdpi/data_sweep_warning_default.9.png b/res/drawable-hdpi/data_sweep_warning_default.9.png
new file mode 100644
index 0000000..e2485fe
--- /dev/null
+++ b/res/drawable-hdpi/data_sweep_warning_default.9.png
Binary files differ
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_settings_bluetooth2.png b/res/drawable-hdpi/ic_settings_bluetooth2.png
new file mode 100755
index 0000000..20ceb20
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_bluetooth2.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_data_usage.png b/res/drawable-hdpi/ic_settings_data_usage.png
new file mode 100755
index 0000000..20ceb20
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_data_usage.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_location.png b/res/drawable-hdpi/ic_settings_location.png
new file mode 100755
index 0000000..4202f5b
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_location.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_more_wireless.png b/res/drawable-hdpi/ic_settings_more_wireless.png
new file mode 100755
index 0000000..20ceb20
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_more_wireless.png
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_settings_bluetooth2.png b/res/drawable-mdpi/ic_settings_bluetooth2.png
new file mode 100755
index 0000000..f8acded
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_bluetooth2.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_data_usage.png b/res/drawable-mdpi/ic_settings_data_usage.png
new file mode 100755
index 0000000..f8acded
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_data_usage.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_location.png b/res/drawable-mdpi/ic_settings_location.png
new file mode 100644
index 0000000..09b0a63
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_location.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_more_wireless.png b/res/drawable-mdpi/ic_settings_more_wireless.png
new file mode 100755
index 0000000..f8acded
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_more_wireless.png
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/drawable/data_sweep_left.xml b/res/drawable/data_sweep_left.xml
new file mode 100644
index 0000000..739a74e
--- /dev/null
+++ b/res/drawable/data_sweep_left.xml
@@ -0,0 +1,22 @@
+<?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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:exitFadeDuration="@android:integer/config_mediumAnimTime">
+
+    <item android:state_activated="true" android:drawable="@drawable/data_sweep_left_activated" />
+    <item android:state_activated="false" android:drawable="@drawable/data_sweep_left_default" />
+</selector>
diff --git a/res/drawable/data_sweep_limit.xml b/res/drawable/data_sweep_limit.xml
new file mode 100644
index 0000000..29ecec8
--- /dev/null
+++ b/res/drawable/data_sweep_limit.xml
@@ -0,0 +1,22 @@
+<?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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:exitFadeDuration="@android:integer/config_mediumAnimTime">
+
+    <item android:state_activated="true" android:drawable="@drawable/data_sweep_limit_activated" />
+    <item android:state_activated="false" android:drawable="@drawable/data_sweep_limit_default" />
+</selector>
diff --git a/res/drawable/data_sweep_right.xml b/res/drawable/data_sweep_right.xml
new file mode 100644
index 0000000..1a11469
--- /dev/null
+++ b/res/drawable/data_sweep_right.xml
@@ -0,0 +1,22 @@
+<?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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:exitFadeDuration="@android:integer/config_mediumAnimTime">
+
+    <item android:state_activated="true" android:drawable="@drawable/data_sweep_right_activated" />
+    <item android:state_activated="false" android:drawable="@drawable/data_sweep_right_default" />
+</selector>
diff --git a/res/drawable/data_sweep_warning.xml b/res/drawable/data_sweep_warning.xml
new file mode 100644
index 0000000..5cafe06
--- /dev/null
+++ b/res/drawable/data_sweep_warning.xml
@@ -0,0 +1,22 @@
+<?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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:exitFadeDuration="@android:integer/config_mediumAnimTime">
+
+    <item android:state_activated="true" android:drawable="@drawable/data_sweep_warning_activated" />
+    <item android:state_activated="false" android:drawable="@drawable/data_sweep_warning_default" />
+</selector>
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/crypt_keeper_password_entry.xml b/res/layout/crypt_keeper_password_entry.xml
index 4dce67a..a5193ce 100644
--- a/res/layout/crypt_keeper_password_entry.xml
+++ b/res/layout/crypt_keeper_password_entry.xml
@@ -30,39 +30,16 @@
                >
        <include layout="@layout/crypt_keeper_status" />
    </LinearLayout>
-   
-   <!-- right side: password -->
-   <LinearLayout
+
+   <EditText android:id="@+id/passwordEntry"
+       android:layout_height="wrap_content"
        android:layout_width="match_parent"
-       android:layout_height="match_parent"
-       android:orientation="vertical"
-       android:gravity="center">
+       android:singleLine="true"
+       android:textStyle="normal"
+       android:inputType="textPassword"
+       android:textSize="24sp"
+       android:textAppearance="?android:attr/textAppearanceMedium"
+       android:textColor="#ffffffff"
+    />
 
-       <!-- Password entry field -->
-       <EditText android:id="@+id/passwordEntry"
-           android:layout_height="wrap_content"
-           android:layout_width="450dip"
-           android:singleLine="true"
-           android:textStyle="normal"
-           android:inputType="textPassword"
-           android:gravity="center"
-           android:layout_gravity="center"
-           android:textSize="24sp"
-           android:layout_marginTop="120dip"
-           android:layout_marginBottom="5dip"
-           android:textAppearance="?android:attr/textAppearanceMedium"
-           android:textColor="#ffffffff"
-           android:editable="false"
-        />
-
-       <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
-           android:layout_width="450dip"
-           android:layout_height="230dip"
-           android:background="#00000000"
-           android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"
-           android:visibility="visible"
-       />
-       
-   </LinearLayout>
-    
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/crypt_keeper_progress.xml b/res/layout/crypt_keeper_progress.xml
index 7c6c363..f8e3a1a 100644
--- a/res/layout/crypt_keeper_progress.xml
+++ b/res/layout/crypt_keeper_progress.xml
@@ -54,11 +54,11 @@
     
     
     <TextView
+        android:id="@+id/status"
         android:layout_width="match_parent"
         android:layout_height="0dip"
         android:layout_weight="1"
         android:layout_marginLeft="16dip"
-        android:text="@string/crypt_keeper_setup_description"
     />
 
 </LinearLayout>
diff --git a/res/layout/data_usage_chart.xml b/res/layout/data_usage_chart.xml
new file mode 100644
index 0000000..5fd640f
--- /dev/null
+++ b/res/layout/data_usage_chart.xml
@@ -0,0 +1,79 @@
+<?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.
+-->
+
+<com.android.settings.widget.DataUsageChartView
+    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="220dip"
+    android:padding="16dip">
+
+    <com.android.settings.widget.ChartGridView
+        android:id="@+id/grid"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="left|bottom"
+        settings:primaryDrawable="@drawable/data_grid_primary"
+        settings:secondaryDrawable="@drawable/data_grid_secondary"
+        settings:borderDrawable="@drawable/data_grid_border"
+        settings:labelColor="#24aae1" />
+
+    <com.android.settings.widget.ChartNetworkSeriesView
+        android:id="@+id/series"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="left|bottom"
+        settings:strokeColor="#24aae1"
+        settings:fillColor="#c050ade5"
+        settings:fillColorSecondary="#88566abc" />
+
+    <com.android.settings.widget.ChartSweepView
+        android:id="@+id/sweep_left"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_gravity="center_horizontal"
+        settings:sweepDrawable="@drawable/data_sweep_left"
+        settings:followAxis="horizontal"
+        settings:showLabel="false" />
+
+    <com.android.settings.widget.ChartSweepView
+        android:id="@+id/sweep_right"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_gravity="center_horizontal"
+        settings:sweepDrawable="@drawable/data_sweep_right"
+        settings:followAxis="horizontal"
+        settings:showLabel="false" />
+
+    <com.android.settings.widget.ChartSweepView
+        android:id="@+id/sweep_limit"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        settings:sweepDrawable="@drawable/data_sweep_limit"
+        settings:followAxis="vertical"
+        settings:showLabel="true" />
+
+    <com.android.settings.widget.ChartSweepView
+        android:id="@+id/sweep_warning"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        settings:sweepDrawable="@drawable/data_sweep_warning"
+        settings:followAxis="vertical"
+        settings:showLabel="true" />
+
+</com.android.settings.widget.DataUsageChartView>
diff --git a/res/layout/data_usage_cycle_editor.xml b/res/layout/data_usage_cycle_editor.xml
new file mode 100644
index 0000000..dffbe18
--- /dev/null
+++ b/res/layout/data_usage_cycle_editor.xml
@@ -0,0 +1,40 @@
+<?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:orientation="horizontal"
+    android:gravity="center"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:text="@string/data_usage_cycle_editor_subtitle" />
+
+    <NumberPicker
+        android:id="@+id/cycle_day"
+        android:layout_width="48dip"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginLeft="16dip"
+        android:layout_marginRight="16dip"
+        android:focusable="true"
+        android:focusableInTouchMode="true" />
+
+</LinearLayout>
diff --git a/res/layout/data_usage_detail.xml b/res/layout/data_usage_detail.xml
new file mode 100644
index 0000000..9415b3f
--- /dev/null
+++ b/res/layout/data_usage_detail.xml
@@ -0,0 +1,56 @@
+<?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.
+-->
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <LinearLayout
+        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="233dip" />
+
+        <TextView
+            android:id="@android:id/title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="16dip" />
+
+        <TextView
+            android:id="@android:id/text1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="16dip" />
+
+        <Button
+            android:id="@+id/data_usage_app_settings"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="16dip"
+            android:text="@string/data_usage_app_settings" />
+
+        <LinearLayout
+            android:id="@+id/switches"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical" />
+
+    </LinearLayout>
+</ScrollView>
diff --git a/res/layout/data_usage_header.xml b/res/layout/data_usage_header.xml
new file mode 100644
index 0000000..8e6f054
--- /dev/null
+++ b/res/layout/data_usage_header.xml
@@ -0,0 +1,51 @@
+<?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="wrap_content"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:id="@+id/switches"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:showDividers="middle|end"
+        android:divider="?android:attr/listDivider" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingLeft="16dip"
+        android:paddingRight="16dip">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:text="@string/data_usage_cycle" />
+
+        <Spinner
+            android:id="@+id/cycles"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/res/layout/data_usage_item.xml b/res/layout/data_usage_item.xml
new file mode 100644
index 0000000..6451e21
--- /dev/null
+++ b/res/layout/data_usage_item.xml
@@ -0,0 +1,39 @@
+<?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="wrap_content"
+    android:minHeight="48dip"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@android:id/text1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="6dip"
+        android:layout_marginTop="6dip"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+    <TextView
+        android:id="@android:id/text2"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="6dip"
+        android:layout_marginBottom="6dip"
+        android:textAppearance="?android:attr/textAppearanceSmall" />
+
+</LinearLayout>
diff --git a/res/layout/data_usage_summary.xml b/res/layout/data_usage_summary.xml
new file mode 100644
index 0000000..41b8eed
--- /dev/null
+++ b/res/layout/data_usage_summary.xml
@@ -0,0 +1,48 @@
+<?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.
+-->
+
+<TabHost xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/tabhost"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <TabWidget
+            android:id="@android:id/tabs"
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <!-- give an empty content area to make tabhost happy -->
+        <FrameLayout
+            android:id="@android:id/tabcontent"
+            android:layout_width="0dip"
+            android:layout_height="0dip" />
+
+        <ListView
+            android:id="@android:id/list"
+            android:layout_width="match_parent"
+            android:layout_height="0dip"
+            android:layout_weight="1"
+            android:smoothScrollbar="false" />
+
+    </LinearLayout>
+
+</TabHost>
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.xml b/res/layout/preference.xml
new file mode 100644
index 0000000..06d8f24
--- /dev/null
+++ b/res/layout/preference.xml
@@ -0,0 +1,63 @@
+<?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="wrap_content"
+    android:minHeight="48dip"
+    android:gravity="center_vertical"
+    android:paddingRight="?android:attr/scrollbarSize"
+    android:background="?android:attr/selectableItemBackground">
+
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="15dip"
+        android:layout_marginRight="6dip"
+        android:layout_marginTop="6dip"
+        android:layout_marginBottom="6dip"
+        android:layout_weight="1">
+
+        <TextView
+            android:id="@+android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal" />
+
+        <TextView
+            android:id="@android:id/summary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@android:id/title"
+            android:layout_alignLeft="@android:id/title"
+            android:visibility="gone"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="?android:attr/textColorSecondary"
+            android:maxLines="4" />
+
+    </RelativeLayout>
+
+    <LinearLayout
+        android:id="@android:id/widget_frame"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:gravity="center_vertical"
+        android:orientation="vertical" />
+
+</LinearLayout>
diff --git a/res/layout/preference_header_switch_item.xml b/res/layout/preference_header_switch_item.xml
new file mode 100644
index 0000000..654f444
--- /dev/null
+++ b/res/layout/preference_header_switch_item.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2006 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.
+-->
+
+<!-- Layout of a header item in PreferenceActivity. -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="48dp"
+    android:background="?android:attr/activatedBackgroundIndicator"
+    android:gravity="center_vertical"
+    android:paddingRight="?android:attr/scrollbarSize">
+
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="6dip"
+        android:layout_marginRight="6dip"
+        android:layout_gravity="center" />
+
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="2dip"
+        android:layout_marginRight="6dip"
+        android:layout_marginTop="6dip"
+        android:layout_marginBottom="6dip"
+        android:layout_weight="1">
+
+        <TextView android:id="@+android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal" />
+
+        <TextView android:id="@+android:id/summary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@android:id/title"
+            android:layout_alignLeft="@android:id/title"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:ellipsize="end"
+            android:maxLines="2" />
+
+    </RelativeLayout>
+
+   <Switch android:id="@+id/switchWidget"
+       android:layout_width="wrap_content"
+       android:layout_height="wrap_content"
+       android:layout_gravity="center"
+       android:padding="16dip"
+       android:focusable="false"
+       android:clickable="true" />
+
+</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/tab_indicator_thin_holo.xml b/res/layout/tab_indicator_thin_holo.xml
new file mode 100644
index 0000000..e4c4652
--- /dev/null
+++ b/res/layout/tab_indicator_thin_holo.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.
+-->
+
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="0dp"
+    android:layout_height="48dp"
+    android:layout_weight="1"
+    android:background="@*android:drawable/tab_indicator_holo">
+
+    <TextView
+        android:id="@android:id/title"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:singleLine="true"
+        android:ellipsize="marquee"
+        android:gravity="center"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+</RelativeLayout>
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_dialog.xml b/res/layout/wifi_dialog.xml
index f502d6d..47b4e92 100644
--- a/res/layout/wifi_dialog.xml
+++ b/res/layout/wifi_dialog.xml
@@ -185,6 +185,7 @@
 
                 <CheckBox android:id="@+id/show_password"
                     style="@style/wifi_item_content"
+                    android:textSize="14sp"
                     android:text="@string/wifi_show_password" />
             </LinearLayout>
         </LinearLayout>
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/menu/data_usage.xml b/res/menu/data_usage.xml
new file mode 100644
index 0000000..a95c074
--- /dev/null
+++ b/res/menu/data_usage.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.
+-->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/action_settings"
+        android:icon="@drawable/ic_sysbar_quicksettings"
+        android:showAsAction="always">
+        <menu>
+            <item
+                android:id="@+id/action_split_4g"
+                android:title="@string/data_usage_menu_split_4g"
+                android:checkable="true" />
+            <item
+                android:id="@+id/action_show_wifi"
+                android:title="@string/data_usage_menu_show_wifi"
+                android:checkable="true" />
+        </menu>
+    </item>
+</menu>
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..e1f3b90
--- /dev/null
+++ b/res/values-af/arrays.xml
@@ -0,0 +1,229 @@
+<?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>
+  <string-array name="screen_timeout_entries">
+    <item msgid="3342301044271143016">"15 sekondes"</item>
+    <item msgid="8881760709354815449">"30 sekondes"</item>
+    <item msgid="7589406073232279088">"1 minuut"</item>
+    <item msgid="7001195990902244174">"2 minute"</item>
+    <item msgid="7489864775127957179">"5 minute"</item>
+    <item msgid="2314124409517439288">"10 minute"</item>
+    <item msgid="6864027152847611413">"30 minute"</item>
+  </string-array>
+    <!-- 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) -->
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="5416834369150305288">"onmiddellik"</item>
+    <item msgid="6736512735606834431">"5 sekondes"</item>
+    <item msgid="8044619388267891375">"15 sekondes"</item>
+    <item msgid="1822002388249545488">"30 sekondes"</item>
+    <item msgid="8538071621211916519">"1 minuut"</item>
+    <item msgid="5663439580228932882">"2 minute"</item>
+    <item msgid="49888496216106852">"5 minute"</item>
+    <item msgid="9002737361305019353">"10 minute"</item>
+    <item msgid="4322676235684793329">"30 minute"</item>
+  </string-array>
+    <!-- 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>
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Skandeer tans…"</item>
+    <item msgid="8513729475867537913">"Koppel tans…"</item>
+    <item msgid="515055375277271756">"Staaf tans…"</item>
+    <item msgid="1943354004029184381">"Bekom tans IP-adres…"</item>
+    <item msgid="4221763391123233270">"Gekoppel"</item>
+    <item msgid="624838831631122137">"Opgeskort"</item>
+    <item msgid="7979680559596111948">"Ontkoppel tans…"</item>
+    <item msgid="1634960474403853625">"Ontkoppel"</item>
+    <item msgid="746097431216080650">"Onsuksesvol"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"Skandeer tans…"</item>
+    <item msgid="355508996603873860">"Koppel tans aan <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="554971459996405634">"Staaf tans met <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7928343808033020343">"Verkry tans IP-adres van <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="8937994881315223448">"Gekoppel aan <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="1330262655415760617">"Opgeskort"</item>
+    <item msgid="7698638434317271902">"Ontkoppel tans van <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="197508606402264311">"Ontkoppel"</item>
+    <item msgid="8578370891960825148">"Onsuksesvol"</item>
+  </string-array>
+  <string-array name="wifi_security">
+    <item msgid="1435933968767043814">"Open"</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">"Swak"</item>
+    <item msgid="5615082285463430971">"Billik"</item>
+    <item msgid="3565079809875324621">"Goed"</item>
+    <item msgid="5702329417707689835">"Uitstekend"</item>
+  </string-array>
+  <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) -->
+  <string-array name="wifi_frequency_band_entries">
+    <item msgid="624340809384223320">"Outo"</item>
+    <item msgid="6670588712989942178">"Net 5 GHz"</item>
+    <item msgid="2715516524973207876">"Net 2.4 GHz"</item>
+  </string-array>
+  <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>
+  <string-array name="wifi_network_setup">
+    <item msgid="784271777398638325">"Handmatig"</item>
+    <item msgid="700386742589384062">"WPS-drukknoppie"</item>
+    <item msgid="7131487972018976724">"WPS-PIN van toegangspunt"</item>
+    <item msgid="4809199848225172977">"WPS-PIN van dié toestel"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"DHCP"</item>
+    <item msgid="628395202971532382">"Staties"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="4473276491748503377">"Geen"</item>
+    <!-- outdated translation 6267482274276126058 -->     <item msgid="8673874894887358090">"Staties"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Af"</item>
+    <item msgid="3165868966179561687">"Berig"</item>
+    <item msgid="6038758039030476855">"Vibreer"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="3856896061242872146">"Geen"</item>
+    <item msgid="5756844015743664882">"PAP"</item>
+    <item msgid="535934025797984365">"CHAP"</item>
+    <item msgid="8383098660619805783">"PAP of 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">"Interne toestelberging"</item>
+    <item msgid="3738430123799803530">"Verwyderbare SD-kaart"</item>
+    <item msgid="4498124044785815005">"Laat die stelsel besluit"</item>
+  </string-array>
+  <string-array name="vibrate_entries">
+    <item msgid="3388952299521009213">"Altyd"</item>
+    <item msgid="6293147072807231256">"Nooit"</item>
+    <item msgid="1276641209451816572">"Net in stilmodus"</item>
+    <item msgid="8418930333779132418">"Net wanneer nie in stilmodus nie"</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-af/strings.xml b/res/values-af/strings.xml
new file mode 100644
index 0000000..d070ac7
--- /dev/null
+++ b/res/values-af/strings.xml
@@ -0,0 +1,1981 @@
+<?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 />
+    <string name="sdcard_unmount" product="nosdcard" msgid="6325292633327972272">"Ontheg USB-berging"</string>
+    <!-- outdated translation 6325292633327972272 -->     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Ontheg USB-berging"</string>
+    <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Vee USB-berging uit"</string>
+    <string name="sdcard_format" product="default" msgid="6713185532039187532">"Vee SD-kaart uit"</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 />
+    <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"USB-berging"</string>
+    <!-- outdated translation 8281011784066476192 -->     <string name="sdcard_setting" product="default" msgid="5922637503871474866">"USB-berging"</string>
+    <!-- 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 />
+    <string name="battery_info_health_cold" msgid="3835692786176707318">"Koud"</string>
+    <!-- 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 />
+    <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Sluit stembellery"</string>
+    <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Voorkom die gebruik van die Bluetooth-beller wanneer die skerm gesluit is"</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> 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>
+    <string name="bluetooth_notif_message" msgid="618099089987569242">"Kies om met <xliff:g id="DEVICE_NAME">%1$s</xliff:g> saam te bind"</string>
+    <!-- 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>
+    <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"\'n Program versoek tans toestemming om Bluetooth aan te skakel. Wil jy dit toelaat?"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"\'n Program op jou tablet versoek toestemming om jou tablet opspoorbaar te maak vir ander Bluetooth-toestelle vir <xliff:g id="TIMEOUT">%1$d</xliff:g> sekondes. Wil jy dit toelaat?"</string>
+    <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 />
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"\'n Program op jou tablet versoek toestemming om Bluetooth aan te skakel en om jou tablet opspoorbaar te maak vir ander toestelle vir <xliff:g id="TIMEOUT">%1$d</xliff:g> sekondes. Wil jy dit toelaat?"</string>
+    <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>
+    <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Outokoppel"</string>
+    <!-- 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>
+    <string name="proxy_settings_title" msgid="5912878565897294401">"Instaaninstellings"</string>
+    <string name="proxy_settings_summary" msgid="7898928000758321486">"Stel die globale HTTP-instaanbediener- en uitsluitingslyste"</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">"Geen instaan nie vir"</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">"Klaar"</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">"Die uitsluitingslys wat jy ingevoer het, is nie behoorlik geformateer nie. Voer asseblief \'n kommageskeide lys uitgeslote domeine in."</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">"Verwissel DNS-kontrole"</string>
+    <string name="oem_radio_info_label" msgid="6163141792477958941">"OEM-spesifieke inligting/instellings"</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 />
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"USB-berging nie geheg nie"</string>
+    <!-- outdated translation 2902787003418172125 -->     <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"USB-berging nie geheg nie"</string>
+    <!-- no translation found for sdcard_settings_available_bytes_label (763232429899373001) -->
+    <skip />
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"USB-berging word tans as \'n massabergingtoestel gebruik"</string>
+    <!-- outdated translation 2736378870889777857 -->     <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"USB-berging word tans as \'n massabergingtoestel gebruik"</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="7503300818792750913">"Dit is nou veilig om die USB-berging te verwyder"</string>
+    <!-- outdated translation 7503300818792750913 -->     <string name="sdcard_settings_unmounted_status" product="default" msgid="3812022095683863087">"Dit is nou veilig om die USB-berging te verwyder"</string>
+    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB-berging is uitgehaal terwyl dit nog in gebruik is!"</string>
+    <!-- outdated translation 7761390725880773697 -->     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"USB-berging is uitgehaal terwyl dit nog in gebruik is!"</string>
+    <!-- no translation found for sdcard_settings_used_bytes_label (8820289486001170836) -->
+    <skip />
+    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Ondersoek tans USB-berging vir media…"</string>
+    <!-- outdated translation 7503429447676219564 -->     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Ondersoek tans USB-berging vir media…"</string>
+    <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"USB-berging geheg as leesalleen"</string>
+    <!-- outdated translation 3771783090621312312 -->     <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"USB-berging geheg as leesalleen"</string>
+    <string name="skip_label" msgid="47510779345218297">"Slaan oor"</string>
+    <!-- no translation found for next_label (4693520878012668114) -->
+    <skip />
+    <string name="language_picker_title" msgid="5349877711342869319">"Taal"</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 />
+    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Tabletinligting"</string>
+    <!-- outdated translation 7820855350955963628 -->     <string name="phone_info_label" product="default" msgid="2127552523124277664">"Tabletinligting"</string>
+    <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"USB-berging"</string>
+    <!-- outdated translation 8101475181301178428 -->     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"USB-berging"</string>
+    <!-- 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">"Instellings"</string>
+    <string name="settings_shortcut" msgid="8597387747077828217">"Kies instellingskortpad"</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>
+    <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Draadloos en netwerke"</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 />
+    <string name="date_time_auto" msgid="7076906458515908345">"Outomatiese datum en tyd"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Gebruik netwerkvoorsiende tyd"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Gebruik netwerkvoorsiende tyd"</string>
+    <string name="zone_auto" msgid="334783869352026648">"Outomatiese tydsone"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Gebruik netwerkvoorsiende tydsone"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Gebruik netwerkvoorsiende tydsone"</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">"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>
+    <string name="date_picker_title" msgid="1338210036394128512">"Datum"</string>
+    <string name="time_picker_title" msgid="483460752287255019">"Tyd"</string>
+    <string name="lock_after_timeout" msgid="940509402681580537">"Uittelling"</string>
+    <string name="lock_after_timeout_summary" msgid="4726009794344934278">"Sluit skerm <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> nadat skerm outomaties afgeskakel het"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Wys eienaarinligting op sluitskerm"</string>
+    <string name="owner_info_settings_title" msgid="2723190010708381889">"Eienaar se inligting"</string>
+    <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
+    <string name="owner_info_settings_edit_text_hint" msgid="2382525043173672857">"Voer teks in om op die sluitskerm te wys"</string>
+    <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 />
+    <string name="lock_settings_picker_title" msgid="8665454308380158195">"Stel sluitskerm op"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Stel sluitskerm op"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"Verander skermslot"</string>
+    <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Verander of deaktiveer patroon-, PIN- of wagwoordsekuriteit"</string>
+    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Kies \'n metode om die skerm te sluit"</string>
+    <string name="unlock_set_unlock_off_title" msgid="1613932765246180079">"Af"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="2791013557563587655">"Moet nooit die skerm sluit nie"</string>
+    <!-- outdated translation 5165705762615690332 -->     <string name="unlock_set_unlock_none_title" msgid="7560817055143323842">"Onbeveilig"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="2609139908913114644">"Moenie \'n patroon, PIN of wagwoord vereis om die skerm te ontsluit nie"</string>
+    <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Patroon"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="8467282436608077882">"Vereis \'n patroon om die skerm te ontsluit"</string>
+    <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Vereis \'n numeriese PIN om die skerm te ontsluit"</string>
+    <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Wagwoord"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Vereis \'n wagwoord om die skerm te ontsluit"</string>
+    <!-- outdated translation 8816944391772300580 -->     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Gedeaktiveer deur afgeleë toesteladministrateur"</string>
+    <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Af"</string>
+    <!-- outdated translation 7953821968316697309 -->     <string name="unlock_set_unlock_mode_none" msgid="7137296704741184239">"Onbeveilig"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Beveilig met patroon"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Beveilig met PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Beveilig met wagwoord"</string>
+    <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Skakel skermslot af"</string>
+    <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Verwyder ontsluitpatroon"</string>
+    <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Verwyder ontsluit-PIN"</string>
+    <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Verwyder ontsluitwagwoord"</string>
+    <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Verander ontsluitpatroon"</string>
+    <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Verander ontsluit-PIN"</string>
+    <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Verander ontsluitwagwoord"</string>
+    <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Wagwoord moet minstens %d karakters hê"</string>
+    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN moet minstens %d karakters bevat"</string>
+    <string name="lockpassword_press_continue" msgid="122706614386757182">"Raak \"Gaan voort\" as jy klaar is"</string>
+    <string name="lockpassword_continue_label" msgid="4602203784934526940">"Gaan voort"</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 mag net syfers 0-9 bevat"</string>
+    <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Toesteladministrateur verbied gebruik van \'n onlangse PIN"</string>
+    <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Wagwoord bevat \'n onwettige karakter"</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"Wagwoord moet minstens een letter bevat"</string>
+    <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"Wagwoord moet minstens een syfer bevat"</string>
+    <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"Wagwoord moet minstens een simbool bevat"</string>
+  <plurals name="lockpassword_password_requires_letters">
+    <item quantity="one" msgid="1462968118065694590">"Wagwoord moet minstens 1 letter bevat"</item>
+    <item quantity="other" msgid="7278096339907683541">"Wagwoord moet minstens %d letters bevat"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_lowercase">
+    <item quantity="one" msgid="2048653993044269649">"Wagwoord moet minstens 1 kleinletter bevat"</item>
+    <item quantity="other" msgid="588499075580432178">"Wagwoord moet minstens %d kleinletters bevat"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_uppercase">
+    <item quantity="one" msgid="7677454174080582601">"Wagwoord moet minstens 1 hoofletter bevat"</item>
+    <item quantity="other" msgid="2183090598541826806">"Wagwoord moet minstens %d hoofletters bevat"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_numeric">
+    <item quantity="one" msgid="8585088032818933985">"Wagwoord moet minstens 1 syfer bevat"</item>
+    <item quantity="other" msgid="995673409754935278">"Wagwoord moet minstens %d syfers bevat"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_symbols">
+    <item quantity="one" msgid="3930886641317826293">"Wagwoord moet minstens 1 spesiale simbool bevat"</item>
+    <item quantity="other" msgid="3047460862484105274">"Wagwoord moet minstens %d spesiale simbole bevat"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_nonletter">
+    <item quantity="one" msgid="1716355580615489062">"Wagwoord moet minstens 1 karakter bevat wat nie \'n letter is nie"</item>
+    <item quantity="other" msgid="5574191164708145973">"Wagwoord moet minstens %d karakters bevat wat nie letters is nie"</item>
+  </plurals>
+    <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"Toesteladministrateur verbied gebruik van \'n onlangse wagwoord"</string>
+    <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
+    <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Kanselleer"</string>
+    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Kanselleer"</string>
+    <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Volgende"</string>
+    <string name="device_admin_title" msgid="3562216873644263804">"Toesteladministrasie"</string>
+    <string name="manage_device_admin" msgid="5059296715271077278">"Toesteladministrateurs"</string>
+    <string name="manage_device_admin_summary" msgid="7672709110988761075">"Sien of deaktiveer toesteladministrateurs"</string>
+    <!-- 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>
+    <string name="bluetooth_enter_pin_msg" msgid="1499285355129256289">\n"Voer PIN in om saam te bind met \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". (Probeer 0000 of 1234.) Jy moet dalk dieselfde PIN op die Bluetooth-toestel invoer."</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="8301499416158195044">\n"Voer wagwoordsleutel in om saam te bind met \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
+    <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>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="9139892462102104755">"Voer \"<xliff:g id="PASSKEY">%2$s</xliff:g>\" in op \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" om saam te bind, gevolg deur Enter."</string>
+    <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>
+    <string name="bluetooth_preference_find_nearby_title" msgid="5087410003465463318">"Vind nabygeleë toestelle"</string>
+    <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"Toestelinstellings"</string>
+    <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Saamgebinde toestelle"</string>
+    <string name="bluetooth_preference_found_devices" msgid="3133019331974936204">"Toestelle gevind"</string>
+    <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>
+    <string name="bluetooth_profile_headset" msgid="81844079120986198">"Vryhands"</string>
+    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Dra oor"</string>
+    <string name="bluetooth_profile_hid" msgid="3000858580917633478">"Invoertoestel"</string>
+    <!-- outdated translation 4225813400648547154 -->     <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Verbinding"</string>
+    <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sal van mediaoudio ontkoppel word."</string>
+    <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>sal van vryhandse oudio ontkoppel word."</string>
+    <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sal van invoertoestel ontkoppel word."</string>
+    <!-- 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>
+    <string name="bluetooth_device_advanced_device_actions_title" msgid="3793430949811946844">"Toestelhandelinge"</string>
+    <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>
+    <string name="bluetooth_device_advanced_rename_device" msgid="350508394033808532">"Hernoem toestel"</string>
+    <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Laat inkomende lêeroordragte toe"</string>
+    <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>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Gekoppel aan invoertoestel"</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">"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>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Gebruik vir invoer"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Gebruik vir internettoegang"</string>
+    <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Dok-instellings"</string>
+    <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Gebruik dok vir oudio"</string>
+    <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"As luidsprekerfoon"</string>
+    <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Vir musiek en media"</string>
+    <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Onthou instellings"</string>
+    <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
+    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"Gebruik kortveldkommunikasie om merkers te lees en te ruil"</string>
+    <string name="nfc_toggle_error" msgid="2233172102497535522">"\'n Fout het voorgekom."</string>
+    <!-- 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 />
+    <string name="wifi_in_airplane_mode" msgid="7618393787965366655">"In vliegtuigmodus"</string>
+    <string name="wifi_fail_to_scan" msgid="6194542252808587669">"Kan nie vir netwerke skandeer nie"</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">"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>
+    <string name="wifi_add_network" msgid="1671334951296205616">"Voeg Wi-Fi-netwerk by"</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">"Skandeer"</string>
+    <!-- no translation found for wifi_menu_advanced (7522252991919573664) -->
+    <skip />
+    <string name="wifi_menu_connect" msgid="4996220309848349408">"Koppel aan netwerk"</string>
+    <string name="wifi_menu_forget" msgid="8736964302477327114">"Vergeet netwerk"</string>
+    <string name="wifi_menu_modify" msgid="2068554918652440105">"Wysig netwerk"</string>
+    <string name="wifi_network_setup" msgid="7974851890019344870">"Netwerkopstelling"</string>
+    <string name="wifi_wps_pin" msgid="5471842298708321115">"Voer PIN van toegangspunt in"</string>
+    <!-- no translation found for wifi_wps_setup_title (150518971269252336) -->
+    <skip />
+    <string name="wifi_wps_pin_output" msgid="8682102965680650853">"Voer die PIN in <xliff:g id="WPS_PIN">%1$s</xliff:g> by die toegangspunt"</string>
+    <!-- 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">"Netwerk-SSID"</string>
+    <!-- no translation found for wifi_security (6603611185592956936) -->
+    <skip />
+    <string name="wifi_signal" msgid="5514120261628065287">"Seinsterkte"</string>
+    <!-- no translation found for wifi_status (4824568012414605414) -->
+    <skip />
+    <string name="wifi_speed" msgid="3526198708812322037">"Koppelspoed"</string>
+    <!-- no translation found for wifi_ip_address (1440054061044402918) -->
+    <skip />
+    <string name="wifi_eap_method" msgid="8529436133640730382">"EAP-metode"</string>
+    <string name="please_select_phase2" msgid="5231074529772044898">"Fase 2-stawing"</string>
+    <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA-sertifikaat"</string>
+    <string name="wifi_eap_user_cert" msgid="1291089413368160789">"Gebruikersertifikaat"</string>
+    <string name="wifi_eap_identity" msgid="4359453783379679103">"Identiteit"</string>
+    <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonieme identiteit"</string>
+    <string name="wifi_password" msgid="5948219759936151048">"Wagwoord"</string>
+    <string name="wifi_show_password" msgid="6461249871236968884">"Wys wagwoord"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"IP-instellings"</string>
+    <string name="wifi_unchanged" msgid="3410422020930397102">"(onveranderd)"</string>
+    <string name="wifi_unspecified" msgid="5431501214192991253">"(ongespesifiseer)"</string>
+    <string name="wifi_remembered" msgid="8426719916135950136">"Het onthou"</string>
+    <string name="wifi_disabled" msgid="2104752038187543712">"Gedeaktiveer"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Nie binne ontvangs nie"</string>
+    <string name="wifi_open_with_wps" msgid="2606968531452521147">"WPS beskikbaar"</string>
+    <string name="wifi_secured" msgid="6759903183748011566">"Beveilig met <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_with_wps" msgid="1822538701086256007">"Beveilig met <xliff:g id="WIFI_SECURITY">%1$s</xliff:g> (WPS beskikbaar)"</string>
+    <string name="wifi_secured_with_status" msgid="6489317496506267302">"<xliff:g id="WIFI_STATUS">%2$s</xliff:g>, beveilig met <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
+    <string name="wifi_connect" msgid="1076622875777072845">"Koppel"</string>
+    <string name="wifi_forget" msgid="8168174695608386644">"Vergeet"</string>
+    <string name="wifi_save" msgid="3331121567988522826">"Stoor"</string>
+    <string name="wifi_cancel" msgid="6763568902542968964">"Kanselleer"</string>
+    <!-- no translation found for wifi_wps_overlap_error (6820987241637459748) -->
+    <skip />
+    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Gevorderd"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi-frekwensieband"</string>
+    <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Spesifiseer die frekwensieomvang van die bewerking"</string>
+    <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Kon nie die frekwensiebandwydte instel nie."</string>
+    <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC-adres"</string>
+    <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP-adres"</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 />
+    <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Voer asseblief \'n geldige IP-adres in."</string>
+    <string name="wifi_ip_settings_invalid_gateway" msgid="6383012465511093067">"Voer asseblief \'n geldige deurgangadres in."</string>
+    <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Voer asseblief \'n geldige dns-adres in."</string>
+    <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Voer asseblief \'n netwerkvoorvoegsel in met lengte tussen 0 en 32."</string>
+    <!-- no translation found for wifi_dns1 (7344118050720080045) -->
+    <skip />
+    <!-- no translation found for wifi_dns2 (1368601006824882659) -->
+    <skip />
+    <!-- no translation found for wifi_gateway (163914742461092086) -->
+    <skip />
+    <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Lengte van netwerkvoorvoegsel"</string>
+    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Losstaande Wi-Fi-warmkol"</string>
+    <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Losstaande Wi-Fi-warmkol <xliff:g id="NETWORK_SSID">%1$s</xliff:g> aktief"</string>
+    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Fout met losstaande Wi-Fi-warmkol"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="3474995108398156258">"Stel Wi-Fi-warmkol op"</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> losstaande Wi-Fi-warmkol"</string>
+    <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
+    <string name="sound_settings_title" msgid="8735891486683305886">"Klank"</string>
+    <string name="display_settings_title" msgid="2378894265964357591">"Skerm"</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">"Maak alle klanke stil behalwe media en wekkers"</string>
+    <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"Alle klanke, behalwe media, word stilgemaak"</string>
+    <string name="ringtone_title" msgid="7037881886694206550">"Inkomende oproep se luitoon"</string>
+    <string name="ringtone_summary" msgid="2630023412632683493"></string>
+    <string name="all_volume_title" msgid="8741571721868253103">"Volume"</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">"Vibreer wanneer stil"</string>
+    <string name="vibrate_in_silent_summary" msgid="3312600513070076281">"Aktiveer vibrasieterugvoer in stilmodus"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"Vibreer"</string>
+    <string name="vibrate_summary" msgid="7378130397830790458">"Vibrasieterugvoer vir oproepe en kennisgewings"</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">"Flikker kennisgewing-liggie"</string>
+    <string name="notification_pulse_summary" msgid="6899220780534617152">"Flikker spoorbal-liggie herhaaldelik vir nuwe kennisgewings"</string>
+    <string name="incoming_call_volume_title" msgid="8073714801365904099">"Luitoon"</string>
+    <string name="notification_volume_title" msgid="2012640760341080408">"Kennisgewing"</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 />
+    <string name="media_volume_title" msgid="3576565767317118106">"Media"</string>
+    <!-- no translation found for media_volume_summary (5363248930648849974) -->
+    <skip />
+    <string name="alarm_volume_title" msgid="2285597478377758706">"Wekker"</string>
+    <string name="dock_settings_summary" msgid="455802113668982481">"Oudio-instellings vir die aangehegte dok"</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">"Skermslotklanke"</string>
+    <string name="lock_sounds_enable_summary_on" msgid="145741024028391473">"Speel klanke wanneer skerm gesluit en ontsluit word"</string>
+    <string name="lock_sounds_enable_summary_off" msgid="8481243116223542804">"Speel klanke wanneer skerm gesluit en ontsluit word"</string>
+    <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>
+    <string name="audio_record_proc_title" msgid="4271091199976457534">"Geraas-kansellasie"</string>
+    <string name="audio_record_proc_summary" msgid="8113628457499616498">"Onderdruk agtergrondgeraas wanneer gepraat of opgeneem word."</string>
+    <string name="dock_settings" msgid="1820107306693002541">"Dok"</string>
+    <string name="dock_settings_title" msgid="9161438664257429372">"Dok-instellings"</string>
+    <string name="dock_audio_settings_title" msgid="3324750259959570305">"Oudio"</string>
+    <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Instellings vir die aangehegte lessenaardok"</string>
+    <string name="dock_audio_summary_car" msgid="6740897586006248450">"Instellings vir die aangehegte motordok"</string>
+    <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"Tablet nie gedok nie"</string>
+    <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Foon nie gedok nie"</string>
+    <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Instellings vir die aangehegte dok"</string>
+    <string name="dock_not_found_title" msgid="3290961741828952424">"Dok nie gevind nie"</string>
+    <string name="dock_not_found_text" product="tablet" msgid="7935403744079168804">"Die tablet moet gedok wees om dokoudio op te stel"</string>
+    <string name="dock_not_found_text" product="default" msgid="3035260358985111855">"Die foon moet gedok wees om dokoudio op te stel"</string>
+    <string name="dock_sounds_enable_title" msgid="3659084028644948905">"Dok-insteekklank"</string>
+    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Speel klank wanneer tablet op dok geplaas of daarvan verwyder word"</string>
+    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Speel klank wanneer foon in dok gesit of uitgehaal word"</string>
+    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Moenie klank speel as tablet op dok geplaas of afgehaal word nie"</string>
+    <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Moenie klank speel wanneer foon in dok gesit of uitgehaal word nie"</string>
+    <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>
+    <string name="accelerometer_title" msgid="7854608399547349157">"Outodraai skerm"</string>
+    <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Wissel oriëntasie outomaties wanneer tablet gedraai word"</string>
+    <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Verwissel outomaties van oriëntasie wanneer foon draai"</string>
+    <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Wissel oriëntasie outomaties wanneer tablet gedraai word"</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>
+    <string name="screen_timeout" msgid="6962654593018319466">"Uittelling"</string>
+    <string name="screen_timeout_summary" msgid="4471347210332380587">"Skerm skakel outomaties af na <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <!-- no translation found for wallpaper_settings_title (5449180116365824625) -->
+    <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 />
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Vereis PIN om tablet te gebruik"</string>
+    <!-- outdated translation 5058355081270397764 -->     <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Vereis PIN om tablet te gebruik"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Vereis PIN om tablet te gebruik"</string>
+    <!-- outdated translation 2813800553917012356 -->     <string name="sim_lock_off" product="default" msgid="258981978215428916">"Vereis PIN om tablet te gebruik"</string>
+    <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 />
+    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Tabletstatus"</string>
+    <!-- outdated translation 1119755927536987178 -->     <string name="device_info_settings" product="default" msgid="475872867864762157">"Tabletstatus"</string>
+    <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Stelselopdaterings"</string>
+    <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
+    <string name="firmware_version" msgid="4801135784886859972">"Android-weergawe"</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">"Status"</string>
+    <!-- no translation found for device_status (607405385799807324) -->
+    <skip />
+    <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Status van die battery, netwerk en ander inligting"</string>
+    <string name="device_status_summary" product="default" msgid="2599162787451519618">"Foonnommer, sein ens."</string>
+    <string name="storage_settings" msgid="4211799979832404953">"Berging"</string>
+    <string name="storage_settings_title" msgid="8746016738388094064">"Bergingsinstellings"</string>
+    <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Ontheg USB-berging, sien beskikbare berging"</string>
+    <!-- outdated translation 3543813623294870759 -->     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Ontheg USB-berging, sien beskikbare berging"</string>
+    <!-- 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>
+    <!-- no translation found for status_msid_number (909010114445780530) -->
+    <skip />
+    <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 />
+    <string name="internal_memory" msgid="9129595691484260784">"Interne berging"</string>
+    <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB-berging"</string>
+    <!-- outdated translation 2510246194083052841 -->     <string name="sd_memory" product="default" msgid="151871913888051515">"USB-berging"</string>
+    <!-- no translation found for memory_available (5052397223077021181) -->
+    <skip />
+    <!-- no translation found for memory_size (6629067715017232195) -->
+    <skip />
+    <string name="memory_calculating_size" msgid="2188358544203768588">"Bereken tans…"</string>
+    <!-- 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">"Ontheg gedeelde berging"</string>
+    <string name="sd_eject" product="default" msgid="6915293408836853020">"Ontheg SD-kaart"</string>
+    <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Ontheg die interne USB-berging"</string>
+    <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Ontheg die SD-kaart sodat jy dit veilig kan verwyder"</string>
+    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Sit USB-berging in vir hegting"</string>
+    <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Steek \'n SD-kaart in vir hegting"</string>
+    <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Heg USB-berging"</string>
+    <string name="sd_mount" product="default" msgid="5940523765187704135">"Heg SD-kaart"</string>
+    <string name="sd_mount_summary" product="nosdcard" msgid="4673411327373419641"></string>
+    <string name="sd_mount_summary" product="default" msgid="4673411327373419641"></string>
+    <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"Vee USB-berging uit"</string>
+    <string name="sd_format" product="default" msgid="2576054280507119870">"Vee SD-kaart uit"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Vee alle data op die interne USB-berging uit, soos musiek en foto\'s"</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"Vee alle data op die SD-kaart uit, soos musiek en foto\'s"</string>
+    <!-- no translation found for read_only (6702420168629076340) -->
+    <skip />
+    <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"Ontheg USB-berging"</string>
+    <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"Ontheg SD-kaart"</string>
+    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"As jy die USB-berging ontheg het, sal sommige programme wat jy gebruik stop en onbeskikbaar wees totdat jy die USB-berging weer heg."</string>
+    <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"As jy die SD-kaart ontheg, sal sekere programme wat jy gebruik, stop en dalk nie beskikbaar wees nie tot jy die SD-kaart weer heg."</string>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"Kon nie USB-berging ontheg nie"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"Kon nie SD-kaart ontheg nie"</string>
+    <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"Kan nie USB-berging ontheg nie. Probeer later weer."</string>
+    <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"Kan nie SD-kaart ontheg nie. Probeer later weer."</string>
+    <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"USB-berging sal ontheg word."</string>
+    <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"SD-kaart sal ontheg word."</string>
+    <string name="sd_ejecting_title" msgid="8824572198034365468">"Onthegting"</string>
+    <string name="sd_ejecting_summary" msgid="2028753069184908491">"Onthegting besig"</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">"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 />
+    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Vee alle data op tablet uit"</string>
+    <!-- outdated translation 4036344100254678429 -->     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Vee alle data op tablet uit"</string>
+    <!-- outdated translation 1305457209008369655 -->     <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"Dit sal alle data van jou tablet se "<b>"interne geheue"</b>" uitvee, insluitend:"\n\n<li>"jou Google-rekening"</li>\n<li>"stelsel- en programdata en -instellings"</li>\n<li>"afgelaaide programme"</li></string>
+    <!-- outdated translation 1305457209008369655 -->     <string name="master_clear_desc" product="default" msgid="3251400937758241249">"Dit sal alle data van jou tablet se "<b>"interne geheue"</b>" uitvee, insluitend:"\n\n<li>"jou Google-rekening"</li>\n<li>"stelsel- en programdata en -instellings"</li>\n<li>"afgelaaide programme"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Jy is tans aangemeld by die volgende rekeninge:"\n</string>
+    <!-- no translation found for master_clear_desc_also_erases_external (1903185203791274237) -->
+    <skip />
+    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Om ook musiek, prente en ander gebruikerdata uit te vee, moet die "<b>"USB-berging"</b>" uitgevee word."</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Om ook musiek, prente en ander gebruikerdata uit te vee, moet die "<b>"SD-kaart"</b>" uitgevee word."</string>
+    <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Vee USB-berging uit"</string>
+    <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Vee SD-kaart uit"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"Vee alle data op die interne USB-berging uit, soos musiek of foto\'s."</string>
+    <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"Vee al die data op die SD-kaart uit, soos musiek of foto\'s."</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Stel tablet terug"</string>
+    <!-- outdated translation 3130786116528304116 -->     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Stel tablet terug"</string>
+    <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>
+    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Jy moet jou ontsluitpatroon teken om jou foon se fabrieksterugstelling te bevestig."</string>
+    <!-- no translation found for master_clear_failed (8655202125010189406) -->
+    <skip />
+    <string name="master_clear_confirm_title" msgid="4845794266129586839">"Bevestig terugstel"</string>
+    <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Vee USB-berging uit"</string>
+    <string name="media_format_title" product="default" msgid="4427528440306787972">"Vee SD-kaart uit"</string>
+    <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Vee alle data in USB-berging uit"</string>
+    <string name="media_format_summary" product="default" msgid="3805714639375830120">"Vee alle data op die SD-kaart uit"</string>
+    <string name="media_format_desc" product="nosdcard" msgid="4553860683952763905">"Hierdie handeling sal die USB-berging uitvee. Jy sal "<b>"alle"</b>" data wat hier gestoor word, verloor!"</string>
+    <string name="media_format_desc" product="default" msgid="1598627584181935513">"Hierdie handeling sal die SD-kaart uitvee. Jy sal "<b>"alle "</b>" data op die kaart verloor!"</string>
+    <string name="media_format_button_text" product="nosdcard" msgid="6293669371185352810">"Vee USB-berging uit"</string>
+    <string name="media_format_button_text" product="default" msgid="6721544380069373626">"Vee SD-kaart uit"</string>
+    <string name="media_format_final_desc" product="nosdcard" msgid="8094635533378487255">"Vee USB-berging uit, wat alle lêers wat daar gestoor word, sal uitvee? Handeling kan nie omgekeer word nie!"</string>
+    <string name="media_format_final_desc" product="default" msgid="9015504991522581434">"Vee SD-kaart uit, wat alle lêers wat daar gestoor word, sal uitvee? Handeling kan nie omgekeer 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>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Jy moet jou ontsluitpatroon teken om te bevestig dat jy die USB-berging wil uitvee."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Jy moet jou ontsluitpatroon teken om te bevestig dat jy die SD-kaart wil uitvee."</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-verbinding"</string>
+    <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Losstaande Wi-Fi-warmkol"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth-verbinding"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Verbinding"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"Verbinding en losstaande Wi-Fi-warmkol"</string>
+    <string name="tether_settings_summary_usb" product="tablet" msgid="785883365108362248">"Deel jou tablet se mobiele dataverbinding via USB"</string>
+    <string name="tether_settings_summary_usb" product="default" msgid="3562431455625637370">"Deel jou foon se mobiele dataverbinding via USB"</string>
+    <string name="tether_settings_summary_wifi" msgid="5474383125137372164">"Deel jou mobiele dataverbinding as \'n losstaande Wi-Fi-warmkol"</string>
+    <string name="tether_settings_summary_bluetooth" msgid="2407506656353819750">"Deel jou mobiele dataverbinding via Bluetooth"</string>
+    <string name="tether_settings_summary_usb_wifi" product="tablet" msgid="3834674129575844910">"Deel jou tablet se mobiele dataverbinding via USB of as \'n losstaande Wi-Fi-warmkol"</string>
+    <string name="tether_settings_summary_usb_wifi" product="default" msgid="3700323208282018772">"Deel jou foon se mobiele dataverbinding via USB of as \'n losstaande Wi-Fi-warmkol"</string>
+    <string name="tether_settings_summary_usb_bluetooth" product="tablet" msgid="1245080236509560839">"Deel jou tablet se mobiele dataverbinding via USB of Bluetooth"</string>
+    <string name="tether_settings_summary_usb_bluetooth" product="default" msgid="4008195891276675882">"Deel jou foon se mobiele dataverbinding via USB of Bluetooth"</string>
+    <string name="tether_settings_summary_wifi_bluetooth" product="tablet" msgid="1924576461932311140">"Deel jou tablet se mobiele dataverbinding via Bluetooth of as \'n losstaande Wi-Fi-warmkol"</string>
+    <string name="tether_settings_summary_wifi_bluetooth" product="default" msgid="2753904149495692201">"Deel jou foon se mobiele dataverbinding via Bluetooth of as \'n losstaande Wi-Fi-warmkol"</string>
+    <string name="tether_settings_summary_all" product="tablet" msgid="6612660164315153427">"Deel jou tablet se mobiele dataverbinding via USB, Wi-Fi of Bluetooth"</string>
+    <string name="tether_settings_summary_all" product="default" msgid="1171769255924636665">"Deel jou foon se mobiele dataverbinding via USB, Wi-Fi of Bluetooth"</string>
+    <string name="usb_title" msgid="7483344855356312510">"USB"</string>
+    <string name="usb_tethering_button_text" msgid="585829947108007917">"USB-verbinding"</string>
+    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB gekoppel, merk om te verbind"</string>
+    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Verbind"</string>
+    <string name="usb_tethering_storage_active_subtext" msgid="6608933594288072573">"Kan nie verbind wanneer USB-geheue gebruik word nie"</string>
+    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB nie gekoppel nie"</string>
+    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB-verbindingsfout"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth-verbinding"</string>
+    <!-- outdated translation 3317112145693933963 -->     <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Bluetooth-verbinding aan, maar nie gekoppel nie"</string>
+    <!-- outdated translation 3317112145693933963 -->     <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Bluetooth-verbinding aan, maar nie gekoppel nie"</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">"Bluetooth-verbinding af"</string>
+    <!-- outdated translation 1798863866978968964 -->     <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Bluetooth-verbinding af"</string>
+    <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Bluetooth-verbindingsfout"</string>
+    <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"Kan nie aan meer as <xliff:g id="MAXCONNECTION">%1$d</xliff:g> toestelle verbind nie"</string>
+    <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sal ontverbind word."</string>
+    <string name="tethering_help_button_text" msgid="656117495547173630">"Hulp"</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">"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>
+    <string name="location_street_level" msgid="7456259025474443314">"Tydens liggingsoek, akkuraat tot op straatvlak"</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>
+    <string name="use_location_title" msgid="3659340070401464551">"Gebruik ligging vir Google Search"</string>
+    <string name="use_location_summary_disabled" msgid="6518008620918354403">"Gebruik ligging vir Google Search en ander Google-dienste"</string>
+    <string name="use_location_summary_enabled" msgid="8110246289085796179">"Ligging gebruik om Google-soekresultate en ander Google-dienste te verbeter"</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"Meer oor tablet"</string>
+    <!-- outdated translation 593457295516533765 -->     <string name="about_settings" product="default" msgid="1743378368185371685">"Meer oor tablet"</string>
+    <string name="about_settings_summary" msgid="3371517697156165959">"Sien regsinligting, status, sagteware-weergawe"</string>
+    <!-- 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>
+    <string name="system_tutorial_list_item_summary" product="tablet" msgid="3341504384445734067">"Leer hoe om jou tablet 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>
+    <string name="settings_safetylegal_activity_unreachable" msgid="170670055116721810">"Jy het nie \'n dataverbinding nie. Om die inligting nou te sien, gaan na %s op enige rekenaar wat aan die internet gekoppel is."</string>
+    <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Laai tans…"</string>
+    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Kies jou wagwoord"</string>
+    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Kies jou patroon"</string>
+    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Kies jou PIN"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Bevestig jou wagwoord"</string>
+    <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Bevestig jou patroon"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Bevestig jou PIN"</string>
+    <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"Wagwoorde stem nie ooreen nie"</string>
+    <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"PIN\'e stem nie ooreen nie"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Ontsluit keuse"</string>
+    <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Wagwoord is gestel"</string>
+    <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN is gestel"</string>
+    <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Patroon is ingestel"</string>
+    <string name="lock_settings_title" msgid="8943058958424073651">"Sluit skerm"</string>
+    <!-- no translation found for lockpattern_change_lock_pattern_label (5679630792003440352) -->
+    <skip />
+    <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Verander ontsluit-PIN"</string>
+    <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 />
+    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Beveilig jou tablet"</string>
+    <!-- outdated translation 2909697418179419990 -->     <string name="lock_title" product="default" msgid="4059246467204273930">"Beveilig jou tablet"</string>
+    <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"Beskerm jou tablet teen ongemagtigde gebruik deur \'n persoonlike skermontsluitpatroon te skep. Gebruik jou vinger om die kolletjies in enige volgorde te verbind op die volgende skerm. Jy moet ten minste vier kolletjies verbind. "\n\n"Reg om te begin? Raak “Volgende”."</string>
+    <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 />
+    <string name="install_unknown_applications" msgid="6612824788917283662">"Laat installering van nie-Market-programme toe"</string>
+    <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"Jou tablet en persoonlike data is meer kwesbaar vir aanvalle deur programme uit onbekende bronne. Jy stem saam dat jy alleen verantwoordelik sal wees vir enige skade aan jou tablet 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 />
+    <string name="disable_text" msgid="6544054052049395202">"Deaktiveer"</string>
+    <string name="enable_text" msgid="9217362512327828987">"Aktiveer"</string>
+    <!-- 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 />
+    <string name="sort_order_alpha" msgid="1410278099123670628">"Rangskik volgens naam"</string>
+    <string name="sort_order_size" msgid="7024513286636502362">"Rangskik volgens grootte"</string>
+    <string name="show_running_services" msgid="5736278767975544570">"Wys lopende dienste"</string>
+    <string name="show_background_processes" msgid="2009840211972293429">"Wys gekaste prosesse"</string>
+    <!-- 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>
+    <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-berging"</string>
+    <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Op SD-kaart"</string>
+    <string name="disabled" msgid="9206776641295849915">"Gedeaktiveer"</string>
+    <string name="no_applications" msgid="5190227407135243904">"Geen programme nie."</string>
+    <string name="internal_storage" msgid="1584700623164275282">"Interne berging"</string>
+    <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB-berging"</string>
+    <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD-kaartberging"</string>
+    <!-- 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>
+    <string name="security_settings_desc" product="tablet" msgid="6158636779728455276">"Hierdie program kan die volgende op jou tablet lees:"</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>
+    <string name="move_app" msgid="5042838441401731346">"Skuif"</string>
+    <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Skuif na tablet"</string>
+    <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Skuif na foon"</string>
+    <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Skuif na USB-berging"</string>
+    <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Skuif na SD-kaart"</string>
+    <string name="moving" msgid="6431016143218876491">"Skuif"</string>
+    <string name="insufficient_storage" msgid="8566913062094452962">"Daar is nie genoeg geheue oor nie."</string>
+    <string name="does_not_exist" msgid="837163572898468245">"Die program bestaan nie."</string>
+    <string name="app_forward_locked" msgid="5747805144210389585">"Die program is beskerm teen kopiëring."</string>
+    <string name="invalid_location" msgid="4934491353200240499">"Die gespesifiseerde installering-ligging is ongeldig."</string>
+    <string name="system_package" msgid="1030561474413022831">"Stelselopdaterings kan nie op eksterne media geïnstalleer word nie."</string>
+    <string name="force_stop_dlg_title" msgid="4289453224368188476">"Dwing stop"</string>
+    <string name="force_stop_dlg_text" msgid="5157374701213502922">"Om \'n program te dwing om te stop, kan dit vreemd laat optree. Is jy seker?"</string>
+    <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Skuif program"</string>
+    <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Kon nie program skuif nie. <xliff:g id="REASON">%1$s</xliff:g>"</string>
+    <string name="app_install_location_title" msgid="2068975150026852168">"Voorkeur-installeerligging"</string>
+    <string name="app_install_location_summary" msgid="879753854530300436">"Verander die voorkeur-installeerligging vir nuwe programme."</string>
+    <string name="storageuse_settings_title" msgid="5657014373502630403">"Geheuegebruik"</string>
+    <string name="storageuse_settings_summary" msgid="2556057379120846792">"Sien berging wat deur programme gebruik word"</string>
+    <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>
+    <string name="cached" msgid="1059590879740175019">"Gekaste agtergrondprosesse"</string>
+    <string name="no_running_services" msgid="2059536495597645347">"Niks loop nie."</string>
+    <string name="service_started_by_app" msgid="6575184738671598131">"Deur program begin."</string>
+    <!-- no translation found for service_client_name (4037193625611815517) -->
+    <skip />
+    <string name="service_background_processes" msgid="6844156253576174488">"<xliff:g id="MEMORY">%1$s</xliff:g> gratis"</string>
+    <string name="service_foreground_processes" msgid="7583975676795574276">"<xliff:g id="MEMORY">%1$s</xliff:g> gebruik"</string>
+    <string name="memory" msgid="6609961111091483458">"RAM"</string>
+    <!-- no translation found for service_process_name (4098932168654826656) -->
+    <skip />
+    <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proses en <xliff:g id="NUMSERVICES">%2$d</xliff:g> diens"</string>
+    <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proses en <xliff:g id="NUMSERVICES">%2$d</xliff:g> dienste"</string>
+    <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> prosesse en <xliff:g id="NUMSERVICES">%2$d</xliff:g> diens"</string>
+    <string name="running_processes_item_description_p_p" msgid="1607384595790852782">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> prosesse en <xliff:g id="NUMSERVICES">%2$d</xliff:g> dienste"</string>
+    <string name="runningservicedetails_settings_title" msgid="6188692418986988288">"Program wat loop"</string>
+    <string name="no_services" msgid="7133900764462288263">"Onaktief"</string>
+    <string name="runningservicedetails_services_title" msgid="391168243725357375">"Dienste"</string>
+    <string name="runningservicedetails_processes_title" msgid="928115582044655268">"Prosesse"</string>
+    <string name="service_stop" msgid="6369807553277527248">"Stop"</string>
+    <string name="service_manage" msgid="1876642087421959194">"Instellings"</string>
+    <string name="service_stop_description" msgid="3261798282116866961">"Hierdie diens is deur sy program begin. As dit gestop word, kan die program misluk."</string>
+    <string name="heavy_weight_stop_description" msgid="6855241582643136019">"Hierdie program kan nie veilig gestop word nie. Deur dit te doen, kan van jou huidige werk verlore gaan."</string>
+    <string name="background_process_stop_description" msgid="1728354083304746737">"Hierdie is \'n ou programproses wat gehou word vir spoedverbetering as dit dalk weer nodig word. Daar is gewoonlik geen rede om dit te stop nie."</string>
+    <string name="service_manage_description" msgid="7050092269951613102">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: tans in gebruik. Raak Instellings om dit te beheer."</string>
+    <string name="main_running_process_description" msgid="929204645380391397">"Hoofproses wat tans gebruik word."</string>
+    <string name="process_service_in_use_description" msgid="8993335064403217080">"Diens <xliff:g id="COMP_NAME">%1$s</xliff:g> word tans gebruik."</string>
+    <string name="process_provider_in_use_description" msgid="5586603325677678940">"Veskaffer <xliff:g id="COMP_NAME">%1$s</xliff:g> word tans gebruik."</string>
+    <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Stop stelseldiens?"</string>
+    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="5420033091144016389">"Is jy seker jy wil hierdie stelseldiens stop? As jy dit doen, sal sommige kenmerke van jou tablet dalk nie behoorlik werk nie totdat jy dit eers aan en af skakel."</string>
+    <string name="runningservicedetails_stop_dlg_text" product="default" msgid="6929716497425738387">"Is jy seker jy wil hierdie stelseldiens stop? Indien wel, kan sommige kenmerke van jou foon dalk nie meer reg werk nie, totdat jy die foon af- en weer aanskakel."</string>
+    <string name="language_settings" msgid="5292716747264442359">"Taal en invoer"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Taal en invoer"</string>
+    <string name="language_settings_category" msgid="2288258489940617043">"Taalinstellings"</string>
+    <string name="keyboard_settings_category" msgid="7060453865544070642">"Sleutelbordinstellings"</string>
+    <!-- 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 />
+    <string name="auto_caps" msgid="6379232078052591265">"Outohoofletters"</string>
+    <!-- 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 />
+    <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Tabletinligting"</string>
+    <!-- outdated translation 193561832258534798 -->     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Tabletinligting"</string>
+    <!-- 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>
+    <string name="input_method" msgid="5434026103176856164">"Invoermetode"</string>
+    <string name="current_input_method" msgid="2146807723398303917">"Huidige invoermetode"</string>
+    <string name="input_method_selector" msgid="4311213129681430709">"Kieser vir invoermetode"</string>
+    <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"Outomaties"</string>
+    <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"Wys altyd"</string>
+    <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"Versteek altyd"</string>
+    <string name="configure_input_method" msgid="7773992829158322455">"Stel invoermetodes op"</string>
+    <string name="input_method_settings" msgid="5801295625486269553">"Instellings"</string>
+    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Aktiewe invoermetodes"</string>
+    <string name="use_system_language_to_select_input_method_subtypes" msgid="3346751753141428573">"Gebruik stelseltaal"</string>
+    <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> instellings"</string>
+    <string name="input_methods_and_subtype_enabler_title" msgid="4018402267502337338">"Kies aktiewe invoermetodes"</string>
+    <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Skermsleutelbord-instellings"</string>
+    <!-- outdated translation 5274990495405941804 -->     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Ingeboude sleutelbord"</string>
+    <!-- outdated translation 7990296351888096836 -->     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Instellings van ingeboude, fisiese sleutelbord"</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>
+    <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"Geen toeganklikheidsverwante programme gevind nie"</string>
+    <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"Jy het nie enige toeganklikheid-verwante programme geïnstalleer nie."\n\n"Jy kan \'n skermleser van Android Market aflaai."\n\n"Klik OK om die skermleser te installeer."</string>
+    <string name="accessibility_script_injection_category" msgid="8649951751131431904">"Toeganklikheidskripte"</string>
+    <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"Laai toeganklikheidskripte af"</string>
+    <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"Laat programme toe om toeganklikheidskripte van Google af te laai"</string>
+    <string name="accessibility_script_injection_security_warning" product="tablet" msgid="1113600871264359828">"Sekere programme kan Google vra om skripte na jou tablet af te laai sodat hul inhoud meer toeganklik is. Is jy seker jy wil Google toelaat om toeganklikheidskripte op jou tablet te installeer?"</string>
+    <string name="accessibility_script_injection_security_warning" product="default" msgid="9078893361741942109">"Sommige programme kan Google vra om skripte op jou foon af te laai wat hulle inhoud meer toeganklik maak. Is jy seker jy wil Google toelaat om toeganklikheidskripte op jou foon te installeer?"</string>
+    <string name="accessibility_power_button_category" msgid="8545885236482339928">"Krag-knoppie"</string>
+    <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"Krag-knoppie beëindig oproep"</string>
+    <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"As jy tydens \'n oproep Krag druk, word die oproep beëindig in plaas daarvan dat die skerm afgeskakel word"</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">"Batterygebruik"</string>
+    <string name="power_usage_summary" msgid="7237084831082848168">"Wat het die battery gebruik"</string>
+    <string name="power_usage_not_available" msgid="3583407442633768046">"Data oor batterygebruik nie beskikbaar nie"</string>
+    <string name="battery_since_unplugged" msgid="338073389740738437">"Batterygebruik sedert uitgeprop"</string>
+    <string name="battery_since_reset" msgid="7464546661121187045">"Batterygebruik sedert terugstelling"</string>
+    <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> op battery"</string>
+    <string name="battery_stats_duration" msgid="7464501326709469282">"<xliff:g id="TIME">%1$s</xliff:g> sedert uitgeprop"</string>
+    <string name="battery_stats_charging_label" msgid="4223311142875178785">"Laai"</string>
+    <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Skerm aan"</string>
+    <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS aan"</string>
+    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
+    <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Wakker"</string>
+    <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Sein van mobiele netwerk"</string>
+    <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
+    <skip />
+    <string name="awake" msgid="387122265874485088">"Toestel se wakkertyd"</string>
+    <string name="wifi_on_time" msgid="6310209835617490616">"Wi-Fi betyds"</string>
+    <string name="bluetooth_on_time" msgid="6157799524996162271">"Wi-Fi betyds"</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>
+    <string name="history_details_title" msgid="3608240585315506067">"Geskiedenisdetails"</string>
+    <string name="details_title" msgid="3792801565213935385">"Gebruik details"</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>
+    <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet 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>
+    <string name="usage_type_wake_lock" msgid="5125438890233677880">"Hou wakker"</string>
+    <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
+    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi loop tans"</string>
+    <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</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>
+    <string name="battery_action_wifi" msgid="2272741639606146903">"Wi-Fi-instellings"</string>
+    <string name="battery_action_bluetooth" msgid="8374789049507723142">"Bluetooth-instellings"</string>
+    <string name="battery_desc_voice" msgid="8980322055722959211">"Battery gebruik deur stemoproepe"</string>
+    <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Battery word gebruik wanneer tablet 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>
+    <string name="battery_desc_apps" msgid="6665712811746233450">"Battery deur program gebruik"</string>
+    <string name="battery_sugg_apps_info" msgid="6065882899391322442">"Stop of deïnstalleer die program"</string>
+    <string name="battery_sugg_apps_gps" msgid="4545056413090932541">"Beheer GPS handmatig om te keer dat program dit gebruik"</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>
+    <string name="voice_input_output_settings" msgid="1336135218350444783">"Steminvoering en -uitvoering"</string>
+    <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Steminvoering- en -uitvoeringsinstellings"</string>
+    <string name="voice_search_settings_title" msgid="2775469246913196536">"Stemsoektog"</string>
+    <string name="keyboard_settings_title" msgid="5080115226780201234">"Android-sleutelbord"</string>
+    <string name="voice_input_category" msgid="1589318440824204736">"Steminvoering"</string>
+    <string name="voice_output_category" msgid="2624538587784986229">"Stemuitvoering"</string>
+    <string name="recognizer_title" msgid="3231385184559054457">"Stemherkenner"</string>
+    <string name="recognizer_settings_title" msgid="6038598099039717232">"Stemherkenning-instellings"</string>
+    <string name="recognizer_settings_summary" msgid="4472287934134546902">"Instellings vir \'<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\'"</string>
+    <string name="tts_settings" msgid="8186971894801348327">"Teks-na-spraak-instellings"</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>
+    <string name="tts_default_synth_title" msgid="29467896463371992">"Verstek enjin"</string>
+    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Stel die spraaksintese-enjin wat vir gesproke teks gebruik word"</string>
+    <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>
+    <string name="tts_engine_error" msgid="5513288178403066867">"Die enjin wat jy gekies het, kan nie loop nie"</string>
+    <string name="tts_engine_error_config" msgid="5820525416624637313">"Stel op"</string>
+    <string name="tts_engine_error_reselect" msgid="3071453963296013376">"Kies \'n ander enjin"</string>
+    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Hierdie spraaksintese-enjin kan dalk al die teks versamel wat uitgespreek sal word, insluitend persoonlike data soos wagwoorde en kredietkaartnommers. Dit kom van die <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> enjin. Aktiveer die gebruik van hierdie spraaksintese-enjin?"</string>
+    <string name="tts_engines_section" msgid="7515470972378742429">"Enjins"</string>
+    <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> instellings"</string>
+    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> is geaktiveer"</string>
+    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> is gedeaktiveer"</string>
+    <!-- no translation found for tts_engine_settings_section (2346105138448751893) -->
+    <skip />
+    <!-- no translation found for tts_engine_settings_title (3499112142425680334) -->
+    <skip />
+    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Taal en stemme"</string>
+    <string name="pico_installed" msgid="2452546687858267414">"Geïnstalleer"</string>
+    <string name="pico_not_installed" msgid="6266845418419994311">"Nie geïnstalleer nie"</string>
+    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Vroulik"</string>
+    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Manlik"</string>
+    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Spraaksintese-enjin geïnstalleer"</string>
+    <string name="tts_notif_engine_install_message" msgid="5304661142202662693">"Aktiveer nuwe enjin voor gebruik"</string>
+    <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>
+    <string name="vpn_details_title" msgid="418806440938510331">"VPN-details"</string>
+    <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>
+    <string name="backup_section_title" msgid="8856083167469467588">"Rugsteun en teruglaai"</string>
+    <string name="personal_data_section_title" msgid="7815209034443782061">"Persoonlike data"</string>
+    <string name="backup_data_title" msgid="1239105919852668016">"Rugsteun my data"</string>
+    <string name="backup_data_summary" msgid="6515285107793232815">"Rugsteun programdata, Wi-Fi-wagwoorde en ander instellings na Google-bedieners"</string>
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"Rugsteunrekening"</string>
+    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Geen rekening stoor tans gerugsteunde data nie"</string>
+    <string name="auto_restore_title" msgid="5397528966329126506">"Outomatiese teruglaai"</string>
+    <string name="auto_restore_summary" msgid="83177150536734378">"As ek weer \'n program installeer, laai gerugsteunde instellings of ander data terug"</string>
+    <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Rugsteun"</string>
+    <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Is jy seker jy wil ophou om jou Wi-Fi-wagwoorde, boekmerke en ander instellings en programdata te rugsteun en alle kopieë op Google-bedieners uitvee?"</string>
+    <string name="device_admin_settings_title" msgid="1335557832906433309">"Toesteladministrasie-instellings"</string>
+    <string name="active_device_admin_msg" msgid="6930903262612422111">"Toesteladministrateur"</string>
+    <string name="remove_device_admin" msgid="3596845261596451437">"Deaktiveer"</string>
+    <string name="select_device_admin_msg" msgid="2645509057946368094">"Toesteladministrateurs"</string>
+    <string name="no_device_admins" msgid="702695100241728775">"Geen toesteladministrateurs beskikbaar nie"</string>
+    <string name="add_device_admin_msg" msgid="6246742476064507965">"Aktiveer toesteladministrateur?"</string>
+    <string name="add_device_admin" msgid="7133327675884827091">"Aktiveer"</string>
+    <string name="device_admin_add_title" msgid="7705551449705676363">"Toesteladministrateur"</string>
+    <string name="device_admin_warning" msgid="1149471041373876923">"As die administrateur geaktiveer word, sal die program <xliff:g id="APP_NAME">%1$s</xliff:g> die volgende bewerkings kan doen:"</string>
+    <string name="device_admin_status" msgid="7169948053970923035">"Die administrateur is aktief en laat die program <xliff:g id="APP_NAME">%1$s</xliff:g> toe om die volgende bewerkings uit te voer:"</string>
+    <string name="untitled_apn" msgid="1230060359198685513">"Titelloos"</string>
+    <string name="sound_category_sound_title" msgid="1488759370067953996">"Algemeen"</string>
+    <string name="sound_category_calls_title" msgid="3688531959256239012">"Inkomende oproepe"</string>
+    <string name="sound_category_notification_title" msgid="3502115998790286943">"Kennisgewings"</string>
+    <string name="sound_category_feedback_title" msgid="4399742321363475393">"Terugvoer"</string>
+    <string name="wifi_setup_title" msgid="661074868726906436">"Wi-Fi-opstelling"</string>
+    <!-- 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">"Nie gekoppel nie"</string>
+    <string name="wifi_setup_add_network" msgid="5939624680150051807">"Voeg netwerk by"</string>
+    <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Herlaai lys"</string>
+    <string name="wifi_setup_skip" msgid="6661541841684895522">"Slaan oor"</string>
+    <string name="wifi_setup_next" msgid="3388694784447820477">"Volgende"</string>
+    <string name="wifi_setup_back" msgid="144777383739164044">"Terug"</string>
+    <string name="wifi_setup_detail" msgid="2336990478140503605">"Netwerkdetails"</string>
+    <string name="wifi_setup_connect" msgid="7954456989590237049">"Koppel"</string>
+    <string name="wifi_setup_forget" msgid="2562847595567347526">"Vergeet"</string>
+    <string name="wifi_setup_save" msgid="3659235094218508211">"Stoor"</string>
+    <string name="wifi_setup_cancel" msgid="3185216020264410239">"Kanselleer"</string>
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"Skandeer tans netwerke..."</string>
+    <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"Raak \'n netwerk om daaraan te koppel"</string>
+    <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Koppel aan bestaande netwerk"</string>
+    <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"Koppel aan onbeveiligde netwerk"</string>
+    <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"Voer netwerkopstelling in"</string>
+    <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Koppel aan nuwe netwerk"</string>
+    <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Koppel tans..."</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Gaan voort na die volgende stap"</string>
+    <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"EAP nie ondersteun nie"</string>
+    <!-- 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 />
+    <string name="account_sync_settings_title" msgid="4578227872921044660">"Sinkroniseer instellings"</string>
+    <!-- no translation found for sync_is_failing (1591561768344128377) -->
+    <skip />
+    <string name="add_account_label" msgid="7811707265834013767">"Voeg rekening by"</string>
+    <string name="header_general_sync_settings" msgid="3487451896424238469">"Algemene sinkroniseerinstellings"</string>
+    <string name="background_data" msgid="5779592891375473817">"Agtergronddata"</string>
+    <string name="background_data_summary" msgid="3630389249212620467">"Programme kan te enige tyd data sinkroniseer, stuur en ontvang"</string>
+    <string name="background_data_dialog_title" msgid="745974259246047425">"Aandag"</string>
+    <string name="background_data_dialog_message" msgid="9155730118215371308">"As jy die agtergronddata deaktiveer, verleng dit die batterylewe en verlaag dit datagebruik. Sekere programme kan dalk steeds die agtergronddataverbinding gebruik."</string>
+    <!-- no translation found for sync_automatically (7558810110682562376) -->
+    <skip />
+    <string name="sync_automatically_summary" msgid="6662623174608419931">"Programme sinkroniseer data outomaties"</string>
+    <string name="header_manage_accounts" msgid="6869002423884539607">"Bestuur rekeninge"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"Sinkronisering is AAN"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"Sinkronisering is AF"</string>
+    <string name="sync_error" msgid="5060969083117872149">"Sinkroniseerfout"</string>
+    <string name="settings_backup" msgid="2274732978260797031">"Rugsteun instellings"</string>
+    <string name="settings_backup_summary" msgid="7916877705938054035">"Rugsteun my instellings"</string>
+    <!-- no translation found for sync_menu_sync_now (6154608350395805683) -->
+    <skip />
+    <!-- no translation found for sync_menu_sync_cancel (8292379009626966949) -->
+    <skip />
+    <string name="sync_one_time_sync" msgid="6766593624598183090">"Raak om nou te sinkroniseer<xliff:g id="LAST_SYNC_TIME">
+%1$s</xliff:g>"</string>
+    <!-- no translation found for sync_gmail (714886122098006477) -->
+    <skip />
+    <!-- no translation found for sync_calendar (9056527206714733735) -->
+    <skip />
+    <!-- no translation found for sync_contacts (9174914394377828043) -->
+    <skip />
+    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Welkom by Google-sinkronisering!"</font>" "\n"\'n Google-benadering tot datasinkronisering om toegang tot jou kontakte, afsprake en meer toe te laat van waar ook al jy is."</string>
+    <string name="header_application_sync_settings" msgid="5514539555293976035">"Programsinkronisering-instellings"</string>
+    <string name="header_data_and_synchronization" msgid="5165024023936509896">"Data en sinkronisering"</string>
+    <string name="preference_change_password_title" msgid="8955581790270130056">"Verander wagwoord"</string>
+    <string name="header_account_settings" msgid="5382475087121880626">"Rekeninginstellings"</string>
+    <string name="remove_account_label" msgid="5921986026504804119">"Verwyder rekening"</string>
+    <string name="header_add_an_account" msgid="756108499532023798">"Voeg \'n rekening by"</string>
+    <string name="finish_button_label" msgid="481587707657751116">"Maak klaar"</string>
+    <string name="really_remove_account_title" msgid="6574643117748564960">"Verwyder rekening"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="4448645571715719563">"Wil jy regtig hierdie rekening verwyder? As jy dit verwyder, sal dit ook al sy boodskappe, kontakte en ander data van die tablet uitvee. "\n"Gaan voort?"</string>
+    <string name="really_remove_account_message" product="default" msgid="1005751790899989319">"Wil jy regtig hierdie rekening verwyder? As jy dit verwyder, sal dit ook al sy boodskappe, kontakte en ander data van die foon uitvee. "\n"Gaan voort?"</string>
+    <string name="remove_account_failed" product="tablet" msgid="1093911989149396624">"Hierdie rekening word deur sekere programme vereis. Jy kan dit net verwyder deur die tablet terug te stel na sy verstek instellings (wat al jou persoonlike data sal uitvee). Jy kan dit doen in die Instellings-program, onder Privaatheid."</string>
+    <string name="remove_account_failed" product="default" msgid="9174390193652391412">"Hierdie rekening word deur sekere programme vereis. Jy kan dit net verwyder deur die foon na sy verstek instellings terug te stel (wat al jou persoonlike data sal uitvee). Jy kan dit doen in die Instellings-program, onder Privaatheid."</string>
+    <string name="provider_label" msgid="7724593781904508866">"Stootpos-intekeninge"</string>
+    <string name="sync_item_title" msgid="1931551540462877488">"Sinkroniseer <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
+    <string name="cant_sync_dialog_title" msgid="7185199796123573317">"Kan nie handmatig sinkroniseer nie"</string>
+    <string name="cant_sync_dialog_message" msgid="2372359241135295930">"Sinkronisering vir hierdie item is tans gedeaktiveer. Om jou voorkeur te verander, skakel agtergronddata en outomatiese sinkronisering tydelik aan."</string>
+    <string name="enter_password" msgid="3268224850821675915">"Voer wagwoord in om berging te dekripteer"</string>
+    <string name="try_again" msgid="5904121494468643129">"Jammer, probeer weer"</string>
+    <!-- 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 />
+    <!-- no translation found for data_usage_summary_title (3804110657238092929) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle (5652529796195787949) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_split_4g (7417435609285381968) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_wifi (8266875319417201085) -->
+    <skip />
+    <!-- no translation found for data_usage_change_cycle (7776556448920114866) -->
+    <skip />
+    <!-- no translation found for data_usage_pick_cycle_day (4470796861757050966) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_mobile_limit (289740911281022322) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_4g_limit (5808210773758699800) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_3g_limit (3856971004328238231) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_wifi (1728851922959017766) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_mobile (454140350007299045) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_4g (1301978716067512235) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_3g (6092169523081538718) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_mobile (986782622560157977) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_3g (6304006671869578254) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_4g (3635854097335036738) -->
+    <skip />
+    <!-- no translation found for data_usage_app_settings (3727561362090820369) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background (8856643905291165256) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background_summary (1503361245973512092) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog_title (8110736468987743260) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog (100001698378554777) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_title (1373797281540188533) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_subtitle (5512903797979928416) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_positive (4565302264487526138) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_title (3023111643632996097) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_mobile (7931094451923591578) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_3g (5478553071420316963) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_4g (6134008906742403777) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_3g_title (4221584306492812040) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_4g_title (715585612162185936) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_mobile_title (209516216265000221) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog (2874031671067845964) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_enable (5738467047490662678) -->
+    <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..6e4699e
--- /dev/null
+++ b/res/values-am/arrays.xml
@@ -0,0 +1,229 @@
+<?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>
+  <string-array name="screen_timeout_entries">
+    <item msgid="3342301044271143016">"15 ሰከንዶች"</item>
+    <item msgid="8881760709354815449">"30 ሰከንዶች"</item>
+    <item msgid="7589406073232279088">"1"</item>
+    <item msgid="7001195990902244174">"2  ደቂቃዎች"</item>
+    <item msgid="7489864775127957179">"5 ደቂቃዎች"</item>
+    <item msgid="2314124409517439288">"10 ደቂቃዎች"</item>
+    <item msgid="6864027152847611413">"30 ደቂቃዎች"</item>
+  </string-array>
+    <!-- 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) -->
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="5416834369150305288">"ወዲያውኑ"</item>
+    <item msgid="6736512735606834431">"5 ሰከንዶች"</item>
+    <item msgid="8044619388267891375">"15 ሰከንዶች"</item>
+    <item msgid="1822002388249545488">"30 ሰከንዶች"</item>
+    <item msgid="8538071621211916519">"1 ደቂቃ"</item>
+    <item msgid="5663439580228932882">"2 ደቂቃዎች"</item>
+    <item msgid="49888496216106852">"5 ደቂቃዎች"</item>
+    <item msgid="9002737361305019353">"10 ደቂቃዎች"</item>
+    <item msgid="4322676235684793329">"30 ደቂቃዎች"</item>
+  </string-array>
+    <!-- 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) -->
+  <string-array name="wifi_frequency_band_entries">
+    <item msgid="624340809384223320">"ራስ ሰር"</item>
+    <item msgid="6670588712989942178">"5 GHz ብቻ"</item>
+    <item msgid="2715516524973207876">"5 GHz ብቻ"</item>
+  </string-array>
+  <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>
+  <string-array name="wifi_network_setup">
+    <item msgid="784271777398638325">"በእጅ"</item>
+    <item msgid="700386742589384062">"WPS አዝራር ተጫን"</item>
+    <item msgid="7131487972018976724">"WPS pin ከድረስ ነጥብ"</item>
+    <item msgid="4809199848225172977">"ከዚህ መሣሪያ የWPS pin"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"DHCP"</item>
+    <item msgid="628395202971532382">"አይለወጤ"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="4473276491748503377">"አንዱም"</item>
+    <!-- outdated translation 6267482274276126058 -->     <item msgid="8673874894887358090">"አይለወጤ"</item>
+  </string-array>
+  <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..4d44f41
--- /dev/null
+++ b/res/values-am/strings.xml
@@ -0,0 +1,1981 @@
+<?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 />
+    <string name="sdcard_unmount" product="nosdcard" msgid="6325292633327972272">"የUSB  ማከማቻ ንቀል"</string>
+    <!-- outdated translation 6325292633327972272 -->     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"የUSB  ማከማቻ ንቀል"</string>
+    <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"USB ማከማቻ አጥፋ"</string>
+    <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 />
+    <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"የUSB  ማከማቻ"</string>
+    <!-- outdated translation 8281011784066476192 -->     <string name="sdcard_setting" product="default" msgid="5922637503871474866">"የUSB  ማከማቻ"</string>
+    <!-- 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 />
+    <string name="battery_info_health_cold" msgid="3835692786176707318">"ቀዝቃዛ"</string>
+    <!-- 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>
+    <string name="bluetooth_notif_message" msgid="618099089987569242">"ከ<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ጋር አጣምር"</string>
+    <!-- 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>
+    <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"ትግበራ ብሉቱዝለማብራት እየጠየቀ ነው። ይህን ለማድረግ ይፈልጋሉ?"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"በጡባዊዎ ላይ ያለ ትግበራ ጡባዊዎ በሌላ የብሉቱዝ መሣሪያዎችለ<xliff:g id="TIMEOUT">%1$d</xliff:g>  ሰንዶች እንዲገኝ ለማድረግ ፈቃድ እየጠየቀ ነው።ይህን ማድረግ ይፈልጋሉ?"</string>
+    <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 />
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"በጡባዊዎ ላይ ያለ ትግበራ ጡባዊዎ በሌላ የብሉቱዝ መሣሪያዎችለ<xliff:g id="TIMEOUT">%1$d</xliff:g> ሰንዶች እንዲገኝ ለማድረግ ፈቃድ እየጠየቀ ነው።ይህን ማድረግ ይፈልጋሉ?"</string>
+    <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>
+    <string name="bluetooth_auto_connect" msgid="8013003320667198460">"ራስ ሰር ተያያዥ"</string>
+    <!-- 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>
+    <string name="proxy_settings_title" msgid="5912878565897294401">"የእጅ አዙር ቅንብሮች"</string>
+    <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 />
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"የUSB  ማከማቻአልተሰካም"</string>
+    <!-- outdated translation 2902787003418172125 -->     <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"የUSB  ማከማቻአልተሰካም"</string>
+    <!-- no translation found for sdcard_settings_available_bytes_label (763232429899373001) -->
+    <skip />
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"USB  ማከማቻ እንደብዙማከማቻ መሣሪያበማገልገል ላይ ነው"</string>
+    <!-- outdated translation 2736378870889777857 -->     <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"USB  ማከማቻ እንደብዙማከማቻ መሣሪያበማገልገል ላይ ነው"</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="7503300818792750913">"አሁን የUSB ማከማቻውንለማስወገድ  ደህና ነው"</string>
+    <!-- outdated translation 7503300818792750913 -->     <string name="sdcard_settings_unmounted_status" product="default" msgid="3812022095683863087">"አሁን የUSB ማከማቻውንለማስወገድ  ደህና ነው"</string>
+    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"የUSB  ማከማቻ በጥቅም ላይ እያለ ተወግዶ ነበር!"</string>
+    <!-- outdated translation 7761390725880773697 -->     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"የUSB  ማከማቻ በጥቅም ላይ እያለ ተወግዶ ነበር!"</string>
+    <!-- no translation found for sdcard_settings_used_bytes_label (8820289486001170836) -->
+    <skip />
+    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"ለማህደረ መረጃ የUSB ማከማቻ በመቃኘት ላይ...."</string>
+    <!-- outdated translation 7503429447676219564 -->     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"ለማህደረ መረጃ የUSB ማከማቻ በመቃኘት ላይ...."</string>
+    <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"የUSB  ማከማቻ አንብብ-ብቻ ሰክቷል"</string>
+    <!-- outdated translation 3771783090621312312 -->     <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"የUSB  ማከማቻ አንብብ-ብቻ ሰክቷል"</string>
+    <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 />
+    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"የጡባዊ መረጃ"</string>
+    <!-- outdated translation 7820855350955963628 -->     <string name="phone_info_label" product="default" msgid="2127552523124277664">"የጡባዊ መረጃ"</string>
+    <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"የUSB  ማከማቻ"</string>
+    <!-- outdated translation 8101475181301178428 -->     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"የUSB  ማከማቻ"</string>
+    <!-- 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>
+    <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>
+    <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>
+    <string name="date_picker_title" msgid="1338210036394128512">"ቀን"</string>
+    <string name="time_picker_title" msgid="483460752287255019">"ጊዜ"</string>
+    <string name="lock_after_timeout" msgid="940509402681580537">"ጊዜው አልቋል"</string>
+    <string name="lock_after_timeout_summary" msgid="4726009794344934278">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>ማያ በራስ ሰር ከጠፋ በኋላማያ ቆልፍ"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"በተቆለፈ ማያ የባለቤት መረጃ አሳይ"</string>
+    <string name="owner_info_settings_title" msgid="2723190010708381889">"የባለቤት መረጃ"</string>
+    <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
+    <string name="owner_info_settings_edit_text_hint" msgid="2382525043173672857">"በተቆለፈ ማያ ላይ ለማሳየት ፅሁፍ አስገባ"</string>
+    <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 />
+    <string name="lock_settings_picker_title" msgid="8665454308380158195">"ማያ ቆልፍ አዋቅር"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"ማያ ቆልፍ አዋቅር"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"ማያ መቆለፊያ ለውጥ"</string>
+    <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"ስርዓተ ጥለት፣  PIN፣ ወይም የይለፍ ቃል ለውጥ ወይም አቦዝን"</string>
+    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"ማያውን ለመቆለፍ ሜተድ ምረጥ"</string>
+    <string name="unlock_set_unlock_off_title" msgid="1613932765246180079">"ውጪ"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="2791013557563587655">"ማያውን በፍፁም አትቆልፍ"</string>
+    <!-- outdated translation 5165705762615690332 -->     <string name="unlock_set_unlock_none_title" msgid="7560817055143323842">"ያልተጠበቀ"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="2609139908913114644">"ማያውን ለመክፈት ስርዓተ ጥለት፣PIN፣ ወይም የይለፍ ቃል አትጠይቅ"</string>
+    <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"ስርዓተ ጥለት"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="8467282436608077882">"ማያለመክፈት ስርዓተ ጥለት ጠይቅ"</string>
+    <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"ማያለመክፈትየቁጥርPIN  ጠይቅ"</string>
+    <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">" የይለፍ ቃል፡"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"ማያለመክፈት የይለፍ ቃል ጠይቅ"</string>
+    <!-- outdated translation 8816944391772300580 -->     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"በሩቅ የመሣሪያ አስተዳዳሪዎች ቦዝኗል"</string>
+    <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"ውጪ"</string>
+    <!-- outdated translation 7953821968316697309 -->     <string name="unlock_set_unlock_mode_none" msgid="7137296704741184239">"ያልተጠበቀ"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"በስርዓተ ጥለት ተጠብቋል"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"በPIN  ተጠብቋል"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"በይለፍ ቃል ተጠብቋል"</string>
+    <string name="unlock_disable_lock_title" msgid="1427036227416979120">"የማያ መዝጊያ አጥፋ"</string>
+    <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"የመክፈቻ ስርዓተ ጥለት አስወግድ"</string>
+    <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"መክፈቻ PIN አስወግድ"</string>
+    <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>
+    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"ይቅር"</string>
+    <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"ቀጥሎ"</string>
+    <string name="device_admin_title" msgid="3562216873644263804">"መሣሪያ አስተዳደር"</string>
+    <string name="manage_device_admin" msgid="5059296715271077278">"የመሣሪያ አስተዳዳሪዎች"</string>
+    <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>
+    <string name="bluetooth_enter_pin_msg" msgid="1499285355129256289">\n" ከ\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" ጋር ለማጣመርPIN አስገባ። (0000 ወይም1234 ሞክር።) በብሉቱዝ መሣሪያው ላይ አንድ አይነት PIN  ማስገባት ሊያስፈልግዎ ይችላል።"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="8301499416158195044">\n"ከ\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" ጋር ለማጣመር የይለፍ ቁልፍ አስገባ።"</string>
+    <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>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="9139892462102104755">"በተመለስ ወይም ግባ በመከተል\"<xliff:g id="PASSKEY">%2$s</xliff:g>\" በ\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"  ላይ ለማጣመርአስገባ።"</string>
+    <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>
+    <string name="bluetooth_preference_find_nearby_title" msgid="5087410003465463318">"በቅርብ ያሉ መሣሪያዎችን አግኝ"</string>
+    <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"የመሣሪያ ቅንብሮች"</string>
+    <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"የተጣመሩ መሣሪያዎች"</string>
+    <string name="bluetooth_preference_found_devices" msgid="3133019331974936204">"መሣሪያዎች አግኝ"</string>
+    <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>
+    <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>
+    <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ከማህድረ መረጃ ድምፅይለያያል።"</string>
+    <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ከእጅ ነፃኦዲዮ ይለያያል።"</string>
+    <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ከግቤት መሣሪያ ይለያያል።"</string>
+    <!-- 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>
+    <string name="bluetooth_device_advanced_device_actions_title" msgid="3793430949811946844">"የመሣሪያ ርምጃዎች"</string>
+    <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>
+    <string name="bluetooth_device_advanced_rename_device" msgid="350508394033808532">"መሣሪያ ዳግም ሰይም"</string>
+    <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"የገቢ ፋይል ሰደዳዎች ፍቀድ"</string>
+    <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>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"ለበይነ መረብ ድረስ ተጠቀም"</string>
+    <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>
+    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"ለማንበብ እና መለያዎችን ለመለዋወጥ የቅርብ ግኑኙነትመስክ ተጠቀም"</string>
+    <string name="nfc_toggle_error" msgid="2233172102497535522">"ስህተት አጋጥሟል።"</string>
+    <!-- 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 />
+    <string name="wifi_wps_pin_output" msgid="8682102965680650853">" pin <xliff:g id="WPS_PIN">%1$s</xliff:g> ከመድረሻ ነጥብ አስገባ"</string>
+    <!-- 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>
+    <string name="wifi_open_with_wps" msgid="2606968531452521147">"WPS አለ"</string>
+    <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>
+    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"ተደጋጋሚ Wi-Fi  ድግ"</string>
+    <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"የክወና ድግግሞሽ ጊዜ ርዝመት ግለፅ"</string>
+    <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"የተደጋጋሚ ድግ ቅንብር ችግር ነበር።"</string>
+    <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 />
+    <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"እባክዎ ትክክለኛ IP አድራሻ ይተይቡ።"</string>
+    <string name="wifi_ip_settings_invalid_gateway" msgid="6383012465511093067">"እባክዎ ትክክለኛጌትዌይአድራሻ ይተይቡ።"</string>
+    <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"እባክዎ ትክክለኛdns አድራሻ ይተይቡ።"</string>
+    <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"እባክዎ በ0 እና 32 መካከልየአውታረ መረብ ቅድመ ቅጥያ ርዝመት ይተይቡ።"</string>
+    <!-- no translation found for wifi_dns1 (7344118050720080045) -->
+    <skip />
+    <!-- no translation found for wifi_dns2 (1368601006824882659) -->
+    <skip />
+    <!-- no translation found for wifi_gateway (163914742461092086) -->
+    <skip />
+    <string name="wifi_network_prefix_length" msgid="3028785234245085998">"የአውታረ መረብ ቅድመ ቅጥያ ርዝመት"</string>
+    <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>
+    <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>
+    <string name="ringtone_title" msgid="7037881886694206550">"የገቢ ስልክ ጥሪ ድምፅ"</string>
+    <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>
+    <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>
+    <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>
+    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"ጡባዊ ከትከል ስትከት ወይም ስታስወግድ ድምፅ አጫውት"</string>
+    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"ስልክ ከትከል ሲከት ወይም ሲያስወግድ በድምፅ አጫውት"</string>
+    <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>
+    <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"ጡባዊ ሲሽከረከርየገፅ አቀማመጥ በራስሰርቀይር"</string>
+    <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"ስልክ ስታሽከረክር በራስሰር ገፅ አቀማመጡን ቀይር"</string>
+    <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>
+    <string name="screen_timeout" msgid="6962654593018319466">"ጊዜው አልቋል"</string>
+    <string name="screen_timeout_summary" msgid="4471347210332380587">"ከ<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> በኋላ ማያ በራስ ሰር ይጠፋል"</string>
+    <!-- no translation found for wallpaper_settings_title (5449180116365824625) -->
+    <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 />
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"ጡባዊ ለመጠቀም PIN ጠይቅ"</string>
+    <!-- outdated translation 5058355081270397764 -->     <string name="sim_lock_on" product="default" msgid="2503536505568814324">"ጡባዊ ለመጠቀም PIN ጠይቅ"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"ጡባዊ ለመጠቀም PIN ጠይቅ"</string>
+    <!-- outdated translation 2813800553917012356 -->     <string name="sim_lock_off" product="default" msgid="258981978215428916">"ጡባዊ ለመጠቀም PIN ጠይቅ"</string>
+    <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 />
+    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"የጡባዊ ኹነታ"</string>
+    <!-- outdated translation 1119755927536987178 -->     <string name="device_info_settings" product="default" msgid="475872867864762157">"የጡባዊ ኹነታ"</string>
+    <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 />
+    <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>
+    <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"የUSB  ማከማቻ ንቀል፣የቀረማከማቻ እይ"</string>
+    <!-- outdated translation 3543813623294870759 -->     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"የUSB  ማከማቻ ንቀል፣የቀረማከማቻ እይ"</string>
+    <!-- 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>
+    <!-- no translation found for status_msid_number (909010114445780530) -->
+    <skip />
+    <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 />
+    <string name="internal_memory" msgid="9129595691484260784">"የውስጥ ማከማቻ"</string>
+    <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"የUSB  ማከማቻ"</string>
+    <!-- outdated translation 2510246194083052841 -->     <string name="sd_memory" product="default" msgid="151871913888051515">"የUSB  ማከማቻ"</string>
+    <!-- no translation found for memory_available (5052397223077021181) -->
+    <skip />
+    <!-- no translation found for memory_size (6629067715017232195) -->
+    <skip />
+    <string name="memory_calculating_size" msgid="2188358544203768588">"በማስላት ላይ..."</string>
+    <!-- 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>
+    <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"የውስጥ USB  ማከማቻ ንቀል"</string>
+    <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"በደህና ለማስወገድ የSD ካርዱን ንቀል"</string>
+    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"ለመሰካት የUSB  ማከማቻ አስገባ"</string>
+    <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"የSD ካርድ ለመሰካት አስገባ"</string>
+    <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"USB  ማከማቻ ሰካ"</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>
+    <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"USB ማከማቻ አጥፋ"</string>
+    <string name="sd_format" product="default" msgid="2576054280507119870">"የSD ካርድ አጥፋ"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"እንደ ሙዚቃ እና ፎቶዎች፣ በውስጥ USB ማከማቻ ላይ ያለ ውሂብ ሁሉ ያጠፋል"</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"እንደ ሙዚቃ እና ፎቶዎች፣ በ SD ካርድ ላይ ያለን ውሂብ ሁሉ ያጠፋል"</string>
+    <!-- no translation found for read_only (6702420168629076340) -->
+    <skip />
+    <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"የUSB  ማከማቻ ንቀል"</string>
+    <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"SD ካርድ ንቀል"</string>
+    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"የ USB ማከማቻውን ከነቀሉ፣ እየተጠቀሙባቸው ያለው አንዳንድ ትግበራዎች ይቆማሉ እና  USB ውን ድጋሚ  እስኪሰኩ ላይኖሩ ይችላሉ።"</string>
+    <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">" የSD ካርዱን ከነቀሉ አንዳንድ እየተጠቀሙባቸው ያሉ ትግበራዎች ይቆሙ እና SD ካርዱን እስኪሰኩ ላይገኙ ይችላሉ።"</string>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"የUSB  ማከማቻ በመንቀል ላይ"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"ያልተሳካ SD ካርድ ንቀል"</string>
+    <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"USB ማከማቻ መንቀል አልተቻለም።ኋላ እንደገና ሞክር።"</string>
+    <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">" SD ካርድ መንቀል አልተቻለም። ትንሽ ቆይተህ እንደገና ሞክር።"</string>
+    <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"USB ማከማቻ ይነቀላል።"</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 />
+    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"በስልኩ ላይ ያለ ውሂብ ሁሉ ያጠፋል"</string>
+    <!-- outdated translation 4036344100254678429 -->     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"በስልኩ ላይ ያለ ውሂብ ሁሉ ያጠፋል"</string>
+    <!-- outdated translation 1305457209008369655 -->     <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"ይህ ሁሉንም ውሂብ ከጡባዊዎ"<b>" የውስጥ ማከማቻ"</b>"ያጠፋል፣"\n\n<li>" የGoogle መለያዎንበመጨመር"</li>\n<li>" የስርዓት እናትግበራ ውሂብ እና ቅንብሮች "</li>\n<li>" ትግበራዎች አውርድ"</li></string>
+    <!-- outdated translation 1305457209008369655 -->     <string name="master_clear_desc" product="default" msgid="3251400937758241249">"ይህ ሁሉንም ውሂብ ከጡባዊዎ"<b>" የውስጥ ማከማቻ"</b>"ያጠፋል፣"\n\n<li>" የGoogle መለያዎንበመጨመር"</li>\n<li>" የስርዓት እናትግበራ ውሂብ እና ቅንብሮች "</li>\n<li>" ትግበራዎች አውርድ"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n" እርስዎ በአሁን ጊዜ የሚከተለው መለያዎች ውስጥ ገብተዋል፡"\n</string>
+    <!-- no translation found for master_clear_desc_also_erases_external (1903185203791274237) -->
+    <skip />
+    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"ሙዚቃ፣ ምስሎች፣ እና ሌላ ተጠቃሚ ውሂብ ለማጥራት፣"<b>"USB ማከማቻ "</b>"መጥፋት ያስፈልገዋል።"</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n" ሙዚቃ፣ ምስሎች፣ እና ሌላ ተጠቃሚ ውሂብ ለማጥራት፣"<b>" የSD ካርድ "</b>"መጥፋት ያስፈልገዋል።"</string>
+    <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB ማከማቻ አጥፋ"</string>
+    <string name="erase_external_storage" product="default" msgid="1397239046334307625">"የSD ካርድ አጥፋ"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"እንደ ሙዚቃ እና ፎቶዎች፣ሁሉንም ውሂብ በውስጥUSB ማከማቻ አጥፋ።"</string>
+    <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"እንደ ሙዚቃ እና ፎቶዎች፣ሁሉንም ውሂብ በSD ካርድ ላይ አጥፋ።"</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"ጡባዊ ዳግም አስጀምር"</string>
+    <!-- outdated translation 3130786116528304116 -->     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"ጡባዊ ዳግም አስጀምር"</string>
+    <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>
+    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"የፋብሪካ ውሂብ ዳግም አስጀምር ለማረጋገጥ የእርስዎን መክፈቻ ስርዓተ ጥለት መሳል አለብዎ።"</string>
+    <!-- no translation found for master_clear_failed (8655202125010189406) -->
+    <skip />
+    <string name="master_clear_confirm_title" msgid="4845794266129586839">"ዳግም አስጀምር አረጋግጥ"</string>
+    <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"USB ማከማቻ አጥፋ"</string>
+    <string name="media_format_title" product="default" msgid="4427528440306787972">"የSD ካርድ አጥፋ"</string>
+    <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"በUSB ማከማቻ ላይ ያለ ውሂብ ሁሉ ያጠፋል"</string>
+    <string name="media_format_summary" product="default" msgid="3805714639375830120">"በSD   ካርድ ላይ ያለ ውሂብ በሙሉ አጥፋ"</string>
+    <string name="media_format_desc" product="nosdcard" msgid="4553860683952763905">"ይህ እርምጃ የUSB ማከማቻውንያጠፋል።እዚያ የተከማቸውንውሂብ"<b>" ሁሉ"</b>" ያጣሉ!"</string>
+    <string name="media_format_desc" product="default" msgid="1598627584181935513">"ይህ እርምጃ የSD ካርዱን ያጠፋል።በካርዱ ላይ ያለውንውሂብ"<b>"ሁሉ"</b>" ያጣሉ!"</string>
+    <string name="media_format_button_text" product="nosdcard" msgid="6293669371185352810">"USB ማከማቻ አጥፋ"</string>
+    <string name="media_format_button_text" product="default" msgid="6721544380069373626">"የSD ካርድ አጥፋ"</string>
+    <string name="media_format_final_desc" product="nosdcard" msgid="8094635533378487255">"USB ማከማቻ አጥፋ፣ እዚያ የተከማቹ ፋይሎች ሁሉ ይሰረዙ? እርምጃውን መመለስ አይቻለም!"</string>
+    <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>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"የ USB ካርዱን ማከማቻ ለማጥፋት መፈለግዎን ለማረጋገጥ የእርስዎን መክፈቻ ስርዓተ ጥለት መሳል አለብዎ።"</string>
+    <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>
+    <string name="tether_settings_summary_usb" product="tablet" msgid="785883365108362248">"የጡባዊዎንተንቀሳቃሽ ውሂብ በUSB ተያያዥ በኩል ያጋሩ"</string>
+    <string name="tether_settings_summary_usb" product="default" msgid="3562431455625637370">"በUSB በኩል የተንቀሳቃሽ ስልክዎን ውሂብ ማያያዣ ያጋሩ"</string>
+    <string name="tether_settings_summary_wifi" msgid="5474383125137372164">"እንደ ተጓጓዥ Wi-Fi ድረስ ነጥብ የተንቀሳቃሽዎን ውሂብ ተያያዥ ያጋሩ"</string>
+    <string name="tether_settings_summary_bluetooth" msgid="2407506656353819750">"በብሉቱዝ በኩል የተንቀሳቃሽ ውሂብ ተያያዥ ያጋሩ"</string>
+    <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>
+    <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>
+    <string name="tether_settings_summary_wifi_bluetooth" product="tablet" msgid="1924576461932311140">"እንደ ተጓጓዥ Wi-Fi ድረስ ነጥብ ወይም በብሉቱዝ በኩል የተንቀሳቃሽዎንጡባዊ ውሂብ ተያያዥ ያጋሩ"</string>
+    <string name="tether_settings_summary_wifi_bluetooth" product="default" msgid="2753904149495692201">"በUSB ወይም እንደ ተጓጓዥ Wi-Fi ድረስ ነጥብ በኩል የተንቀሳቃሽ ስልክዎን ውሂብ ማያያዣ ያጋሩ"</string>
+    <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>
+    <string name="use_location_title" msgid="3659340070401464551">"ሥፍራGoogle ፍለጋ ተጠቀም"</string>
+    <string name="use_location_summary_disabled" msgid="6518008620918354403">"ለGoogle ፍለጋ እናሌላየGoogle አገልግሎቶች ሥፍራ ተጠቀም"</string>
+    <string name="use_location_summary_enabled" msgid="8110246289085796179">"ሥፍራ የGoogle ፍለጋውጤቶችን እና ሌላ የGoogle አገልግሎቶች ለማሻሻል ይጠቅማል።"</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"ስለጡባዊ"</string>
+    <!-- outdated translation 593457295516533765 -->     <string name="about_settings" product="default" msgid="1743378368185371685">"ስለጡባዊ"</string>
+    <string name="about_settings_summary" msgid="3371517697156165959">"የሕግ መረጃ፣ኹነታ፣ የሶፍትዌር ሥሪት እይ"</string>
+    <!-- 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>
+    <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>
+    <string name="settings_safetylegal_activity_unreachable" msgid="170670055116721810">"የውሂብ ተያያዥ የልዎትም። ይህን መረጃ አሁን ለማየት፣ ከማንኛውም ኮምፒዩተር ጋር ወደ %s የተያያዘ በይነ መረብ ይሂዱ።"</string>
+    <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"በማስገባት ላይ..."</string>
+    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"የይለፍ ቃለዎን ይምረጡ"</string>
+    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"የእርስዎን ስርዓተ ጥለት ይምረጡ"</string>
+    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"PINዎን ይምረጡ"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"የይለፍ ቃልዎን ያረጋግጡ"</string>
+    <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"ስርዓተ ጥለትዎን ያረጋግጡ"</string>
+    <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>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"ምርጫዎችን ክፈት"</string>
+    <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>
+    <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 />
+    <string name="lock_title" product="tablet" msgid="2909697418179419990">"ጡባዊዎን በማስጠበቅ ላይ"</string>
+    <!-- outdated translation 2909697418179419990 -->     <string name="lock_title" product="default" msgid="4059246467204273930">"ጡባዊዎን በማስጠበቅ ላይ"</string>
+    <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"የግል ማያ መክፈቻ ስርዓተ ጥለት በመፍጠርጡባዊዎ ካልተፈቀደ ጥቅም ይከላከሉ።በሚቀጥለው ማያ ላይበማንኛውም ስርዓተ ነጥቦቹን ለማገናኘት  ጣትዎን ይጠቀሙ። ቢያንስ አራት ነጥቦች ማገናኘት አለብዎ።"\n\n" ለመጀመር ዝግጁ ነዎት? \"ቀጥል\" ይንኩ።"</string>
+    <string name="lock_intro_message" product="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>
+    <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>
+    <string name="show_running_services" msgid="5736278767975544570">"አሂድ አገልግሎቶችን አሳይ"</string>
+    <string name="show_background_processes" msgid="2009840211972293429">"የተሸጎጡ ሂደቶችን አሳይ"</string>
+    <!-- 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>
+    <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"የUSB  ማከማቻ"</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>
+    <string name="internal_storage" msgid="1584700623164275282">"የውስጥ ማከማቻ"</string>
+    <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"የUSB  ማከማቻ"</string>
+    <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD ካርድ ማከማቻ"</string>
+    <!-- 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>
+    <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>
+    <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"ወደ ጡባዊ አንቀሳቅስ"</string>
+    <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"ወደ ስልክ አንቀሳቅስ"</string>
+    <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"ወደUSB ማከማቻ አንቀሳቅስ"</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>
+    <string name="cached" msgid="1059590879740175019">"የተሸጎጠ የዳራ ሂደት"</string>
+    <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 />
+    <string name="service_background_processes" msgid="6844156253576174488">"<xliff:g id="MEMORY">%1$s</xliff:g> ነፃ"</string>
+    <string name="service_foreground_processes" msgid="7583975676795574276">"<xliff:g id="MEMORY">%1$s</xliff:g> ተጠቅሟል"</string>
+    <string name="memory" msgid="6609961111091483458">"RAM"</string>
+    <!-- no translation found for service_process_name (4098932168654826656) -->
+    <skip />
+    <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<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>
+    <string name="background_process_stop_description" msgid="1728354083304746737">"ይህ የድሮ ትግበራ ሂደት ለተሻለ ፍጥነት እንደገና ድንገት ከተፈለገበሚል የተጠበቀ ነው። አብዛኛውን ጊዜ እሱን ለማቆም ምንም ምክንያትየለም።"</string>
+    <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>
+    <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"የስርዓት አገልግለቶት ይቁም?"</string>
+    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="5420033091144016389">"ይህን የስርዓት አገልግሎት ለማቆም በእርግጥ ይፈልጋሉ? ከፈለጉ፣አጥፍተው እንደገና እስኪያበሩትአንዳንድ የጡባዊዎ ገጽታዎችበትክክል መስራት ያቆማሉ ።"</string>
+    <string name="runningservicedetails_stop_dlg_text" product="default" msgid="6929716497425738387">"ይህን የስርዓት አገልግሎት ለማቆም በእርግጥ ይፈልጋሉ? ከፈለጉ፣አጥፍተው እንደገና እስኪያበሩትአንዳንድ የስልክዎ ገጽታዎችበትክክል መስራት ያቆማሉ ።"</string>
+    <string name="language_settings" msgid="5292716747264442359">"ቋንቋ&amp; ግቤት"</string>
+    <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 />
+    <string name="auto_caps" msgid="6379232078052591265">"በራስ ሰር አብይ ማድረግ"</string>
+    <!-- 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 />
+    <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"የጡባዊ መረጃ"</string>
+    <!-- outdated translation 193561832258534798 -->     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"የጡባዊ መረጃ"</string>
+    <!-- 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>
+    <string name="current_input_method" msgid="2146807723398303917">"የአሁን ግቤት ሜተድ"</string>
+    <string name="input_method_selector" msgid="4311213129681430709">"የግቤት ሜተድ መራጭ"</string>
+    <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"ራስ ሰር"</string>
+    <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"ሁልጊዜ አሳይ"</string>
+    <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"ሁልጊዜ ደብቅ"</string>
+    <string name="configure_input_method" msgid="7773992829158322455">"ግቤት ሜተዶችን አዋቀር"</string>
+    <string name="input_method_settings" msgid="5801295625486269553">"ቅንብሮች"</string>
+    <string name="active_input_method_subtypes" msgid="3596398805424733238">"ገባሪ ግቤት ሜተድ"</string>
+    <string name="use_system_language_to_select_input_method_subtypes" msgid="3346751753141428573">"የስርዓት ቋንቋ ተጠቀም"</string>
+    <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g>ቅንብሮች"</string>
+    <string name="input_methods_and_subtype_enabler_title" msgid="4018402267502337338">"ገባሪ የሆኑ ግቤት ሜተዶች ምረጥ"</string>
+    <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>
+    <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>
+    <string name="power_usage_not_available" msgid="3583407442633768046">"የባትሪ አጠቃቀም ውሂብ የለም"</string>
+    <string name="battery_since_unplugged" msgid="338073389740738437">"ከተነቀለ ጀምሮ የባትሪ ጥቅም"</string>
+    <string name="battery_since_reset" msgid="7464546661121187045">"ዳግም ከተጀመረጀምሮ የባትሪ ጥቅም"</string>
+    <string name="battery_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>
+    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
+    <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"ነቃ"</string>
+    <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>
+    <string name="wifi_on_time" msgid="6310209835617490616">"Wi-Fi በጊዜ"</string>
+    <string name="bluetooth_on_time" msgid="6157799524996162271">"Wi-Fi በጊዜ"</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>
+    <string name="history_details_title" msgid="3608240585315506067">"የታሪክ ዝርዝሮች"</string>
+    <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>
+    <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>
+    <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>
+    <string name="battery_action_wifi" msgid="2272741639606146903">"Wi-Fi ቅንብሮች"</string>
+    <string name="battery_action_bluetooth" msgid="8374789049507723142">"የብሉቱዝ ቅንብሮች"</string>
+    <string name="battery_desc_voice" msgid="8980322055722959211">"የድምፅ ጥሪዎች የተጠቀሙበት ባትሪመጠን"</string>
+    <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>
+    <!-- no translation found for tts_engine_settings_section (2346105138448751893) -->
+    <skip />
+    <!-- no translation found for tts_engine_settings_title (3499112142425680334) -->
+    <skip />
+    <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>
+    <string name="vpn_details_title" msgid="418806440938510331">"VPN ዝርዝሮች"</string>
+    <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>
+    <string name="backup_data_summary" msgid="6515285107793232815">"ወደ Google  አገልጋዮች የትግበራ ውሂብ ፣የWi-Fi  ይለፍ ቃሎች እና ሌላ ቅንብሮች   ተተኪ አኑር"</string>
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"መለያ መጠባበቂ"</string>
+    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"በአሁኑ ጊዜ ምንም መለያ ተተኪ አኑር ውሂብ እያከማቸ አይደለም።"</string>
+    <string name="auto_restore_title" msgid="5397528966329126506">"ራስ ሰር ነበረበት መልስ"</string>
+    <string name="auto_restore_summary" msgid="83177150536734378">"ትግበራ ድጋሚ ከጫንኩ፣ ተተኪ አኑር ቅንብሮችን ወይም ሌላ ውሂብ እነበሩበት መልስ"</string>
+    <string name="backup_erase_dialog_title" msgid="3438255037256586237">"መጠባበቂያ"</string>
+    <string name="backup_erase_dialog_message" msgid="7766283133557587608">"የ Wi-Fi  ይለፍቃልዎች፣ እልባቶቸ ፣ እና ሌላ ቅንብሮች እና የትግበራ ውሂብ እና 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>
+    <string name="wifi_setup_title" msgid="661074868726906436">"Wi-Fi ጫን"</string>
+    <!-- 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>
+    <string name="wifi_setup_back" msgid="144777383739164044">"ተመለስ"</string>
+    <string name="wifi_setup_detail" msgid="2336990478140503605">"የአውታረ መረብ ዝርዝሮች"</string>
+    <string name="wifi_setup_connect" msgid="7954456989590237049">"አያይዝ"</string>
+    <string name="wifi_setup_forget" msgid="2562847595567347526">"እርሳ"</string>
+    <string name="wifi_setup_save" msgid="3659235094218508211">"አስቀምጥ"</string>
+    <string name="wifi_setup_cancel" msgid="3185216020264410239">"ይቅር"</string>
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"አውታረ መረቦች በመቃኘት ላይ....."</string>
+    <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"አውታረ መረብ ለመያያዝ ንካ"</string>
+    <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"ካለው አውታረ መረብ ጋር አያይዝ"</string>
+    <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"ያልተጠበቀ አውታረ መረብ አያይዝ"</string>
+    <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>
+    <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"EAP  አይታገዝም"</string>
+    <!-- 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 />
+    <string name="account_sync_settings_title" msgid="4578227872921044660">"ቅንብሮች አስምር"</string>
+    <!-- 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>
+    <string name="settings_backup" msgid="2274732978260797031">"ቅንብሮች  ተተኪ አኑር"</string>
+    <string name="settings_backup_summary" msgid="7916877705938054035">"ቅንብሮቼን ተተኪ አኑር"</string>
+    <!-- no translation found for sync_menu_sync_now (6154608350395805683) -->
+    <skip />
+    <!-- no translation found for sync_menu_sync_cancel (8292379009626966949) -->
+    <skip />
+    <string name="sync_one_time_sync" msgid="6766593624598183090">"<xliff:g id="LAST_SYNC_TIME">
+%1$s</xliff:g> አሁን ለማስመር ንካ"</string>
+    <!-- no translation found for sync_gmail (714886122098006477) -->
+    <skip />
+    <!-- no translation found for sync_calendar (9056527206714733735) -->
+    <skip />
+    <!-- no translation found for sync_contacts (9174914394377828043) -->
+    <skip />
+    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">" ወደ Google አስምር እንኳን ደህና መጡ!"</font>\n"  የእርዎን ዕውቂያዎች፣ ቀጠሮዎች እና ሌሎችም ካሉበት መድረስ ለመፍቀድ የGoogle ውሂብ አስምር አቀራረብ።"</string>
+    <string name="header_application_sync_settings" msgid="5514539555293976035">" የትግበራ አስምር ቅንብሮች"</string>
+    <string name="header_data_and_synchronization" msgid="5165024023936509896">"ውሂብ &amp; ማስመር"</string>
+    <string name="preference_change_password_title" msgid="8955581790270130056">"የይለፍ ቃል ቀይር"</string>
+    <string name="header_account_settings" msgid="5382475087121880626">"መለያ ቅንብሮች"</string>
+    <string name="remove_account_label" msgid="5921986026504804119">"መለያ አስወግድ"</string>
+    <string name="header_add_an_account" msgid="756108499532023798">"መለያ አክል"</string>
+    <string name="finish_button_label" msgid="481587707657751116">"ጨርስ"</string>
+    <string name="really_remove_account_title" msgid="6574643117748564960">"መለያ አስወግድ"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="4448645571715719563">"ይህን መለያ በእውነት ማስወገድ ይፈልጋሉ? ማስወገዱ መልዕክቶቹን፣ እውቂያዎቹን፣ እና ከጡባዊው ውስጥ ሌላ ውሂብ ይሰርዛል።"\n" ይቀጥል?"</string>
+    <string name="really_remove_account_message" product="default" msgid="1005751790899989319">"ይህመለያ በእውነት ማስወገድ ይፈልጋሉ? ማስወገዱ መልዕክቶቹን፣ እውቂያዎቹን፣ እና ከስልኩ ሌላ ውሂብ ይሰርዛል።"\n" ይቀጥል?"</string>
+    <string name="remove_account_failed" product="tablet" msgid="1093911989149396624">"ይህ መለያ በአንዳንድ ትግበራዎች ይጠየቃል። ማስወገድ የሚችሉት ጡባዊውን ወደ ፋብሪካ ነባሪዎች(ሁሉንም የግል ውሂብ ይሰርዛል) ዳግም በማስጀመር ብቻ ነው። በብሕትውነት ስር፣በቅንብሮች ትግበራ ውስጥ ያድርጉ።"</string>
+    <string name="remove_account_failed" product="default" msgid="9174390193652391412">"ይህ መለያ በአንዳንድ ትግበራዎች ይጠየቃል። ማስወገድ የሚችሉት ስልኩን ወደ ፋብሪካ ነባሪዎች(ሁሉንም የግል ውሂብ ይሰርዛል) ዳግም በማስጀመር ብቻ ነው። በብሕትውነት ስር፣በቅንብሮች ትግበራ ውስጥ ያድርጉ።"</string>
+    <string name="provider_label" msgid="7724593781904508866">"ምዝገባዎችላይ ተጫን"</string>
+    <string name="sync_item_title" msgid="1931551540462877488">"<xliff:g id="AUTHORITY">%s</xliff:g> አስምር"</string>
+    <string name="cant_sync_dialog_title" msgid="7185199796123573317">"በእጅ አስምር አልተቻለም"</string>
+    <string name="cant_sync_dialog_message" msgid="2372359241135295930">"አስምር ለዚህ አይነት በአሁን ጊዜ ቦዝኗል።ምርጫዎን ለመለወጥ፣ለጊዜው የዳራ ውሂብ እና ራስ ሰር አስምር ያንቁ።"</string>
+    <string name="enter_password" msgid="3268224850821675915">"ማከማቻ ለመፍታት የይለፍ ቃል አስገባ"</string>
+    <string name="try_again" msgid="5904121494468643129">"ይቅርታ፣እንደገና ሞክር"</string>
+    <!-- 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 />
+    <!-- no translation found for data_usage_summary_title (3804110657238092929) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle (5652529796195787949) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_split_4g (7417435609285381968) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_wifi (8266875319417201085) -->
+    <skip />
+    <!-- no translation found for data_usage_change_cycle (7776556448920114866) -->
+    <skip />
+    <!-- no translation found for data_usage_pick_cycle_day (4470796861757050966) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_mobile_limit (289740911281022322) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_4g_limit (5808210773758699800) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_3g_limit (3856971004328238231) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_wifi (1728851922959017766) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_mobile (454140350007299045) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_4g (1301978716067512235) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_3g (6092169523081538718) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_mobile (986782622560157977) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_3g (6304006671869578254) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_4g (3635854097335036738) -->
+    <skip />
+    <!-- no translation found for data_usage_app_settings (3727561362090820369) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background (8856643905291165256) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background_summary (1503361245973512092) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog_title (8110736468987743260) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog (100001698378554777) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_title (1373797281540188533) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_subtitle (5512903797979928416) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_positive (4565302264487526138) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_title (3023111643632996097) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_mobile (7931094451923591578) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_3g (5478553071420316963) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_4g (6134008906742403777) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_3g_title (4221584306492812040) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_4g_title (715585612162185936) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_mobile_title (209516216265000221) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog (2874031671067845964) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_enable (5738467047490662678) -->
+    <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 24e2d3d..e1b5deb 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>
+    <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,19 @@
     <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>
+    <!-- no translation found for wallpaper_settings_title (5449180116365824625) -->
+    <skip />
+    <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>
@@ -643,8 +656,9 @@
     <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN (رقم دليل الجوال)"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"رقم هاتفي"</string>
     <string name="status_min_number" msgid="3519504522179420597">"دقيقة"</string>
+    <string name="status_msid_number" msgid="909010114445780530">"MSID"</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 +754,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@33f42b49)  -->
+    <!-- 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@35a8767)  -->
     <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,6 +907,8 @@
     <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>
@@ -1026,7 +1042,8 @@
     <string name="pointer_settings_category" msgid="6090176550039035130">"إعدادات الماوس واللوحة اللمسية"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"سرعة المؤشر"</string>
     <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>
@@ -1035,6 +1052,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>
@@ -1106,6 +1124,7 @@
     <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>
+    <string name="settings_button" msgid="3006713718908152930">"الإعدادات"</string>
     <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>
@@ -1218,6 +1237,10 @@
     <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>
+    <!-- no translation found for tts_engine_settings_section (2346105138448751893) -->
+    <skip />
+    <!-- no translation found for tts_engine_settings_title (3499112142425680334) -->
+    <skip />
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"اللغات والأصوات"</string>
     <string name="pico_installed" msgid="2452546687858267414">"مثبت"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"غير مثبت"</string>
@@ -1308,30 +1331,24 @@
     <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>
+    <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>
+    <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>
+    <string name="credentials_not_erased" msgid="397954733557821269">"تعذر محو وحدة تخزين بيانات الاعتماد."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"تم تمكين تخزين بيانات الاعتماد."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6816970208840577219">"يجب تعيين رقم تعريف شخصي لتأمين الشاشة أو كلمة مرور قبل أن تتمكن من استخدام وحدة تخزين بيانات الاعتماد. هل تريد ذلك الآن؟"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"نغمة الطوارئ"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"تعيين السلوك عند إجراء اتصال بالطوارئ"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"الخصوصية"</string>
@@ -1439,4 +1456,69 @@
     <string name="select_all" msgid="6783085295161532497">"تحديد الكل"</string>
     <string name="hdcp_checking_title" msgid="8605478913544273282">"التحقق من HDCP"</string>
     <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"تعيين سلوك التحقق من HDCP"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"استخدام البيانات"</string>
+    <!-- no translation found for data_usage_cycle (5652529796195787949) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_split_4g (7417435609285381968) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_wifi (8266875319417201085) -->
+    <skip />
+    <!-- no translation found for data_usage_change_cycle (7776556448920114866) -->
+    <skip />
+    <!-- no translation found for data_usage_pick_cycle_day (4470796861757050966) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_mobile_limit (289740911281022322) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_4g_limit (5808210773758699800) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_3g_limit (3856971004328238231) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_wifi (1728851922959017766) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_mobile (454140350007299045) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_4g (1301978716067512235) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_3g (6092169523081538718) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_mobile (986782622560157977) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_3g (6304006671869578254) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_4g (3635854097335036738) -->
+    <skip />
+    <!-- no translation found for data_usage_app_settings (3727561362090820369) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background (8856643905291165256) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background_summary (1503361245973512092) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog_title (8110736468987743260) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog (100001698378554777) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_title (1373797281540188533) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_subtitle (5512903797979928416) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_positive (4565302264487526138) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_title (3023111643632996097) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_mobile (7931094451923591578) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_3g (5478553071420316963) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_4g (6134008906742403777) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_3g_title (4221584306492812040) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_4g_title (715585612162185936) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_mobile_title (209516216265000221) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog (2874031671067845964) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_enable (5738467047490662678) -->
+    <skip />
 </resources>
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 6519092..f980afa 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>
+    <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,19 @@
     <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>
+    <!-- no translation found for wallpaper_settings_title (5449180116365824625) -->
+    <skip />
+    <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>
@@ -643,8 +656,9 @@
     <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"Моят телефонен номер"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
+    <string name="status_msid_number" msgid="909010114445780530">"MSID"</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,6 +907,8 @@
     <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>
@@ -1026,7 +1042,8 @@
     <string name="pointer_settings_category" msgid="6090176550039035130">"Настройки на мишката и тракпада"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Скорост на курсора"</string>
     <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>
@@ -1035,6 +1052,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>
@@ -1106,6 +1124,7 @@
     <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>
+    <string name="settings_button" msgid="3006713718908152930">"Настройки"</string>
     <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>
@@ -1218,6 +1237,10 @@
     <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>
+    <!-- no translation found for tts_engine_settings_section (2346105138448751893) -->
+    <skip />
+    <!-- no translation found for tts_engine_settings_title (3499112142425680334) -->
+    <skip />
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"Езици и гласове"</string>
     <string name="pico_installed" msgid="2452546687858267414">"Инсталиран"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"Не е инсталирано"</string>
@@ -1308,30 +1331,24 @@
     <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>
+    <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>
+    <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>
+    <string name="credentials_not_erased" msgid="397954733557821269">"Хранил. за идент. данни не можа да бъде изтрито."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Хранилището за идентификационни данни е активирано."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6816970208840577219">"Трябва да зададете ПИН код или парола за заключен екран, преди да можете да използвате хранилището за идентификационни данни. Искате ли да го направите сега?"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Тон за спешност"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Задаване на поведение при спешно обаждане"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"Поверителност"</string>
@@ -1440,4 +1457,69 @@
     <string name="select_all" msgid="6783085295161532497">"Избиране на всички"</string>
     <string name="hdcp_checking_title" msgid="8605478913544273282">"Проверка с HDCP"</string>
     <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Повед. за проверка с HDCP"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Използване на данни"</string>
+    <!-- no translation found for data_usage_cycle (5652529796195787949) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_split_4g (7417435609285381968) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_wifi (8266875319417201085) -->
+    <skip />
+    <!-- no translation found for data_usage_change_cycle (7776556448920114866) -->
+    <skip />
+    <!-- no translation found for data_usage_pick_cycle_day (4470796861757050966) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_mobile_limit (289740911281022322) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_4g_limit (5808210773758699800) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_3g_limit (3856971004328238231) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_wifi (1728851922959017766) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_mobile (454140350007299045) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_4g (1301978716067512235) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_3g (6092169523081538718) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_mobile (986782622560157977) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_3g (6304006671869578254) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_4g (3635854097335036738) -->
+    <skip />
+    <!-- no translation found for data_usage_app_settings (3727561362090820369) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background (8856643905291165256) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background_summary (1503361245973512092) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog_title (8110736468987743260) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog (100001698378554777) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_title (1373797281540188533) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_subtitle (5512903797979928416) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_positive (4565302264487526138) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_title (3023111643632996097) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_mobile (7931094451923591578) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_3g (5478553071420316963) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_4g (6134008906742403777) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_3g_title (4221584306492812040) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_4g_title (715585612162185936) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_mobile_title (209516216265000221) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog (2874031671067845964) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_enable (5738467047490662678) -->
+    <skip />
 </resources>
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 7e7078e..ddedb95 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>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Desactivada per administrador, política d\'encriptació o emmagatzematge de credencials"</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,19 @@
     <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>
+    <!-- no translation found for wallpaper_settings_title (5449180116365824625) -->
+    <skip />
+    <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>
@@ -643,8 +656,9 @@
     <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <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_msid_number" msgid="909010114445780530">"MSID"</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,6 +907,8 @@
     <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>
@@ -1026,7 +1042,8 @@
     <string name="pointer_settings_category" msgid="6090176550039035130">"Configuració de ratolí i ratolí tàctil"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Velocitat del punter"</string>
     <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>
@@ -1035,6 +1052,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>
@@ -1106,6 +1124,7 @@
     <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>
+    <string name="settings_button" msgid="3006713718908152930">"Configuració"</string>
     <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>
@@ -1218,6 +1237,10 @@
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Configuració de: <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> està activat"</string>
     <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> està desactivat"</string>
+    <!-- no translation found for tts_engine_settings_section (2346105138448751893) -->
+    <skip />
+    <!-- no translation found for tts_engine_settings_title (3499112142425680334) -->
+    <skip />
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"Idiomes i veus"</string>
     <string name="pico_installed" msgid="2452546687858267414">"Instal·lada"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"No instal·lada"</string>
@@ -1308,30 +1331,24 @@
     <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>
+    <string name="credentials_reset_summary" msgid="3369361230171260282">"Elimina tots els certificats"</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>
+    <string name="credentials_reset_hint" msgid="1566409057833618877">"Tots els continguts s\'eliminaran. N\'estàs segur?"</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>
+    <string name="credentials_not_erased" msgid="397954733557821269">"L\'emmagatzematge de credencials no s\'ha esborrat."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"L\'emmagatzematge de credencials està activat."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6816970208840577219">"Has d\'establir un PIN o una contrasenya de bloqueig de la pantalla per poder utilitzar l\'emmagatzematge de credencials. Vols fer-ho ara?"</string>
     <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>
@@ -1440,4 +1457,69 @@
     <string name="select_all" msgid="6783085295161532497">"Selecciona-ho tot"</string>
     <string name="hdcp_checking_title" msgid="8605478913544273282">"Comprovació HDCP"</string>
     <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Defineix comport. comprov. HDCP"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Ús de dades"</string>
+    <!-- no translation found for data_usage_cycle (5652529796195787949) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_split_4g (7417435609285381968) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_wifi (8266875319417201085) -->
+    <skip />
+    <!-- no translation found for data_usage_change_cycle (7776556448920114866) -->
+    <skip />
+    <!-- no translation found for data_usage_pick_cycle_day (4470796861757050966) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_mobile_limit (289740911281022322) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_4g_limit (5808210773758699800) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_3g_limit (3856971004328238231) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_wifi (1728851922959017766) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_mobile (454140350007299045) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_4g (1301978716067512235) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_3g (6092169523081538718) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_mobile (986782622560157977) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_3g (6304006671869578254) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_4g (3635854097335036738) -->
+    <skip />
+    <!-- no translation found for data_usage_app_settings (3727561362090820369) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background (8856643905291165256) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background_summary (1503361245973512092) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog_title (8110736468987743260) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog (100001698378554777) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_title (1373797281540188533) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_subtitle (5512903797979928416) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_positive (4565302264487526138) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_title (3023111643632996097) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_mobile (7931094451923591578) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_3g (5478553071420316963) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_4g (6134008906742403777) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_3g_title (4221584306492812040) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_4g_title (715585612162185936) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_mobile_title (209516216265000221) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog (2874031671067845964) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_enable (5738467047490662678) -->
+    <skip />
 </resources>
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 a4888d9..a74ff33 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>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Zakázáno správcem, zásadami šifrování nebo úložištěm pověření"</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,19 @@
     <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>
+    <!-- no translation found for wallpaper_settings_title (5449180116365824625) -->
+    <skip />
+    <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>
@@ -643,8 +656,9 @@
     <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"Moje telefonní číslo"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
+    <string name="status_msid_number" msgid="909010114445780530">"MSID"</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,6 +907,8 @@
     <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>
@@ -1026,7 +1042,8 @@
     <string name="pointer_settings_category" msgid="6090176550039035130">"Nastavení myši a trackpadu"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Rychlost kurzoru"</string>
     <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>
@@ -1035,6 +1052,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>
@@ -1106,6 +1124,7 @@
     <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>
+    <string name="settings_button" msgid="3006713718908152930">"Nastavení"</string>
     <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>
@@ -1218,6 +1237,10 @@
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Nastavení modulu <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"Položka <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> je aktivována"</string>
     <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"Možnost <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> je deaktivována"</string>
+    <!-- no translation found for tts_engine_settings_section (2346105138448751893) -->
+    <skip />
+    <!-- no translation found for tts_engine_settings_title (3499112142425680334) -->
+    <skip />
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"Jazyky a hlasy"</string>
     <string name="pico_installed" msgid="2452546687858267414">"Nainstalováno"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"Není nainstalováno"</string>
@@ -1308,30 +1331,24 @@
     <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>
+    <string name="credentials_reset_summary" msgid="3369361230171260282">"Odebrat všechny certifikáty"</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>
+    <string name="credentials_reset_hint" msgid="1566409057833618877">"Veškerý obsah bude odstraněn. Opravdu chcete akci provést?"</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>
+    <string name="credentials_not_erased" msgid="397954733557821269">"Úložiště pověření nelze smazat."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Úložiště pověření je aktivováno."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6816970208840577219">"Před použitím úložiště pověření musíte nastavit kód PIN nebo heslo zámku obrazovky. Chcete to provést?"</string>
     <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>
@@ -1439,4 +1456,69 @@
     <string name="select_all" msgid="6783085295161532497">"Vybrat vše"</string>
     <string name="hdcp_checking_title" msgid="8605478913544273282">"Kontrola HDCP"</string>
     <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Nastavit chování kontroly HDCP"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Přenesená data"</string>
+    <!-- no translation found for data_usage_cycle (5652529796195787949) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_split_4g (7417435609285381968) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_wifi (8266875319417201085) -->
+    <skip />
+    <!-- no translation found for data_usage_change_cycle (7776556448920114866) -->
+    <skip />
+    <!-- no translation found for data_usage_pick_cycle_day (4470796861757050966) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_mobile_limit (289740911281022322) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_4g_limit (5808210773758699800) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_3g_limit (3856971004328238231) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_wifi (1728851922959017766) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_mobile (454140350007299045) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_4g (1301978716067512235) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_3g (6092169523081538718) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_mobile (986782622560157977) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_3g (6304006671869578254) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_4g (3635854097335036738) -->
+    <skip />
+    <!-- no translation found for data_usage_app_settings (3727561362090820369) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background (8856643905291165256) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background_summary (1503361245973512092) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog_title (8110736468987743260) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog (100001698378554777) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_title (1373797281540188533) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_subtitle (5512903797979928416) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_positive (4565302264487526138) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_title (3023111643632996097) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_mobile (7931094451923591578) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_3g (5478553071420316963) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_4g (6134008906742403777) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_3g_title (4221584306492812040) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_4g_title (715585612162185936) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_mobile_title (209516216265000221) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog (2874031671067845964) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_enable (5738467047490662678) -->
+    <skip />
 </resources>
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 221dca8..36a65ad 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -273,8 +273,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="2382525043173672857">"Indtast tekst, der skal vises på låseskærmen"</string>
     <string name="security_settings_title" msgid="5168491784222013179">"Placering og sikkerhed"</string>
     <string name="location_security_settings_title" msgid="4624434296446625554">"Indstillinger for placering og sikkerhed"</string>
-    <string name="security_settings_summary" msgid="967393342537986570">"Angiv Min placering, oplåsning af skærmen, låsning af SIM-kort og oplysningslagring"</string>
-    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Angiv Min placering, oplåsning af skærmen, oplysningslagring"</string>
+    <string name="security_settings_summary" msgid="967393342537986570">"Angiv Min placering, oplåsning af skærmen, låsning af SIM-kort og lager for loginoplysninger"</string>
+    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Angiv Min placering, oplåsning af skærmen, lager for loginoplysninger"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Adgangskoder"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Kryptering"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Krypter tablet"</string>
@@ -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>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Deaktiveret af administrator, kryptering eller loginlager"</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,19 @@
     <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>
+    <!-- no translation found for wallpaper_settings_title (5449180116365824625) -->
+    <skip />
+    <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>
@@ -643,8 +656,9 @@
     <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"Mit telefonnummer"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
+    <string name="status_msid_number" msgid="909010114445780530">"MSID"</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,6 +907,8 @@
     <string name="install_unknown_applications" msgid="6612824788917283662">"Tillad installation af applikationer, 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 applikationer 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 applikationer."</string>
     <string name="install_all_warning" product="default" msgid="1923717607319933741">"Din telefon og dine personlige oplysninger er mere sårbare over for angreb af applikationer 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 applikationer."</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>
@@ -1026,7 +1042,8 @@
     <string name="pointer_settings_category" msgid="6090176550039035130">"Indstillinger for mus og pegefelt"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Markørens hastighed"</string>
     <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>
@@ -1035,6 +1052,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>
@@ -1106,6 +1124,7 @@
     <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>
+    <string name="settings_button" msgid="3006713718908152930">"Indstillinger"</string>
     <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>
@@ -1218,6 +1237,10 @@
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>-indstillinger"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> er aktiveret"</string>
     <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> er deaktiveret"</string>
+    <!-- no translation found for tts_engine_settings_section (2346105138448751893) -->
+    <skip />
+    <!-- no translation found for tts_engine_settings_title (3499112142425680334) -->
+    <skip />
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"Sprog og stemmer"</string>
     <string name="pico_installed" msgid="2452546687858267414">"Installeret"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"Ikke installeret"</string>
@@ -1308,30 +1331,24 @@
     <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 applikationer 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>
+    <string name="credentials_reset_summary" msgid="3369361230171260282">"Fjern alle certifikater"</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_unlock_hint" msgid="5889551635843338639">"Indtast adgangskoden for lager for loginoplysninger."</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>
+    <string name="credentials_reset_hint" msgid="1566409057833618877">"Alt indhold vil blive fjernet. Er du sikker?"</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>
+    <string name="credentials_not_erased" msgid="397954733557821269">"Lager for logins kan ikke slettes."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Oplysningslagring er aktiveret."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6816970208840577219">"Du skal angive en pinkode eller adgangskode til låseskærmen, før du kan bruge lageret for loginoplysninger. Vil du gøre det nu?"</string>
     <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>
@@ -1439,4 +1456,69 @@
     <string name="select_all" msgid="6783085295161532497">"Vælg alle"</string>
     <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP-kontrol"</string>
     <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Indstil HDCP-kontroladfærd"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Dataforbrug"</string>
+    <!-- no translation found for data_usage_cycle (5652529796195787949) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_split_4g (7417435609285381968) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_wifi (8266875319417201085) -->
+    <skip />
+    <!-- no translation found for data_usage_change_cycle (7776556448920114866) -->
+    <skip />
+    <!-- no translation found for data_usage_pick_cycle_day (4470796861757050966) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_mobile_limit (289740911281022322) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_4g_limit (5808210773758699800) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_3g_limit (3856971004328238231) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_wifi (1728851922959017766) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_mobile (454140350007299045) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_4g (1301978716067512235) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_3g (6092169523081538718) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_mobile (986782622560157977) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_3g (6304006671869578254) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_4g (3635854097335036738) -->
+    <skip />
+    <!-- no translation found for data_usage_app_settings (3727561362090820369) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background (8856643905291165256) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background_summary (1503361245973512092) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog_title (8110736468987743260) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog (100001698378554777) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_title (1373797281540188533) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_subtitle (5512903797979928416) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_positive (4565302264487526138) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_title (3023111643632996097) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_mobile (7931094451923591578) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_3g (5478553071420316963) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_4g (6134008906742403777) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_3g_title (4221584306492812040) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_4g_title (715585612162185936) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_mobile_title (209516216265000221) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog (2874031671067845964) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_enable (5738467047490662678) -->
+    <skip />
 </resources>
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 b8ab60f..577faa6 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>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Von Admin, Richtlinie oder Anmeldedaten 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,19 @@
     <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>
+    <!-- no translation found for wallpaper_settings_title (5449180116365824625) -->
+    <skip />
+    <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>
@@ -643,8 +656,9 @@
     <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"Meine Telefonnummer"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
+    <string name="status_msid_number" msgid="909010114445780530">"MSID"</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,6 +907,8 @@
     <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>
@@ -1026,7 +1042,8 @@
     <string name="pointer_settings_category" msgid="6090176550039035130">"Maus- und Touchpad-Einstellungen"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Zeigergeschwindigkeit"</string>
     <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>
@@ -1035,6 +1052,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>
@@ -1106,6 +1124,7 @@
     <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>
+    <string name="settings_button" msgid="3006713718908152930">"Einstellungen"</string>
     <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>
@@ -1218,6 +1237,10 @@
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>-Einstellungen"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> ist aktiviert."</string>
     <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> ist deaktiviert."</string>
+    <!-- no translation found for tts_engine_settings_section (2346105138448751893) -->
+    <skip />
+    <!-- no translation found for tts_engine_settings_title (3499112142425680334) -->
+    <skip />
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"Sprachen und Stimmen"</string>
     <string name="pico_installed" msgid="2452546687858267414">"Installiert"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"Nicht installiert"</string>
@@ -1308,30 +1331,24 @@
     <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>
+    <string name="credentials_reset_summary" msgid="3369361230171260282">"Alle Zertifikate entfernen"</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>
+    <string name="credentials_reset_hint" msgid="1566409057833618877">"Alle Inhalte werden entfernt. Möchten Sie wirklich fortfahren?"</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>
+    <string name="credentials_not_erased" msgid="397954733557821269">"Anmeldedaten nicht gelöscht"</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Der Anmeldeinformationsspeicher ist aktiviert."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6816970208840577219">"Zur Verwendung des Anmeldeinformationsspeichers müssen Sie eine PIN oder ein Passwort für die Bildschirmsperre festlegen."</string>
     <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>
@@ -1439,4 +1456,69 @@
     <string name="select_all" msgid="6783085295161532497">"Alle auswählen"</string>
     <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP-Prüfung"</string>
     <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"HDCP-Prüfverhalten festl."</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Datennutzung"</string>
+    <!-- no translation found for data_usage_cycle (5652529796195787949) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_split_4g (7417435609285381968) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_wifi (8266875319417201085) -->
+    <skip />
+    <!-- no translation found for data_usage_change_cycle (7776556448920114866) -->
+    <skip />
+    <!-- no translation found for data_usage_pick_cycle_day (4470796861757050966) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_mobile_limit (289740911281022322) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_4g_limit (5808210773758699800) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_3g_limit (3856971004328238231) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_wifi (1728851922959017766) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_mobile (454140350007299045) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_4g (1301978716067512235) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_3g (6092169523081538718) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_mobile (986782622560157977) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_3g (6304006671869578254) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_4g (3635854097335036738) -->
+    <skip />
+    <!-- no translation found for data_usage_app_settings (3727561362090820369) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background (8856643905291165256) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background_summary (1503361245973512092) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog_title (8110736468987743260) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog (100001698378554777) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_title (1373797281540188533) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_subtitle (5512903797979928416) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_positive (4565302264487526138) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_title (3023111643632996097) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_mobile (7931094451923591578) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_3g (5478553071420316963) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_4g (6134008906742403777) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_3g_title (4221584306492812040) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_4g_title (715585612162185936) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_mobile_title (209516216265000221) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog (2874031671067845964) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_enable (5738467047490662678) -->
+    <skip />
 </resources>
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 714da64..2088593 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>
+    <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,19 @@
     <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>
+    <!-- no translation found for wallpaper_settings_title (5449180116365824625) -->
+    <skip />
+    <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>
@@ -643,8 +656,9 @@
     <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"Ο τηλεφωνικός αριθμός μου"</string>
     <string name="status_min_number" msgid="3519504522179420597">"ΛΕΠΤΟ"</string>
+    <string name="status_msid_number" msgid="909010114445780530">"MSID"</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,6 +907,8 @@
     <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>
@@ -1026,7 +1042,8 @@
     <string name="pointer_settings_category" msgid="6090176550039035130">"Ρυθμίσεις ποντικιού και επιφάνειας αφής"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Ταχύτητα δείκτη"</string>
     <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>
@@ -1035,6 +1052,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>
@@ -1106,6 +1124,7 @@
     <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>
+    <string name="settings_button" msgid="3006713718908152930">"Ρυθμίσεις"</string>
     <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>
@@ -1218,6 +1237,10 @@
     <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>
+    <!-- no translation found for tts_engine_settings_section (2346105138448751893) -->
+    <skip />
+    <!-- no translation found for tts_engine_settings_title (3499112142425680334) -->
+    <skip />
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"Γλώσσες και φωνές"</string>
     <string name="pico_installed" msgid="2452546687858267414">"Εγκαταστάθηκε"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"Δεν έχει εγκατασταθεί"</string>
@@ -1308,30 +1331,24 @@
     <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>
+    <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>
+    <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>
+    <string name="credentials_not_erased" msgid="397954733557821269">"Δεν ήταν δυνατή η διαγραφή του χώρου αποθήκευσης διαπιστευτηρίων."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Ο χώρος αποθήκευσης διαπιστευτηρίων ενεργοποιήθηκε."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6816970208840577219">"Πρέπει να ορίσετε ένα PIN ή κωδικό πρόσβασης κλειδώματος οθόνης προτού χρησιμοποιήσετε τον χώρο αποθήκευσης διαπιστευτηρίων. Θα θέλατε να το κάνετε τώρα;"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Τόνος επείγουσας ανάγκης"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Ορισμός συμπεριφοράς κατά την πραγματοποίηση κλήσης επείγουσας ανάγκης"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"Απόρρητο"</string>
@@ -1446,4 +1463,69 @@
     <string name="select_all" msgid="6783085295161532497">"Επιλογή όλων"</string>
     <string name="hdcp_checking_title" msgid="8605478913544273282">"Έλεγχος HDCP"</string>
     <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Ρύθμιση συμπεριφοράς ελέγχου HDCP"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Χρήση δεδομένων"</string>
+    <!-- no translation found for data_usage_cycle (5652529796195787949) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_split_4g (7417435609285381968) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_wifi (8266875319417201085) -->
+    <skip />
+    <!-- no translation found for data_usage_change_cycle (7776556448920114866) -->
+    <skip />
+    <!-- no translation found for data_usage_pick_cycle_day (4470796861757050966) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_mobile_limit (289740911281022322) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_4g_limit (5808210773758699800) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_3g_limit (3856971004328238231) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_wifi (1728851922959017766) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_mobile (454140350007299045) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_4g (1301978716067512235) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_3g (6092169523081538718) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_mobile (986782622560157977) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_3g (6304006671869578254) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_4g (3635854097335036738) -->
+    <skip />
+    <!-- no translation found for data_usage_app_settings (3727561362090820369) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background (8856643905291165256) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background_summary (1503361245973512092) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog_title (8110736468987743260) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog (100001698378554777) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_title (1373797281540188533) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_subtitle (5512903797979928416) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_positive (4565302264487526138) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_title (3023111643632996097) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_mobile (7931094451923591578) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_3g (5478553071420316963) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_4g (6134008906742403777) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_3g_title (4221584306492812040) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_4g_title (715585612162185936) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_mobile_title (209516216265000221) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog (2874031671067845964) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_enable (5738467047490662678) -->
+    <skip />
 </resources>
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 f5bab30..3d1d184 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>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Disabled by administrator, encryption policy or credential storage"</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,18 @@
     <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="wallpaper_settings_title" msgid="5449180116365824625">"Wallpaper"</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>
@@ -643,8 +655,9 @@
     <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"My phone number"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
+    <string name="status_msid_number" msgid="909010114445780530">"MSID"</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,6 +906,8 @@
     <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>
@@ -1026,7 +1041,8 @@
     <string name="pointer_settings_category" msgid="6090176550039035130">"Mouse and track pad settings"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Pointer speed"</string>
     <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>
@@ -1035,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>
@@ -1106,6 +1123,7 @@
     <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>
+    <string name="settings_button" msgid="3006713718908152930">"Settings"</string>
     <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>
@@ -1218,6 +1236,8 @@
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> Settings"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> is enabled"</string>
     <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> is disabled"</string>
+    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Engine settings"</string>
+    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Settings for <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"Languages and voices"</string>
     <string name="pico_installed" msgid="2452546687858267414">"Installed"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"Not installed"</string>
@@ -1308,30 +1328,24 @@
     <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>
+    <string name="credentials_reset_summary" msgid="3369361230171260282">"Remove all certificates"</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>
+    <string name="credentials_reset_hint" msgid="1566409057833618877">"All the contents will be removed. Are you sure about that?"</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>
+    <string name="credentials_not_erased" msgid="397954733557821269">"Credential storage could not be erased."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Credential storage is enabled."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6816970208840577219">"You must set a lock-screen PIN or password before you can use credential storage. Would you like to do that now?"</string>
     <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>
@@ -1439,4 +1453,37 @@
     <string name="select_all" msgid="6783085295161532497">"Select All"</string>
     <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP checking"</string>
     <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Set HDCP checking behaviour"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Data usage"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"Data usage cycle"</string>
+    <string name="data_usage_menu_split_4g" msgid="7417435609285381968">"Split 4G usage"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Show Wi-Fi usage"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"Change cycle…"</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Day of month to reset data usage cycle:"</string>
+    <string name="data_usage_disable_mobile_limit" msgid="289740911281022322">"Disable mobile data at limit"</string>
+    <string name="data_usage_disable_4g_limit" msgid="5808210773758699800">"Disable 4G data at limit"</string>
+    <string name="data_usage_disable_3g_limit" msgid="3856971004328238231">"Disable 2G-3G data at limit"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_mobile" msgid="454140350007299045">"Mobile"</string>
+    <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
+    <string name="data_usage_tab_3g" msgid="6092169523081538718">"2G-3G"</string>
+    <string name="data_usage_enable_mobile" msgid="986782622560157977">"Mobile data"</string>
+    <string name="data_usage_enable_3g" msgid="6304006671869578254">"2G-3G data"</string>
+    <string name="data_usage_enable_4g" msgid="3635854097335036738">"4G data"</string>
+    <string name="data_usage_app_settings" msgid="3727561362090820369">"View application settings"</string>
+    <string name="data_usage_app_restrict_background" msgid="8856643905291165256">"Restrict background data usage"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="1503361245973512092">"Only allow application background data when using an unlimited network"</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="8110736468987743260">"Restricting background data"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="100001698378554777">"This feature may negatively affect applications which depend on background data usage."\n\n"More appropriate data usage controls may be found within this application\'s settings."</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Usage cycle reset date"</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Date of each month:"</string>
+    <string name="data_usage_cycle_editor_positive" msgid="4565302264487526138">"set"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Limiting data usage"</string>
+    <string name="data_usage_limit_dialog_mobile" msgid="7931094451923591578">"Your mobile data connection will be disabled when the specified limit is reached."\n\n"To avoid coverage charges, consider using a reduced limit, as device and operator accounting methods may vary."</string>
+    <string name="data_usage_limit_dialog_3g" msgid="5478553071420316963">"Your 2G-3G data connection will be disabled when the specified limit is reached."\n\n"To avoid coverage charges, consider using a reduced limit, as device and operator accounting methods may vary."</string>
+    <string name="data_usage_limit_dialog_4g" msgid="6134008906742403777">"Your 4G data connection will be disabled when the specified limit is reached."\n\n"To avoid coverage charges, consider using a reduced limit, as device and operator accounting methods may vary."</string>
+    <string name="data_usage_disabled_dialog_3g_title" msgid="4221584306492812040">"2G-3G data disabled"</string>
+    <string name="data_usage_disabled_dialog_4g_title" msgid="715585612162185936">"4G data disabled"</string>
+    <string name="data_usage_disabled_dialog_mobile_title" msgid="209516216265000221">"Mobile data disabled"</string>
+    <string name="data_usage_disabled_dialog" msgid="2874031671067845964">"The specified data usage limit has been reached."\n\n"Additional data use may incur operator charges."</string>
+    <string name="data_usage_disabled_dialog_enable" msgid="5738467047490662678">"re-enable data"</string>
 </resources>
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 ddfe78d..9244c62 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>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Inhab por admin/política encrip/almac credenciales"</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,19 @@
     <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>
+    <!-- no translation found for wallpaper_settings_title (5449180116365824625) -->
+    <skip />
+    <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>
@@ -643,8 +656,9 @@
     <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <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_msid_number" msgid="909010114445780530">"MSID"</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,6 +907,8 @@
     <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>
@@ -1026,7 +1042,8 @@
     <string name="pointer_settings_category" msgid="6090176550039035130">"Ajustes de mouse y de trackpad"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Velocidad del puntero"</string>
     <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>
@@ -1035,6 +1052,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>
@@ -1106,6 +1124,7 @@
     <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>
+    <string name="settings_button" msgid="3006713718908152930">"Configuración"</string>
     <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>
@@ -1218,6 +1237,10 @@
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Configuración de <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> está habilitado."</string>
     <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> está inhabilitada."</string>
+    <!-- no translation found for tts_engine_settings_section (2346105138448751893) -->
+    <skip />
+    <!-- no translation found for tts_engine_settings_title (3499112142425680334) -->
+    <skip />
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"Idiomas y voces"</string>
     <string name="pico_installed" msgid="2452546687858267414">"Instalada"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"No se ha instalado."</string>
@@ -1308,30 +1331,24 @@
     <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>
+    <string name="credentials_reset_summary" msgid="3369361230171260282">"Eliminar todos los certificados"</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>
+    <string name="credentials_reset_hint" msgid="1566409057833618877">"Se eliminará todo el contenido. ¿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>
+    <string name="credentials_not_erased" msgid="397954733557821269">"Imposible borrar almac credenc"</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"El almacenamiento de la credencial está activado."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6816970208840577219">"Debes establecer una contraseña o un PIN de la pantalla de bloqueo para poder utilizar el almacenamiento de credenciales. ¿Quieres hacerlo ahora?"</string>
     <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>
@@ -1439,4 +1456,69 @@
     <string name="select_all" msgid="6783085295161532497">"Seleccionar todo"</string>
     <string name="hdcp_checking_title" msgid="8605478913544273282">"Comprobación HDCP"</string>
     <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Configurar comportamiento de la comprobación HDCP"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Uso de datos"</string>
+    <!-- no translation found for data_usage_cycle (5652529796195787949) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_split_4g (7417435609285381968) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_wifi (8266875319417201085) -->
+    <skip />
+    <!-- no translation found for data_usage_change_cycle (7776556448920114866) -->
+    <skip />
+    <!-- no translation found for data_usage_pick_cycle_day (4470796861757050966) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_mobile_limit (289740911281022322) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_4g_limit (5808210773758699800) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_3g_limit (3856971004328238231) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_wifi (1728851922959017766) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_mobile (454140350007299045) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_4g (1301978716067512235) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_3g (6092169523081538718) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_mobile (986782622560157977) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_3g (6304006671869578254) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_4g (3635854097335036738) -->
+    <skip />
+    <!-- no translation found for data_usage_app_settings (3727561362090820369) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background (8856643905291165256) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background_summary (1503361245973512092) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog_title (8110736468987743260) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog (100001698378554777) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_title (1373797281540188533) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_subtitle (5512903797979928416) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_positive (4565302264487526138) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_title (3023111643632996097) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_mobile (7931094451923591578) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_3g (5478553071420316963) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_4g (6134008906742403777) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_3g_title (4221584306492812040) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_4g_title (715585612162185936) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_mobile_title (209516216265000221) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog (2874031671067845964) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_enable (5738467047490662678) -->
+    <skip />
 </resources>
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 94000a3..5dbc05f 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>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Desactivado por admin./política encriptación/almacenamiento credenc."</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,19 @@
     <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>
+    <!-- no translation found for wallpaper_settings_title (5449180116365824625) -->
+    <skip />
+    <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>
@@ -643,8 +656,9 @@
     <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <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_msid_number" msgid="909010114445780530">"MSID"</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>
@@ -893,6 +907,8 @@
     <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>
@@ -1026,7 +1042,8 @@
     <string name="pointer_settings_category" msgid="6090176550039035130">"Ajustes de ratón y de trackpad"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Velocidad del puntero"</string>
     <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>
@@ -1035,6 +1052,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>
@@ -1106,6 +1124,7 @@
     <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>
+    <string name="settings_button" msgid="3006713718908152930">"Ajustes"</string>
     <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>
@@ -1218,6 +1237,10 @@
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Ajustes de <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"Se ha habilitado <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>."</string>
     <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"Se ha inhabilitado <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>."</string>
+    <!-- no translation found for tts_engine_settings_section (2346105138448751893) -->
+    <skip />
+    <!-- no translation found for tts_engine_settings_title (3499112142425680334) -->
+    <skip />
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"Idiomas y voces"</string>
     <string name="pico_installed" msgid="2452546687858267414">"Instalada"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"Sin instalar"</string>
@@ -1308,30 +1331,24 @@
     <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>
+    <string name="credentials_reset_summary" msgid="3369361230171260282">"Eliminar todos los certificados"</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>
+    <string name="credentials_reset_hint" msgid="1566409057833618877">"Se eliminará todo el contenido. ¿Seguro que quieres continuar?"</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>
+    <string name="credentials_not_erased" msgid="397954733557821269">"Imposible borrar almac. credenciales."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Almacenamiento de credenciales habilitado"</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6816970208840577219">"Debes establecer una contraseña o un PIN de la pantalla de bloqueo para poder utilizar el almacenamiento de credenciales. ¿Quieres hacerlo ahora?"</string>
     <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>
@@ -1439,4 +1456,69 @@
     <string name="select_all" msgid="6783085295161532497">"Seleccionar todo"</string>
     <string name="hdcp_checking_title" msgid="8605478913544273282">"Comprobación de HDCP"</string>
     <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Definir comprobación HDCP"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Uso de datos"</string>
+    <!-- no translation found for data_usage_cycle (5652529796195787949) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_split_4g (7417435609285381968) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_wifi (8266875319417201085) -->
+    <skip />
+    <!-- no translation found for data_usage_change_cycle (7776556448920114866) -->
+    <skip />
+    <!-- no translation found for data_usage_pick_cycle_day (4470796861757050966) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_mobile_limit (289740911281022322) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_4g_limit (5808210773758699800) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_3g_limit (3856971004328238231) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_wifi (1728851922959017766) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_mobile (454140350007299045) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_4g (1301978716067512235) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_3g (6092169523081538718) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_mobile (986782622560157977) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_3g (6304006671869578254) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_4g (3635854097335036738) -->
+    <skip />
+    <!-- no translation found for data_usage_app_settings (3727561362090820369) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background (8856643905291165256) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background_summary (1503361245973512092) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog_title (8110736468987743260) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog (100001698378554777) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_title (1373797281540188533) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_subtitle (5512903797979928416) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_positive (4565302264487526138) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_title (3023111643632996097) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_mobile (7931094451923591578) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_3g (5478553071420316963) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_4g (6134008906742403777) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_3g_title (4221584306492812040) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_4g_title (715585612162185936) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_mobile_title (209516216265000221) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog (2874031671067845964) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_enable (5738467047490662678) -->
+    <skip />
 </resources>
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 c7d7220..c28b33a 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>
+    <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,19 @@
     <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>
+    <!-- no translation found for wallpaper_settings_title (5449180116365824625) -->
+    <skip />
+    <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>
@@ -643,8 +656,9 @@
     <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"شماره تلفن من"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
+    <string name="status_msid_number" msgid="909010114445780530">"MSID"</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,6 +907,8 @@
     <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>
@@ -1026,7 +1042,8 @@
     <string name="pointer_settings_category" msgid="6090176550039035130">"تنظیمات ماوس و پد لمسی"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"سرعت اشاره گر"</string>
     <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>
@@ -1035,6 +1052,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>
@@ -1106,6 +1124,7 @@
     <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>
+    <string name="settings_button" msgid="3006713718908152930">"تنظیمات"</string>
     <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>
@@ -1218,6 +1237,10 @@
     <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>
+    <!-- no translation found for tts_engine_settings_section (2346105138448751893) -->
+    <skip />
+    <!-- no translation found for tts_engine_settings_title (3499112142425680334) -->
+    <skip />
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"زبان ها و صداها"</string>
     <string name="pico_installed" msgid="2452546687858267414">"نصب شده"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"نصب نشد"</string>
@@ -1308,30 +1331,24 @@
     <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>
+    <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>
+    <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>
+    <string name="credentials_not_erased" msgid="397954733557821269">"حافظه اطلاعات کاربری پاک نمی شود."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"ذخیره سازی اطلاعات کاربری فعال شد."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6816970208840577219">"باید یک پین قفل صفحه یا رمز ورود را قبل از استفاده از حافظه اطلاعات کاربردی تنظیم کنید. می خواهید اکنون این کار را انجام دهید؟"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"آهنگ اضطراری"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"واکنش موجود در هنگام برقراری تماس اضطراری را تنظیم کنید"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"رازداری"</string>
@@ -1440,4 +1457,69 @@
     <string name="select_all" msgid="6783085295161532497">"انتخاب همه"</string>
     <string name="hdcp_checking_title" msgid="8605478913544273282">"بررسی HDCP"</string>
     <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"تنظیم عملکرد بررسی HDCP"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"مصرف داده"</string>
+    <!-- no translation found for data_usage_cycle (5652529796195787949) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_split_4g (7417435609285381968) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_wifi (8266875319417201085) -->
+    <skip />
+    <!-- no translation found for data_usage_change_cycle (7776556448920114866) -->
+    <skip />
+    <!-- no translation found for data_usage_pick_cycle_day (4470796861757050966) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_mobile_limit (289740911281022322) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_4g_limit (5808210773758699800) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_3g_limit (3856971004328238231) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_wifi (1728851922959017766) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_mobile (454140350007299045) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_4g (1301978716067512235) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_3g (6092169523081538718) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_mobile (986782622560157977) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_3g (6304006671869578254) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_4g (3635854097335036738) -->
+    <skip />
+    <!-- no translation found for data_usage_app_settings (3727561362090820369) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background (8856643905291165256) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background_summary (1503361245973512092) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog_title (8110736468987743260) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog (100001698378554777) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_title (1373797281540188533) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_subtitle (5512903797979928416) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_positive (4565302264487526138) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_title (3023111643632996097) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_mobile (7931094451923591578) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_3g (5478553071420316963) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_4g (6134008906742403777) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_3g_title (4221584306492812040) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_4g_title (715585612162185936) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_mobile_title (209516216265000221) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog (2874031671067845964) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_enable (5738467047490662678) -->
+    <skip />
 </resources>
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 6f4da62..7baeca0 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>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Ei käytössä (järj.valv/salauskäyt./tunnuks. hall.)"</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,19 @@
     <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>
+    <!-- no translation found for wallpaper_settings_title (5449180116365824625) -->
+    <skip />
+    <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>
@@ -643,8 +656,9 @@
     <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"Oma puhelinnumero"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
+    <string name="status_msid_number" msgid="909010114445780530">"MSID"</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,6 +907,8 @@
     <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>
@@ -1026,7 +1042,8 @@
     <string name="pointer_settings_category" msgid="6090176550039035130">"Hiiren ja ohjauslevyn asetukset"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Osoittimen nopeus"</string>
     <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>
@@ -1035,6 +1052,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>
@@ -1106,6 +1124,7 @@
     <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>
+    <string name="settings_button" msgid="3006713718908152930">"Asetukset"</string>
     <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>
@@ -1218,6 +1237,10 @@
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>-asetukset"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> on käytössä"</string>
     <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> on poistettu käytöstä"</string>
+    <!-- no translation found for tts_engine_settings_section (2346105138448751893) -->
+    <skip />
+    <!-- no translation found for tts_engine_settings_title (3499112142425680334) -->
+    <skip />
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"Kielet ja äänet"</string>
     <string name="pico_installed" msgid="2452546687858267414">"Asennettu"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"Ei asennettu"</string>
@@ -1308,30 +1331,24 @@
     <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>
+    <string name="credentials_reset_summary" msgid="3369361230171260282">"Poista kaikki varmenteet"</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>
+    <string name="credentials_reset_hint" msgid="1566409057833618877">"Kaikki sisältö poistetaan. Haluatko jatkaa?"</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>
+    <string name="credentials_not_erased" msgid="397954733557821269">"Käyttöoik. tiet. ei poistettu."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Käyttöoikeustietojen tallentaminen on käytössä."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6816970208840577219">"Ruudunlukituksen PIN-koodi tai salasana on asetettava ennen kuin käyttöoikeustietojen tallennustilaa voi käyttää. Haluatko asettaa koodin tai salasanan nyt?"</string>
     <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>
@@ -1439,4 +1456,69 @@
     <string name="select_all" msgid="6783085295161532497">"Valitse kaikki"</string>
     <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP-tarkistus"</string>
     <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Aseta HDCP-tarkistus"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Tietojen käyttö"</string>
+    <!-- no translation found for data_usage_cycle (5652529796195787949) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_split_4g (7417435609285381968) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_wifi (8266875319417201085) -->
+    <skip />
+    <!-- no translation found for data_usage_change_cycle (7776556448920114866) -->
+    <skip />
+    <!-- no translation found for data_usage_pick_cycle_day (4470796861757050966) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_mobile_limit (289740911281022322) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_4g_limit (5808210773758699800) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_3g_limit (3856971004328238231) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_wifi (1728851922959017766) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_mobile (454140350007299045) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_4g (1301978716067512235) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_3g (6092169523081538718) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_mobile (986782622560157977) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_3g (6304006671869578254) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_4g (3635854097335036738) -->
+    <skip />
+    <!-- no translation found for data_usage_app_settings (3727561362090820369) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background (8856643905291165256) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background_summary (1503361245973512092) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog_title (8110736468987743260) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog (100001698378554777) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_title (1373797281540188533) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_subtitle (5512903797979928416) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_positive (4565302264487526138) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_title (3023111643632996097) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_mobile (7931094451923591578) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_3g (5478553071420316963) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_4g (6134008906742403777) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_3g_title (4221584306492812040) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_4g_title (715585612162185936) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_mobile_title (209516216265000221) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog (2874031671067845964) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_enable (5738467047490662678) -->
+    <skip />
 </resources>
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 8536302..0ae55c4 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -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 chiffrement"</string>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Désactivé par admin., règles chiffrement ou stockage des identifiants"</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,19 @@
     <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>
+    <!-- no translation found for wallpaper_settings_title (5449180116365824625) -->
+    <skip />
+    <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>
@@ -643,8 +656,9 @@
     <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <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_msid_number" msgid="909010114445780530">"MSID"</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,6 +907,8 @@
     <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>
@@ -1026,7 +1042,8 @@
     <string name="pointer_settings_category" msgid="6090176550039035130">"Paramètres pavé tactile et souris"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Vitesse du pointeur"</string>
     <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>
@@ -1035,6 +1052,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>
@@ -1106,6 +1124,7 @@
     <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>
+    <string name="settings_button" msgid="3006713718908152930">"Paramètres"</string>
     <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>
@@ -1218,6 +1237,10 @@
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Paramètres <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> est activé."</string>
     <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> est désactivé."</string>
+    <!-- no translation found for tts_engine_settings_section (2346105138448751893) -->
+    <skip />
+    <!-- no translation found for tts_engine_settings_title (3499112142425680334) -->
+    <skip />
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"Langues et voix"</string>
     <string name="pico_installed" msgid="2452546687858267414">"Installée"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"Non installée"</string>
@@ -1308,30 +1331,24 @@
     <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>
+    <string name="credentials_reset_summary" msgid="3369361230171260282">"Supprimer tous les certificats"</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>
+    <string name="credentials_reset_hint" msgid="1566409057833618877">"L\'ensemble du contenu sera effacé. Voulez-vous vraiment continuer ?"</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>
+    <string name="credentials_not_erased" msgid="397954733557821269">"Impossible effacer stockage identifiants."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Stockage des identifiants activé"</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6816970208840577219">"Avant de pouvoir utiliser le stockage des identifiants, vous devez définir un code PIN ou un mot de passe de verrouillage d\'écran. Souhaitez-vous le faire maintenant ?"</string>
     <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>
@@ -1439,4 +1456,69 @@
     <string name="select_all" msgid="6783085295161532497">"Tout sélectionner"</string>
     <string name="hdcp_checking_title" msgid="8605478913544273282">"Vérification HDCP"</string>
     <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Config. vérification HDCP"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Utilisation des données"</string>
+    <!-- no translation found for data_usage_cycle (5652529796195787949) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_split_4g (7417435609285381968) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_wifi (8266875319417201085) -->
+    <skip />
+    <!-- no translation found for data_usage_change_cycle (7776556448920114866) -->
+    <skip />
+    <!-- no translation found for data_usage_pick_cycle_day (4470796861757050966) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_mobile_limit (289740911281022322) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_4g_limit (5808210773758699800) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_3g_limit (3856971004328238231) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_wifi (1728851922959017766) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_mobile (454140350007299045) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_4g (1301978716067512235) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_3g (6092169523081538718) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_mobile (986782622560157977) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_3g (6304006671869578254) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_4g (3635854097335036738) -->
+    <skip />
+    <!-- no translation found for data_usage_app_settings (3727561362090820369) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background (8856643905291165256) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background_summary (1503361245973512092) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog_title (8110736468987743260) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog (100001698378554777) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_title (1373797281540188533) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_subtitle (5512903797979928416) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_positive (4565302264487526138) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_title (3023111643632996097) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_mobile (7931094451923591578) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_3g (5478553071420316963) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_4g (6134008906742403777) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_3g_title (4221584306492812040) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_4g_title (715585612162185936) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_mobile_title (209516216265000221) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog (2874031671067845964) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_enable (5738467047490662678) -->
+    <skip />
 </resources>
diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml
index ef68942..4a0fcd9 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 98fd7f9..46638d7 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>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Onemogućili administrator, pravila enkripcije ili pohrana vjerodajnica"</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,19 @@
     <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>
+    <!-- no translation found for wallpaper_settings_title (5449180116365824625) -->
+    <skip />
+    <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>
@@ -643,8 +656,9 @@
     <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"Moj telefonski broj"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
+    <string name="status_msid_number" msgid="909010114445780530">"MSID"</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,6 +907,8 @@
     <string name="install_unknown_applications" msgid="6612824788917283662">"Dopusti instalaciju aplikacija koje nisu s usluge Market"</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>
@@ -1026,7 +1042,8 @@
     <string name="pointer_settings_category" msgid="6090176550039035130">"Postavke miša i dodirne pločice"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Brzina pokazivača"</string>
     <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>
@@ -1035,6 +1052,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>
@@ -1106,6 +1124,7 @@
     <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 prekida poziv"</string>
     <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"Tijekom poziva tipka za uključivanje ne isključuje zaslon, već prekida poziv."</string>
+    <string name="settings_button" msgid="3006713718908152930">"Postavke"</string>
     <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>
@@ -1218,6 +1237,10 @@
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> postavke"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"Stavka <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> je onemogućena"</string>
     <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"Stavka <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> je onemogućena"</string>
+    <!-- no translation found for tts_engine_settings_section (2346105138448751893) -->
+    <skip />
+    <!-- no translation found for tts_engine_settings_title (3499112142425680334) -->
+    <skip />
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"Jezici i glasovi"</string>
     <string name="pico_installed" msgid="2452546687858267414">"Instalirano"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"Nije instalirano"</string>
@@ -1308,30 +1331,24 @@
     <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>
+    <string name="credentials_reset_summary" msgid="3369361230171260282">"Uklanjanje svih certifikata"</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>
+    <string name="credentials_reset_hint" msgid="1566409057833618877">"Svi sadržaji bit će uklonjeni. Jeste li sigurni?"</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>
+    <string name="credentials_not_erased" msgid="397954733557821269">"Pohrana vjer. nije izbrisana."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Pohranjivanje vjerodajnica je omogućeno."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6816970208840577219">"Morate postaviti PIN ili zaporku za zaključavanje zaslona kako biste mogli upotrebljavati pohranu vjerodajnica. Želite li to učiniti sada?"</string>
     <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>
@@ -1440,4 +1457,69 @@
     <string name="select_all" msgid="6783085295161532497">"Odaberi sve"</string>
     <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP provjera"</string>
     <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Postav. ponaš. HDCP prov."</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Potrošnja podataka"</string>
+    <!-- no translation found for data_usage_cycle (5652529796195787949) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_split_4g (7417435609285381968) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_wifi (8266875319417201085) -->
+    <skip />
+    <!-- no translation found for data_usage_change_cycle (7776556448920114866) -->
+    <skip />
+    <!-- no translation found for data_usage_pick_cycle_day (4470796861757050966) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_mobile_limit (289740911281022322) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_4g_limit (5808210773758699800) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_3g_limit (3856971004328238231) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_wifi (1728851922959017766) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_mobile (454140350007299045) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_4g (1301978716067512235) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_3g (6092169523081538718) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_mobile (986782622560157977) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_3g (6304006671869578254) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_4g (3635854097335036738) -->
+    <skip />
+    <!-- no translation found for data_usage_app_settings (3727561362090820369) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background (8856643905291165256) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background_summary (1503361245973512092) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog_title (8110736468987743260) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog (100001698378554777) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_title (1373797281540188533) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_subtitle (5512903797979928416) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_positive (4565302264487526138) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_title (3023111643632996097) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_mobile (7931094451923591578) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_3g (5478553071420316963) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_4g (6134008906742403777) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_3g_title (4221584306492812040) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_4g_title (715585612162185936) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_mobile_title (209516216265000221) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog (2874031671067845964) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_enable (5738467047490662678) -->
+    <skip />
 </resources>
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 1f5c90e..27e314c 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>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Rendszergazda, szabályzat vagy adattár letiltotta"</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,19 @@
     <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>
+    <!-- no translation found for wallpaper_settings_title (5449180116365824625) -->
+    <skip />
+    <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>
@@ -643,8 +656,9 @@
     <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <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_msid_number" msgid="909010114445780530">"MSID"</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,6 +907,8 @@
     <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>
@@ -1026,7 +1042,8 @@
     <string name="pointer_settings_category" msgid="6090176550039035130">"Egér és érintőpad beállításai"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Mutató sebessége"</string>
     <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>
@@ -1035,6 +1052,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>
@@ -1106,6 +1124,7 @@
     <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>
+    <string name="settings_button" msgid="3006713718908152930">"Beállítások"</string>
     <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>
@@ -1218,6 +1237,10 @@
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> beállításai"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"A(z) <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> engedélyezve van"</string>
     <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"A(z) <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> le van tiltva"</string>
+    <!-- no translation found for tts_engine_settings_section (2346105138448751893) -->
+    <skip />
+    <!-- no translation found for tts_engine_settings_title (3499112142425680334) -->
+    <skip />
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"Nyelvek és hangok"</string>
     <string name="pico_installed" msgid="2452546687858267414">"Telepítve"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"Nincs telepítve"</string>
@@ -1308,30 +1331,24 @@
     <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>
+    <string name="credentials_reset_summary" msgid="3369361230171260282">"Összes tanúsítvány eltávolí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>
+    <string name="credentials_reset_hint" msgid="1566409057833618877">"Minden tartalom eltávolításra kerül. Biztos benne?"</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>
+    <string name="credentials_not_erased" msgid="397954733557821269">"Adattárat nem lehet törölni."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"A hitelesítési adatok tárolója engedélyezve van."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6816970208840577219">"Be kell állítania PIN kódot vagy jelszót a zárolt képernyőhöz, mielőtt használhatná a hitelesítő adatok tárolóját. Szeretné ezt most megtenni?"</string>
     <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>
@@ -1439,4 +1456,69 @@
     <string name="select_all" msgid="6783085295161532497">"Összes kijelölése"</string>
     <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP ellenőrzés"</string>
     <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"HDCP-ellenőrzés beállítása"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Adathasználat"</string>
+    <!-- no translation found for data_usage_cycle (5652529796195787949) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_split_4g (7417435609285381968) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_wifi (8266875319417201085) -->
+    <skip />
+    <!-- no translation found for data_usage_change_cycle (7776556448920114866) -->
+    <skip />
+    <!-- no translation found for data_usage_pick_cycle_day (4470796861757050966) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_mobile_limit (289740911281022322) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_4g_limit (5808210773758699800) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_3g_limit (3856971004328238231) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_wifi (1728851922959017766) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_mobile (454140350007299045) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_4g (1301978716067512235) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_3g (6092169523081538718) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_mobile (986782622560157977) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_3g (6304006671869578254) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_4g (3635854097335036738) -->
+    <skip />
+    <!-- no translation found for data_usage_app_settings (3727561362090820369) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background (8856643905291165256) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background_summary (1503361245973512092) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog_title (8110736468987743260) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog (100001698378554777) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_title (1373797281540188533) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_subtitle (5512903797979928416) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_positive (4565302264487526138) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_title (3023111643632996097) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_mobile (7931094451923591578) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_3g (5478553071420316963) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_4g (6134008906742403777) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_3g_title (4221584306492812040) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_4g_title (715585612162185936) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_mobile_title (209516216265000221) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog (2874031671067845964) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_enable (5738467047490662678) -->
+    <skip />
 </resources>
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 79d1d3a..1868170 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>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Dinonaktifkan oleh administrator, kebijakan enkripsi, atau penyimpanan kredensial"</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,19 @@
     <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>
+    <!-- no translation found for wallpaper_settings_title (5449180116365824625) -->
+    <skip />
+    <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>
@@ -643,8 +656,9 @@
     <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"Nomor teleponku"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MENIT"</string>
+    <string name="status_msid_number" msgid="909010114445780530">"MSID"</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,6 +907,8 @@
     <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>
@@ -1026,7 +1042,8 @@
     <string name="pointer_settings_category" msgid="6090176550039035130">"Setelan mouse dan trackpad"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Kecepatan penunjuk"</string>
     <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>
@@ -1035,6 +1052,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>
@@ -1106,7 +1124,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>
-    <string name="touchscreen_gestures_category" msgid="3109869155350859625">"Gestur layar sentuh"</string>
+    <string name="settings_button" msgid="3006713718908152930">"Setelan"</string>
+    <string name="touchscreen_gestures_category" msgid="3109869155350859625">"Isyarat 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>
     <string name="power_usage_summary_title" msgid="5180282911164282324">"Penggunaan baterai"</string>
@@ -1218,6 +1237,10 @@
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> setelan"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> diaktifkan"</string>
     <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> dinonaktifkan"</string>
+    <!-- no translation found for tts_engine_settings_section (2346105138448751893) -->
+    <skip />
+    <!-- no translation found for tts_engine_settings_title (3499112142425680334) -->
+    <skip />
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"Bahasa dan suara"</string>
     <string name="pico_installed" msgid="2452546687858267414">"Terpasang"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"Tidak terpasang"</string>
@@ -1308,30 +1331,24 @@
     <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>
+    <string name="credentials_reset_summary" msgid="3369361230171260282">"Hapus semua sertifikat"</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>
+    <string name="credentials_reset_hint" msgid="1566409057833618877">"Semua konten akan dihapus. Yakin dengan hal itu?"</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>
+    <string name="credentials_not_erased" msgid="397954733557821269">"Penyimpanan kredensial tidak dapat dihapus."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Penyimpanan kredensial diaktifkan."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6816970208840577219">"Anda harus menyetel PIN atau sandi kunci layar sebelum dapat menggunakan penyimpanan kredensial. Apakah Anda ingin melakukannya sekarang?"</string>
     <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>
@@ -1440,4 +1457,69 @@
     <string name="select_all" msgid="6783085295161532497">"Pilih Semua"</string>
     <string name="hdcp_checking_title" msgid="8605478913544273282">"Pemeriksaan HDCP"</string>
     <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Setel perilaku pemeriksaan HDCP"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Penggunaan data"</string>
+    <!-- no translation found for data_usage_cycle (5652529796195787949) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_split_4g (7417435609285381968) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_wifi (8266875319417201085) -->
+    <skip />
+    <!-- no translation found for data_usage_change_cycle (7776556448920114866) -->
+    <skip />
+    <!-- no translation found for data_usage_pick_cycle_day (4470796861757050966) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_mobile_limit (289740911281022322) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_4g_limit (5808210773758699800) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_3g_limit (3856971004328238231) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_wifi (1728851922959017766) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_mobile (454140350007299045) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_4g (1301978716067512235) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_3g (6092169523081538718) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_mobile (986782622560157977) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_3g (6304006671869578254) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_4g (3635854097335036738) -->
+    <skip />
+    <!-- no translation found for data_usage_app_settings (3727561362090820369) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background (8856643905291165256) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background_summary (1503361245973512092) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog_title (8110736468987743260) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog (100001698378554777) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_title (1373797281540188533) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_subtitle (5512903797979928416) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_positive (4565302264487526138) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_title (3023111643632996097) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_mobile (7931094451923591578) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_3g (5478553071420316963) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_4g (6134008906742403777) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_3g_title (4221584306492812040) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_4g_title (715585612162185936) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_mobile_title (209516216265000221) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog (2874031671067845964) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_enable (5738467047490662678) -->
+    <skip />
 </resources>
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 5f4b63b..eb0a016 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>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Disattivata da amministr., norma crittografia o archivio credenziali"</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,19 @@
     <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>
+    <!-- no translation found for wallpaper_settings_title (5449180116365824625) -->
+    <skip />
+    <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>
@@ -643,8 +656,9 @@
     <string name="status_number" product="tablet" msgid="1138837891091222272">"Numero di telefono"</string>
     <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_msid_number" msgid="909010114445780530">"MSID"</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,6 +907,8 @@
     <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>
@@ -1026,7 +1042,8 @@
     <string name="pointer_settings_category" msgid="6090176550039035130">"Impostazioni mouse e trackpad"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Velocità del puntatore"</string>
     <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>
@@ -1035,6 +1052,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>
@@ -1106,6 +1124,7 @@
     <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>
+    <string name="settings_button" msgid="3006713718908152930">"Impostazioni"</string>
     <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>
@@ -1218,6 +1237,10 @@
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Impostazioni di <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> è abilitato"</string>
     <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> non è attivo"</string>
+    <!-- no translation found for tts_engine_settings_section (2346105138448751893) -->
+    <skip />
+    <!-- no translation found for tts_engine_settings_title (3499112142425680334) -->
+    <skip />
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"Lingue e voci"</string>
     <string name="pico_installed" msgid="2452546687858267414">"Installata"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"Non installata"</string>
@@ -1308,30 +1331,24 @@
     <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>
+    <string name="credentials_reset_summary" msgid="3369361230171260282">"Rimuovi tutti i certificati"</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>
+    <string name="credentials_reset_hint" msgid="1566409057833618877">"Tutti i contenuti saranno rimossi. Continuare?"</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>
+    <string name="credentials_not_erased" msgid="397954733557821269">"Archivio credenziali non cancellato."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"L\'archivio di credenziali è attivo."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6816970208840577219">"Devi impostare un PIN o una password di blocco dello schermo per poter utilizzare l\'archivio credenziali. Procedere ora?"</string>
     <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>
@@ -1439,4 +1456,69 @@
     <string name="select_all" msgid="6783085295161532497">"Seleziona tutto"</string>
     <string name="hdcp_checking_title" msgid="8605478913544273282">"Verifica HDCP"</string>
     <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Comportamento di verifica HDCP"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Utilizzo dati"</string>
+    <!-- no translation found for data_usage_cycle (5652529796195787949) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_split_4g (7417435609285381968) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_wifi (8266875319417201085) -->
+    <skip />
+    <!-- no translation found for data_usage_change_cycle (7776556448920114866) -->
+    <skip />
+    <!-- no translation found for data_usage_pick_cycle_day (4470796861757050966) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_mobile_limit (289740911281022322) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_4g_limit (5808210773758699800) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_3g_limit (3856971004328238231) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_wifi (1728851922959017766) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_mobile (454140350007299045) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_4g (1301978716067512235) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_3g (6092169523081538718) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_mobile (986782622560157977) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_3g (6304006671869578254) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_4g (3635854097335036738) -->
+    <skip />
+    <!-- no translation found for data_usage_app_settings (3727561362090820369) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background (8856643905291165256) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background_summary (1503361245973512092) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog_title (8110736468987743260) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog (100001698378554777) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_title (1373797281540188533) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_subtitle (5512903797979928416) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_positive (4565302264487526138) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_title (3023111643632996097) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_mobile (7931094451923591578) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_3g (5478553071420316963) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_4g (6134008906742403777) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_3g_title (4221584306492812040) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_4g_title (715585612162185936) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_mobile_title (209516216265000221) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog (2874031671067845964) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_enable (5738467047490662678) -->
+    <skip />
 </resources>
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 53e68a3..6059b4f 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>
+    <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,19 @@
     <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>
+    <!-- no translation found for wallpaper_settings_title (5449180116365824625) -->
+    <skip />
+    <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>
@@ -643,8 +656,9 @@
     <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"מספר הטלפון שלי"</string>
     <string name="status_min_number" msgid="3519504522179420597">"דקות"</string>
+    <string name="status_msid_number" msgid="909010114445780530">"MSID"</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,6 +907,8 @@
     <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>
@@ -1026,7 +1042,8 @@
     <string name="pointer_settings_category" msgid="6090176550039035130">"הגדרות עכבר ומשטח עקיבה"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"מהירות המצביע"</string>
     <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>
@@ -1035,6 +1052,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>
@@ -1106,6 +1124,7 @@
     <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>
+    <string name="settings_button" msgid="3006713718908152930">"הגדרות"</string>
     <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>
@@ -1218,6 +1237,10 @@
     <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>
+    <!-- no translation found for tts_engine_settings_section (2346105138448751893) -->
+    <skip />
+    <!-- no translation found for tts_engine_settings_title (3499112142425680334) -->
+    <skip />
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"שפות וצלילים"</string>
     <string name="pico_installed" msgid="2452546687858267414">"הותקן"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"לא מותקן"</string>
@@ -1308,30 +1331,24 @@
     <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>
+    <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>
+    <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>
+    <string name="credentials_not_erased" msgid="397954733557821269">"לא היתה אפשרות למחוק את אחסון האישור."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"אחסון האישורים מופעל."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6816970208840577219">"עליך להגדיר PIN או סיסמה לנעילת המסך לפני שתוכל להשתמש באחסון אישורים. באם תרצה לעשות זאת עכשיו?"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"צליל חירום"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"הגדר אופן פעולה בעת ביצוע שיחת חירום"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"פרטיות"</string>
@@ -1439,4 +1456,69 @@
     <string name="select_all" msgid="6783085295161532497">"בחר הכל"</string>
     <string name="hdcp_checking_title" msgid="8605478913544273282">"בדיקת HDCP"</string>
     <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"הגדר אופן בדיקת HDCP"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"שימוש בנתונים"</string>
+    <!-- no translation found for data_usage_cycle (5652529796195787949) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_split_4g (7417435609285381968) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_wifi (8266875319417201085) -->
+    <skip />
+    <!-- no translation found for data_usage_change_cycle (7776556448920114866) -->
+    <skip />
+    <!-- no translation found for data_usage_pick_cycle_day (4470796861757050966) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_mobile_limit (289740911281022322) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_4g_limit (5808210773758699800) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_3g_limit (3856971004328238231) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_wifi (1728851922959017766) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_mobile (454140350007299045) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_4g (1301978716067512235) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_3g (6092169523081538718) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_mobile (986782622560157977) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_3g (6304006671869578254) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_4g (3635854097335036738) -->
+    <skip />
+    <!-- no translation found for data_usage_app_settings (3727561362090820369) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background (8856643905291165256) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background_summary (1503361245973512092) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog_title (8110736468987743260) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog (100001698378554777) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_title (1373797281540188533) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_subtitle (5512903797979928416) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_positive (4565302264487526138) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_title (3023111643632996097) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_mobile (7931094451923591578) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_3g (5478553071420316963) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_4g (6134008906742403777) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_3g_title (4221584306492812040) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_4g_title (715585612162185936) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_mobile_title (209516216265000221) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog (2874031671067845964) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_enable (5738467047490662678) -->
+    <skip />
 </resources>
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 b41aeff..9d32e49 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>
+    <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,19 @@
     <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>
+    <!-- no translation found for wallpaper_settings_title (5449180116365824625) -->
+    <skip />
+    <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>
@@ -643,8 +656,9 @@
     <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"電話番号"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
+    <string name="status_msid_number" msgid="909010114445780530">"MSID"</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,6 +907,8 @@
     <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>
@@ -1026,7 +1042,8 @@
     <string name="pointer_settings_category" msgid="6090176550039035130">"マウスとトラックパッドの設定"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"ポインタの速度"</string>
     <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>
@@ -1035,6 +1052,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>
@@ -1106,6 +1124,7 @@
     <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>
+    <string name="settings_button" msgid="3006713718908152930">"設定"</string>
     <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>
@@ -1218,6 +1237,10 @@
     <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>
+    <!-- no translation found for tts_engine_settings_section (2346105138448751893) -->
+    <skip />
+    <!-- no translation found for tts_engine_settings_title (3499112142425680334) -->
+    <skip />
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"言語と音声"</string>
     <string name="pico_installed" msgid="2452546687858267414">"インストール済み"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"未インストール"</string>
@@ -1308,30 +1331,24 @@
     <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>
+    <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>
+    <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>
+    <string name="credentials_not_erased" msgid="397954733557821269">"認証情報ストレージを消去不可"</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"認証情報ストレージが有効になりました。"</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6816970208840577219">"認証情報ストレージを使用する前に、画面ロックのPINまたはパスワードを設定する必要があります。今すぐ設定しますか？"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"緊急時の音"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"緊急通報時の動作を設定します"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"バックアップと復元"</string>
@@ -1439,4 +1456,69 @@
     <string name="select_all" msgid="6783085295161532497">"すべて選択"</string>
     <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCPチェック"</string>
     <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"HDCPチェック動作を設定"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"データ使用"</string>
+    <!-- no translation found for data_usage_cycle (5652529796195787949) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_split_4g (7417435609285381968) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_wifi (8266875319417201085) -->
+    <skip />
+    <!-- no translation found for data_usage_change_cycle (7776556448920114866) -->
+    <skip />
+    <!-- no translation found for data_usage_pick_cycle_day (4470796861757050966) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_mobile_limit (289740911281022322) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_4g_limit (5808210773758699800) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_3g_limit (3856971004328238231) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_wifi (1728851922959017766) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_mobile (454140350007299045) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_4g (1301978716067512235) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_3g (6092169523081538718) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_mobile (986782622560157977) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_3g (6304006671869578254) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_4g (3635854097335036738) -->
+    <skip />
+    <!-- no translation found for data_usage_app_settings (3727561362090820369) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background (8856643905291165256) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background_summary (1503361245973512092) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog_title (8110736468987743260) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog (100001698378554777) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_title (1373797281540188533) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_subtitle (5512903797979928416) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_positive (4565302264487526138) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_title (3023111643632996097) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_mobile (7931094451923591578) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_3g (5478553071420316963) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_4g (6134008906742403777) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_3g_title (4221584306492812040) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_4g_title (715585612162185936) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_mobile_title (209516216265000221) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog (2874031671067845964) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_enable (5738467047490662678) -->
+    <skip />
 </resources>
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 69c5b08..b26f705 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>
+    <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,19 @@
     <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>
+    <!-- no translation found for wallpaper_settings_title (5449180116365824625) -->
+    <skip />
+    <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>
@@ -643,8 +656,9 @@
     <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"내 휴대전화 번호"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
+    <string name="status_msid_number" msgid="909010114445780530">"MSID"</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,6 +907,8 @@
     <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>
@@ -1026,7 +1042,8 @@
     <string name="pointer_settings_category" msgid="6090176550039035130">"마우스 및 트랙패드 설정"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"포인터 속도"</string>
     <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>
@@ -1035,6 +1052,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>
@@ -1106,6 +1124,7 @@
     <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>
+    <string name="settings_button" msgid="3006713718908152930">"설정"</string>
     <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>
@@ -1218,6 +1237,10 @@
     <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>
+    <!-- no translation found for tts_engine_settings_section (2346105138448751893) -->
+    <skip />
+    <!-- no translation found for tts_engine_settings_title (3499112142425680334) -->
+    <skip />
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"언어 및 음성"</string>
     <string name="pico_installed" msgid="2452546687858267414">"설치됨"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"설치되지 않음"</string>
@@ -1308,30 +1331,24 @@
     <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>
+    <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>
+    <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>
+    <string name="credentials_not_erased" msgid="397954733557821269">"자격증명 저장소를 삭제하지 못했습니다."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"자격증명 저장소를 사용합니다."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6816970208840577219">"자격증명 저장소를 사용하려면 먼저 화면 잠금 PIN 또는 비밀번호를 설정해야 합니다. 지금 설정하시겠습니까?"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"긴급 신호음"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"긴급 통화 중 동작 설정"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"개인정보 보호"</string>
@@ -1439,4 +1456,69 @@
     <string name="select_all" msgid="6783085295161532497">"모두 선택"</string>
     <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP 확인"</string>
     <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"HDCP 확인 동작 설정"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"데이터 사용량"</string>
+    <!-- no translation found for data_usage_cycle (5652529796195787949) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_split_4g (7417435609285381968) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_wifi (8266875319417201085) -->
+    <skip />
+    <!-- no translation found for data_usage_change_cycle (7776556448920114866) -->
+    <skip />
+    <!-- no translation found for data_usage_pick_cycle_day (4470796861757050966) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_mobile_limit (289740911281022322) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_4g_limit (5808210773758699800) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_3g_limit (3856971004328238231) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_wifi (1728851922959017766) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_mobile (454140350007299045) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_4g (1301978716067512235) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_3g (6092169523081538718) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_mobile (986782622560157977) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_3g (6304006671869578254) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_4g (3635854097335036738) -->
+    <skip />
+    <!-- no translation found for data_usage_app_settings (3727561362090820369) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background (8856643905291165256) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background_summary (1503361245973512092) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog_title (8110736468987743260) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog (100001698378554777) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_title (1373797281540188533) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_subtitle (5512903797979928416) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_positive (4565302264487526138) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_title (3023111643632996097) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_mobile (7931094451923591578) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_3g (5478553071420316963) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_4g (6134008906742403777) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_3g_title (4221584306492812040) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_4g_title (715585612162185936) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_mobile_title (209516216265000221) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog (2874031671067845964) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_enable (5738467047490662678) -->
+    <skip />
 </resources>
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 d4eedcb..3d63672 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>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Neleido: administr., šifrav. polit. ar įgalioj. atmint."</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,19 @@
     <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>
+    <!-- no translation found for wallpaper_settings_title (5449180116365824625) -->
+    <skip />
+    <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>
@@ -643,8 +656,9 @@
     <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"Mano telefono numeris"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN."</string>
+    <string name="status_msid_number" msgid="909010114445780530">"MSID"</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,6 +907,8 @@
     <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>
@@ -1026,7 +1042,8 @@
     <string name="pointer_settings_category" msgid="6090176550039035130">"Pelės ir jutiklinės planšetės nustat."</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Žymiklio greitis"</string>
     <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>
@@ -1035,6 +1052,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>
@@ -1106,6 +1124,7 @@
     <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>
+    <string name="settings_button" msgid="3006713718908152930">"Nustatymai"</string>
     <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>
@@ -1218,6 +1237,10 @@
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> nustatymai"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> įgalinta"</string>
     <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> išjungta"</string>
+    <!-- no translation found for tts_engine_settings_section (2346105138448751893) -->
+    <skip />
+    <!-- no translation found for tts_engine_settings_title (3499112142425680334) -->
+    <skip />
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"Kalbos ir balsai"</string>
     <string name="pico_installed" msgid="2452546687858267414">"Įdiegta"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"Neįdiegta"</string>
@@ -1308,30 +1331,24 @@
     <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>
+    <string name="credentials_reset_summary" msgid="3369361230171260282">"Pašalinti visus sertifikatus"</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>
+    <string name="credentials_reset_hint" msgid="1566409057833618877">"Visas turinys bus pašalintas. Ar tikrai norite tai atlikti?"</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>
+    <string name="credentials_not_erased" msgid="397954733557821269">"Nepavyko ištr. įgal. atmint."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Įgaliojimų saugykla įgalinta."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6816970208840577219">"Jei norite naudoti įgaliojimų atmintinę, pirmiausia turite nustatyti ekrano užrakto PIN kodą arba slaptažodį. Ar norite padaryti tai dabar?"</string>
     <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>
@@ -1440,4 +1457,69 @@
     <string name="select_all" msgid="6783085295161532497">"Pasirinkti viską"</string>
     <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP tikrinimas"</string>
     <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Nust. HDCP tikrin. elgs."</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Duomenų naudojimas"</string>
+    <!-- no translation found for data_usage_cycle (5652529796195787949) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_split_4g (7417435609285381968) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_wifi (8266875319417201085) -->
+    <skip />
+    <!-- no translation found for data_usage_change_cycle (7776556448920114866) -->
+    <skip />
+    <!-- no translation found for data_usage_pick_cycle_day (4470796861757050966) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_mobile_limit (289740911281022322) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_4g_limit (5808210773758699800) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_3g_limit (3856971004328238231) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_wifi (1728851922959017766) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_mobile (454140350007299045) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_4g (1301978716067512235) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_3g (6092169523081538718) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_mobile (986782622560157977) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_3g (6304006671869578254) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_4g (3635854097335036738) -->
+    <skip />
+    <!-- no translation found for data_usage_app_settings (3727561362090820369) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background (8856643905291165256) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background_summary (1503361245973512092) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog_title (8110736468987743260) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog (100001698378554777) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_title (1373797281540188533) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_subtitle (5512903797979928416) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_positive (4565302264487526138) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_title (3023111643632996097) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_mobile (7931094451923591578) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_3g (5478553071420316963) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_4g (6134008906742403777) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_3g_title (4221584306492812040) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_4g_title (715585612162185936) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_mobile_title (209516216265000221) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog (2874031671067845964) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_enable (5738467047490662678) -->
+    <skip />
 </resources>
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 1574916..121e2b9 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>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Atspēj. admin., šifr. polit. vai akred. datu krāt."</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,19 @@
     <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>
+    <!-- no translation found for wallpaper_settings_title (5449180116365824625) -->
+    <skip />
+    <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>
@@ -643,8 +656,9 @@
     <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <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_msid_number" msgid="909010114445780530">"MSID"</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,6 +907,8 @@
     <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>
@@ -1026,7 +1042,8 @@
     <string name="pointer_settings_category" msgid="6090176550039035130">"Peles un skārienpaliktņa iestatījumi"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Rādītāja ātrums"</string>
     <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>
@@ -1035,6 +1052,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>
@@ -1106,6 +1124,7 @@
     <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>
+    <string name="settings_button" msgid="3006713718908152930">"Iestatījumi"</string>
     <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>
@@ -1218,6 +1237,10 @@
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> iestatījumi"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> ir iespējots"</string>
     <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> ir atspējots"</string>
+    <!-- no translation found for tts_engine_settings_section (2346105138448751893) -->
+    <skip />
+    <!-- no translation found for tts_engine_settings_title (3499112142425680334) -->
+    <skip />
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"Valodas un balsis"</string>
     <string name="pico_installed" msgid="2452546687858267414">"Instalēts"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"Nav instalēts"</string>
@@ -1308,30 +1331,24 @@
     <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>
+    <string name="credentials_reset_summary" msgid="3369361230171260282">"Noņemt visus sertifikātus"</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>
+    <string name="credentials_reset_hint" msgid="1566409057833618877">"Tiks noņemts viss saturs. Vai tiešām vēlaties veikt šo darbību?"</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>
+    <string name="credentials_not_erased" msgid="397954733557821269">"Akred. datu krāt. nevar dzēst."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Akreditācijas datu krātuve ir iespējota."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6816970208840577219">"Iestatiet ekrāna bloķēšanas PIN vai paroli, lai varētu izmantot akreditācijas datu krātuvi. Vai vēlaties to darīt tagad?"</string>
     <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>
@@ -1440,4 +1457,69 @@
     <string name="select_all" msgid="6783085295161532497">"Atlasīt visu"</string>
     <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP pārbaude"</string>
     <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"HDCP pārb. iestatīšana"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Datu lietojums"</string>
+    <!-- no translation found for data_usage_cycle (5652529796195787949) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_split_4g (7417435609285381968) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_wifi (8266875319417201085) -->
+    <skip />
+    <!-- no translation found for data_usage_change_cycle (7776556448920114866) -->
+    <skip />
+    <!-- no translation found for data_usage_pick_cycle_day (4470796861757050966) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_mobile_limit (289740911281022322) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_4g_limit (5808210773758699800) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_3g_limit (3856971004328238231) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_wifi (1728851922959017766) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_mobile (454140350007299045) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_4g (1301978716067512235) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_3g (6092169523081538718) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_mobile (986782622560157977) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_3g (6304006671869578254) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_4g (3635854097335036738) -->
+    <skip />
+    <!-- no translation found for data_usage_app_settings (3727561362090820369) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background (8856643905291165256) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background_summary (1503361245973512092) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog_title (8110736468987743260) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog (100001698378554777) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_title (1373797281540188533) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_subtitle (5512903797979928416) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_positive (4565302264487526138) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_title (3023111643632996097) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_mobile (7931094451923591578) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_3g (5478553071420316963) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_4g (6134008906742403777) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_3g_title (4221584306492812040) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_4g_title (715585612162185936) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_mobile_title (209516216265000221) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog (2874031671067845964) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_enable (5738467047490662678) -->
+    <skip />
 </resources>
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..8dda2af
--- /dev/null
+++ b/res/values-ms/arrays.xml
@@ -0,0 +1,241 @@
+<?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>
+  <string-array name="animations_entries">
+    <item msgid="207790005475613429">"Tiada animasi"</item>
+    <item msgid="6291186755504776720">"Sedikit animasi"</item>
+    <item msgid="3856065399819979491">"Semua animasi"</item>
+  </string-array>
+  <string-array name="animations_summaries">
+    <item msgid="4569165952409350897">"Tiada animasi tetingkap ditunjukkan"</item>
+    <item msgid="4460915688877708508">"Sedikit animasi tetingkap ditunjukkan"</item>
+    <item msgid="488968798204105119">"Semua animasi tetingkap ditunjukkan"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item msgid="3342301044271143016">"15 saat"</item>
+    <item msgid="8881760709354815449">"30 saat"</item>
+    <item msgid="7589406073232279088">"1 minit"</item>
+    <item msgid="7001195990902244174">"2 minit"</item>
+    <item msgid="7489864775127957179">"5 minit"</item>
+    <item msgid="2314124409517439288">"10 minit"</item>
+    <item msgid="6864027152847611413">"30 minit"</item>
+  </string-array>
+    <!-- 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) -->
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="5416834369150305288">"dengan segera"</item>
+    <item msgid="6736512735606834431">"5 saat"</item>
+    <item msgid="8044619388267891375">"15 saat"</item>
+    <item msgid="1822002388249545488">"30 saat"</item>
+    <item msgid="8538071621211916519">"1 minit"</item>
+    <item msgid="5663439580228932882">"2 minit"</item>
+    <item msgid="49888496216106852">"5 minit"</item>
+    <item msgid="9002737361305019353">"10 minit"</item>
+    <item msgid="4322676235684793329">"30 minit"</item>
+  </string-array>
+  <string-array name="entries_font_size">
+    <item msgid="2722636506084795405">"Terlalu Kecil"</item>
+    <item msgid="383133849547816572">"Sangat Kecil"</item>
+    <item msgid="6490061470416867723">"Kecil"</item>
+    <item msgid="3579015730662088893">"Biasa"</item>
+    <item msgid="1678068858001018666">"Besar"</item>
+    <item msgid="490158884605093126">"Sangat Besar"</item>
+    <item msgid="2123802548987439763">"Terlalu 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 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>
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Mengimbas…"</item>
+    <item msgid="8513729475867537913">"Menyambung..."</item>
+    <item msgid="515055375277271756">"Mengesahkan..."</item>
+    <item msgid="1943354004029184381">"Mendapatkan alamat IP…"</item>
+    <item msgid="4221763391123233270">"Disambungkan"</item>
+    <item msgid="624838831631122137">"Digantung"</item>
+    <item msgid="7979680559596111948">"Memutuskan sambungan..."</item>
+    <item msgid="1634960474403853625">"Diputuskan sambungan"</item>
+    <item msgid="746097431216080650">"Tidak berjaya"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"Mengimbas…"</item>
+    <item msgid="355508996603873860">"Menyambung kepada <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="554971459996405634">"Mengesahkan dengan <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7928343808033020343">"Mendapatkan alamat IP dari <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="8937994881315223448">"Disambungkan kepada <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="1330262655415760617">"Digantung"</item>
+    <item msgid="7698638434317271902">"Memutuskan sambungan dari <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="197508606402264311">"Diputuskan sambungan"</item>
+    <item msgid="8578370891960825148">"Tidak berjaya"</item>
+  </string-array>
+  <string-array name="wifi_security">
+    <item msgid="1435933968767043814">"Buka"</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>
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item msgid="1106621950288502195">"2 Minit"</item>
+    <item msgid="5780349442819375570">"5 Minit"</item>
+    <item msgid="1166466894270177580">"1 Jam"</item>
+    <item msgid="9032073376232198148">"Tidak sekali-kali"</item>
+  </string-array>
+  <string-array name="wifi_signal">
+    <item msgid="2245412278046491293">"Lemah"</item>
+    <item msgid="5615082285463430971">"Sederhana"</item>
+    <item msgid="3565079809875324621">"Baik"</item>
+    <item msgid="5702329417707689835">"Sangat baik"</item>
+  </string-array>
+  <string-array name="wifi_sleep_policy_entries">
+    <item msgid="643915340724070374">"Apabila skrin dimatikan (menggunakan lebih banyak data mudah alih)"</item>
+    <item msgid="1549288661423279207">"Jangan sekali-kali semasa palam dipasangkan"</item>
+    <item msgid="6592896328877671197">"Tidak pernah (menggunakan lebih kuasa bateri)"</item>
+  </string-array>
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <item msgid="2659922042905569057">"Apabila skrin dimatikan"</item>
+    <item msgid="8137861573803398334">"Jangan sekali-kali semasa palam dipsg"</item>
+    <item msgid="5996547094658157629">"Jangan sekali-kali (guna lebih kuasa)"</item>
+  </string-array>
+  <string-array name="wifi_frequency_band_entries">
+    <item msgid="624340809384223320">"Auto"</item>
+    <item msgid="6670588712989942178">"5 GHz sahaja"</item>
+    <item msgid="2715516524973207876">"2.4 GHz sahaja"</item>
+  </string-array>
+  <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>
+  <string-array name="wifi_phase2_entries">
+    <item msgid="1818786254010764570">"Tiada"</item>
+    <item msgid="6189918678874123056">"PAP"</item>
+    <item msgid="1524112260493662517">"MSCHAP"</item>
+    <item msgid="5923246669412752932">"MSCHAPV2"</item>
+    <item msgid="8651992560135239389">"GTC"</item>
+  </string-array>
+  <string-array name="wifi_network_setup">
+    <item msgid="784271777398638325">"Manual"</item>
+    <item msgid="700386742589384062">"Butang tekan WPS"</item>
+    <item msgid="7131487972018976724">"Pin WPS dari titik akses"</item>
+    <item msgid="4809199848225172977">"Pin WPS dari peranti ini"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"DHCP"</item>
+    <item msgid="628395202971532382">"Statik"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="4473276491748503377">"Tiada"</item>
+    <item msgid="8673874894887358090">"Manual"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Matikan"</item>
+    <item msgid="3165868966179561687">"Awasan"</item>
+    <item msgid="6038758039030476855">"Getar"</item>
+  </string-array>
+  <string-array name="apn_auth_entries">
+    <item msgid="3856896061242872146">"Tiada"</item>
+    <item msgid="5756844015743664882">"PAP"</item>
+    <item msgid="535934025797984365">"CHAP"</item>
+    <item msgid="8383098660619805783">"PAP atau 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">"Storan dalaman peranti"</item>
+    <item msgid="3738430123799803530">"Kad SD boleh tanggal"</item>
+    <item msgid="4498124044785815005">"Biar sistem menentukan"</item>
+  </string-array>
+  <string-array name="vibrate_entries">
+    <item msgid="3388952299521009213">"Sentiasa"</item>
+    <item msgid="6293147072807231256">"Jangan sekali-kali"</item>
+    <item msgid="1276641209451816572">"Dalam mod Senyap sahaja"</item>
+    <item msgid="8418930333779132418">"Apabila tidak berada dalam mod Senyap sahaja"</item>
+  </string-array>
+  <string-array name="long_press_timeout_selector_titles">
+    <item msgid="3511504869290423954">"Pendek"</item>
+    <item msgid="2560532955514699713">"Sederhana"</item>
+    <item msgid="2372711992605524591">"Panjang"</item>
+  </string-array>
+  <string-array name="hdcp_checking_titles">
+    <item msgid="441827799230089869">"Jangan sekali-kali semak"</item>
+    <item msgid="6042769699089883931">"Semak kandungan DRM sahaja"</item>
+    <item msgid="9174900380056846820">"Sentiasa semak"</item>
+  </string-array>
+  <string-array name="hdcp_checking_summaries">
+    <item msgid="505558545611516707">"Jangan sekali-kali gunakan penyemakan HDCP"</item>
+    <item msgid="3878793616631049349">"Gunakan penyemakan HDCP untuk kandungan DRM sahaja"</item>
+    <item msgid="45075631231212732">"Sentiasa gunakan penyemakan HDCP"</item>
+  </string-array>
+</resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
new file mode 100644
index 0000000..faba09f
--- /dev/null
+++ b/res/values-ms/strings.xml
@@ -0,0 +1,1545 @@
+<?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">"Ya"</string>
+    <string name="no" msgid="6731231425810196216">"Tidak"</string>
+    <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>
+    <string name="sdcard_unmount" product="nosdcard" msgid="6325292633327972272">"Menyahlekap storan USB"</string>
+    <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Nyahlekap kad SD"</string>
+    <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Padam storan USB"</string>
+    <string name="sdcard_format" product="default" msgid="6713185532039187532">"Padam 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>
+    <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"Storan USB"</string>
+    <string name="sdcard_setting" product="default" msgid="5922637503871474866">"Kad SD"</string>
+    <string name="battery_info_status_label" msgid="8109155295509700309">"Status bateri:"</string>
+    <string name="battery_info_power_label" msgid="7465140230991349382">"Palam kuasa:"</string>
+    <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>
+    <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Palam dicabut"</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">"Tidak diketahui"</string>
+    <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>
+    <string name="battery_info_health_cold" msgid="3835692786176707318">"Sejuk"</string>
+    <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>
+    <string name="bluetooth_is_discoverable_always" msgid="8573385118329733931">"Boleh ditemui"</string>
+    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Jadikan peranti boleh ditemui"</string>
+    <string name="bluetooth_visibility_timeout" msgid="6634508002347847278">"Tamat masa boleh ditemui"</string>
+    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Menetapkan berapa lama peranti akan boleh ditemui"</string>
+    <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Kunci dailan suara"</string>
+    <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Halang penggunaan pendail bluetooth apabila skrin dikunci"</string>
+    <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>
+    <string name="bluetooth_notif_message" msgid="618099089987569242">"Pilih untuk berpasangan dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_show_received_files_title" msgid="816172853268536399">"Tunjukkan fail yang diterima"</string>
+    <string name="bluetooth_show_received_files_summary" msgid="7322193220909480775">"Tunjukkan senarai fail yang diterima melalui Bluetooth"</string>
+    <string name="device_picker" msgid="8721012448931226323">"Pemilih peranti Bluetooth"</string>
+    <string name="bluetooth_permission_request" msgid="1523129741266262748">"Permintaan kebenaran Bluetooth"</string>
+    <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Sebuah aplikasi sedang meminta kebenaran untuk menghidupkan Bluetooth. Adakah anda mahu melakukannya?"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Sebuah aplikasi pada tablet anda sedang meminta kebenaran untuk menjadikan tablet anda boleh ditemui oleh peranti Bluetooth lain untuk <xliff:g id="TIMEOUT">%1$d</xliff:g> saat. Adakah anda mahu melakukannya?"</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="669870705606180872">"Aplikasi pada telefon anda sedang meminta kebenaran untuk menjadikan telefon anda boleh ditemui oleh peranti Bluetooth lain selama <xliff:g id="TIMEOUT">%1$d</xliff:g> saat. Adakah anda mahu melakukannya?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="1680661751413856600">"Aplikasi pada tablet anda sedang meminta kebenaran untuk menjadikan tablet anda “sentiasa boleh ditemui” oleh peranti Bluetooth lain. Adakah anda mahu melakukannya?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="3413855805411554871">"Aplikasi pada telefon anda sedang meminta kebenaran untuk menjadikan telefon anda “sentiasa boleh ditemui” oleh peranti Bluetooth lain. Adakah anda mahu melakukannya?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Sebuah aplikasi pada tablet anda sedang meminta kebenaran untuk menghidupkan Bluetooth dan menjadikan tablet anda boleh ditemui oleh peranti lain untuk <xliff:g id="TIMEOUT">%1$d</xliff:g> saat. Adakah anda mahu melakukannya?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="7220210326619399542">"Aplikasi pada telefon anda sedang meminta kebenaran untuk menghidupkan Bluetooth dan menjadikan telefon anda boleh ditemui oleh peranti lain selama <xliff:g id="TIMEOUT">%1$d</xliff:g> saat. Adakah anda mahu melakukannya?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="6132824454823539873">"Aplikasi pada tablet anda sedang meminta kebenaran untuk menghidupkan Bluetooth dan untuk menjadikan tablet anda boleh ditemui oleh peranti lain. Adakah anda mahu melakukannya?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Aplikasi pada telefon anda sedang meminta kebenaran untuk menghidupkan Bluetooth dan untuk menjadikan telefon anda boleh ditemui oleh peranti lain. Adakah anda mahu melakukannya?"</string>
+    <string name="bluetooth_turning_on" msgid="3107102168379705771">"Menghidupkan Bluetooth..."</string>
+    <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Autosambung"</string>
+    <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>
+    <string name="proxy_settings_title" msgid="5912878565897294401">"Tetapan proksi"</string>
+    <string name="proxy_settings_summary" msgid="7898928000758321486">"Tetapkan proksi HTTP global dan senarai pengecualian"</string>
+    <string name="proxy_clear_text" msgid="5555400754952012657">"Padam bersih"</string>
+    <string name="proxy_port_label" msgid="5655276502233453400">"Port proksi"</string>
+    <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Pintas proksi untuk"</string>
+    <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
+    <string name="proxy_defaultView_text" msgid="6387985519141433291">"Pulihkan lalai"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"Selesai"</string>
+    <string name="proxy_hostname_label" msgid="8490171412999373362">"Nama hos proksi"</string>
+    <string name="proxy_hostname_hint" msgid="2076157057003936176">"proxy.example.com"</string>
+    <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>
+    <string name="proxy_error_invalid_exclusion_list" msgid="4753810662233875893">"Senarai pengecualian yang anda taipkan tidak diformat dengan betul. Sila masukkan senarai domain dikecualikan yang dipisahkan koma."</string>
+    <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>
+    <string name="proxy_warning_limited_support" msgid="7442676587591460854">"Proksi HTTP digunakan oleh penyemak imbas tetapi mungkin tidak digunakan oleh aplikasi lain"</string>
+    <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>
+    <string name="oem_radio_info_label" msgid="6163141792477958941">"Maklumat/Tetapan khusus OEM"</string>
+    <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>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"Storan USB tidak dilekapkan."</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>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"Strn USB diguna sbg prnti strn"</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"Kad SD sedang digunakan sebagai peranti simpanan massa"</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="7503300818792750913">"Ia slmt utk keluarkan strn USB"</string>
+    <string name="sdcard_settings_unmounted_status" product="default" msgid="3812022095683863087">"Kini adalah selamat untuk mengeluarkan kad SD"</string>
+    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"Strn USB dikluarkn smasa guna!"</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>
+    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Imbas storan USB utk media..."</string>
+    <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Mengimbas kad SD untuk mengesan media..."</string>
+    <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"Storan USB dilekap baca sahaja"</string>
+    <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"Kad SD dilekapkan baca sahaja"</string>
+    <string name="skip_label" msgid="47510779345218297">"Langkau"</string>
+    <string name="next_label" msgid="4693520878012668114">"Seterusnya"</string>
+    <string name="language_picker_title" msgid="5349877711342869319">"Bahasa"</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>
+    <string name="display_label" msgid="8074070940506840792">"Skrin"</string>
+    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Maklumat tablet"</string>
+    <string name="phone_info_label" product="default" msgid="2127552523124277664">"Maklumat telefon"</string>
+    <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"Storan USB"</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>
+    <string name="settings_label_launcher" msgid="8344735489639482340">"Tetapan"</string>
+    <string name="settings_shortcut" msgid="8597387747077828217">"Pilih tetapan pintasan"</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>
+    <string name="radio_controls_title" msgid="5868688473587168882">"Wayarles &amp; rangkaian"</string>
+    <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Wayarles &amp; rangkaian"</string>
+    <string name="radio_controls_summary" msgid="2998818677094465517">"Urus Wi-Fi, Bluetooth, mod pesawat, rangkaian mudah alih &amp; VPN"</string>
+    <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>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Tetapkan tarikh dan masa"</string>
+    <string name="date_and_time_settings_summary" msgid="2435705040205950381">"Tetapkan tarikh, masa, zon waktu &amp; format"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"Tarikh &amp; masa automatik"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Gunakan waktu yang diberikan oleh rangkaian"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Gunakan waktu yang diberikan oleh rangkaian"</string>
+    <string name="zone_auto" msgid="334783869352026648">"Zon waktu automatik"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Gunakan zon waktu yang diberikan oleh rangkaian"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Gunakan zon waktu yang diberikan oleh rangkaian"</string>
+    <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>
+    <string name="date_picker_title" msgid="1338210036394128512">"Tarikh"</string>
+    <string name="time_picker_title" msgid="483460752287255019">"Masa"</string>
+    <string name="lock_after_timeout" msgid="940509402681580537">"Tamat masa"</string>
+    <string name="lock_after_timeout_summary" msgid="4726009794344934278">"Kunci skrin <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> selepas skrin dimatikan secara automatik"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Tunjuk maklumat pemilik pada skrin yang dikunci"</string>
+    <string name="owner_info_settings_title" msgid="2723190010708381889">"Maklumat pemilik"</string>
+    <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
+    <string name="owner_info_settings_edit_text_hint" msgid="2382525043173672857">"Masukkan teks untuk dipaparkan pada kunci skrin"</string>
+    <string name="security_settings_title" msgid="5168491784222013179">"Lokasi &amp; keselamatan"</string>
+    <string name="location_security_settings_title" msgid="4624434296446625554">"Tetapan lokasi &amp; keselamatan"</string>
+    <string name="security_settings_summary" msgid="967393342537986570">"Tetapkan Lokasi Saya, buka kunci skrin, kunci kad SIM, kunci storan bukti kelayakan"</string>
+    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Tetapkan Lokasi Saya, buka kunci skrin, kunci storan bukti kelayakan"</string>
+    <string name="security_passwords_title" msgid="2930627259125138363">"Kata laluan"</string>
+    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Penyulitan"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Sulitkan tablet"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Sulitkan telefon"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Memerlukan PIN atau kata laluan angka untuk menyahsulit tablet anda setiap kali anda menghidupkannya"</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Memerlukan PIN atau kata laluan angka untuk menyahsulit telefon anda setiap kali dan menghidupkannya"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Disulitkan"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="2150571569618349332">"Anda boleh menyulitkan akaun anda, tetapan, aplikasi yang dimuat turun serta datanya, media dan fail lain. Apabila anda sudah menyulitkan tablet anda, anda mesti memasukkan PIN atau kata laluan angka untuk menyahsulitnya setiap kali anda menghidupkannya: anda tidak boleh membuang penyulitan tablet anda kecuali dengan melaksanakan penetapan semula data kilang yang akan menghapuskan semua data anda."\n\n"Penyulitan mengambil masa satu jam atau lebih. Anda mesti bermula dengan bateri yang sudah dicas dan membiarkan tablet anda disambungkan kepada bekalan kuasa sehingga penyulitan selesai. Jika anda mengganggu proses penyulitan, anda akan kehilangan sebahagian atau kesemua data anda."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7366703764847750586">"Anda boleh menyulitkan akaun anda, tetapan, aplikasi yang dimuat turun serta datanya, media dan fail lain. Apabila anda sudah menyulitkan telefon anda, anda mesti memasukkan PIN atau kata laluan angka untuk menyahsulitnya setia kali anda menghidupkannya: anda tidak boleh membuang penyulitan telefon anda kecuali dengan melaksanakan penetapan semula data kilang yang akan memadamkan semua data anda."\n\n"Penyulitan mengambil masa satu jam atau lebih. Anda mesti bermula dengan bateri yang sudah dicas dan menyambungkan bekalan kuasa kepada telefon anda sehingga penyulitan selesai. Jika anda mengganggu proses penyulitan, anda akan kehilangan sebahagian atau kesemua data anda."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Sulitkan tablet"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Sulitkan telefon"</string>
+    <string name="crypt_keeper_low_charge_text" msgid="5920622844033087792">"Sila caskan bateri anda dan cuba lagi."</string>
+    <string name="crypt_keeper_unplugged_text" msgid="3360883915598669748">"Sila pasangkan palam pengecas anda dan cuba lagi."</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Tiada PIN kunci skrin atau kata laluan"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Anda mesti menetapkan PIN atau kata laluan kunci skrin sebelum anda boleh memulakan penyulitan."</string>
+    <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Sahkan penyulitan"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Sulitkan tablet? Operasi ini tidak boleh dibalikkan dan sekiranya anda mengganggunya, anda akan kehilangan data. Penyulitan mengambil masa sejam atau lebih, dalam masa yang sama tablet akan dimulakan semula beberapa kali."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Sulitkan telefon? Operasi ini tidak boleh dibalikkan dan sekiranya anda mengganggunya, anda akan kehilangan data. Penyulitan mengambil masa sejam atau lebih, dalam masa yang sama telefon akan dimulakan semula beberapa kali."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Penyulitan"</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="5317479293244660361">"Sila tunggu sementara tablet anda disulitkan. <xliff:g id="PERCENT">^1</xliff:g>% selesai."</string>
+    <string name="crypt_keeper_setup_description" product="default" msgid="8166730416836285875">"Sila tunggu sementara telefon anda disulitkan. <xliff:g id="PERCENT">^1</xliff:g>% selesai."</string>
+    <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Cuba lagi dalam <xliff:g id="DELAY">^1</xliff:g> saat."</string>
+    <string name="crypt_keeper_enter_password" msgid="1492603008983893532">"Masukkan kata laluan anda"</string>
+    <string name="crypt_keeper_failed_title" msgid="1166918236711686187">"Penyulitan gagal"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="1075638996134310507">"Penyulitan telah terganggu dan tidak boleh diselesaikan. Anda mesti melakukan tetapan semula data kilang (memadamkan semua data anda) sebelum anda boleh menyambung semula menggunakan tablet anda. Anda boleh mencuba menyulitkan tablet anda semula selepas tetapan semula selesai."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3394708817932222518">"Penyulitan telah terganggu dan tidak boleh diselesaikan. Anda mesti melakukan tetapan semula data kilang (memadamkan semua data anda) sebelum anda boleh menyambung semula menggunakan telefon anda. Anda boleh mencuba menyulitkan telefon anda semula selepas tetapan semula selesai."</string>
+    <string name="lock_settings_picker_title" msgid="8665454308380158195">"Konfigurasikan kunci skrin"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Konfigurasikan kunci skrin"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="6987228635944678726">"Tukar kunci skrin"</string>
+    <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Tukar atau lumpuhkan corak, PIN atau keselamatan kata laluan"</string>
+    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Pilih kaedah untuk mengunci skrin"</string>
+    <string name="unlock_set_unlock_off_title" msgid="1613932765246180079">"Matikan"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="2791013557563587655">"Jangan sekali-kali kunci skrin"</string>
+    <string name="unlock_set_unlock_none_title" msgid="7560817055143323842">"Tidak terjamin"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="2609139908913114644">"Tidak memerlukan corak, PIN atau kata laluan untuk membuka kunci skrin"</string>
+    <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Corak"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="8467282436608077882">"Memerlukan corak untuk membuka kunci skrin"</string>
+    <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Memerlukan PIN angka untuk membuka kunci skrin"</string>
+    <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Kata laluan"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Memerlukan kata laluan untuk membuka kunci skrin"</string>
+    <!-- outdated translation 8563103042330816018 -->     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Dilumpuhkan oleh pentadbir atau dasar penyulitan"</string>
+    <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Mati"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="7137296704741184239">"Tiada keselamatan"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Dilindungi dengan corak"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Dilindungi PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Dilindungi kata laluan"</string>
+    <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Matikan kunci skrin"</string>
+    <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Alih keluar corak buka kunci"</string>
+    <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Alih keluar PIN buka kunci"</string>
+    <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"Alih keluar kata laluan buka kunci"</string>
+    <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"Tukar corak buka kunci"</string>
+    <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Tukar PIN buka kunci"</string>
+    <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Tkr kta lluan bka knci"</string>
+    <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Kata laluan mesti sekurang-kurangnya %d aksara"</string>
+    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN mestilah sekurang-kurangnya %d aksara"</string>
+    <string name="lockpassword_press_continue" msgid="122706614386757182">"Sentuh Teruskan apabila selesai"</string>
+    <string name="lockpassword_continue_label" msgid="4602203784934526940">"Teruskan"</string>
+    <string name="lockpassword_password_too_long" msgid="5487426077939378487">"Kata laluan mesti kurang daripada <xliff:g id="NUMBER">%d</xliff:g> aksara"</string>
+    <string name="lockpassword_pin_too_long" msgid="6382649850551200693">"PIN mesti kurang daripada <xliff:g id="NUMBER">%d</xliff:g> digit"</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"PIN mesti mengandungi 0-9 digit sahaja"</string>
+    <string name="lockpassword_pin_recently_used" msgid="2729073062730842496">"Pentadbir peranti tidak membenarkan PIN terbaru digunakan"</string>
+    <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Kata laluan mengandungi aksara tidak sah"</string>
+    <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"Kata laluan mesti mengandungi sekurang-kurangnya satu huruf"</string>
+    <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"Kata laluan mesti mengandungi sekurang-kurangnya satu digit"</string>
+    <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"Kata laluan mesti mengandungi sekurang-kurangnya 1 simbol"</string>
+  <plurals name="lockpassword_password_requires_letters">
+    <item quantity="one" msgid="1462968118065694590">"Kata laluan mesti mengandungi sekurang-kurangnya 1 huruf"</item>
+    <item quantity="other" msgid="7278096339907683541">"Kata laluan mesti mengandungi sekurang-kurangnya %d huruf"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_lowercase">
+    <item quantity="one" msgid="2048653993044269649">"Kata laluan mesti mengandungi sekurang-kurangnya 1 huruf kecil"</item>
+    <item quantity="other" msgid="588499075580432178">"Kata laluan mesti mengandungi sekurang-kurangnya %d huruf kecil"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_uppercase">
+    <item quantity="one" msgid="7677454174080582601">"Kata laluan mesti mengandungi sekurang-kurangnya 1 huruf besar"</item>
+    <item quantity="other" msgid="2183090598541826806">"Kata laluan mesti mengandungi sekurang-kurangnya %d huruf besar"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_numeric">
+    <item quantity="one" msgid="8585088032818933985">"Kata laluan mesti mengandungi sekurang-kurangnya 1 digit angka"</item>
+    <item quantity="other" msgid="995673409754935278">"Kata laluan mesti mengandungi sekurang-kurangnya %d digit angka"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_symbols">
+    <item quantity="one" msgid="3930886641317826293">"Kata laluan mesti mengandungi sekurang-kurangnya 1 simbol khas"</item>
+    <item quantity="other" msgid="3047460862484105274">"Kata laluan mesti mengandungi sekurang-kurangnya %d simbol khas"</item>
+  </plurals>
+  <plurals name="lockpassword_password_requires_nonletter">
+    <item quantity="one" msgid="1716355580615489062">"Kata laluan mesti mengandungi sekurang-kurangnya 1 aksara bukan huruf"</item>
+    <item quantity="other" msgid="5574191164708145973">"Kata laluan mesti mengandungi sekurang-kurangnya %d aksara bukan huruf"</item>
+  </plurals>
+    <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"Pentadbir peranti tidak membenarkan kata laluan terbaru digunakan"</string>
+    <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
+    <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Batal"</string>
+    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Batal"</string>
+    <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Seterusnya"</string>
+    <string name="device_admin_title" msgid="3562216873644263804">"Pentadbiran peranti"</string>
+    <string name="manage_device_admin" msgid="5059296715271077278">"Pentadbir peranti"</string>
+    <string name="manage_device_admin_summary" msgid="7672709110988761075">"Lihat atau nyahaktifkan pentadbir peranti"</string>
+    <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>
+    <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Permintaan menjadi pasangan Bluetooth"</string>
+    <string name="bluetooth_enter_pin_msg" msgid="1499285355129256289">\n"Masukkan PIN untuk berpasangan dengan \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". (Cuba 0000 atau 1234.) Anda mungkin perlu memasukkan PIN yang sama pada peranti Bluetooth."</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="8301499416158195044">\n"Masukkan kunci laluan untuk berpasangan dengan \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
+    <string name="bluetooth_confirm_passkey_msg" msgid="1205362283945104263">"Untuk menjadi pasangan \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\", sahkan bahawa ia menunjukkan kunci laluan: <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"mahu menjadi pasangan."</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="9139892462102104755">"Masukkan \"<xliff:g id="PASSKEY">%2$s</xliff:g>\" pada \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" untuk menjadikan pasangan diikuti dengan return atau enter."</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Jadikan pasangan"</string>
+    <string name="bluetooth_pairing_decline" msgid="930951069988011471">"Jangan Jadikan Pasangan"</string>
+    <string name="bluetooth_remote_device" msgid="2406662802908395389">"peranti bluetooth"</string>
+    <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>
+    <string name="bluetooth_pairing_pin_error_message" msgid="6065697229258906937">"Terdapat masalah memasangkan dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g> kerana PIN atau Kunci Laluan tidak betul."</string>
+    <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>
+    <string name="bluetooth_preference_find_nearby_title" msgid="5087410003465463318">"Cari peranti berdekatan"</string>
+    <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"Tetapan peranti"</string>
+    <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Peranti pasangan"</string>
+    <string name="bluetooth_preference_found_devices" msgid="3133019331974936204">"Menemui peranti"</string>
+    <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>
+    <string name="bluetooth_profile_headset" msgid="81844079120986198">"Bebas tangan"</string>
+    <string name="bluetooth_profile_opp" msgid="3799470046565284440">"Pemindahan"</string>
+    <string name="bluetooth_profile_hid" msgid="3000858580917633478">"Peranti Input"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Akses Internet"</string>
+    <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan diputuskan dari media audio."</string>
+    <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan diputuskan dari audio bebas tangan."</string>
+    <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan diputuskan dari peranti input."</string>
+    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"Akses Internet melalui <xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan diputuskan."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan diputuskan sambungan dari berkongsi sambungan Internet tablet ini."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan diputuskan sambungan dari berkongsi sambungan Internet telefon ini."</string>
+    <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"Pilihan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_device_advanced_device_actions_title" msgid="3793430949811946844">"Tindakan peranti"</string>
+    <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>
+    <string name="bluetooth_device_advanced_rename_device" msgid="350508394033808532">"Namakan semula peranti"</string>
+    <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Benarkan pindahan fail masuk"</string>
+    <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>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Bersambung ke pelayan pemindahan fail"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Tidak bersambung kepada pelayan pemindahan fail"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Disambungkan ke peranti input"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Sbg ke pranti utk aks Int"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Kgsi sbgn Int dgn peranti"</string>
+    <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>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Gunakan untuk pemindahan fail"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Gunakan untuk input"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Gunakan untuk akses Internet"</string>
+    <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Tetapan Dok"</string>
+    <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Gunakan dok untuk audio"</string>
+    <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Sebagai telefon pembesar suara"</string>
+    <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Untuk muzik dan media"</string>
+    <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Ingat tetapan"</string>
+    <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
+    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"Gunakan Komunikasi Medan Dekat untuk membaca dan bertukar teg"</string>
+    <string name="nfc_toggle_error" msgid="2233172102497535522">"Ralat telah berlaku."</string>
+    <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>
+    <string name="wifi_in_airplane_mode" msgid="7618393787965366655">"Dalam mod pesawat"</string>
+    <string name="wifi_fail_to_scan" msgid="6194542252808587669">"Tidak boleh mengimbas untuk mengesan rangkaian"</string>
+    <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>
+    <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Dasar memutuskan sambungan Wi-Fi"</string>
+    <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Tentukan bila hendak bertukar daripada Wi-Fi kepada data mudah alih"</string>
+    <string name="wifi_setting_sleep_policy_summary_wifi_only" msgid="5025244230722670496">"Tentukan bila hendak memutuskan sambungan dari Wi-Fi"</string>
+    <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Terdapat masalah menukar tetapan"</string>
+    <string name="wifi_add_network" msgid="1671334951296205616">"Tambah rangkaian Wi-Fi"</string>
+    <string name="wifi_add_network_summary" msgid="6345544206968025811">"Konfigurasi rangkaian bukan siaran"</string>
+    <string name="wifi_access_points" msgid="2664629396767022441">"Rangkaian Wi-Fi"</string>
+    <string name="wifi_menu_scan" msgid="1470911530412095868">"Imbas"</string>
+    <string name="wifi_menu_advanced" msgid="7522252991919573664">"Terperinci"</string>
+    <string name="wifi_menu_connect" msgid="4996220309848349408">"Sambung kepada rangkaian"</string>
+    <string name="wifi_menu_forget" msgid="8736964302477327114">"Lupakan rangkaian"</string>
+    <string name="wifi_menu_modify" msgid="2068554918652440105">"Ubah suai"</string>
+    <string name="wifi_network_setup" msgid="7974851890019344870">"Persediaan Rangkaian"</string>
+    <string name="wifi_wps_pin" msgid="5471842298708321115">"Masukkan pin dari titik akses"</string>
+    <string name="wifi_wps_setup_title" msgid="150518971269252336">"Persediaan WPS"</string>
+    <string name="wifi_wps_pin_output" msgid="8682102965680650853">"Masukkan pin <xliff:g id="WPS_PIN">%1$s</xliff:g> pada titik akses"</string>
+    <string name="wifi_wps_in_progress" msgid="2776555137392461525">"WPS sudah pun dijalankan dan boleh mengambil masa sepuluh saat untuk selesai"</string>
+    <string name="wifi_wps_failed" msgid="2277409652621482331">"Gagal menghidupkan WPS, sila cuba lagi"</string>
+    <string name="wifi_ssid" msgid="641393708309146745">"SSID rangkaian"</string>
+    <string name="wifi_security" msgid="6603611185592956936">"Keselamatan"</string>
+    <string name="wifi_signal" msgid="5514120261628065287">"Kekuatan isyarat"</string>
+    <string name="wifi_status" msgid="4824568012414605414">"Status"</string>
+    <string name="wifi_speed" msgid="3526198708812322037">"Kelajuan pautan"</string>
+    <string name="wifi_ip_address" msgid="1440054061044402918">"Alamat IP"</string>
+    <string name="wifi_eap_method" msgid="8529436133640730382">"Kaedah EAP"</string>
+    <string name="please_select_phase2" msgid="5231074529772044898">"Pengesahan fasa 2"</string>
+    <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Sijil CA"</string>
+    <string name="wifi_eap_user_cert" msgid="1291089413368160789">"Sijil pengguna"</string>
+    <string name="wifi_eap_identity" msgid="4359453783379679103">"Identiti"</string>
+    <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Identiti tanpa nama"</string>
+    <string name="wifi_password" msgid="5948219759936151048">"Kata laluan"</string>
+    <string name="wifi_show_password" msgid="6461249871236968884">"Tunjukkan kata laluan"</string>
+    <string name="wifi_ip_settings" msgid="3359331401377059481">"Tetapan IP"</string>
+    <string name="wifi_unchanged" msgid="3410422020930397102">"(tidak berubah)"</string>
+    <string name="wifi_unspecified" msgid="5431501214192991253">"(tidak ditentukan)"</string>
+    <string name="wifi_remembered" msgid="8426719916135950136">"Diingati"</string>
+    <string name="wifi_disabled" msgid="2104752038187543712">"Dilumpuhkan"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Tidak dalam liputan"</string>
+    <string name="wifi_open_with_wps" msgid="2606968531452521147">"WPS tersedia"</string>
+    <string name="wifi_secured" msgid="6759903183748011566">"Dilindungi <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_with_wps" msgid="1822538701086256007">"Terjamin dengan <xliff:g id="WIFI_SECURITY">%1$s</xliff:g> (WPS tersedia)"</string>
+    <string name="wifi_secured_with_status" msgid="6489317496506267302">"<xliff:g id="WIFI_STATUS">%2$s</xliff:g>, dilindungi <xliff:g id="WIFI_SECURITY">%1$s</xliff:g>"</string>
+    <string name="wifi_connect" msgid="1076622875777072845">"Sambung"</string>
+    <string name="wifi_forget" msgid="8168174695608386644">"Lupakan"</string>
+    <string name="wifi_save" msgid="3331121567988522826">"Simpan"</string>
+    <string name="wifi_cancel" msgid="6763568902542968964">"Batal"</string>
+    <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"Sesi WPS dikesan, sila cuba semula dalam beberapa minit"</string>
+    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Terperinci"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Jalur frekuensi Wi-Fi"</string>
+    <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Tentukan julat frekuensi operasi"</string>
+    <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Terdapat masalah menetapkan jalur frekuensi."</string>
+    <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Alamat MAC"</string>
+    <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Alamat IP"</string>
+    <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>
+    <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Sila taipkan alamat IP yang sah."</string>
+    <string name="wifi_ip_settings_invalid_gateway" msgid="6383012465511093067">"Sila taipkan alamat get laluan yang sah."</string>
+    <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Sila taipkan alamat dns yang sah."</string>
+    <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Sila taip awlan rgkaian yg pjgnya antara 0 dan 32."</string>
+    <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>
+    <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Panjang awalan rangkaian"</string>
+    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Titik panas Wi-Fi mudah alih"</string>
+    <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Titik panas mudah alih <xliff:g id="NETWORK_SSID">%1$s</xliff:g> aktif"</string>
+    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Ralat titik panas Wi-Fi mudah alih"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="3474995108398156258">"Konfigurasikan titik panas 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> titik panas Wi-Fi mudah alih"</string>
+    <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"TitikPanasAndroid"</string>
+    <string name="sound_settings_title" msgid="8735891486683305886">"Bunyi"</string>
+    <string name="display_settings_title" msgid="2378894265964357591">"Skrin"</string>
+    <string name="sound_settings" msgid="5007659014828162881">"Tetapan bunyi"</string>
+    <string name="silent_mode_title" msgid="3181479108593217704">"Mod senyap"</string>
+    <string name="silent_mode_summary" msgid="3309650676072917899">"Senyapkan semua bunyi kecuali bunyi media &amp; penggera"</string>
+    <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"Semua bunyi kecuali media disenyapkan"</string>
+    <string name="ringtone_title" msgid="7037881886694206550">"Nada dering panggilan masuk"</string>
+    <string name="ringtone_summary" msgid="2630023412632683493"></string>
+    <string name="all_volume_title" msgid="8741571721868253103">"Kelantangan"</string>
+    <string name="ring_volume_title" msgid="7938706566797464165">"Kelantangan pendering"</string>
+    <string name="ring_volume_summary" msgid="7055497624193116879"></string>
+    <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Getar apabila senyap"</string>
+    <string name="vibrate_in_silent_summary" msgid="3312600513070076281">"Benarkan maklum balas getaran dalam mod senyap"</string>
+    <string name="vibrate_title" msgid="6045820877942801599">"Getar"</string>
+    <string name="vibrate_summary" msgid="7378130397830790458">"Maklum balas getaran untuk panggilan dan pemberitahuan"</string>
+    <string name="notification_sound_title" msgid="6316316069880531693">"Nada dering pemberitahuan"</string>
+    <string name="notification_sound_summary" msgid="2953599929394109819"></string>
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Lampu pemberitahuan denyutan"</string>
+    <string name="notification_pulse_summary" msgid="6899220780534617152">"Denyutkan cahaya bebola jejak berulang-ulang bagi pemberitahuan baru"</string>
+    <string name="incoming_call_volume_title" msgid="8073714801365904099">"Nada dering"</string>
+    <string name="notification_volume_title" msgid="2012640760341080408">"Pemberitahuan"</string>
+    <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>
+    <string name="media_volume_title" msgid="3576565767317118106">"Media"</string>
+    <string name="media_volume_summary" msgid="5363248930648849974">"Tetapkan kelantangan untuk muzik dan video"</string>
+    <string name="alarm_volume_title" msgid="2285597478377758706">"Penggera"</string>
+    <string name="dock_settings_summary" msgid="455802113668982481">"Tetapan audio untuk dok yang dipasangkan"</string>
+    <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>
+    <string name="lock_sounds_enable_title" msgid="1575990840389107141">"Bunyi kunci skrin"</string>
+    <string name="lock_sounds_enable_summary_on" msgid="145741024028391473">"Mainkan bunyi apabila mengunci dan membuka kunci skrin"</string>
+    <string name="lock_sounds_enable_summary_off" msgid="8481243116223542804">"Mainkan bunyi apabila mengunci dan membuka kunci skrin"</string>
+    <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"Maklum balas haptik"</string>
+    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"Getar semasa menekan kekunci lembut dan semasa melakukan interaksi UI tertentu"</string>
+    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Getar apabila menekan kekunci lembut dan pada interaksi UI tertentu"</string>
+    <string name="audio_record_proc_title" msgid="4271091199976457534">"Pembatalan hingar"</string>
+    <string name="audio_record_proc_summary" msgid="8113628457499616498">"Sekat bunyi latar belakang semasa bercakap atau merakam."</string>
+    <string name="dock_settings" msgid="1820107306693002541">"Dok"</string>
+    <string name="dock_settings_title" msgid="9161438664257429372">"Tetapan dok"</string>
+    <string name="dock_audio_settings_title" msgid="3324750259959570305">"Audio"</string>
+    <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Tetapan untuk dok desktop yang dipasangkan"</string>
+    <string name="dock_audio_summary_car" msgid="6740897586006248450">"Tetapan untuk dok kereta yang dipasangkan"</string>
+    <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"Tablet tidak berada dalam dok"</string>
+    <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Telefon tidak berada dalam dok"</string>
+    <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Tetapan untuk dok yang dipasangkan"</string>
+    <string name="dock_not_found_title" msgid="3290961741828952424">"Dok tidak ditemui"</string>
+    <string name="dock_not_found_text" product="tablet" msgid="7935403744079168804">"Tablet mesti berada dalam dok untuk mengkonfigurasikan audio dok"</string>
+    <string name="dock_not_found_text" product="default" msgid="3035260358985111855">"Telefon mesti berada dalam dok untuk mengkofigurasikan audio dok"</string>
+    <string name="dock_sounds_enable_title" msgid="3659084028644948905">"Bunyi pemasukan dok"</string>
+    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Mainkan bunyi apabila memasukkan atau mengeluarkan tablet dari dok"</string>
+    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Mainkan bunyi apabila memasukkan atau mengeluarkan telefon dari dok"</string>
+    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Jangan mainkan bunyi semasa memasukkan atau mengeluarkan tablet dari dok"</string>
+    <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Jangan mainkan bunyi semasa memasukkan atau mengeluarkan telefon dari dok"</string>
+    <string name="sync_settings" msgid="9186125469300013491">"Akaun &amp; penyegerakan"</string>
+    <string name="sync_settings_summary" msgid="2962179505214965667">"Tambah atau alih keluar akaun dan tukar tetapan akaun"</string>
+    <string name="search_settings" msgid="1910951467596035063">"Carian"</string>
+    <string name="search_settings_summary" msgid="9205656546570654169">"Urus tetapan dan sejarah carian"</string>
+    <string name="display_settings" msgid="5947830029420609057">"Tetapan skrin"</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>
+    <string name="accelerometer_title" msgid="7854608399547349157">"Skrin autoputar"</string>
+    <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Menukar orientasi secara automatik apabila memutarkan tablet"</string>
+    <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Tukar orientasi secara automatik apabila memutarkan telefon"</string>
+    <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Menukar orientasi secara automatik apabila memutarkan tablet"</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>
+    <string name="screen_timeout" msgid="6962654593018319466">"Tamat masa"</string>
+    <string name="screen_timeout_summary" msgid="4471347210332380587">"Skrin dimatikan secara automatik selepas <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <!-- no translation found for wallpaper_settings_title (5449180116365824625) -->
+    <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">"Kecerahan automatik"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Saiz fon"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Saiz fon keseluruhan"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Pilih saiz fon"</string>
+    <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>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Memerlukan PIN untuk menggunakan tablet"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Memerlukan PIN untuk menggunakan telefon"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Memerlukan PIN untuk menggunakan tablet"</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>
+    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Status tablet"</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>
+    <string name="firmware_version" msgid="4801135784886859972">"Versi Android"</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>
+    <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Status bateri, rangkaian dan maklumat lain"</string>
+    <string name="device_status_summary" product="default" msgid="2599162787451519618">"Nombor telefon, isyarat, dll."</string>
+    <string name="storage_settings" msgid="4211799979832404953">"Storan"</string>
+    <string name="storage_settings_title" msgid="8746016738388094064">"Tetapan Storan"</string>
+    <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Nyahlekap storan USB, lihat storan tersedia"</string>
+    <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Nyahlekap kad SD, lihat storan tersedia"</string>
+    <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
+    <string name="status_number" product="default" msgid="5123197324870153205">"Nombor telefon saya"</string>
+    <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
+    <!-- no translation found for status_msid_number (909010114445780530) -->
+    <skip />
+    <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>
+    <string name="status_serial_number" msgid="2257111183374628137">"Nombor siri"</string>
+    <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>
+    <string name="internal_memory" msgid="9129595691484260784">"Storan dalaman"</string>
+    <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Storan USB"</string>
+    <string name="sd_memory" product="default" msgid="151871913888051515">"Kad SD"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Tersedia"</string>
+    <string name="memory_size" msgid="6629067715017232195">"Jumlah ruang"</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"Mengira..."</string>
+    <string name="memory_apps_usage" msgid="9079237985722858506">"Aplikasi"</string>
+    <string name="memory_media_usage" msgid="3738830697707880405">"Media"</string>
+    <string name="memory_downloads_usage" msgid="3755173051677533027">"Muat turun"</string>
+    <string name="memory_dcim_usage" msgid="6679615808140067136">"Gambar, Video"</string>
+    <string name="memory_music_usage" msgid="4040027367622874108">"Audio (muzik, nada dering, podcast dsb)"</string>
+    <string name="memory_media_misc_usage" msgid="235452944021647124">"Pelbagai"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Nyahlekap storan kongsi"</string>
+    <string name="sd_eject" product="default" msgid="6915293408836853020">"Nyahlekap kad SD"</string>
+    <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Nyahlekap storan USB dalaman"</string>
+    <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Nyahlekap kad SD supaya anda boleh mengeluarkannya dengan selamat"</string>
+    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Sisip strn USB utk dilekp"</string>
+    <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Masukkan kad SD untuk dilekapkan"</string>
+    <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Lekap storan USB"</string>
+    <string name="sd_mount" product="default" msgid="5940523765187704135">"Lekapkan kad SD"</string>
+    <string name="sd_mount_summary" product="nosdcard" msgid="4673411327373419641"></string>
+    <string name="sd_mount_summary" product="default" msgid="4673411327373419641"></string>
+    <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"Padam storan USB"</string>
+    <string name="sd_format" product="default" msgid="2576054280507119870">"Padam kad SD"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Memadamkan semua data pada storan USB dalaman, seperti muzik dan foto"</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"Memadamkan semua data pada kad SD, seperti muzik dan foto"</string>
+    <string name="read_only" msgid="6702420168629076340">" (Baca sahaja)"</string>
+    <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"Menyahlekap storan USB"</string>
+    <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"Nyahlekap kad SD"</string>
+    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"Jika anda menyahlekap storan USB, sesetengah aplikasi yang anda sedang gunakan akan berhenti dan akan menjadi tidak tersedia sehingga anda melekapkan semula storan USB."</string>
+    <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Jika anda menyahlekap kad SD, sesetengah aplikasi yang anda gunakan akan terhenti dan mungkin tidak tersedia sehingga anda melekapkan semula kad SD itu."</string>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"Menyahlekap storan USB gagal"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"Kad SD gagal dinyahlekap."</string>
+    <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"Tidak boleh menyahlekap storan USB. Cuba sebentar lagi."</string>
+    <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"Tidak boleh menyahlekap kad SD. Sila cuba sebentar lagi."</string>
+    <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"Storan USB akan dinyahlekapkan."</string>
+    <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"Kad SD akan dinyahlekapkan."</string>
+    <string name="sd_ejecting_title" msgid="8824572198034365468">"Menyahlekap"</string>
+    <string name="sd_ejecting_summary" msgid="2028753069184908491">"Penyahlekapan sedang berlangsung"</string>
+    <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>
+    <string name="apn_auth_type" msgid="6167205395676037015">"Jenis pengesahan"</string>
+    <string name="apn_auth_type_none" msgid="5069592676845549926">"Tiada"</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 atau CHAP"</string>
+    <string name="apn_type" msgid="469613123902220544">"Jenis APN"</string>
+    <string name="apn_protocol" msgid="3272222921649348640">"Protokol APN"</string>
+    <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>
+    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Memadamkan semua data pada tablet"</string>
+    <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Memadamkan semua data pada telefon"</string>
+    <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"Ini akan memadamkan semua data dari "<b>"storan dalaman"</b>" tablet anda, termasuk:"\n\n<li>"Akaun Google anda"</li>\n<li>"Data dan tetapan sistem dan aplikasi"</li>\n<li>"Aplikasi yang dimuat turun"</li></string>
+    <string name="master_clear_desc" product="default" msgid="3251400937758241249">"Ini akan memadamkan semua data dari "<b>"storan dalaman"</b>" telefon anda, termasuk:"\n\n<li>"Akaun Google anda"</li>\n<li>"Data dan tetapan sistem dan aplikasi"</li>\n<li>"Aplikasi yang dimuat turun"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Anda melog masuk ke dalam akaun berikut buat masa ini:"\n</string>
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muzik"</li>\n<li>"Foto"</li>\n<li>"Data pengguna yang lain"</li></string>
+    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Untuk turut memadam bersih muzik, gambar dan data pengguna lain, "<b>"storan USB"</b>" perlu dipadamkan."</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Untuk turut memadam bersih muzik, gambar dan data pengguna lain, "<b>"SD card"</b>" perlu dipadamkan."</string>
+    <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Padam storan USB"</string>
+    <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Padam kad SD"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"Memadamkan semua data pada storan USB dalaman, seperti muzik atau foto."</string>
+    <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"Memadamkan semua data pada kad SD, seperti muzik atau foto."</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Tetapkan semula tablet"</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>
+    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Anda mesti melukiskan corak buka kunci anda untuk mengesahkan tetapan semula data kilang."</string>
+    <string name="master_clear_failed" msgid="8655202125010189406">"Tiada penetapan semula dijalankan kerana perkhidmatan Padam Bersih Sistem tidak tersedia."</string>
+    <string name="master_clear_confirm_title" msgid="4845794266129586839">"Mengesahkan tetapan semula"</string>
+    <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Padam storan USB"</string>
+    <string name="media_format_title" product="default" msgid="4427528440306787972">"Padam kad SD"</string>
+    <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Padam semua data dlm storn USB"</string>
+    <string name="media_format_summary" product="default" msgid="3805714639375830120">"Memadamkan semua data pada kad SD"</string>
+    <string name="media_format_desc" product="nosdcard" msgid="4553860683952763905">"Tindakan ini akan memadamkan storan USB. Anda akan kehilangan "<b>"semua"</b>" data yang disimpan di sana!"</string>
+    <string name="media_format_desc" product="default" msgid="1598627584181935513">"Tindakan ini akan memadamkan kad SD. Anda akan kehilangan "<b>"semua"</b>" data pada kad tersebut!"</string>
+    <string name="media_format_button_text" product="nosdcard" msgid="6293669371185352810">"Padam storan USB"</string>
+    <string name="media_format_button_text" product="default" msgid="6721544380069373626">"Padam kad SD"</string>
+    <string name="media_format_final_desc" product="nosdcard" msgid="8094635533378487255">"Padamkan storan USB, memadamkan semua fail yang disimpan di sana? Tindakan tidak boleh dibalikkan!"</string>
+    <string name="media_format_final_desc" product="default" msgid="9015504991522581434">"Padamkan kad SD, memadamkan semua fail yang disimpan di sana? Tindakan tidak boleh dibalikkan!"</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>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Anda mesti melukis corak buka kunci anda untuk mengesahkan bahawa anda mahu memadamkan storan USB."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Anda mesti melukis corak buka kunci anda untuk mengesahkan bahawa anda mahu memadamkan 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>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"Penambatan USB"</string>
+    <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Titik panas mudah alih"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Penambatan Bluetooth"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Penambatan"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"Tambat &amp; ttk pns mdh alh"</string>
+    <string name="tether_settings_summary_usb" product="tablet" msgid="785883365108362248">"Berkongsi sambungan data mudah alih tablet anda melalui USB"</string>
+    <string name="tether_settings_summary_usb" product="default" msgid="3562431455625637370">"Kongsi sambungan data mudah alih telefon anda melalui USB"</string>
+    <string name="tether_settings_summary_wifi" msgid="5474383125137372164">"Berkongsi sambungan data mudah alih sebagai hotspot Wi-Fi mudah alih"</string>
+    <string name="tether_settings_summary_bluetooth" msgid="2407506656353819750">"Berkongsi sambungan data mudah alih anda melalui Bluetooth"</string>
+    <string name="tether_settings_summary_usb_wifi" product="tablet" msgid="3834674129575844910">"Berkongsi sambungan data mudah alih tablet anda melalui USB atau sebagai hotspot Wi-Fi mudah alih"</string>
+    <string name="tether_settings_summary_usb_wifi" product="default" msgid="3700323208282018772">"Kongsi sambungan data mudah alih telefon anda melalui USB atau titik panas Wi-Fi mudah alih"</string>
+    <string name="tether_settings_summary_usb_bluetooth" product="tablet" msgid="1245080236509560839">"Berkongsi sambungan data mudah alih tablet anda melalui USB atau Bluetooth"</string>
+    <string name="tether_settings_summary_usb_bluetooth" product="default" msgid="4008195891276675882">"Kongsi sambungan data mudah alih telefon anda melalui USB atau Bluetooth"</string>
+    <string name="tether_settings_summary_wifi_bluetooth" product="tablet" msgid="1924576461932311140">"Berkongsi sambungan data mudah alih tablet anda melalui Bluetooth atau sbg hotspot Wi-Fi mudah alih"</string>
+    <string name="tether_settings_summary_wifi_bluetooth" product="default" msgid="2753904149495692201">"Kongsi sambungan data mudah alih telefon anda melalui Bluetooth atau titik panas Wi-Fi mudah alih"</string>
+    <string name="tether_settings_summary_all" product="tablet" msgid="6612660164315153427">"Berkongsi sambungan data mudah alih tablet anda melalui USB, Wi-Fi atau Bluetooth"</string>
+    <string name="tether_settings_summary_all" product="default" msgid="1171769255924636665">"Berkongsi sambungan data mudah alih telefon anda melalui USB, Wi-Fi atau Bluetooth"</string>
+    <string name="usb_title" msgid="7483344855356312510">"USB"</string>
+    <string name="usb_tethering_button_text" msgid="585829947108007917">"Penambatan USB"</string>
+    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB disambungkan, semak untuk menambat"</string>
+    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Ditambatkan"</string>
+    <string name="usb_tethering_storage_active_subtext" msgid="6608933594288072573">"Tidak boleh menambat apabila storan USB sedang digunakan"</string>
+    <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB tidak disambungkan"</string>
+    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Ralat penambatan USB"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Penambatan Bluetooth"</string>
+    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Berkongsi sambungan Internet tablet ini"</string>
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Berkongsi sambungan Internet telefon ini"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Berkongsi sambungan Internet tablet ini ke 1 peranti"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Berkongsi sambungan Internet telefon ini ke 1 peranti"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Berkongsi sambungan Internet tablet ini ke <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> peranti"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Berkongsi sambungan Internet telefon ini ke <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> peranti"</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Tidak berkongsi sambungan Internet tablet ini"</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Tidak berkongsi sambungan Internet telefon ini"</string>
+    <string name="bluetooth_tethering_errored_subtext" msgid="1344187103463073993">"Ralat penambatan Bluetooth"</string>
+    <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"Tidak boleh menambat pada lebih dari <xliff:g id="MAXCONNECTION">%1$d</xliff:g> peranti"</string>
+    <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan dinyahtambat."</string>
+    <string name="tethering_help_button_text" msgid="656117495547173630">"Bantuan"</string>
+    <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>
+    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Lokasi ditentukan oleh Wi-Fi"</string>
+    <string name="location_gps" msgid="6296125378829097831">"Gunakan satelit GPS"</string>
+    <string name="location_street_level" msgid="7456259025474443314">"Apabila mengesan, tepat hingga ke tahap jalan"</string>
+    <string name="location_gps_disabled" msgid="6632537158777308128">"Cari sehingga tahap jalan (memerlukan lebih bateri serta pandangan langit)"</string>
+    <string name="assisted_gps" msgid="4649317129586736885">"Gunakan GPS berbantu"</string>
+    <string name="assisted_gps_enabled" msgid="8751899609589792803">"Gunakan pelayan untuk membantu GPS (nyahtanda untuk mengurangkan penggunaan rangkaian)"</string>
+    <string name="assisted_gps_disabled" msgid="6982698333968010748">"Gunakan pelayan untuk membantu GPS (nyahtanda untuk memperbaik prestasi GPS)"</string>
+    <string name="use_location_title" msgid="3659340070401464551">"Gunakan lokasi untuk Carian Google"</string>
+    <string name="use_location_summary_disabled" msgid="6518008620918354403">"Gunakan lokasi untuk Carian Google dan perkhidmatan Google lain"</string>
+    <string name="use_location_summary_enabled" msgid="8110246289085796179">"Lokasi yang digunakan untuk memperbaik hasil Carian Google dan perkhidmatan Google lain"</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"Mengenai tablet"</string>
+    <string name="about_settings" product="default" msgid="1743378368185371685">"Mengenai telefon"</string>
+    <string name="about_settings_summary" msgid="3371517697156165959">"Lihat maklumat undang-undang, status, 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>
+    <string name="system_tutorial_list_item_summary" product="tablet" msgid="3341504384445734067">"Ketahui cara menggunakan tablet 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>
+    <string name="settings_safetylegal_title" msgid="1289483965535937431">"Maklumat keselamatan"</string>
+    <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Maklumat keselamatan"</string>
+    <string name="settings_safetylegal_activity_unreachable" msgid="170670055116721810">"Anda tidak mempunyai sambungan data. Untuk melihat maklumat ini sekarang, pergi ke %s dari mana-mana komputer yang disambungkan ke Internet."</string>
+    <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Memuatkan..."</string>
+    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Pilih kata laluan anda"</string>
+    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Pilih corak anda"</string>
+    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Pilih PIN anda"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Sahkan kata laluan anda"</string>
+    <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Sahkan corak anda"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Sahkan PIN anda"</string>
+    <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"Kata laluan tidak sepadan"</string>
+    <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"PIN tidak sepadan"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Pilihan buka kunci"</string>
+    <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Kata laluan sudah ditetapkan"</string>
+    <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN belum ditetapkan"</string>
+    <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Corak sudah ditetapkan"</string>
+    <string name="lock_settings_title" msgid="8943058958424073651">"Kunci skrin"</string>
+    <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Tukar corak buka kunci"</string>
+    <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Tukar PIN buka kunci"</string>
+    <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>
+    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Melindungi tablet anda"</string>
+    <string name="lock_title" product="default" msgid="4059246467204273930">"Melindungi telefon anda"</string>
+    <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"Lindungi tablet anda daripada penggunaan tanpa kebenaran dengan membuat corak buka kunci skrin peribadi. Gunakan jari anda untuk menyambungkan titik dalam sebarang tertib pada skrin berikutnya. Anda mesti menyambungkan sekurang-kurangnya empat titik. "\n\n"Sedia untuk bermula? Sentuh “Seterusnya”."</string>
+    <string name="lock_intro_message" product="default" msgid="9100785646737118042"><font size="17">"Lindungi telefon anda daripada penggunaan tanpa kebenaran dengan membuat corak buka kunci skrin peribadi. "\n<font height="17">\n</font><b>"1"</b>"  Pada skrin berikutnya, lihat sementara corak contoh dilukiskan. "\n<font height="17">\n</font><b>"2"</b>"  Apabila sedia, lukiskan corak buka kunci peribadi anda sendiri. Cuba dengan pelbagai corak tetapi sambungkan sekurang-kurangnya empat titik. "\n<font height="17">\n</font><b>"3"</b>"  Lukiskan semula corak anda untuk mengesahkan. "\n<font height="17">\n</font><b>"Sedia untuk bermula? Sentuh “Seterusnya”"</b>". "\n<font height="3">\n</font>"Untuk meninggalkan telefon anda tanpa dilindungi, sentuh “Batal”."</font></string>
+    <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>
+    <string name="install_unknown_applications" msgid="6612824788917283662">"Benarkan pemasangan aplikasi bukan Market"</string>
+    <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"Tablet dan data peribadi anda lebih mudah diserang oleh aplikasi dari sumber yang tidak diketahui. Anda bersetuju bahawa anda bertanggungjawab sepenuhnya ke atas sebarang kerosakan pada tablet anda atau kehilangan data yang disebabkan oleh 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>
+    <string name="advanced_settings" msgid="1777249286757067969">"Tetapan terperinci"</string>
+    <string name="advanced_settings_summary" msgid="145134386044169043">"Dayakan lebih pilihan tetapan."</string>
+    <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>
+    <string name="external_size_label" product="nosdcard" msgid="4465530017830945766">"Storan USB"</string>
+    <string name="external_size_label" product="default" msgid="2107155737635944440">"Kad SD"</string>
+    <string name="uninstall_text" msgid="3644892466144802466">"Nyahpasang"</string>
+    <string name="disable_text" msgid="6544054052049395202">"Lumpuhkan"</string>
+    <string name="enable_text" msgid="9217362512327828987">"Dayakan"</string>
+    <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>
+    <string name="sort_order_alpha" msgid="1410278099123670628">"Isih mengikut nama"</string>
+    <string name="sort_order_size" msgid="7024513286636502362">"Isih mengikut saiz"</string>
+    <string name="show_running_services" msgid="5736278767975544570">"Tnjk prkhdmtn sdg dijlnkn"</string>
+    <string name="show_background_processes" msgid="2009840211972293429">"Tunjuk proses yg dicache"</string>
+    <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>
+    <string name="filter_apps_third_party" msgid="7786348047690140979">"Sudah dimuat turun"</string>
+    <string name="filter_apps_running" msgid="7767071454371350486">"Dijalankan"</string>
+    <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Storan USB"</string>
+    <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Pada kad SD"</string>
+    <string name="disabled" msgid="9206776641295849915">"Dilumpuhkan"</string>
+    <string name="no_applications" msgid="5190227407135243904">"Tiada aplikasi."</string>
+    <string name="internal_storage" msgid="1584700623164275282">"Storan dalaman"</string>
+    <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Storan USB"</string>
+    <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Storan kad SD"</string>
+    <string name="recompute_size" msgid="7722567982831691718">"Mengira semula saiz..."</string>
+    <string name="clear_data_dlg_title" msgid="4470209520936375508">"Padam"</string>
+    <string name="clear_data_dlg_text" msgid="8368035073300828451">"Semua data aplikasi ini akan dipadamkan secara kekal. Ini termasuk semua fail, tetapan, akaun, pangkalan data dan sebagainya."</string>
+    <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>
+    <string name="security_settings_desc" product="tablet" msgid="6158636779728455276">"Aplikasi ini boleh mengakses yang berikut pada tablet 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>
+    <string name="empty_list_msg" msgid="2901049162265094971">"Anda tiada sebarang aplikasi pihak ketiga dipasangkan."</string>
+    <string name="version_text" msgid="9189073826278676425">"versi <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
+    <string name="move_app" msgid="5042838441401731346">"Alih"</string>
+    <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Alih ke tablet"</string>
+    <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Alihkan ke telefon"</string>
+    <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Alih ke storan USB"</string>
+    <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Alihkan ke kad SD"</string>
+    <string name="moving" msgid="6431016143218876491">"Mengalihkan"</string>
+    <string name="insufficient_storage" msgid="8566913062094452962">"Baki storan tidak mencukupi."</string>
+    <string name="does_not_exist" msgid="837163572898468245">"Aplikasi tidak wujud."</string>
+    <string name="app_forward_locked" msgid="5747805144210389585">"Aplikasi dilindung salin."</string>
+    <string name="invalid_location" msgid="4934491353200240499">"Lokasi pemasangan yang ditentukan tidak sah."</string>
+    <string name="system_package" msgid="1030561474413022831">"Kemaskinian sistem tidak boleh dipasangkan pada media luaran."</string>
+    <string name="force_stop_dlg_title" msgid="4289453224368188476">"Henti paksa"</string>
+    <string name="force_stop_dlg_text" msgid="5157374701213502922">"Menghenti paksa aplikasi boleh menyebabkannya berkelakuan secara salah. Adakah anda pasti?"</string>
+    <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Alihkan aplikasi"</string>
+    <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Gagal mengalihkan aplikasi. <xliff:g id="REASON">%1$s</xliff:g>"</string>
+    <string name="app_install_location_title" msgid="2068975150026852168">"Lokasi pemasangan pilihan"</string>
+    <string name="app_install_location_summary" msgid="879753854530300436">"Tukar lokasi pemasangan pilihan untuk aplikasi baru."</string>
+    <string name="storageuse_settings_title" msgid="5657014373502630403">"Penggunaan storan"</string>
+    <string name="storageuse_settings_summary" msgid="2556057379120846792">"Lihat storan yang digunakan oleh aplikasi"</string>
+    <string name="runningservices_settings_title" msgid="8097287939865165213">"Perkhidmatan dijalankan"</string>
+    <string name="runningservices_settings_summary" msgid="854608995821032748">"Lihat dan kawal perkhidmatan yang dijalankan pada masa ini"</string>
+    <string name="service_restarting" msgid="2242747937372354306">"Memulakan semula"</string>
+    <string name="cached" msgid="1059590879740175019">"Proses latar belakang dicache"</string>
+    <string name="no_running_services" msgid="2059536495597645347">"Tiada apa-apa yang dijalankan."</string>
+    <string name="service_started_by_app" msgid="6575184738671598131">"Dimulakan oleh aplikasi."</string>
+    <!-- no translation found for service_client_name (4037193625611815517) -->
+    <skip />
+    <string name="service_background_processes" msgid="6844156253576174488">"<xliff:g id="MEMORY">%1$s</xliff:g> bebas"</string>
+    <string name="service_foreground_processes" msgid="7583975676795574276">"<xliff:g id="MEMORY">%1$s</xliff:g> diguna"</string>
+    <string name="memory" msgid="6609961111091483458">"RAM"</string>
+    <!-- no translation found for service_process_name (4098932168654826656) -->
+    <skip />
+    <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proses dan <xliff:g id="NUMSERVICES">%2$d</xliff:g> perkhidmatan"</string>
+    <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proses dan <xliff:g id="NUMSERVICES">%2$d</xliff:g> perkhidmatan"</string>
+    <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proses dan <xliff:g id="NUMSERVICES">%2$d</xliff:g> perkhidmatan"</string>
+    <string name="running_processes_item_description_p_p" msgid="1607384595790852782">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proses dan <xliff:g id="NUMSERVICES">%2$d</xliff:g> perkhidmatan"</string>
+    <string name="runningservicedetails_settings_title" msgid="6188692418986988288">"Aplikasi yang dijalankan"</string>
+    <string name="no_services" msgid="7133900764462288263">"Tidak aktif"</string>
+    <string name="runningservicedetails_services_title" msgid="391168243725357375">"Perkhidmatan"</string>
+    <string name="runningservicedetails_processes_title" msgid="928115582044655268">"Proses"</string>
+    <string name="service_stop" msgid="6369807553277527248">"Henti"</string>
+    <string name="service_manage" msgid="1876642087421959194">"Tetapan"</string>
+    <string name="service_stop_description" msgid="3261798282116866961">"Perkhidmatan ini dimulakan oleh aplikasinya. Menghentikannya boleh mengakibatkan aplikasi gagal."</string>
+    <string name="heavy_weight_stop_description" msgid="6855241582643136019">"Aplikasi ini tidak boleh dihentikan dengan selamat. Sesetengah kerja yang anda sedang lakukan akan hilang jika aplikasi ini dihentikan."</string>
+    <string name="background_process_stop_description" msgid="1728354083304746737">"Ini adalah proses aplikasi lama yang disimpan kelajuan yang lebih baik seandainya ia diperlukan lagi. Biasanya tiada sebab untuk menghentikannya."</string>
+    <string name="service_manage_description" msgid="7050092269951613102">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: sedang digunakan. Sentuh Tetapan untuk mengawalnya."</string>
+    <string name="main_running_process_description" msgid="929204645380391397">"Proses utama yang sedang digunakan."</string>
+    <string name="process_service_in_use_description" msgid="8993335064403217080">"Perkhidmatan <xliff:g id="COMP_NAME">%1$s</xliff:g> sedang digunakan."</string>
+    <string name="process_provider_in_use_description" msgid="5586603325677678940">"Pembekal <xliff:g id="COMP_NAME">%1$s</xliff:g> sedang dalam penggunaan."</string>
+    <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Hentikan perkhidmatan sistem?"</string>
+    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="5420033091144016389">"Adakah anda pasti mahu menghentikan perkhidmatan sistem ini? Jika ya, beberapa ciri tablet anda mungkin berhenti berfungsi dengan betul sehingga anda mematikan dan menghidupkan semula kuasanya."</string>
+    <string name="runningservicedetails_stop_dlg_text" product="default" msgid="6929716497425738387">"Adakah anda pasti mahu menghentikan perkhidmatan sistem ini? Jika ya, beberapa ciri telefon anda mungkin berhenti berfungsi dengan betul sehingga anda mematikan dan menghidupkan semula kuasanya."</string>
+    <string name="language_settings" msgid="5292716747264442359">"Bahasa &amp; input"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Bahasa &amp; input"</string>
+    <string name="language_settings_category" msgid="2288258489940617043">"Tetapan bahasa"</string>
+    <string name="keyboard_settings_category" msgid="7060453865544070642">"Tetapan papan kekunci"</string>
+    <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>
+    <string name="auto_caps" msgid="6379232078052591265">"Auto huruf besar"</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>
+    <string name="ime_security_warning" msgid="812267421486877917">"Kaedah input ini mungkin boleh mengumpulkan semua teks yang anda taipkan, termasuk data peribadi seperti kata laluan dan nombor kad kredit. Ia datang daripada aplikasi <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Gunakan kaedah input 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>
+    <!-- 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>
+    <string name="user_dict_settings_empty_text" product="tablet" msgid="1766522102636921529">"Anda tidak mempunyai sebarang perkataan dalam kamus pengguna. Anda boleh menambah perkataan dengan menyentuh butang Tambah ( + )."</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>
+    <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Maklumat tablet"</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>
+    <string name="input_method" msgid="5434026103176856164">"Kaedah input"</string>
+    <string name="current_input_method" msgid="2146807723398303917">"Kaedah input semasa"</string>
+    <string name="input_method_selector" msgid="4311213129681430709">"Pemilih kaedah input"</string>
+    <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"Automatik"</string>
+    <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"Sentiasa tunjukkan"</string>
+    <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"Sentiasa sembunyikan"</string>
+    <string name="configure_input_method" msgid="7773992829158322455">"Konfigurasi kaedah input"</string>
+    <string name="input_method_settings" msgid="5801295625486269553">"Tetapan"</string>
+    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Kaedah input aktif"</string>
+    <string name="use_system_language_to_select_input_method_subtypes" msgid="3346751753141428573">"Gunakan bahasa sistem"</string>
+    <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Tetapan <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
+    <string name="input_methods_and_subtype_enabler_title" msgid="4018402267502337338">"Pilih kaedah input aktif"</string>
+    <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Tetapan papan kekunci pada skrin"</string>
+    <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Papan kekunci fizikal"</string>
+    <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Tetapan papan kekunci fizikal"</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>
+    <string name="adb_warning_title" msgid="6234463310896563253">"Benarkan penyahpepijatan USB?"</string>
+    <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>
+    <string name="accessibility_settings" msgid="3975902491934816215">"Kebolehaksesan"</string>
+    <string name="accessibility_settings_title" msgid="2130492524656204459">"Tetapan kebolehaksesan"</string>
+    <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>
+    <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Perkhidmatan kebolehaksesan ini mungkin boleh mengumpulkan semua teks yang anda taipkan, termasuk data peribadi nombor kad kredit kecuali kata laluan. Ia juga boleh melog interaksi antara muka pengguna anda. Ia datang daripada aplikasi <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Gunakan perkhidmatan kebolehaksesan ini?"</string>
+    <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Lumpuhkan kebolehaksesan?"</string>
+    <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"Tiada aplikasi berkaitan kebolehaksesan ditemui"</string>
+    <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"Anda tiada aplikasi berkaitan kebolehaksesan dipasangkan."\n\n"Anda boleh memuat turun pembaca skrin untuk peranti anda dari Android Market."\n\n"Klik OK untuk memasang pembaca skrin."</string>
+    <string name="accessibility_script_injection_category" msgid="8649951751131431904">"Skrip kebolehcapaian"</string>
+    <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"Muat turun skrip kebolehcapaian"</string>
+    <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"Membenarkan aplikasi memuat turun skrip kebolehcapaian dr Google"</string>
+    <string name="accessibility_script_injection_security_warning" product="tablet" msgid="1113600871264359828">"Sesetengah aplikasi boleh meminta Google untuk memuat turun skrip ke tablet anda yang membuat kandungannya lebih mudah diakses. Adakah anda pasti mahu membenarkan Google memasang skrip kebolehcapaian pada tablet anda?"</string>
+    <string name="accessibility_script_injection_security_warning" product="default" msgid="9078893361741942109">"Sesetengah aplikasi boleh meminta Google untuk memuat turun skrip ke telefon anda supaya menjadikan kandungannya lebih mudah diakses. Adakah anda pasti mahu membenarkan Google memasang skrip kebolehcapaian pada telefon anda?"</string>
+    <string name="accessibility_power_button_category" msgid="8545885236482339928">"Butang kuasa"</string>
+    <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"Butang kuasa menamatkan panggilan"</string>
+    <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"Semasa panggilan, menekan Kuasa akan menamatkan panggilan dan bukan memadamkan skrin"</string>
+    <!-- no translation found for settings_button (3006713718908152930) -->
+    <skip />
+    <string name="touchscreen_gestures_category" msgid="3109869155350859625">"Gerak isyarat skrin sentuh"</string>
+    <string name="long_press_timeout_selector_title" msgid="1396876537252863044">"Kelewatan sentuh &amp; tahan"</string>
+    <string name="long_press_timeout_selector_summary" msgid="2261114502740278996">"Tunda sehingga sentuhan ditafsirkan sebagai sentuh &amp; tahan"</string>
+    <string name="power_usage_summary_title" msgid="5180282911164282324">"Penggunaan bateri"</string>
+    <string name="power_usage_summary" msgid="7237084831082848168">"Apa yang telah menggunakan bateri"</string>
+    <string name="power_usage_not_available" msgid="3583407442633768046">"Dta penggunaan btri tdk tsedia"</string>
+    <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>
+    <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> semasa menggunakan bateri"</string>
+    <string name="battery_stats_duration" msgid="7464501326709469282">"<xliff:g id="TIME">%1$s</xliff:g> sejak palam dicabut"</string>
+    <string name="battery_stats_charging_label" msgid="4223311142875178785">"Mengecas"</string>
+    <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Skrin dihidupkan"</string>
+    <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS hidup"</string>
+    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
+    <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Berjaga"</string>
+    <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Isyarat rgkaian mdah alih"</string>
+    <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
+    <skip />
+    <string name="awake" msgid="387122265874485088">"Waktu jaga peranti"</string>
+    <string name="wifi_on_time" msgid="6310209835617490616">"Masa hidup Wi-Fi"</string>
+    <string name="bluetooth_on_time" msgid="6157799524996162271">"Masa hidup Wi-Fi"</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>
+    <string name="history_details_title" msgid="3608240585315506067">"Butiran sejarah"</string>
+    <string name="details_title" msgid="3792801565213935385">"Gunakan butiran"</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>
+    <string name="power_screen" msgid="3023346080675904613">"Skrin"</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>
+    <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet 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>
+    <string name="usage_type_wake_lock" msgid="5125438890233677880">"Kekal berjaga"</string>
+    <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
+    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi berjalan"</string>
+    <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</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>
+    <string name="usage_type_on_time" msgid="3351200096173733159">"Masa hidup"</string>
+    <string name="usage_type_no_coverage" msgid="3797004252954385053">"Masa tanpa isyarat"</string>
+    <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>
+    <string name="battery_action_display" msgid="7338551244519110831">"Tetapan skrin"</string>
+    <string name="battery_action_wifi" msgid="2272741639606146903">"Tetapan Wi-Fi"</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>
+    <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Bateri yang digunakan apabila tablet 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>
+    <string name="battery_sugg_wifi" msgid="7542345142282261691">"Padamkan Wi-Fi apabila tidak menggunakannya atau apabila ia tidak tersedia"</string>
+    <string name="battery_desc_bluetooth" msgid="7535520658674621902">"Bateri yang digunakan oleh bluetooth"</string>
+    <string name="battery_sugg_bluetooth_basic" msgid="817276933922157788">"Matikan bluetooth apabila anda tidak menggunakannya"</string>
+    <string name="battery_sugg_bluetooth_headset" msgid="8214816222115517479">"Cuba menyambung ke peranti bluetooth yang lain"</string>
+    <string name="battery_desc_apps" msgid="6665712811746233450">"Bateri yang digunakan oleh aplikasi"</string>
+    <string name="battery_sugg_apps_info" msgid="6065882899391322442">"Berhenti atau nyahpasang aplikasi"</string>
+    <string name="battery_sugg_apps_gps" msgid="4545056413090932541">"Kawal GPS secara manual untuk mengelakkan aplikasi daripada menggunakannya"</string>
+    <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>
+    <string name="voice_input_output_settings" msgid="1336135218350444783">"Input &amp; output suara"</string>
+    <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Tetapan input &amp; output suara"</string>
+    <string name="voice_search_settings_title" msgid="2775469246913196536">"Carian suara"</string>
+    <string name="keyboard_settings_title" msgid="5080115226780201234">"Papan kekunci Android"</string>
+    <string name="voice_input_category" msgid="1589318440824204736">"Input suara"</string>
+    <string name="voice_output_category" msgid="2624538587784986229">"Output suara"</string>
+    <string name="recognizer_title" msgid="3231385184559054457">"Pengecam suara"</string>
+    <string name="recognizer_settings_title" msgid="6038598099039717232">"Tetapan pengecam suara"</string>
+    <string name="recognizer_settings_summary" msgid="4472287934134546902">"Tetapan untuk \'<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\'"</string>
+    <string name="tts_settings" msgid="8186971894801348327">"Tetapan teks kepada pertuturan"</string>
+    <string name="tts_settings_title" msgid="4182348653053000933">"Tetapan teks kepada pertuturan"</string>
+    <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>
+    <string name="tts_default_synth_title" msgid="29467896463371992">"Enjin Lalai"</string>
+    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Menetapkan enjin sintesis pertuturan untuk digunakan bagi teks pertuturan"</string>
+    <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>
+    <string name="tts_engine_error" msgid="5513288178403066867">"Enjin yang anda pilih tidak boleh dijalankan"</string>
+    <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfigurasi"</string>
+    <string name="tts_engine_error_reselect" msgid="3071453963296013376">"Pilih enjin lain"</string>
+    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Enjin sintesis pertuturan ini mungkin boleh mengumpul semua teks yang akan dituturkan, termasuk data peribadi seperti kata laluan dan nombor kad kredit. Ia datang daripada enjin <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Dayakan penggunaan enjin sintesis pertuturan ini?"</string>
+    <string name="tts_engines_section" msgid="7515470972378742429">"Enjin"</string>
+    <string name="tts_engine_name_settings" msgid="4974538563074395920">"Tetapan <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> didayakan"</string>
+    <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> dilumpuhkan"</string>
+    <!-- no translation found for tts_engine_settings_section (2346105138448751893) -->
+    <skip />
+    <!-- no translation found for tts_engine_settings_title (3499112142425680334) -->
+    <skip />
+    <string name="pico_languages_and_voices" msgid="4611320375917773238">"Bahasa dan suara"</string>
+    <string name="pico_installed" msgid="2452546687858267414">"Dipasang"</string>
+    <string name="pico_not_installed" msgid="6266845418419994311">"Tidak dipasangkan"</string>
+    <string name="pico_voice_summary_female" msgid="8047327176247727492">"Perempuan"</string>
+    <string name="pico_voice_summary_male" msgid="8331266854058577610">"Lelaki"</string>
+    <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"Enjin sintesis pertuturan dipasng"</string>
+    <string name="tts_notif_engine_install_message" msgid="5304661142202662693">"Dayakn enjin br sebelum diguna"</string>
+    <string name="gadget_title" msgid="7455548605888590466">"Kawalan Kuasa"</string>
+    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Mengemas kini tetapan Wi-Fi"</string>
+    <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Mengemas kini tetapan Bluetooth"</string>
+    <string name="vpn_settings_activity_title" msgid="7276864950701612579">"Tetapan VPN"</string>
+    <string name="vpn_connect_to" msgid="2541409082892684362">"Sambungkan ke <xliff:g id="NAME">%s</xliff:g>"</string>
+    <string name="vpn_username_colon" msgid="7854930370861306247">"Nama pengguna:"</string>
+    <string name="vpn_password_colon" msgid="5716278710848606626">"Kata laluan:"</string>
+    <string name="vpn_a_username" msgid="6664733641993968692">"nama pengguna"</string>
+    <string name="vpn_a_password" msgid="1537213632501483753">"kata laluan"</string>
+    <string name="vpn_save_username" msgid="1408415289165970790">"Ingat nama pengguna"</string>
+    <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>
+    <string name="vpn_mistake_button" msgid="1683383660912491270">"Tidak"</string>
+    <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>
+    <string name="vpn_menu_disconnect" msgid="8254492450022562235">"Putuskan sambungan daripada rangkaian"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"Edit rangkaian"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"Padamkan rangkaian"</string>
+    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"Anda mesti memasukkan <xliff:g id="CODE">%s</xliff:g>."</string>
+    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"Anda mesti memilih <xliff:g id="OPTION">%s</xliff:g>."</string>
+    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"Nama VPN \'<xliff:g id="NAME">%s</xliff:g>\' sudah pun wujud. Cari nama lain."</string>
+    <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>
+    <string name="vpn_confirm_reconnect" msgid="5748535476278674296">"Tidak boleh bersambung ke rangkaian. Adakah anda mahu mencuba lagi?"</string>
+    <string name="vpn_reconnect_from_lost" msgid="2442844155623372118">"Sambungan terputus. Adakah anda mahu menyambung lagi?"</string>
+    <string name="vpn_unknown_server_dialog_msg" msgid="3080742299823671319">"Nama pelayan tidak boleh diselesaikan. Adakah anda mahu menyemak tetapan nama pelayan anda?"</string>
+    <string name="vpn_challenge_error_dialog_msg" msgid="6174901754230038601">"Ralat cabaran. Adakah anda mahu menyemak tetapan rahsia anda?"</string>
+    <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"Satu atau lebih rahsia tiada dalam konfigurasi VPN. Adakah anda mahu menyemak tetapan rahsia anda?"</string>
+    <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"Nama pengguna dan kata laluan yang anda masukkan tidak betul. Adakah anda mahu mencuba lagi?"</string>
+    <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"Pelayan menamatkan sambungan. Nama pengguna atau kata laluan yang anda masukkan mungkin tidak betul. Adakah anda mahu mencuba lagi?"</string>
+    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"Pelayan menamatkan sambungan. Anda mungkin berada di belakang firewall yang menghalang anda bersambung ke pelayan. Adakah anda mahu mencuba lagi?"</string>
+    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"Rundingan pelayan gagal. Pelayan mungkin tidak bersetuju dengan pilihan penyulitan anda. Adakah anda mahu menyemak tetapan penyulitan anda?"</string>
+    <string name="vpn_type_title" msgid="6392933604218676224">"Tambah VPN"</string>
+    <string name="vpn_add_new_vpn" msgid="5438260689052714550">"Tambah VPN"</string>
+    <string name="vpn_details_title" msgid="418806440938510331">"Butiran VPN"</string>
+    <string name="vpn_edit_title_add" msgid="2121313217989682890">"Tambah VPN <xliff:g id="NAME">%s</xliff:g>"</string>
+    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"Butiran <xliff:g id="NAME">%s</xliff:g>"</string>
+    <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>
+    <string name="vpn_a_name" msgid="8445736942405283509">"nama VPN"</string>
+    <string name="vpn_profile_added" msgid="9061017910337129840">"\'<xliff:g id="NAME">%s</xliff:g>\' ditambahkan"</string>
+    <string name="vpn_profile_replaced" msgid="587435576816273815">"Perubahan dibuat kepada \'<xliff:g id="NAME">%s</xliff:g>\'"</string>
+    <string name="vpn_user_certificate_title" msgid="6812545893924071742">"Tetapkan sijil pengguna"</string>
+    <string name="vpn_user_certificate" msgid="949322691686938888">"Sijil pengguna"</string>
+    <string name="vpn_a_user_certificate" msgid="8943983437956898649">"sijil pengguna"</string>
+    <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>
+    <string name="vpn_a_ca_certificate" msgid="3374242520974884295">"sijil CA"</string>
+    <string name="vpn_l2tp_secret_string_title" msgid="5039677186748940987">"Tetapkan rahsia L2TP"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"Rahsia L2TP"</string>
+    <string name="vpn_a_l2tp_secret" msgid="6612042930810981845">"rahsia L2TP"</string>
+    <string name="vpn_pptp_encryption_title" msgid="2236795167467896499">"penyulitan"</string>
+    <string name="vpn_pptp_encryption" msgid="2602329949737259686">"Penyulitan PPTP"</string>
+    <string name="vpn_ipsec_presharedkey_title" msgid="2184060087690539175">"Tetapkan kunci prakongsi IPSec"</string>
+    <string name="vpn_ipsec_presharedkey" msgid="5434316521616673741">"Kunci prakongsi IPSec"</string>
+    <string name="vpn_a_ipsec_presharedkey" msgid="1255301923217898418">"kunci prakongsi IPSec"</string>
+    <string name="vpn_vpn_server_title" msgid="8897005887420358913">"Tetapkan pelayan VPN"</string>
+    <string name="vpn_vpn_server" msgid="1141754908824209260">"Pelayan VPN"</string>
+    <string name="vpn_a_vpn_server" msgid="5960906152125045853">"pelayan VPN"</string>
+    <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>
+    <string name="vpn_field_is_set" msgid="7137320847812992243">"<xliff:g id="VALUE">%s</xliff:g> sudah ditetapkan"</string>
+    <string name="vpn_field_not_set" msgid="2972519243515893804">"<xliff:g id="VALUE">%s</xliff:g> tidak ditetapkan"</string>
+    <string name="vpn_field_not_set_optional" msgid="8840557698252556791">"<xliff:g id="VALUE">%s</xliff:g> tidak ditetapkan (pilihan)"</string>
+    <string name="vpn_enable_field" msgid="3700967675854517191">"Dayakan <xliff:g id="OPTION">%s</xliff:g>"</string>
+    <string name="vpn_disable_field" msgid="6905658811179634005">"Lumpuhkan <xliff:g id="OPTION">%s</xliff:g>"</string>
+    <string name="vpn_is_enabled" msgid="1266304230417098877">"<xliff:g id="OPTION">%s</xliff:g> didayakan"</string>
+    <string name="vpn_is_disabled" msgid="2013622485867806167">"<xliff:g id="OPTION">%s</xliff:g> dilumpuhkan"</string>
+    <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>
+    <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(tidak berubah)"</string>
+    <string name="vpn_secret_not_set" msgid="1037792636371641845">"(tidak ditetapkan)"</string>
+    <string name="credentials_title" msgid="4446234003860769883">"Storan bukti kelayakan"</string>
+    <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Pasang daripada storan"</string>
+    <string name="credentials_install" product="default" msgid="953914549998062317">"Pasang dari kad SD"</string>
+    <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Pasang sijil daripada storan"</string>
+    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Pasang sijil dari kad SD"</string>
+    <string name="credentials_reset" msgid="3239382277144980418">"Padam bersih bukti kelayakan"</string>
+    <!-- outdated translation 3810369467217453606 -->     <string name="credentials_reset_summary" msgid="3369361230171260282">"Alih keluar semua kandungan dan tetapkan semula kata laluan"</string>
+    <string name="credentials_unlock" msgid="1463040326264133844">"Masukkan kata laluan"</string>
+    <string name="credentials_unlock_hint" msgid="5889551635843338639">"Masukkan kata laluan untuk storan bukti kelayakan."</string>
+    <string name="credentials_old_password" msgid="7553393815538684028">"Kata laluan semasa:"</string>
+    <!-- outdated translation 2336340927894094814 -->     <string name="credentials_reset_hint" msgid="1566409057833618877">"Semua kandungan akan dialihkan keluar dan kata laluan akan ditetapkan semula. Adakah anda pasti mengenainya?"</string>
+    <string name="credentials_password_too_short" msgid="7502749986405522663">"Kata laluan mesti mempunyai sekurang-kurangnya 8 aksara."</string>
+    <string name="credentials_wrong_password" msgid="2541932597104054807">"Kata laluan salah."</string>
+    <string name="credentials_reset_warning" msgid="5320653011511797600">"Kata laluan salah. Anda ada satu lagi peluang sebelum storan kelayakan dipadamkan."</string>
+    <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Kata laluan salah. Anda ada <xliff:g id="NUMBER">%1$d</xliff:g> lagi peluang sebelum storan bukti kelayakan dipadamkan."</string>
+    <string name="credentials_erased" msgid="2907836028586342969">"Storan bukti kelayakan dipadamkan."</string>
+    <!-- no translation found for credentials_not_erased (397954733557821269) -->
+    <skip />
+    <string name="credentials_enabled" msgid="7588607413349978930">"Storan bukti klykn didayakan."</string>
+    <!-- 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>
+    <string name="privacy_settings" msgid="9206631214140954954">"Privasi"</string>
+    <string name="privacy_settings_title" msgid="1987089301293213705">"Tetapan privasi"</string>
+    <string name="backup_section_title" msgid="8856083167469467588">"Sandaran dan pemulihan"</string>
+    <string name="personal_data_section_title" msgid="7815209034443782061">"Data peribadi"</string>
+    <string name="backup_data_title" msgid="1239105919852668016">"Sandarkan data saya"</string>
+    <string name="backup_data_summary" msgid="6515285107793232815">"Sandarkan data aplikasi, kata laluan Wi-Fi dan tetapan lain ke pelayan Google"</string>
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"Sandarkan akaun"</string>
+    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Tiada akaun yang sedang menyimpan data sandaran buat masa ini"</string>
+    <string name="auto_restore_title" msgid="5397528966329126506">"Pemulihan automatik"</string>
+    <string name="auto_restore_summary" msgid="83177150536734378">"Jika saya memasang semula aplikasi, pulihkan tetapan yang disandarkan atau data lain."</string>
+    <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Sandaran"</string>
+    <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Adakah anda pasti mahu menghentikan sandaran kata laluan Wi-Fi, penanda halaman dan tetapan lain dan data aplikasi serta memadam semua salinan pada pelayan Google?"</string>
+    <string name="device_admin_settings_title" msgid="1335557832906433309">"Tetapan pentadbir peranti"</string>
+    <string name="active_device_admin_msg" msgid="6930903262612422111">"Pentadbir peranti"</string>
+    <string name="remove_device_admin" msgid="3596845261596451437">"Nyahaktifkan"</string>
+    <string name="select_device_admin_msg" msgid="2645509057946368094">"Pentadbir peranti"</string>
+    <string name="no_device_admins" msgid="702695100241728775">"Tiada pentadbir peranti tersedia"</string>
+    <string name="add_device_admin_msg" msgid="6246742476064507965">"Aktifkan pentadbir peranti?"</string>
+    <string name="add_device_admin" msgid="7133327675884827091">"Aktifkan"</string>
+    <string name="device_admin_add_title" msgid="7705551449705676363">"Pentadbir peranti"</string>
+    <string name="device_admin_warning" msgid="1149471041373876923">"Mengaktifkan pentadbir ini akan membenarkan aplikasi <xliff:g id="APP_NAME">%1$s</xliff:g> melaksanakan pengendalian berikut:"</string>
+    <string name="device_admin_status" msgid="7169948053970923035">"Pentadbir ini aktif dan membenarkan aplikasi <xliff:g id="APP_NAME">%1$s</xliff:g> melaksanakan pengendalian berikut:"</string>
+    <string name="untitled_apn" msgid="1230060359198685513">"Tidak bertajuk"</string>
+    <string name="sound_category_sound_title" msgid="1488759370067953996">"Umum"</string>
+    <string name="sound_category_calls_title" msgid="3688531959256239012">"Panggilan masuk"</string>
+    <string name="sound_category_notification_title" msgid="3502115998790286943">"Pemberitahuan"</string>
+    <string name="sound_category_feedback_title" msgid="4399742321363475393">"Maklum balas"</string>
+    <string name="wifi_setup_title" msgid="661074868726906436">"Persediaan Wi-Fi"</string>
+    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Sambung kepada rangkaian Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="2408378435027118687">"Menyambung kepada rangkaian Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
+    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Disambungkan kepada rangkaian Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Tambah rangkaian"</string>
+    <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Tidak bersambung"</string>
+    <string name="wifi_setup_add_network" msgid="5939624680150051807">"Tambah rangkaian"</string>
+    <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Muat semula senarai"</string>
+    <string name="wifi_setup_skip" msgid="6661541841684895522">"Langkau"</string>
+    <string name="wifi_setup_next" msgid="3388694784447820477">"Seterusnya"</string>
+    <string name="wifi_setup_back" msgid="144777383739164044">"Kembali"</string>
+    <string name="wifi_setup_detail" msgid="2336990478140503605">"Butiran rangkaian"</string>
+    <string name="wifi_setup_connect" msgid="7954456989590237049">"Sambung"</string>
+    <string name="wifi_setup_forget" msgid="2562847595567347526">"Lupakan"</string>
+    <string name="wifi_setup_save" msgid="3659235094218508211">"Simpan"</string>
+    <string name="wifi_setup_cancel" msgid="3185216020264410239">"Batal"</string>
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"Mengimbas rangkaian..."</string>
+    <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"Sentuhan rangkaian untuk menyambung kepadanya"</string>
+    <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Sambung kepada rangkaian sedia ada"</string>
+    <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"Sambung kpd rangkaian tidak selamat"</string>
+    <string name="wifi_setup_status_edit_network" msgid="6582036394332822032">"Masukkan konfigurasi rangkaian"</string>
+    <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Sambung kepada rangkaian baru"</string>
+    <string name="wifi_setup_status_connecting" msgid="2594117697215042584">"Menyambung..."</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="9071951312604559022">"Teruskan ke langkah seterusnya"</string>
+    <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"EAP tidak disokong"</string>
+    <string name="wifi_setup_eap_not_supported" msgid="683540356393542939">"Anda tidak boleh mengkonfigurasikan sambungan Wi-Fi EAP semasa persediaan. Selepas persediaan, anda boleh melakukannya dalam Tetapan, di bawah "<b>"Wayarles &amp; rangkaian"</b>"."</string>
+    <string name="wifi_setup_description_connecting" msgid="1884664966455980182">"Penyambungan boleh mengambil masa beberapa minit..."</string>
+    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Sentuh "<b>"Seterusnya"</b>" untuk meneruskan dengan persediaan."\n\n"Sentuh "<b>"Kembali"</b>" untuk menyambung kepada rangkaian Wi-Fi lain."</string>
+    <string name="account_sync_settings_title" msgid="4578227872921044660">"Tetapan penyegerakan"</string>
+    <string name="sync_is_failing" msgid="1591561768344128377">"Penyegerakan sedang mengalami masalah. Ia akan kembali sebentar lagi."</string>
+    <string name="add_account_label" msgid="7811707265834013767">"Tambah akaun"</string>
+    <string name="header_general_sync_settings" msgid="3487451896424238469">"Tetapan penyegerakan umum"</string>
+    <string name="background_data" msgid="5779592891375473817">"Data latar belakang"</string>
+    <string name="background_data_summary" msgid="3630389249212620467">"Aplikasi blh segerak, hntar dn terima data pd bila-bila masa"</string>
+    <string name="background_data_dialog_title" msgid="745974259246047425">"Perhatian"</string>
+    <string name="background_data_dialog_message" msgid="9155730118215371308">"Melumpuhkan data latar belakang boleh memanjangkan hayat bateri dan mengurangkan penggunaan data. Sesetengah aplikasi mungkin masih menggunakan sambungan data latar belakang."</string>
+    <string name="sync_automatically" msgid="7558810110682562376">"Auto segerak"</string>
+    <string name="sync_automatically_summary" msgid="6662623174608419931">"Aplikasi menyegerak data secara automatik"</string>
+    <string name="header_manage_accounts" msgid="6869002423884539607">"Urus akaun"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"Segerak DIHIDUPKAN"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"Segerak DIMATIKAN"</string>
+    <string name="sync_error" msgid="5060969083117872149">"Ralat penyegerakan"</string>
+    <string name="settings_backup" msgid="2274732978260797031">"Sandarkan tetapan"</string>
+    <string name="settings_backup_summary" msgid="7916877705938054035">"Sandarkan tetapan saya"</string>
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"Segerakkan sekarang"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Batalkan penyegerakan"</string>
+    <string name="sync_one_time_sync" msgid="6766593624598183090">"Sentuh untuk menyegerak sekarang<xliff:g id="LAST_SYNC_TIME">
+%1$s</xliff:g>"</string>
+    <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
+    <string name="sync_calendar" msgid="9056527206714733735">"Kalendar"</string>
+    <string name="sync_contacts" msgid="9174914394377828043">"Kenalan"</string>
+    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Selamat datang ke Google segerak!"</font>\n"Pendekatan Google kepada penyegerakan data untuk membenarkan akses kepada kenalan anda, janji temu dan banyak lagi dari mana sahaja anda berada."</string>
+    <string name="header_application_sync_settings" msgid="5514539555293976035">"Tetapan penyegerakan aplikasi"</string>
+    <string name="header_data_and_synchronization" msgid="5165024023936509896">"Data &amp; penyegerakan"</string>
+    <string name="preference_change_password_title" msgid="8955581790270130056">"Tukar kata laluan"</string>
+    <string name="header_account_settings" msgid="5382475087121880626">"Tetapan akaun"</string>
+    <string name="remove_account_label" msgid="5921986026504804119">"Alih keluar akaun"</string>
+    <string name="header_add_an_account" msgid="756108499532023798">"Tambah akaun"</string>
+    <string name="finish_button_label" msgid="481587707657751116">"Selesai"</string>
+    <string name="really_remove_account_title" msgid="6574643117748564960">"Alih keluar akaun"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="4448645571715719563">"Adakah anda benar-benar mahu mengalih keluar akaun ini? Mengalihkannya keluar juga akan turut memadamkan semua mesejnya, kenalan dan data lain dari tablet. "\n"Teruskan?"</string>
+    <string name="really_remove_account_message" product="default" msgid="1005751790899989319">"Adakah anda benar-benar mahu mengalih keluar akaun ini? Mengalihkannya keluar juga akan turut memadamkan semua mesejnya, kenalan dan data lain dari telefon. "\n"Teruskan?"</string>
+    <string name="remove_account_failed" product="tablet" msgid="1093911989149396624">"Akaun ini diperlukan oleh sesetengah aplikasi. Anda hanya boleh mengalihnya keluar dengan menetapkan semula tablet anda kepada lalai kilang (yang memadamkan semua data peribadi anda). Anda boleh melakukannya dalam aplikasi Tetapan, di bawah Privasi."</string>
+    <string name="remove_account_failed" product="default" msgid="9174390193652391412">"Akaun ini diperlukan oleh sesetengah aplikasi. Anda hanya boleh mengalihnya keluar dengan menetapkan semula telefon kepada lalai kilang (yang memadamkan semua data peribadi anda). Anda boleh melakukannya dalam aplikasi Tetapan, di bawah Privasi."</string>
+    <string name="provider_label" msgid="7724593781904508866">"Langganan penolakan"</string>
+    <string name="sync_item_title" msgid="1931551540462877488">"Segerak <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
+    <string name="cant_sync_dialog_title" msgid="7185199796123573317">"Tidak boleh menyegerak secara manual"</string>
+    <string name="cant_sync_dialog_message" msgid="2372359241135295930">"Penyerakan untuk item ini dilumpuhkan buat masa ini. Untuk menukar pilihan anda, hidupkan data latar belakang dan penyegerakan automatik buat sementara waktu."</string>
+    <string name="enter_password" msgid="3268224850821675915">"Masukkan kata laluan untuk menyahsulit storan"</string>
+    <string name="try_again" msgid="5904121494468643129">"Maaf, cuba lagi"</string>
+    <string name="service_busy" msgid="225227519012409130">"Perkhidmatan sibuk, cuba lagi"</string>
+    <string name="delete" msgid="4219243412325163003">"Padam"</string>
+    <string name="misc_files" msgid="6298643430106707497">"Fail Pelbagai"</string>
+    <string name="misc_files_selected_count" msgid="4647048020823912088">"pilihan <xliff:g id="NUMBER">%1$d</xliff:g> dari <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
+    <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> dari <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <string name="select_all" msgid="6783085295161532497">"Pilih Semua"</string>
+    <string name="hdcp_checking_title" msgid="8605478913544273282">"Penyemakan HDCP"</string>
+    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Ttpkn tngkh laku smk HDCP"</string>
+    <!-- no translation found for data_usage_summary_title (3804110657238092929) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle (5652529796195787949) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_split_4g (7417435609285381968) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_wifi (8266875319417201085) -->
+    <skip />
+    <!-- no translation found for data_usage_change_cycle (7776556448920114866) -->
+    <skip />
+    <!-- no translation found for data_usage_pick_cycle_day (4470796861757050966) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_mobile_limit (289740911281022322) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_4g_limit (5808210773758699800) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_3g_limit (3856971004328238231) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_wifi (1728851922959017766) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_mobile (454140350007299045) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_4g (1301978716067512235) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_3g (6092169523081538718) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_mobile (986782622560157977) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_3g (6304006671869578254) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_4g (3635854097335036738) -->
+    <skip />
+    <!-- no translation found for data_usage_app_settings (3727561362090820369) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background (8856643905291165256) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background_summary (1503361245973512092) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog_title (8110736468987743260) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog (100001698378554777) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_title (1373797281540188533) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_subtitle (5512903797979928416) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_positive (4565302264487526138) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_title (3023111643632996097) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_mobile (7931094451923591578) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_3g (5478553071420316963) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_4g (6134008906742403777) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_3g_title (4221584306492812040) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_4g_title (715585612162185936) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_mobile_title (209516216265000221) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog (2874031671067845964) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_enable (5738467047490662678) -->
+    <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 07d4463..27536f7 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>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Deaktivert av admin., krypteringsregel eller legitimasjonslager"</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,19 @@
     <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>
+    <!-- no translation found for wallpaper_settings_title (5449180116365824625) -->
+    <skip />
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android Dreams"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Skjermsparere og annen moro 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>
@@ -643,8 +656,9 @@
     <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"Telefonnummer"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
+    <string name="status_msid_number" msgid="909010114445780530">"MSID"</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,6 +907,8 @@
     <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>
@@ -1026,7 +1042,8 @@
     <string name="pointer_settings_category" msgid="6090176550039035130">"Innstillinger for mus og styreflate"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Pekerhastighet"</string>
     <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>
@@ -1035,6 +1052,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>
@@ -1106,6 +1124,7 @@
     <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>
+    <string name="settings_button" msgid="3006713718908152930">"Innstillinger"</string>
     <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>
@@ -1218,6 +1237,10 @@
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Innstillinger for <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> er aktivert"</string>
     <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> er deaktivert"</string>
+    <!-- no translation found for tts_engine_settings_section (2346105138448751893) -->
+    <skip />
+    <!-- no translation found for tts_engine_settings_title (3499112142425680334) -->
+    <skip />
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"Språk og stemmer"</string>
     <string name="pico_installed" msgid="2452546687858267414">"Installert"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"Ikke installert"</string>
@@ -1308,30 +1331,24 @@
     <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>
+    <string name="credentials_reset_summary" msgid="3369361230171260282">"Fjern alle sertifikater"</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>
+    <string name="credentials_reset_hint" msgid="1566409057833618877">"Alt innholdet blir fjernet. Er du sikker?"</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>
+    <string name="credentials_not_erased" msgid="397954733557821269">"Leg.lageret kunne ikke slettes."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Akkreditivlageret er aktivert."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6816970208840577219">"Du må angi en PIN-kode eller et passord for låsing av skjerm før du kan bruke legitimasjonslager. Vil du gjøre det nå?"</string>
     <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>
@@ -1439,4 +1456,69 @@
     <string name="select_all" msgid="6783085295161532497">"Marker alle"</string>
     <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP-kontroll"</string>
     <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Angi HDPC-kontrollatferd"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Databruk"</string>
+    <!-- no translation found for data_usage_cycle (5652529796195787949) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_split_4g (7417435609285381968) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_wifi (8266875319417201085) -->
+    <skip />
+    <!-- no translation found for data_usage_change_cycle (7776556448920114866) -->
+    <skip />
+    <!-- no translation found for data_usage_pick_cycle_day (4470796861757050966) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_mobile_limit (289740911281022322) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_4g_limit (5808210773758699800) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_3g_limit (3856971004328238231) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_wifi (1728851922959017766) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_mobile (454140350007299045) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_4g (1301978716067512235) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_3g (6092169523081538718) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_mobile (986782622560157977) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_3g (6304006671869578254) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_4g (3635854097335036738) -->
+    <skip />
+    <!-- no translation found for data_usage_app_settings (3727561362090820369) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background (8856643905291165256) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background_summary (1503361245973512092) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog_title (8110736468987743260) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog (100001698378554777) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_title (1373797281540188533) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_subtitle (5512903797979928416) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_positive (4565302264487526138) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_title (3023111643632996097) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_mobile (7931094451923591578) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_3g (5478553071420316963) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_4g (6134008906742403777) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_3g_title (4221584306492812040) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_4g_title (715585612162185936) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_mobile_title (209516216265000221) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog (2874031671067845964) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_enable (5738467047490662678) -->
+    <skip />
 </resources>
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 858ca1e..ee5edee 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>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Uitgeschakeld door beheerder, encryptiebeleid of referentieopslag"</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,19 @@
     <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>
+    <!-- no translation found for wallpaper_settings_title (5449180116365824625) -->
+    <skip />
+    <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>
@@ -643,8 +656,9 @@
     <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"Mijn telefoonnummer"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
+    <string name="status_msid_number" msgid="909010114445780530">"MSID"</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,6 +907,8 @@
     <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>
@@ -1026,7 +1042,8 @@
     <string name="pointer_settings_category" msgid="6090176550039035130">"Instellingen voor muis en trackpad"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Snelheid van aanwijzer"</string>
     <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>
@@ -1035,6 +1052,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>
@@ -1106,6 +1124,7 @@
     <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>
+    <string name="settings_button" msgid="3006713718908152930">"Instellingen"</string>
     <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>
@@ -1218,6 +1237,10 @@
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Instellingen voor <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> is ingeschakeld"</string>
     <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> is uitgeschakeld"</string>
+    <!-- no translation found for tts_engine_settings_section (2346105138448751893) -->
+    <skip />
+    <!-- no translation found for tts_engine_settings_title (3499112142425680334) -->
+    <skip />
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"Talen en stemmen"</string>
     <string name="pico_installed" msgid="2452546687858267414">"Geïnstalleerd"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"Niet geïnstalleerd"</string>
@@ -1308,30 +1331,24 @@
     <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>
+    <string name="credentials_reset_summary" msgid="3369361230171260282">"Alle certificaten verwijderen"</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>
+    <string name="credentials_reset_hint" msgid="1566409057833618877">"Alle inhoud wordt verwijderd. Weet u zeker dat u dit wilt doen?"</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>
+    <string name="credentials_not_erased" msgid="397954733557821269">"Kan referentieopslag niet wissen."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"De opslag van referenties is ingeschakeld."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6816970208840577219">"U moet een pincode of wachtwoord voor het vergrendelen van het scherm instellen voordat u de referentieopslag kunt gebruiken. Wilt u dit nu doen?"</string>
     <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>
@@ -1439,4 +1456,69 @@
     <string name="select_all" msgid="6783085295161532497">"Alles selecteren"</string>
     <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP-controle"</string>
     <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"HDCP-controlegedrag instellen"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Datagebruik"</string>
+    <!-- no translation found for data_usage_cycle (5652529796195787949) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_split_4g (7417435609285381968) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_wifi (8266875319417201085) -->
+    <skip />
+    <!-- no translation found for data_usage_change_cycle (7776556448920114866) -->
+    <skip />
+    <!-- no translation found for data_usage_pick_cycle_day (4470796861757050966) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_mobile_limit (289740911281022322) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_4g_limit (5808210773758699800) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_3g_limit (3856971004328238231) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_wifi (1728851922959017766) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_mobile (454140350007299045) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_4g (1301978716067512235) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_3g (6092169523081538718) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_mobile (986782622560157977) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_3g (6304006671869578254) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_4g (3635854097335036738) -->
+    <skip />
+    <!-- no translation found for data_usage_app_settings (3727561362090820369) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background (8856643905291165256) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background_summary (1503361245973512092) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog_title (8110736468987743260) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog (100001698378554777) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_title (1373797281540188533) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_subtitle (5512903797979928416) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_positive (4565302264487526138) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_title (3023111643632996097) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_mobile (7931094451923591578) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_3g (5478553071420316963) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_4g (6134008906742403777) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_3g_title (4221584306492812040) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_4g_title (715585612162185936) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_mobile_title (209516216265000221) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog (2874031671067845964) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_enable (5738467047490662678) -->
+    <skip />
 </resources>
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 c8dbd64..c771867 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>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Wyłączone przez administratora lub ze względu na zasady szyfrowania albo magazyn danych logowania"</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,19 @@
     <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>
+    <!-- no translation found for wallpaper_settings_title (5449180116365824625) -->
+    <skip />
+    <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>
@@ -643,8 +656,9 @@
     <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <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_msid_number" msgid="909010114445780530">"MSID"</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,6 +907,8 @@
     <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>
@@ -1026,7 +1042,8 @@
     <string name="pointer_settings_category" msgid="6090176550039035130">"Ustawienia myszy i panelu dotykowego"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Szybkość wskaźnika"</string>
     <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>
@@ -1035,6 +1052,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>
@@ -1106,6 +1124,7 @@
     <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>
+    <string name="settings_button" msgid="3006713718908152930">"Ustawienia"</string>
     <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>
@@ -1218,6 +1237,10 @@
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Ustawienia mechanizmu <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"Mechanizm <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> jest włączony"</string>
     <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"Mechanizm <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> jest wyłączony"</string>
+    <!-- no translation found for tts_engine_settings_section (2346105138448751893) -->
+    <skip />
+    <!-- no translation found for tts_engine_settings_title (3499112142425680334) -->
+    <skip />
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"Języki i głosy"</string>
     <string name="pico_installed" msgid="2452546687858267414">"Zainstalowano"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"Nie zainstalowano"</string>
@@ -1308,30 +1331,24 @@
     <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>
+    <string name="credentials_reset_summary" msgid="3369361230171260282">"Usuń wszystkie certyfikaty"</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>
+    <string name="credentials_reset_hint" msgid="1566409057833618877">"Cała zawartość zostanie usunięta. Czy na pewno chcesz to zrobić?"</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>
+    <string name="credentials_not_erased" msgid="397954733557821269">"Nie można wyczyścić magazynu danych logowania."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Magazyn danych logowania jest włączony."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6816970208840577219">"Aby możliwe było korzystanie z magazynu danych logowania, musisz ustawić kod PIN lub hasło ekranu blokady. Czy chcesz zrobić to teraz?"</string>
     <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>
@@ -1439,4 +1456,69 @@
     <string name="select_all" msgid="6783085295161532497">"Zaznacz wszystko"</string>
     <string name="hdcp_checking_title" msgid="8605478913544273282">"Sprawdzanie HDCP"</string>
     <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Ustaw zachowanie sprawdzania HDCP"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Użycie danych"</string>
+    <!-- no translation found for data_usage_cycle (5652529796195787949) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_split_4g (7417435609285381968) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_wifi (8266875319417201085) -->
+    <skip />
+    <!-- no translation found for data_usage_change_cycle (7776556448920114866) -->
+    <skip />
+    <!-- no translation found for data_usage_pick_cycle_day (4470796861757050966) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_mobile_limit (289740911281022322) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_4g_limit (5808210773758699800) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_3g_limit (3856971004328238231) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_wifi (1728851922959017766) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_mobile (454140350007299045) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_4g (1301978716067512235) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_3g (6092169523081538718) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_mobile (986782622560157977) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_3g (6304006671869578254) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_4g (3635854097335036738) -->
+    <skip />
+    <!-- no translation found for data_usage_app_settings (3727561362090820369) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background (8856643905291165256) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background_summary (1503361245973512092) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog_title (8110736468987743260) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog (100001698378554777) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_title (1373797281540188533) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_subtitle (5512903797979928416) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_positive (4565302264487526138) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_title (3023111643632996097) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_mobile (7931094451923591578) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_3g (5478553071420316963) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_4g (6134008906742403777) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_3g_title (4221584306492812040) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_4g_title (715585612162185936) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_mobile_title (209516216265000221) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog (2874031671067845964) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_enable (5738467047490662678) -->
+    <skip />
 </resources>
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 41a7cdd..33f4109 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>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Des. pelo adm., política de encrip. ou arm. de cred."</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,19 @@
     <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>
+    <!-- no translation found for wallpaper_settings_title (5449180116365824625) -->
+    <skip />
+    <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>
@@ -643,8 +656,9 @@
     <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <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_msid_number" msgid="909010114445780530">"MSID"</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,6 +907,8 @@
     <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>
@@ -1026,7 +1042,8 @@
     <string name="pointer_settings_category" msgid="6090176550039035130">"Definições do rato e do trackpad"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Velocidade do ponteiro"</string>
     <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>
@@ -1035,6 +1052,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>
@@ -1106,6 +1124,7 @@
     <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>
+    <string name="settings_button" msgid="3006713718908152930">"Definições"</string>
     <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>
@@ -1218,6 +1237,10 @@
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Definições de <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> está activado"</string>
     <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> está desactivado"</string>
+    <!-- no translation found for tts_engine_settings_section (2346105138448751893) -->
+    <skip />
+    <!-- no translation found for tts_engine_settings_title (3499112142425680334) -->
+    <skip />
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"Idiomas e vozes"</string>
     <string name="pico_installed" msgid="2452546687858267414">"Instalado"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"Não instalada"</string>
@@ -1308,30 +1331,24 @@
     <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>
+    <string name="credentials_reset_summary" msgid="3369361230171260282">"Remover todos os certificados"</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>
+    <string name="credentials_reset_hint" msgid="1566409057833618877">"Serão removidos todos os conteúdos. Tem a certeza de que pretende efetuar esta ação?"</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>
+    <string name="credentials_not_erased" msgid="397954733557821269">"Imp. apag. arm. de credenciais."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"O armazenamento de credenciais está activado."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6816970208840577219">"Antes de poder utilizar o armazenamento de credenciais, tem de definir um PIN ou palavra-passe de bloqueio do ecrã. Pretende fazê-lo agora?"</string>
     <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>
@@ -1446,4 +1463,69 @@
     <string name="select_all" msgid="6783085295161532497">"Selecionar tudo"</string>
     <string name="hdcp_checking_title" msgid="8605478913544273282">"Verificação HDCP"</string>
     <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Definir o comportamento da verificação HDCP"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Utilização de dados"</string>
+    <!-- no translation found for data_usage_cycle (5652529796195787949) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_split_4g (7417435609285381968) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_wifi (8266875319417201085) -->
+    <skip />
+    <!-- no translation found for data_usage_change_cycle (7776556448920114866) -->
+    <skip />
+    <!-- no translation found for data_usage_pick_cycle_day (4470796861757050966) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_mobile_limit (289740911281022322) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_4g_limit (5808210773758699800) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_3g_limit (3856971004328238231) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_wifi (1728851922959017766) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_mobile (454140350007299045) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_4g (1301978716067512235) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_3g (6092169523081538718) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_mobile (986782622560157977) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_3g (6304006671869578254) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_4g (3635854097335036738) -->
+    <skip />
+    <!-- no translation found for data_usage_app_settings (3727561362090820369) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background (8856643905291165256) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background_summary (1503361245973512092) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog_title (8110736468987743260) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog (100001698378554777) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_title (1373797281540188533) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_subtitle (5512903797979928416) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_positive (4565302264487526138) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_title (3023111643632996097) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_mobile (7931094451923591578) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_3g (5478553071420316963) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_4g (6134008906742403777) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_3g_title (4221584306492812040) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_4g_title (715585612162185936) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_mobile_title (209516216265000221) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog (2874031671067845964) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_enable (5738467047490662678) -->
+    <skip />
 </resources>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index ab0c62d..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>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 42b3e39..f849e26 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -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>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Des. pelo adm., pol. de cript. ou armaz. de cred."</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,19 @@
     <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>
+    <!-- no translation found for wallpaper_settings_title (5449180116365824625) -->
+    <skip />
+    <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>
@@ -643,8 +656,9 @@
     <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <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_msid_number" msgid="909010114445780530">"MSID"</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,6 +907,8 @@
     <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>
@@ -1026,7 +1042,8 @@
     <string name="pointer_settings_category" msgid="6090176550039035130">"Configurações de mouse e trackpad"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Velocidade do ponteiro"</string>
     <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>
@@ -1035,6 +1052,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>
@@ -1106,6 +1124,7 @@
     <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>
+    <string name="settings_button" msgid="3006713718908152930">"Configurações"</string>
     <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>
@@ -1218,6 +1237,10 @@
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Configurações de <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> foi ativado"</string>
     <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> foi desativado"</string>
+    <!-- no translation found for tts_engine_settings_section (2346105138448751893) -->
+    <skip />
+    <!-- no translation found for tts_engine_settings_title (3499112142425680334) -->
+    <skip />
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"Idiomas e vozes"</string>
     <string name="pico_installed" msgid="2452546687858267414">"Instalado"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"Não instalado"</string>
@@ -1308,30 +1331,24 @@
     <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>
+    <string name="credentials_reset_summary" msgid="3369361230171260282">"Remover todos os certificados"</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>
+    <string name="credentials_reset_hint" msgid="1566409057833618877">"Todo o conteúdo será removido. Tem certeza de que deseja fazer isso?"</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>
+    <string name="credentials_not_erased" msgid="397954733557821269">"Armaz. de credenc. não apagado."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"O armazenamento de credenciais foi ativado."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6816970208840577219">"Você deve configurar um PIN ou uma senha da tela de bloqueio antes de usar o armazenamento de credenciais. Deseja fazer isso agora?"</string>
     <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>
@@ -1439,4 +1456,69 @@
     <string name="select_all" msgid="6783085295161532497">"Selecionar todos"</string>
     <string name="hdcp_checking_title" msgid="8605478913544273282">"Verificação HDCP"</string>
     <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Config. a verificação HDCP"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Uso de dados"</string>
+    <!-- no translation found for data_usage_cycle (5652529796195787949) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_split_4g (7417435609285381968) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_wifi (8266875319417201085) -->
+    <skip />
+    <!-- no translation found for data_usage_change_cycle (7776556448920114866) -->
+    <skip />
+    <!-- no translation found for data_usage_pick_cycle_day (4470796861757050966) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_mobile_limit (289740911281022322) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_4g_limit (5808210773758699800) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_3g_limit (3856971004328238231) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_wifi (1728851922959017766) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_mobile (454140350007299045) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_4g (1301978716067512235) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_3g (6092169523081538718) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_mobile (986782622560157977) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_3g (6304006671869578254) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_4g (3635854097335036738) -->
+    <skip />
+    <!-- no translation found for data_usage_app_settings (3727561362090820369) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background (8856643905291165256) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background_summary (1503361245973512092) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog_title (8110736468987743260) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog (100001698378554777) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_title (1373797281540188533) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_subtitle (5512903797979928416) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_positive (4565302264487526138) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_title (3023111643632996097) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_mobile (7931094451923591578) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_3g (5478553071420316963) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_4g (6134008906742403777) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_3g_title (4221584306492812040) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_4g_title (715585612162185936) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_mobile_title (209516216265000221) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog (2874031671067845964) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_enable (5738467047490662678) -->
+    <skip />
 </resources>
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 d5dd85a..a2a630e 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,29 @@
     <!-- 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 wallpaper_settings_title (5449180116365824625) -->
+    <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>
@@ -753,8 +777,10 @@
     <!-- outdated translation 5948892105546651296 -->     <string name="status_number" product="tablet" msgid="1138837891091222272">"Numer da telefon"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"Mes numer da telefon"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
+    <!-- no translation found for status_msid_number (909010114445780530) -->
+    <skip />
     <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,6 +1061,10 @@
     <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>
@@ -1191,7 +1221,10 @@
     <!-- 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>
@@ -1200,6 +1233,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>
@@ -1286,6 +1321,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) -->
@@ -1404,6 +1441,10 @@
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Parameters <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> è activà."</string>
     <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> è deactivà."</string>
+    <!-- no translation found for tts_engine_settings_section (2346105138448751893) -->
+    <skip />
+    <!-- no translation found for tts_engine_settings_title (3499112142425680334) -->
+    <skip />
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"Linguas e vuschs"</string>
     <string name="pico_installed" msgid="2452546687858267414">"Installà"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"Betg installà"</string>
@@ -1496,8 +1537,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) -->
@@ -1506,26 +1545,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>
@@ -1711,4 +1747,70 @@
     <skip />
     <!-- no translation found for hdcp_checking_dialog_title (5141305530923283) -->
     <skip />
+    <!-- no translation found for data_usage_summary_title (3804110657238092929) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle (5652529796195787949) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_split_4g (7417435609285381968) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_wifi (8266875319417201085) -->
+    <skip />
+    <!-- no translation found for data_usage_change_cycle (7776556448920114866) -->
+    <skip />
+    <!-- no translation found for data_usage_pick_cycle_day (4470796861757050966) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_mobile_limit (289740911281022322) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_4g_limit (5808210773758699800) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_3g_limit (3856971004328238231) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_wifi (1728851922959017766) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_mobile (454140350007299045) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_4g (1301978716067512235) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_3g (6092169523081538718) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_mobile (986782622560157977) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_3g (6304006671869578254) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_4g (3635854097335036738) -->
+    <skip />
+    <!-- no translation found for data_usage_app_settings (3727561362090820369) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background (8856643905291165256) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background_summary (1503361245973512092) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog_title (8110736468987743260) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog (100001698378554777) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_title (1373797281540188533) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_subtitle (5512903797979928416) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_positive (4565302264487526138) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_title (3023111643632996097) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_mobile (7931094451923591578) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_3g (5478553071420316963) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_4g (6134008906742403777) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_3g_title (4221584306492812040) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_4g_title (715585612162185936) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_mobile_title (209516216265000221) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog (2874031671067845964) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_enable (5738467047490662678) -->
+    <skip />
 </resources>
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 41f36a4..97af2f2 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>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Dez. de adm., dator. pol. crip. sau a stoc. acred."</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,19 @@
     <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>
+    <!-- no translation found for wallpaper_settings_title (5449180116365824625) -->
+    <skip />
+    <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>
@@ -643,8 +656,9 @@
     <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <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_msid_number" msgid="909010114445780530">"MSID"</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,6 +907,8 @@
     <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>
@@ -1026,7 +1042,8 @@
     <string name="pointer_settings_category" msgid="6090176550039035130">"Setări pentru mouse şi trackpad"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Viteza indicatorului"</string>
     <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>
@@ -1035,6 +1052,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>
@@ -1106,6 +1124,7 @@
     <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>
+    <string name="settings_button" msgid="3006713718908152930">"Setări"</string>
     <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>
@@ -1218,6 +1237,10 @@
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Setări <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> este activat"</string>
     <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> este dezactivat"</string>
+    <!-- no translation found for tts_engine_settings_section (2346105138448751893) -->
+    <skip />
+    <!-- no translation found for tts_engine_settings_title (3499112142425680334) -->
+    <skip />
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"Limbi şi voci"</string>
     <string name="pico_installed" msgid="2452546687858267414">"Instalată"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"Neinstalată"</string>
@@ -1308,30 +1331,24 @@
     <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>
+    <string name="credentials_reset_summary" msgid="3369361230171260282">"Eliminaţi toate certificatele"</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>
+    <string name="credentials_reset_hint" msgid="1566409057833618877">"Întregul conţinut va fi eliminat. Sigur doriţi acest lucru?"</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>
+    <string name="credentials_not_erased" msgid="397954733557821269">"Stoc. acred. nu s-a şters."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Stocarea acreditărilor este activată."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6816970208840577219">"Trebuie să setaţi un cod PIN de blocare a ecranului sau o parolă înainte de a putea utiliza stocarea acreditărilor. Doriţi să faceţi acest lucru acum?"</string>
     <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>
@@ -1440,4 +1457,69 @@
     <string name="select_all" msgid="6783085295161532497">"Selectaţi-le pe toate"</string>
     <string name="hdcp_checking_title" msgid="8605478913544273282">"Verificare HDCP"</string>
     <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Setaţi comp. verif. HDCP"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Rata de utilizare a datelor"</string>
+    <!-- no translation found for data_usage_cycle (5652529796195787949) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_split_4g (7417435609285381968) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_wifi (8266875319417201085) -->
+    <skip />
+    <!-- no translation found for data_usage_change_cycle (7776556448920114866) -->
+    <skip />
+    <!-- no translation found for data_usage_pick_cycle_day (4470796861757050966) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_mobile_limit (289740911281022322) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_4g_limit (5808210773758699800) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_3g_limit (3856971004328238231) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_wifi (1728851922959017766) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_mobile (454140350007299045) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_4g (1301978716067512235) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_3g (6092169523081538718) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_mobile (986782622560157977) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_3g (6304006671869578254) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_4g (3635854097335036738) -->
+    <skip />
+    <!-- no translation found for data_usage_app_settings (3727561362090820369) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background (8856643905291165256) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background_summary (1503361245973512092) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog_title (8110736468987743260) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog (100001698378554777) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_title (1373797281540188533) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_subtitle (5512903797979928416) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_positive (4565302264487526138) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_title (3023111643632996097) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_mobile (7931094451923591578) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_3g (5478553071420316963) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_4g (6134008906742403777) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_3g_title (4221584306492812040) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_4g_title (715585612162185936) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_mobile_title (209516216265000221) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog (2874031671067845964) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_enable (5738467047490662678) -->
+    <skip />
 </resources>
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 c30ee7f..13cf251 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>
+    <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,19 @@
     <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>
+    <!-- no translation found for wallpaper_settings_title (5449180116365824625) -->
+    <skip />
+    <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>
@@ -643,8 +656,9 @@
     <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"Мой номер телефона"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
+    <string name="status_msid_number" msgid="909010114445780530">"MSID"</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,6 +907,8 @@
     <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>
@@ -1026,7 +1042,8 @@
     <string name="pointer_settings_category" msgid="6090176550039035130">"Настройки мыши и трекпада"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Скорость указателя"</string>
     <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>
@@ -1035,6 +1052,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>
@@ -1106,6 +1124,7 @@
     <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>
+    <string name="settings_button" msgid="3006713718908152930">"Настройки"</string>
     <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>
@@ -1218,6 +1237,10 @@
     <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>
+    <!-- no translation found for tts_engine_settings_section (2346105138448751893) -->
+    <skip />
+    <!-- no translation found for tts_engine_settings_title (3499112142425680334) -->
+    <skip />
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"Языки и голос"</string>
     <string name="pico_installed" msgid="2452546687858267414">"Установлено"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"Не установлено"</string>
@@ -1308,30 +1331,24 @@
     <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>
+    <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>
+    <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>
+    <string name="credentials_not_erased" msgid="397954733557821269">"Хранилище нельзя очистить."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Хранилище регистрационных данных включено."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6816970208840577219">"Перед тем, как использовать хранилище учетных данных, необходимо задать PIN-код или пароль для блокировки экрана. Сделать это сейчас?"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Тональный сигнал экстренного вызова"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Настроить режим работы при экстренном вызове"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"Восстановление и сброс"</string>
@@ -1439,4 +1456,69 @@
     <string name="select_all" msgid="6783085295161532497">"Выбрать все"</string>
     <string name="hdcp_checking_title" msgid="8605478913544273282">"Проверка HDCP"</string>
     <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Порядок проверки HDCP"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Передача данных"</string>
+    <!-- no translation found for data_usage_cycle (5652529796195787949) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_split_4g (7417435609285381968) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_wifi (8266875319417201085) -->
+    <skip />
+    <!-- no translation found for data_usage_change_cycle (7776556448920114866) -->
+    <skip />
+    <!-- no translation found for data_usage_pick_cycle_day (4470796861757050966) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_mobile_limit (289740911281022322) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_4g_limit (5808210773758699800) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_3g_limit (3856971004328238231) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_wifi (1728851922959017766) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_mobile (454140350007299045) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_4g (1301978716067512235) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_3g (6092169523081538718) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_mobile (986782622560157977) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_3g (6304006671869578254) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_4g (3635854097335036738) -->
+    <skip />
+    <!-- no translation found for data_usage_app_settings (3727561362090820369) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background (8856643905291165256) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background_summary (1503361245973512092) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog_title (8110736468987743260) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog (100001698378554777) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_title (1373797281540188533) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_subtitle (5512903797979928416) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_positive (4565302264487526138) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_title (3023111643632996097) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_mobile (7931094451923591578) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_3g (5478553071420316963) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_4g (6134008906742403777) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_3g_title (4221584306492812040) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_4g_title (715585612162185936) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_mobile_title (209516216265000221) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog (2874031671067845964) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_enable (5738467047490662678) -->
+    <skip />
 </resources>
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 832d648..dddbbd4 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>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Zakázané správcom, pravidlom šifrovania či uklad. priest. poverení"</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,19 @@
     <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>
+    <!-- no translation found for wallpaper_settings_title (5449180116365824625) -->
+    <skip />
+    <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>
@@ -643,8 +656,9 @@
     <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <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_msid_number" msgid="909010114445780530">"MSID"</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,6 +907,8 @@
     <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>
@@ -1026,7 +1042,8 @@
     <string name="pointer_settings_category" msgid="6090176550039035130">"Nastavenia myši a trackpadu"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Rýchlosť ukazovateľa"</string>
     <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>
@@ -1035,6 +1052,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>
@@ -1106,6 +1124,7 @@
     <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>
+    <string name="settings_button" msgid="3006713718908152930">"Nastavenia"</string>
     <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>
@@ -1218,6 +1237,10 @@
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Nastavenia <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"Možnosť <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> je aktivovaná"</string>
     <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"Nástroj <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> je zakázaný"</string>
+    <!-- no translation found for tts_engine_settings_section (2346105138448751893) -->
+    <skip />
+    <!-- no translation found for tts_engine_settings_title (3499112142425680334) -->
+    <skip />
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"Jazyky a hlasy"</string>
     <string name="pico_installed" msgid="2452546687858267414">"Nainštalované"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"Nie je nainštalované"</string>
@@ -1308,30 +1331,24 @@
     <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>
+    <string name="credentials_reset_summary" msgid="3369361230171260282">"Odstrániť všetky certifikáty"</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>
+    <string name="credentials_reset_hint" msgid="1566409057833618877">"Všetok obsah bude odstránený. Naozaj chcete pokračovať?"</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>
+    <string name="credentials_not_erased" msgid="397954733557821269">"Ukad. priestor poverení sa nedá vymazať."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Ukladací priestor poverení je aktivovaný."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6816970208840577219">"Pred použitím ukladacieho priestoru poverení musíte nastaviť číslo PIN alebo heslo uzamknutia obrazovky. Chcete to urobiť teraz?"</string>
     <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>
@@ -1440,4 +1457,69 @@
     <string name="select_all" msgid="6783085295161532497">"Vybrať všetko"</string>
     <string name="hdcp_checking_title" msgid="8605478913544273282">"Kontrola HDCP"</string>
     <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Nastaviť spôsob kontroly HDCP"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Využitie dát"</string>
+    <!-- no translation found for data_usage_cycle (5652529796195787949) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_split_4g (7417435609285381968) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_wifi (8266875319417201085) -->
+    <skip />
+    <!-- no translation found for data_usage_change_cycle (7776556448920114866) -->
+    <skip />
+    <!-- no translation found for data_usage_pick_cycle_day (4470796861757050966) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_mobile_limit (289740911281022322) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_4g_limit (5808210773758699800) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_3g_limit (3856971004328238231) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_wifi (1728851922959017766) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_mobile (454140350007299045) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_4g (1301978716067512235) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_3g (6092169523081538718) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_mobile (986782622560157977) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_3g (6304006671869578254) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_4g (3635854097335036738) -->
+    <skip />
+    <!-- no translation found for data_usage_app_settings (3727561362090820369) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background (8856643905291165256) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background_summary (1503361245973512092) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog_title (8110736468987743260) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog (100001698378554777) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_title (1373797281540188533) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_subtitle (5512903797979928416) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_positive (4565302264487526138) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_title (3023111643632996097) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_mobile (7931094451923591578) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_3g (5478553071420316963) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_4g (6134008906742403777) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_3g_title (4221584306492812040) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_4g_title (715585612162185936) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_mobile_title (209516216265000221) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog (2874031671067845964) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_enable (5738467047490662678) -->
+    <skip />
 </resources>
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 133e86e..6be57c1 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>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Onem. skrbnik, šifr. pravilnik shr. poverilnic"</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,19 @@
     <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>
+    <!-- no translation found for wallpaper_settings_title (5449180116365824625) -->
+    <skip />
+    <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>
@@ -643,8 +656,9 @@
     <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"Moja telefonska številka"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
+    <string name="status_msid_number" msgid="909010114445780530">"MSID"</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,6 +907,8 @@
     <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>
@@ -1026,7 +1042,8 @@
     <string name="pointer_settings_category" msgid="6090176550039035130">"Nastavitve miške in sledilne ploščice"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Hitrost kazalca"</string>
     <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>
@@ -1035,6 +1052,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>
@@ -1106,6 +1124,7 @@
     <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>
+    <string name="settings_button" msgid="3006713718908152930">"Nastavitve"</string>
     <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>
@@ -1218,6 +1237,10 @@
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Nastavitve za <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"Mehanizem <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> je omogočen"</string>
     <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"Mehanizem <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> je onemogočen"</string>
+    <!-- no translation found for tts_engine_settings_section (2346105138448751893) -->
+    <skip />
+    <!-- no translation found for tts_engine_settings_title (3499112142425680334) -->
+    <skip />
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"Jeziki in glasovi"</string>
     <string name="pico_installed" msgid="2452546687858267414">"Nameščeno"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"Ni nameščeno"</string>
@@ -1308,30 +1331,24 @@
     <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>
+    <string name="credentials_reset_summary" msgid="3369361230171260282">"Odstrani vsa potrdila"</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>
+    <string name="credentials_reset_hint" msgid="1566409057833618877">"Vsa vsebina bo odstranjena. Ali ste prepričani o tem?"</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>
+    <string name="credentials_not_erased" msgid="397954733557821269">"Shrambe pover. ni mogoče izbr."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Shramba poverilnic je omogočena."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6816970208840577219">"Pred uporabo shrambe poverilnic morate nastaviti PIN ali geslo za zaklepanje zaslona. Želite to storiti zdaj?"</string>
     <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>
@@ -1440,4 +1457,69 @@
     <string name="select_all" msgid="6783085295161532497">"Izberi vse"</string>
     <string name="hdcp_checking_title" msgid="8605478913544273282">"Preverjanje HDCP"</string>
     <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Nastavi preverjanje HDCP"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Podatkovni promet"</string>
+    <!-- no translation found for data_usage_cycle (5652529796195787949) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_split_4g (7417435609285381968) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_wifi (8266875319417201085) -->
+    <skip />
+    <!-- no translation found for data_usage_change_cycle (7776556448920114866) -->
+    <skip />
+    <!-- no translation found for data_usage_pick_cycle_day (4470796861757050966) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_mobile_limit (289740911281022322) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_4g_limit (5808210773758699800) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_3g_limit (3856971004328238231) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_wifi (1728851922959017766) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_mobile (454140350007299045) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_4g (1301978716067512235) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_3g (6092169523081538718) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_mobile (986782622560157977) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_3g (6304006671869578254) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_4g (3635854097335036738) -->
+    <skip />
+    <!-- no translation found for data_usage_app_settings (3727561362090820369) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background (8856643905291165256) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background_summary (1503361245973512092) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog_title (8110736468987743260) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog (100001698378554777) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_title (1373797281540188533) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_subtitle (5512903797979928416) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_positive (4565302264487526138) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_title (3023111643632996097) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_mobile (7931094451923591578) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_3g (5478553071420316963) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_4g (6134008906742403777) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_3g_title (4221584306492812040) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_4g_title (715585612162185936) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_mobile_title (209516216265000221) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog (2874031671067845964) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_enable (5738467047490662678) -->
+    <skip />
 </resources>
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 069a4a2..aed951f 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>
+    <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,19 @@
     <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>
+    <!-- no translation found for wallpaper_settings_title (5449180116365824625) -->
+    <skip />
+    <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>
@@ -643,8 +656,9 @@
     <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">"MIN"</string>
+    <string name="status_msid_number" msgid="909010114445780530">"MSID"</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,6 +907,8 @@
     <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>
@@ -1026,7 +1042,8 @@
     <string name="pointer_settings_category" msgid="6090176550039035130">"Подешавања миша и додирне табле"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Брзина показивача"</string>
     <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>
@@ -1035,6 +1052,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>
@@ -1106,6 +1124,7 @@
     <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>
+    <string name="settings_button" msgid="3006713718908152930">"Подешавања"</string>
     <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>
@@ -1218,6 +1237,10 @@
     <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>
+    <!-- no translation found for tts_engine_settings_section (2346105138448751893) -->
+    <skip />
+    <!-- no translation found for tts_engine_settings_title (3499112142425680334) -->
+    <skip />
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"Језици и гласови"</string>
     <string name="pico_installed" msgid="2452546687858267414">"Инсталирано"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"Није инсталирано"</string>
@@ -1308,30 +1331,24 @@
     <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>
+    <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>
+    <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>
+    <string name="credentials_not_erased" msgid="397954733557821269">"Није могуће избрисати складиште акредитива."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Складиште акредитива је омогућено."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6816970208840577219">"Морате да подесите PIN или лозинку за закључавање екрана да бисте могли да користите складиштење акредитива. Желите ли да то урадите сада?"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Тон за хитне позиве"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Подешавање понашања када се успоставља хитни позив"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"Приватност"</string>
@@ -1440,4 +1457,69 @@
     <string name="select_all" msgid="6783085295161532497">"Изабери све"</string>
     <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP провера"</string>
     <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Подешав. понаш. HDCP пров."</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Коришћење података"</string>
+    <!-- no translation found for data_usage_cycle (5652529796195787949) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_split_4g (7417435609285381968) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_wifi (8266875319417201085) -->
+    <skip />
+    <!-- no translation found for data_usage_change_cycle (7776556448920114866) -->
+    <skip />
+    <!-- no translation found for data_usage_pick_cycle_day (4470796861757050966) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_mobile_limit (289740911281022322) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_4g_limit (5808210773758699800) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_3g_limit (3856971004328238231) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_wifi (1728851922959017766) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_mobile (454140350007299045) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_4g (1301978716067512235) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_3g (6092169523081538718) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_mobile (986782622560157977) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_3g (6304006671869578254) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_4g (3635854097335036738) -->
+    <skip />
+    <!-- no translation found for data_usage_app_settings (3727561362090820369) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background (8856643905291165256) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background_summary (1503361245973512092) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog_title (8110736468987743260) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog (100001698378554777) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_title (1373797281540188533) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_subtitle (5512903797979928416) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_positive (4565302264487526138) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_title (3023111643632996097) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_mobile (7931094451923591578) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_3g (5478553071420316963) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_4g (6134008906742403777) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_3g_title (4221584306492812040) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_4g_title (715585612162185936) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_mobile_title (209516216265000221) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog (2874031671067845964) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_enable (5738467047490662678) -->
+    <skip />
 </resources>
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 f718658..8dc994f 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>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Inaktiverad p.g.a. admin., kryptering eller uppgiftslagring"</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,19 @@
     <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>
+    <!-- no translation found for wallpaper_settings_title (5449180116365824625) -->
+    <skip />
+    <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>
@@ -643,8 +656,9 @@
     <string name="status_number" product="tablet" msgid="1138837891091222272">"Mobilnummer (MDN)"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"Mitt telefonnummer"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
+    <string name="status_msid_number" msgid="909010114445780530">"MSID"</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,6 +907,8 @@
     <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>
@@ -1026,7 +1042,8 @@
     <string name="pointer_settings_category" msgid="6090176550039035130">"Inställningar för mus och styrplatta"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Markörens hastighet"</string>
     <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>
@@ -1035,6 +1052,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>
@@ -1106,6 +1124,7 @@
     <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>
+    <string name="settings_button" msgid="3006713718908152930">"Inställningar"</string>
     <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>
@@ -1218,6 +1237,10 @@
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>-inställningar"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> är aktiverad"</string>
     <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> är inaktiverad"</string>
+    <!-- no translation found for tts_engine_settings_section (2346105138448751893) -->
+    <skip />
+    <!-- no translation found for tts_engine_settings_title (3499112142425680334) -->
+    <skip />
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"Språk och röster"</string>
     <string name="pico_installed" msgid="2452546687858267414">"Installerad"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"Inte installerad"</string>
@@ -1308,30 +1331,24 @@
     <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>
+    <string name="credentials_reset_summary" msgid="3369361230171260282">"Ta bort alla certifikat"</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>
+    <string name="credentials_reset_hint" msgid="1566409057833618877">"Allt innehåll kommer att tas bort. Vill du fortsätta?"</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>
+    <string name="credentials_not_erased" msgid="397954733557821269">"Uppgifter kunde inte raderas."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Uppgiftslagring är aktiverat."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6816970208840577219">"Du måste ange en PIN-kod eller ett lösenord för skärmlås för att kunna använda uppgiftslagring. Vill du göra det nu?"</string>
     <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>
@@ -1446,4 +1463,69 @@
     <string name="select_all" msgid="6783085295161532497">"Markera alla"</string>
     <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP-kontroll"</string>
     <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Konfigurera HDCP-kontroll"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Dataanvändning"</string>
+    <!-- no translation found for data_usage_cycle (5652529796195787949) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_split_4g (7417435609285381968) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_wifi (8266875319417201085) -->
+    <skip />
+    <!-- no translation found for data_usage_change_cycle (7776556448920114866) -->
+    <skip />
+    <!-- no translation found for data_usage_pick_cycle_day (4470796861757050966) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_mobile_limit (289740911281022322) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_4g_limit (5808210773758699800) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_3g_limit (3856971004328238231) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_wifi (1728851922959017766) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_mobile (454140350007299045) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_4g (1301978716067512235) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_3g (6092169523081538718) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_mobile (986782622560157977) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_3g (6304006671869578254) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_4g (3635854097335036738) -->
+    <skip />
+    <!-- no translation found for data_usage_app_settings (3727561362090820369) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background (8856643905291165256) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background_summary (1503361245973512092) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog_title (8110736468987743260) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog (100001698378554777) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_title (1373797281540188533) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_subtitle (5512903797979928416) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_positive (4565302264487526138) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_title (3023111643632996097) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_mobile (7931094451923591578) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_3g (5478553071420316963) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_4g (6134008906742403777) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_3g_title (4221584306492812040) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_4g_title (715585612162185936) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_mobile_title (209516216265000221) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog (2874031671067845964) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_enable (5738467047490662678) -->
+    <skip />
 </resources>
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..b2cc4ee
--- /dev/null
+++ b/res/values-sw/arrays.xml
@@ -0,0 +1,229 @@
+<?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>
+  <string-array name="screen_timeout_entries">
+    <item msgid="3342301044271143016">"Sekunde 15"</item>
+    <item msgid="8881760709354815449">"sekunde 30"</item>
+    <item msgid="7589406073232279088">"Dakika 1"</item>
+    <item msgid="7001195990902244174">"Dakika 2"</item>
+    <item msgid="7489864775127957179">"Dakika 5"</item>
+    <item msgid="2314124409517439288">"Dakika 10"</item>
+    <item msgid="6864027152847611413">"Dakika 30"</item>
+  </string-array>
+    <!-- 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) -->
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="5416834369150305288">"mara moja"</item>
+    <item msgid="6736512735606834431">"Sekunde 5"</item>
+    <item msgid="8044619388267891375">"Sekunde 15"</item>
+    <item msgid="1822002388249545488">"Sekunde 30"</item>
+    <item msgid="8538071621211916519">"Dakika 1"</item>
+    <item msgid="5663439580228932882">"Dakika 2"</item>
+    <item msgid="49888496216106852">"dakika 5"</item>
+    <item msgid="9002737361305019353">"Dakika 10"</item>
+    <item msgid="4322676235684793329">"Dakika 30"</item>
+  </string-array>
+    <!-- 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) -->
+  <string-array name="wifi_frequency_band_entries">
+    <item msgid="624340809384223320">"Atomatiki"</item>
+    <item msgid="6670588712989942178">"GHz 5 tu"</item>
+    <item msgid="2715516524973207876">"GHz 2.4 tu"</item>
+  </string-array>
+  <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>
+  <string-array name="wifi_network_setup">
+    <item msgid="784271777398638325">"Mwongozo"</item>
+    <item msgid="700386742589384062">"Kitufe cha kusukuma cha WSP"</item>
+    <item msgid="7131487972018976724">"Pin ya WPS kutoka kwa kituo cha ufikivu"</item>
+    <item msgid="4809199848225172977">"Pin ya WPS kutoka kwenye kifaa hiki"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"DHCP"</item>
+    <item msgid="628395202971532382">"Haibadiliki"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="4473276491748503377">"Hamna"</item>
+    <!-- outdated translation 6267482274276126058 -->     <item msgid="8673874894887358090">"Takwimu"</item>
+  </string-array>
+  <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..01dbfe9
--- /dev/null
+++ b/res/values-sw/strings.xml
@@ -0,0 +1,1981 @@
+<?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 />
+    <string name="sdcard_unmount" product="nosdcard" msgid="6325292633327972272">"Ondoa hifadhi ya USB"</string>
+    <!-- outdated translation 6325292633327972272 -->     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Ondoa hifadhi ya USB"</string>
+    <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Futa hifadhi ya USB"</string>
+    <string name="sdcard_format" product="default" msgid="6713185532039187532">"Futa 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 />
+    <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"Hifadhi ya USB"</string>
+    <!-- outdated translation 8281011784066476192 -->     <string name="sdcard_setting" product="default" msgid="5922637503871474866">"Hifadhi ya USB"</string>
+    <!-- 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 />
+    <string name="battery_info_health_cold" msgid="3835692786176707318">"Baridi"</string>
+    <!-- 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>
+    <string name="bluetooth_notif_message" msgid="618099089987569242">"Chagua ili kulinganisha na <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <!-- 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>
+    <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Programu inaomba kibali ili kuwasha Bluetooth. Unataka kufanya hivi?"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Programu kwenye kompyuta yako ndogo inaomba kibali cha kufanya kompyuta yako ndogo iweze kutambuliwa na vifaa vingine vya Bluetooth kwa sekunde <xliff:g id="TIMEOUT">%1$d</xliff:g>. Unataka kufanya hivi?"</string>
+    <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 />
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Programu kwenye kompyuta yako ndogo inaomba kibali cha kuwasha Bluetooth na kufanya kompyuta yako ndogo iweze kutambuliwa na vifaa vingine kwa sekunde <xliff:g id="TIMEOUT">%1$d</xliff:g>. Unataka kufanya hivi?"</string>
+    <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>
+    <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Unganisha kiotomatiki"</string>
+    <!-- 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>
+    <string name="proxy_settings_title" msgid="5912878565897294401">"Mipangilio ya seva mbadala"</string>
+    <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 />
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"Hifadhi ya USB haijawekwa"</string>
+    <!-- outdated translation 2902787003418172125 -->     <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"Hifadhi ya USB haijawekwa"</string>
+    <!-- no translation found for sdcard_settings_available_bytes_label (763232429899373001) -->
+    <skip />
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"Hifadhi ya USB inatumiwa kama kifaa cha kuhifadhi vitu vingi"</string>
+    <!-- outdated translation 2736378870889777857 -->     <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"Hifadhi ya USB inatumiwa kama kifaa cha kuhifadhi vitu vingi"</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="7503300818792750913">"Ni salama sasa kuondoa hifadhi ya USB"</string>
+    <!-- outdated translation 7503300818792750913 -->     <string name="sdcard_settings_unmounted_status" product="default" msgid="3812022095683863087">"Ni salama sasa kuondoa hifadhi ya USB"</string>
+    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"Hifadhi ya USB iliondolewa wakati bado yatumiwa!"</string>
+    <!-- outdated translation 7761390725880773697 -->     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"Hifadhi ya USB iliondolewa wakati bado yatumiwa!"</string>
+    <!-- no translation found for sdcard_settings_used_bytes_label (8820289486001170836) -->
+    <skip />
+    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Inachanganua hifadhi ya USB ya media..."</string>
+    <!-- outdated translation 7503429447676219564 -->     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Inachanganua hifadhi ya USB ya media..."</string>
+    <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"Hifadhi ya USB imeweka soma-tu"</string>
+    <!-- outdated translation 3771783090621312312 -->     <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"Hifadhi ya USB imeweka soma-tu"</string>
+    <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 />
+    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Maelezo ya kompyuta ndogo"</string>
+    <!-- outdated translation 7820855350955963628 -->     <string name="phone_info_label" product="default" msgid="2127552523124277664">"Maelezo ya kompyuta ndogo"</string>
+    <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"Hifadhi ya USB"</string>
+    <!-- outdated translation 8101475181301178428 -->     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Hifadhi ya USB"</string>
+    <!-- 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>
+    <string name="settings_shortcut" msgid="8597387747077828217">"Chagua njia ya mkato ya 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>
+    <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Mitandao isiyotumia waya"</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>
+    <string name="date_picker_title" msgid="1338210036394128512">"Tarehe"</string>
+    <string name="time_picker_title" msgid="483460752287255019">"Saa"</string>
+    <string name="lock_after_timeout" msgid="940509402681580537">"Muda umeisha"</string>
+    <string name="lock_after_timeout_summary" msgid="4726009794344934278">"Skrini ya kufunga <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> baada ya skrini kuzima kiotomatiki"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Onyesha maelezo ya mmiliki skrini inapofunga"</string>
+    <string name="owner_info_settings_title" msgid="2723190010708381889">"Maelezo ya mmiliki"</string>
+    <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
+    <string name="owner_info_settings_edit_text_hint" msgid="2382525043173672857">"Ingiza maandishi ili kuonyesha kwenye skrini ya kufunga"</string>
+    <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 />
+    <string name="lock_settings_picker_title" msgid="8665454308380158195">"Sanidi skrini ya kufunga"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Sanidi skrini ya kufunga"</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>
+    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Chagua mbinu ili kufunga skrini"</string>
+    <string name="unlock_set_unlock_off_title" msgid="1613932765246180079">"Zima"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="2791013557563587655">"Kamwe usifunge skrini"</string>
+    <!-- outdated translation 5165705762615690332 -->     <string name="unlock_set_unlock_none_title" msgid="7560817055143323842">"Isiyo salama"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="2609139908913114644">"Haihitaji mchoro, PIN, au nenosiri ili kufungua skrini"</string>
+    <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Mchoro"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="8467282436608077882">"Inahitaji mchoro ili kufungua skrini"</string>
+    <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Inahitaji PIN ya nambari ili i kufungua skrini"</string>
+    <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Nenosiri"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Inahitaji nenosiri ili kufungua skrini"</string>
+    <!-- outdated translation 8816944391772300580 -->     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Imelemezwa na msimamizi wa mbali wa kifaa"</string>
+    <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Zima"</string>
+    <!-- outdated translation 7953821968316697309 -->     <string name="unlock_set_unlock_mode_none" msgid="7137296704741184239">"Isiyo salama"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Imelindwa na mchoro"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Imelindwa na PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Imelindwa na nenosiri"</string>
+    <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>
+    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Ghairi"</string>
+    <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Ifuatayo"</string>
+    <string name="device_admin_title" msgid="3562216873644263804">"Usimamizi wa kifaa"</string>
+    <string name="manage_device_admin" msgid="5059296715271077278">"Wasimamizi wa kifaa"</string>
+    <string name="manage_device_admin_summary" msgid="7672709110988761075">"Angalia au lemaza wasimamizi wa kifaa"</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>
+    <string name="bluetooth_enter_pin_msg" msgid="1499285355129256289">\n"Ingiza PIN ili kulinganisha na \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". (Jaribu 0000 au 1234.) Huenda ukahitaji kuingiza PIN sawia kwenye kifaa cha Bluetooth."</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="8301499416158195044">\n"Ingiza nenosiri ili kulinganisha na \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
+    <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>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="9139892462102104755">"Ingiza \"<xliff:g id="PASSKEY">%2$s</xliff:g>\" kwenye \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" ili kulinganisha ikifuatiliwa na rudi au ingiza."</string>
+    <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>
+    <string name="bluetooth_preference_find_nearby_title" msgid="5087410003465463318">"Tafuta vifaa vilivyo karibu"</string>
+    <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"Mipangilio ya kifaa"</string>
+    <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Vifaa vilivyolinganishwa"</string>
+    <string name="bluetooth_preference_found_devices" msgid="3133019331974936204">"Vifaa vilivyopatikana"</string>
+    <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>
+    <string name="bluetooth_profile_headset" msgid="81844079120986198">"Isiyotumia mikono"</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>
+    <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> itatenganishwa kutoka kwa sauti ya media."</string>
+    <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> itatenganishwa kutoka kwa sauti ya kifaa kisichotumia mikono."</string>
+    <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> itatenganishwa kutoka kwa kifaa cha kuingiza."</string>
+    <!-- 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>
+    <string name="bluetooth_device_advanced_device_actions_title" msgid="3793430949811946844">"Vitendo vya kifaa"</string>
+    <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>
+    <string name="bluetooth_device_advanced_rename_device" msgid="350508394033808532">"Ipe jina jipya kifaa"</string>
+    <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Ruhusu mahamisho ya faili inayoingia"</string>
+    <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>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Tumia kwa ufikiaji mtandao"</string>
+    <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>
+    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"Tumia Mawasiliano ya Karibu na Uga ili kusoma lebo za ubadilishanaji"</string>
+    <string name="nfc_toggle_error" msgid="2233172102497535522">"Hitilafu imetokea."</string>
+    <!-- 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 />
+    <string name="wifi_wps_pin_output" msgid="8682102965680650853">"Ingiza pin <xliff:g id="WPS_PIN">%1$s</xliff:g> kwenye kituo cha ufikivu"</string>
+    <!-- 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>
+    <string name="wifi_open_with_wps" msgid="2606968531452521147">"WPS inapatikana"</string>
+    <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>
+    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Bendi ya masafa ya mtandao-hewa"</string>
+    <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Bainisha masafa ya mazoea ya shughuli"</string>
+    <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Kulikuwa na tatizo la kuweka bendi ya masafa."</string>
+    <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 />
+    <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Tafadhali charaza anwani halali ya IP."</string>
+    <string name="wifi_ip_settings_invalid_gateway" msgid="6383012465511093067">"Tafadhali charaza anwani halali ya lango."</string>
+    <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Tafadhali charaza anwani halali ya dns."</string>
+    <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Tafadhali charaza urefu wa kiambishi awali cha mtandao kati ya 0 na 32."</string>
+    <!-- no translation found for wifi_dns1 (7344118050720080045) -->
+    <skip />
+    <!-- no translation found for wifi_dns2 (1368601006824882659) -->
+    <skip />
+    <!-- no translation found for wifi_gateway (163914742461092086) -->
+    <skip />
+    <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Urefu wa kiambishi awali cha mtandao"</string>
+    <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>
+    <string name="display_settings_title" msgid="2378894265964357591">"Skrini"</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>
+    <string name="ringtone_title" msgid="7037881886694206550">"Mlio wa simu inayoingia"</string>
+    <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>
+    <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"Kompyuta ndogo haijawekwa kwenye gati"</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>
+    <string name="dock_not_found_text" product="tablet" msgid="7935403744079168804">"Kompyuta ndogo lazima iwe kwenye gati ili kusanidi sauti ya gati"</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>
+    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Cheza sauti wakati unaingiza au kuondoa kompyuta ndogo kutoka kwa gati"</string>
+    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Chezesha sauti wakati unapoingiza au kuondoa simu nkutoka gati"</string>
+    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Usicheze sauti wakati unaingiza au kuondoa kompyuta ndogo 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>
+    <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Badilisha uelekezo kiotomatiki wakati unazungusha kompyuta ndogo"</string>
+    <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Badili uelekezaji kiotomatiki wakati wa kuzungusha simu"</string>
+    <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Badilisha uelekezo kiotomatiki wakati unazungusha kompyuta ndogo"</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>
+    <string name="screen_timeout" msgid="6962654593018319466">"Muda wa umeisha"</string>
+    <string name="screen_timeout_summary" msgid="4471347210332380587">"Skrini huzima kiotomati baada ya <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <!-- no translation found for wallpaper_settings_title (5449180116365824625) -->
+    <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 />
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Inahitaji PIN ili kutumia kompyuta ndogo"</string>
+    <!-- outdated translation 5058355081270397764 -->     <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Inahitaji PIN ili kutumia kompyuta ndogo"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Inahitaji PIN ili kutumia kompyuta ndogo"</string>
+    <!-- outdated translation 2813800553917012356 -->     <string name="sim_lock_off" product="default" msgid="258981978215428916">"Inahitaji PIN ili kutumia kompyuta ndogo"</string>
+    <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 />
+    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Hadhi ya kompyuta ndogo"</string>
+    <!-- outdated translation 1119755927536987178 -->     <string name="device_info_settings" product="default" msgid="475872867864762157">"Hadhi ya kompyuta ndogo"</string>
+    <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 />
+    <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Hadhi ya betri, mtandao na maelezo mengine"</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>
+    <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Ondoa hifadhi ya USB, angalia hifadhi inayopatikana"</string>
+    <!-- outdated translation 3543813623294870759 -->     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Ondoa hifadhi ya USB, angalia hifadhi inayopatikana"</string>
+    <!-- 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>
+    <!-- no translation found for status_msid_number (909010114445780530) -->
+    <skip />
+    <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 />
+    <string name="internal_memory" msgid="9129595691484260784">"Hifadhi ya ndani"</string>
+    <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Hifadhi ya USB"</string>
+    <!-- outdated translation 2510246194083052841 -->     <string name="sd_memory" product="default" msgid="151871913888051515">"Hifadhi ya USB"</string>
+    <!-- no translation found for memory_available (5052397223077021181) -->
+    <skip />
+    <!-- no translation found for memory_size (6629067715017232195) -->
+    <skip />
+    <string name="memory_calculating_size" msgid="2188358544203768588">"Inahesabu..."</string>
+    <!-- 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>
+    <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Ondoa hifadhi ya ndani ya USB"</string>
+    <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Ondoa kadi ya SD ili uweze kuindoa kwa usalama"</string>
+    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Ingiza hifadhi ya USB ya kuondoa"</string>
+    <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Ingiza kadi ya SD ya uangikaji"</string>
+    <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Weka hifadhi ya USB"</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>
+    <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"Futa hifadhi ya USB"</string>
+    <string name="sd_format" product="default" msgid="2576054280507119870">"Futa kadi ya SD"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Futa data yote kwenye hifadhi ya ndani ya USB, kama vile muziki na picha"</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"Futa data yote kwenye kadi ya SD, kama vile muziki na picha"</string>
+    <!-- no translation found for read_only (6702420168629076340) -->
+    <skip />
+    <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"Ondoa hifadhi ya USB"</string>
+    <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"Uanguaji wa kadi ya SD"</string>
+    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"Ukiondoa hifadhi ya USB, programu zingine unazotumia zitakoma na huenda zisipatikane hadi uweke upya hifadhi ya USB."</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>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"Imeshindwa kuondoa hifadhi ya USB"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"Uanguaji wa kadi ya SD umeshindikana"</string>
+    <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"Haiwezi kuondoa hifadhi ya USB. Jaribu tena baadaye."</string>
+    <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"Haiwezi kuangua kadi ya SD. Jaribu tena baadaye."</string>
+    <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"Hifadhi ya USB itaondolewa."</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 />
+    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Futa data yote kwenye kompyuta ndoto"</string>
+    <!-- outdated translation 4036344100254678429 -->     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Futa data yote kwenye kompyuta ndoto"</string>
+    <!-- outdated translation 1305457209008369655 -->     <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"Hii itafuta data yote kutoka kwa "<b>"hifadhi ya ndani"</b>" ya kompyuta yako ndogo, pamoja na:"\n\n<li>"Akaunti yako ya Google"</li>\n<li>"Mfumo na data ya programu na mipangilio"</li>\n<li>"Programu zilizopakuliwa"</li></string>
+    <!-- outdated translation 1305457209008369655 -->     <string name="master_clear_desc" product="default" msgid="3251400937758241249">"Hii itafuta data yote kutoka kwa "<b>"hifadhi ya ndani"</b>" ya kompyuta yako ndogo, pamoja na:"\n\n<li>"Akaunti yako ya Google"</li>\n<li>"Mfumo na data ya programu na mipangilio"</li>\n<li>"Programu zilizopakuliwa"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Kwa sasa umeingia kwenye akaunti zinazofuata:"\n</string>
+    <!-- no translation found for master_clear_desc_also_erases_external (1903185203791274237) -->
+    <skip />
+    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Ili kufuta pia muziki, picha, na data zingine za mtumiaji, "<b>"hifadhi ya USB"</b>" inahitaji kufutwa."</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Ili kufuta pia muziki, picha, na data zingine za mtumiaji, "<b>"kadi ya SD"</b>" inahitaji kufutwa."</string>
+    <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Futa hifadhi ya USB"</string>
+    <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Futa kadi ya SD"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"Futa data yote kwenye hifadhi ya ndani ya USB, kama vile muziki au picha."</string>
+    <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"Futa data yote kwenye kadi ya SD, kama vile muziki au picha."</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Weka upya kompyuta ndogo"</string>
+    <!-- outdated translation 3130786116528304116 -->     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Weka upya kompyuta ndogo"</string>
+    <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>
+    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Lazima uchore mchoro wa kufungua ili uthibitishe kuweka upya data ya kiwanda."</string>
+    <!-- no translation found for master_clear_failed (8655202125010189406) -->
+    <skip />
+    <string name="master_clear_confirm_title" msgid="4845794266129586839">"Thibitisha kuweka upya"</string>
+    <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Futa hifadhi ya USB"</string>
+    <string name="media_format_title" product="default" msgid="4427528440306787972">"Futa kadi ya SD"</string>
+    <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Hufuta data yote katika hifadhi ya USB"</string>
+    <string name="media_format_summary" product="default" msgid="3805714639375830120">"Futa data zote kwenye kadi ya SD"</string>
+    <string name="media_format_desc" product="nosdcard" msgid="4553860683952763905">"Kitendo hiki kitafuta hifadhi ya USB. Utapoteza data "<b>"yote"</b>" iliyohifadhiwa hapa!"</string>
+    <string name="media_format_desc" product="default" msgid="1598627584181935513">"Kitendo hiki kitafuta kadi ya SD. Utapoteza "<b>"data"</b>" zote kwenye kadi!"</string>
+    <string name="media_format_button_text" product="nosdcard" msgid="6293669371185352810">"Futa hifadhi ya USB"</string>
+    <string name="media_format_button_text" product="default" msgid="6721544380069373626">"Futa kadi ya SD"</string>
+    <string name="media_format_final_desc" product="nosdcard" msgid="8094635533378487255">"Futa hifadhi ya USB, unafuta faili zote zilizohifadhiwa hapo? Hatua hii haiwezi kugeuzwa!"</string>
+    <string name="media_format_final_desc" product="default" msgid="9015504991522581434">"Futa kadi ya SD, unafuta faili zote zilizohifadhiwa hapo? Kitendo hakiwezi kugeuzwa!"</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>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Lazima uchore mchoro wako wa kufungua ili kuthibitisha kwamba unataka kufuta hifadhi ya USB."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Lazima uchore mchoro wako wa kufungua ili kuthibitisha kwamba unataka kufuta 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>
+    <string name="tether_settings_summary_usb" product="tablet" msgid="785883365108362248">"Shirikia muunganisho wako wa data ya simu ya mkononi kupitia USB"</string>
+    <string name="tether_settings_summary_usb" product="default" msgid="3562431455625637370">"Shiriki data yako ya simu ya mkononi kuunganisha kupitia USB"</string>
+    <string name="tether_settings_summary_wifi" msgid="5474383125137372164">"Shiriki muunganisho wako wa data ya simu ya mkononi kama eneo linaloweza kubebwa la mtandao-hewa"</string>
+    <string name="tether_settings_summary_bluetooth" msgid="2407506656353819750">"Shiriki muunganisho wako wa data ya simu ya mkononi kupitia Bluetooth"</string>
+    <string name="tether_settings_summary_usb_wifi" product="tablet" msgid="3834674129575844910">"Shiriki muunganisho wako wa data ya kompyuta ndogo ya mkononi kupitia USB au eneo linaloweza kubebwa la mtandao-hewa"</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>
+    <string name="tether_settings_summary_usb_bluetooth" product="tablet" msgid="1245080236509560839">"Shiriki muunganisho wako wa data ya simu ya mkononi 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>
+    <string name="tether_settings_summary_wifi_bluetooth" product="tablet" msgid="1924576461932311140">"Shiriki muunganisho wako wa data ya kompyuta ndogo ya mkononi kupitia Bluetooth au eneo linaloweza kubebwa la mtandao-hewa"</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>
+    <string name="tether_settings_summary_all" product="tablet" msgid="6612660164315153427">"Shirikia muunganisho wako wa data ya simu ya mkononi kupitia USB, mtandao-hewa 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>
+    <string name="use_location_title" msgid="3659340070401464551">"Tumia mahali kwa Utafutaji wa Google"</string>
+    <string name="use_location_summary_disabled" msgid="6518008620918354403">"Tumia mahali kwa utafutaji wa Google na huduma zingine za Google."</string>
+    <string name="use_location_summary_enabled" msgid="8110246289085796179">"Mahali palipotumiwa ili kuboresha matokeo ya Utafutaji wa Google na huduma zingine za Google"</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"Kuhusu kompyuta ndogo"</string>
+    <!-- outdated translation 593457295516533765 -->     <string name="about_settings" product="default" msgid="1743378368185371685">"Kuhusu kompyuta ndogo"</string>
+    <string name="about_settings_summary" msgid="3371517697156165959">"Angalia maelezo ya kisheria, hadhi, toleo la programu"</string>
+    <!-- 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>
+    <string name="system_tutorial_list_item_summary" product="tablet" msgid="3341504384445734067">"Jifunze jinsi ya kutumia kompyuta yako ndogo"</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>
+    <string name="settings_safetylegal_activity_unreachable" msgid="170670055116721810">"Huna muunganisho wa data. Ili kuona maelezo haya sasa, nenda kwa %s kutoka kwa kompyuta yoyote iliyounganishwa kwenye mtandao."</string>
+    <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Inapakia…"</string>
+    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Chagua nenosiri lako"</string>
+    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Chagua mchoro wako"</string>
+    <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>
+    <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Thibitisha mchoro wako"</string>
+    <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>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Fungua uchaguzi"</string>
+    <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>
+    <string name="lock_settings_title" msgid="8943058958424073651">"Skrini ya kufunga"</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 />
+    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Kulinda kompyuta yako ndogo"</string>
+    <!-- outdated translation 2909697418179419990 -->     <string name="lock_title" product="default" msgid="4059246467204273930">"Kulinda kompyuta yako ndogo"</string>
+    <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"Linda kompyuta yako ndogo dhidi ya utumizi usioidhinishwa kwa kuunda mchoro wa kibinafsi wa kufungua skrini. Tumia kidole chako ili kuunganisha vitone katika mpangilio wowote kwenye skrini ifuatayo. Lazima uunganishe angalau vitonne vinne. "\n\n"Uko tayari kuanza? Gusa \"Ifuatayo\"."</string>
+    <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>
+    <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"Kompyuta yako ndogo na maelezo ya kibinafsi yanaweza kuathiriwa zaidi na programu kutoka kwa vyanzo visivyojulikana. Unakubali kwamba unawajibika kivyako kwa uharibifu wowote kwa kompyuta yako ndogo au upotezaji wa data ambao huenda ukatokea kwa sababu ya kutumia programu hizi."</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>
+    <string name="show_running_services" msgid="5736278767975544570">"Onyesha huduma zinazoendeshwa"</string>
+    <string name="show_background_processes" msgid="2009840211972293429">"Onyesha michakato ya kache"</string>
+    <!-- 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>
+    <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Hifadhi ya USB"</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>
+    <string name="internal_storage" msgid="1584700623164275282">"Hifadhi ya ndani"</string>
+    <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Hifadhi ya USB"</string>
+    <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Hifadhi ya kadi ya SD"</string>
+    <!-- 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>
+    <string name="security_settings_desc" product="tablet" msgid="6158636779728455276">"Programu hii haiwezi kufikia inayofuata kwenye kompyuta hii ndogo:"</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>
+    <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Hamisha kwa kompyuta ndogo"</string>
+    <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Sogeza kwa simu"</string>
+    <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Hamisha kwa hifadhi ya USB"</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>
+    <string name="cached" msgid="1059590879740175019">"Imenasa mchakato wa usuli"</string>
+    <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 />
+    <string name="service_background_processes" msgid="6844156253576174488">"<xliff:g id="MEMORY">%1$s</xliff:g> Haina malipo"</string>
+    <string name="service_foreground_processes" msgid="7583975676795574276">"<xliff:g id="MEMORY">%1$s</xliff:g> imetumiwa"</string>
+    <string name="memory" msgid="6609961111091483458">"RAM"</string>
+    <!-- no translation found for service_process_name (4098932168654826656) -->
+    <skip />
+    <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<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>
+    <string name="background_process_stop_description" msgid="1728354083304746737">"Huu ni mchakato wa zamani wa programu ambao unawekwa kwa ajili ya kasi bora zaidi iwapo inahitajika tena. Kwa kawaida hakuna sababu ya kuikomesha."</string>
+    <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>
+    <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Komesha huduma ya mfumo?"</string>
+    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="5420033091144016389">"Una uhakika unataka kukomesha huduma hii ya mfumo? Kama unataka, vipengele vingine vya kompyuta yako ndogo huenda vikome kufanya kazi vizuri hadi uizime na uiwashe tena."</string>
+    <string name="runningservicedetails_stop_dlg_text" product="default" msgid="6929716497425738387">"Una uhakika unataka kukomesha huduma hii ya mfumo? Kama unataka, vipengele vingine vya simu yako huenda vikome kufanya kazi vizuri hadi uizime na uiwashe tena."</string>
+    <string name="language_settings" msgid="5292716747264442359">"Uingizaji lugha"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Uingizaji lugha"</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 />
+    <string name="auto_caps" msgid="6379232078052591265">"Ukozaji-kioto"</string>
+    <!-- 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 />
+    <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Maelezo ya kompyuta ndogo"</string>
+    <!-- outdated translation 193561832258534798 -->     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Maelezo ya kompyuta ndogo"</string>
+    <!-- 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>
+    <string name="current_input_method" msgid="2146807723398303917">"Mbinu ya sasa ya uingizaji"</string>
+    <string name="input_method_selector" msgid="4311213129681430709">"Ingioza kichaguaji mbinu"</string>
+    <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"Kiotomatiki"</string>
+    <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"Onyesha kila wakati"</string>
+    <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"Ficha kila wakati"</string>
+    <string name="configure_input_method" msgid="7773992829158322455">"Sanidi mbinu za uingizaji"</string>
+    <string name="input_method_settings" msgid="5801295625486269553">"Mipangilio"</string>
+    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Mbinu amilifu za uingizaji"</string>
+    <string name="use_system_language_to_select_input_method_subtypes" msgid="3346751753141428573">"Tumia lugha ya mfumo"</string>
+    <string name="input_methods_settings_label_format" msgid="6002887604815693322">"Mipangilio ya <xliff:g id="IME_NAME">%1$s</xliff:g>"</string>
+    <string name="input_methods_and_subtype_enabler_title" msgid="4018402267502337338">"Chagua mbinu amilifu za uingizaji"</string>
+    <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>
+    <string name="accessibility_script_injection_security_warning" product="tablet" msgid="1113600871264359828">"Programu zingine zinaweza kuuliza Google kupakua hati kwenye kompyuta yako ndogo ambayo hufanya maudhui yake kufikiwa zaidi. Una uhakika unataka kuruhusu Google kusakinisha hati za ufikiaji kwenye kompyuta yako ndogo?"</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>
+    <string name="power_usage_not_available" msgid="3583407442633768046">"Data ya utumizi wa betri haipatikani"</string>
+    <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>
+    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"mtandao-hewa"</string>
+    <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Amka"</string>
+    <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Mawimbi ya mtandao wa simu ya mkononi"</string>
+    <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
+    <skip />
+    <string name="awake" msgid="387122265874485088">"Muda wa kuamka kwa kifaa"</string>
+    <string name="wifi_on_time" msgid="6310209835617490616">"mtandao-hewa kwa wakati unaofaa"</string>
+    <string name="bluetooth_on_time" msgid="6157799524996162271">"mtandao-hewa 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>
+    <string name="history_details_title" msgid="3608240585315506067">"Maelezo ya historia"</string>
+    <string name="details_title" msgid="3792801565213935385">"Tumia maelezo"</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>
+    <string name="power_idle" product="tablet" msgid="4612478572401640759">"Kompyuta ndogo haina shughuli"</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>
+    <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Kompyuta ndogo"</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>
+    <string name="battery_action_wifi" msgid="2272741639606146903">"Mipangilio ya mtandao-hewa"</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>
+    <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Betri inayotumiwa wakati kompyuta ndogo haina shughuli"</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>
+    <!-- no translation found for tts_engine_settings_section (2346105138448751893) -->
+    <skip />
+    <!-- no translation found for tts_engine_settings_title (3499112142425680334) -->
+    <skip />
+    <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>
+    <string name="vpn_details_title" msgid="418806440938510331">"Maelezo ya VPN"</string>
+    <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>
+    <string name="backup_data_summary" msgid="6515285107793232815">"Cheleza data ya programu, manenosiri ya mtandao-hewa, na mipangilio mingine kwa seva za Google"</string>
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"Akaunti ya chelezo"</string>
+    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Hakuna akaunti inayohifadhi kwa sasa data iliyochelezwa"</string>
+    <string name="auto_restore_title" msgid="5397528966329126506">"Onyesha upya otomatiki"</string>
+    <string name="auto_restore_summary" msgid="83177150536734378">"Kama nitasakinisha upya programu, kurejesha mipangilio ya chelezo au data nyingine"</string>
+    <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Cheleza"</string>
+    <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Una uhakika unataka kukomesha kucheleza menenosiri yako ya mtandao-hewa, alamisho, na mipangilio mengine na data ya programu na kufuta nakala zote 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>
+    <string name="wifi_setup_title" msgid="661074868726906436">"Usanidi wa mtandao-hewa"</string>
+    <!-- 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>
+    <string name="wifi_setup_back" msgid="144777383739164044">"Nyuma"</string>
+    <string name="wifi_setup_detail" msgid="2336990478140503605">"Maelezo ya mtandao"</string>
+    <string name="wifi_setup_connect" msgid="7954456989590237049">"Unganisha"</string>
+    <string name="wifi_setup_forget" msgid="2562847595567347526">"Sahau"</string>
+    <string name="wifi_setup_save" msgid="3659235094218508211">"Hifadhi"</string>
+    <string name="wifi_setup_cancel" msgid="3185216020264410239">"Ghairi"</string>
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"Inasafisha mitandao..."</string>
+    <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"Gusa mtandao ili kuunganisha"</string>
+    <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Unganisha kwa mtandao uliopo"</string>
+    <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"Unganisha kwenye mtandao usio salama"</string>
+    <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>
+    <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"EAP haiamiliwi"</string>
+    <!-- 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 />
+    <string name="account_sync_settings_title" msgid="4578227872921044660">"Mipangilio ya usawazishaji"</string>
+    <!-- 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>
+    <string name="settings_backup" msgid="2274732978260797031">"Mipangilio ya chelezo"</string>
+    <string name="settings_backup_summary" msgid="7916877705938054035">"Cheleza mipangilio yangu"</string>
+    <!-- no translation found for sync_menu_sync_now (6154608350395805683) -->
+    <skip />
+    <!-- no translation found for sync_menu_sync_cancel (8292379009626966949) -->
+    <skip />
+    <string name="sync_one_time_sync" msgid="6766593624598183090">"Gusa ili kusawazisha sasa<xliff:g id="LAST_SYNC_TIME">
+%1$s</xliff:g>"</string>
+    <!-- no translation found for sync_gmail (714886122098006477) -->
+    <skip />
+    <!-- no translation found for sync_calendar (9056527206714733735) -->
+    <skip />
+    <!-- no translation found for sync_contacts (9174914394377828043) -->
+    <skip />
+    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Karibu kwa Google sync!"</font>" "\n"Njia ya Google ya kusawazisha data ili kuruhusu ufikiaji wa anwani zako, miadi, na mengi popote ulipo."</string>
+    <string name="header_application_sync_settings" msgid="5514539555293976035">"Mipangilio ya kusawazisha programu"</string>
+    <string name="header_data_and_synchronization" msgid="5165024023936509896">"Usawazishaji data"</string>
+    <string name="preference_change_password_title" msgid="8955581790270130056">"Badilisha nenosiri"</string>
+    <string name="header_account_settings" msgid="5382475087121880626">"Mipangilio ya akaunti"</string>
+    <string name="remove_account_label" msgid="5921986026504804119">"Ondoa akaunti"</string>
+    <string name="header_add_an_account" msgid="756108499532023798">"Ongeza akaunti"</string>
+    <string name="finish_button_label" msgid="481587707657751116">"Maliza"</string>
+    <string name="really_remove_account_title" msgid="6574643117748564960">"Ondoa akaunti"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="4448645571715719563">"Kwa kweli unataka kuondoa akaunti hii? Kuiondoa kutafuta pia ujumbe wake wote, anwani, na data zingine kutoka kwa kompyuta ndogo. "\n"Endelea?"</string>
+    <string name="really_remove_account_message" product="default" msgid="1005751790899989319">"Je, kweli unataka kuondoa akaunti hii? Kuiondoa kutafuta pia ujumbe wake wote, anwani, na data zingine kutoka kwa simu. "\n"Endelea?"</string>
+    <string name="remove_account_failed" product="tablet" msgid="1093911989149396624">"Akaunti hii inahitajika na programu zingine. Unaweza tu kuiondoa kwa kuweka upya kompyuta ndogo kwa chaguo-msingi za kiwanda (ambazo hufuta data yako yote ya kibinafsi). Unafanya hivyo katika programu ya Mipangilio, chini ya Faragha."</string>
+    <string name="remove_account_failed" product="default" msgid="9174390193652391412">"Akaunti hii inahitajika na programu zingine. Unaweza tu kuiondoa kwa kuweka upya simu kwa chaguo-msingi za kiwanda (ambazo hufuta data yako yote ya kibinafsi). Unafanya hivyo katika programu ya Mipangilio, chini ya Faragha."</string>
+    <string name="provider_label" msgid="7724593781904508866">"Usajili wa Push"</string>
+    <string name="sync_item_title" msgid="1931551540462877488">"Usawazishaji <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
+    <string name="cant_sync_dialog_title" msgid="7185199796123573317">"Haiwezi kusawazisha kwa mikono"</string>
+    <string name="cant_sync_dialog_message" msgid="2372359241135295930">"Usawazishaji wa kipengee hiki umelemazwa kwa sasa. Ili kubadilisha upendeleo wako, washa kwa muda data ya usuli na usawazishaji otomatiki."</string>
+    <string name="enter_password" msgid="3268224850821675915">"Ingiza nenosiri ili kugeuza hifadhi"</string>
+    <string name="try_again" msgid="5904121494468643129">"Samahani, jaribu tena"</string>
+    <!-- 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 />
+    <!-- no translation found for data_usage_summary_title (3804110657238092929) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle (5652529796195787949) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_split_4g (7417435609285381968) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_wifi (8266875319417201085) -->
+    <skip />
+    <!-- no translation found for data_usage_change_cycle (7776556448920114866) -->
+    <skip />
+    <!-- no translation found for data_usage_pick_cycle_day (4470796861757050966) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_mobile_limit (289740911281022322) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_4g_limit (5808210773758699800) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_3g_limit (3856971004328238231) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_wifi (1728851922959017766) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_mobile (454140350007299045) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_4g (1301978716067512235) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_3g (6092169523081538718) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_mobile (986782622560157977) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_3g (6304006671869578254) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_4g (3635854097335036738) -->
+    <skip />
+    <!-- no translation found for data_usage_app_settings (3727561362090820369) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background (8856643905291165256) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background_summary (1503361245973512092) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog_title (8110736468987743260) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog (100001698378554777) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_title (1373797281540188533) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_subtitle (5512903797979928416) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_positive (4565302264487526138) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_title (3023111643632996097) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_mobile (7931094451923591578) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_3g (5478553071420316963) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_4g (6134008906742403777) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_3g_title (4221584306492812040) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_4g_title (715585612162185936) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_mobile_title (209516216265000221) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog (2874031671067845964) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_enable (5738467047490662678) -->
+    <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 a8ed94b..2ca9e02 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>
+    <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,19 @@
     <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>
+    <!-- no translation found for wallpaper_settings_title (5449180116365824625) -->
+    <skip />
+    <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>
@@ -643,8 +656,9 @@
     <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"หมายเลขโทรศัพท์ของฉัน"</string>
     <string name="status_min_number" msgid="3519504522179420597">"นาที"</string>
+    <string name="status_msid_number" msgid="909010114445780530">"MSID"</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,6 +907,8 @@
     <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>
@@ -1026,7 +1042,8 @@
     <string name="pointer_settings_category" msgid="6090176550039035130">"การตั้งค่าเมาส์และแทร็กแพด"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"ความเร็วของตัวชี้"</string>
     <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>
@@ -1035,6 +1052,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>
@@ -1106,6 +1124,7 @@
     <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>
+    <string name="settings_button" msgid="3006713718908152930">"การตั้งค่า"</string>
     <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>
@@ -1218,6 +1237,10 @@
     <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>
+    <!-- no translation found for tts_engine_settings_section (2346105138448751893) -->
+    <skip />
+    <!-- no translation found for tts_engine_settings_title (3499112142425680334) -->
+    <skip />
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"ภาษาและเสียง"</string>
     <string name="pico_installed" msgid="2452546687858267414">"ติดตั้งแล้ว"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"ไม่ได้ติดตั้ง"</string>
@@ -1308,30 +1331,24 @@
     <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>
+    <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>
+    <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>
+    <string name="credentials_not_erased" msgid="397954733557821269">"ไม่สามารถลบที่จัดเก็บข้อมูลรับรอง"</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"เปิดการใช้งานที่จัดเก็บข้อมูลรับรองไว้"</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6816970208840577219">"คุณต้องตั้ง PIN หรือรหัสผ่านสำหรับล็อกหน้าจอก่อนจึงจะสามารถใช้ที่จัดเก็บข้อมูลรับรองได้ คุณต้องการทำในขณะนี้หรือไม่"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"โทนเสียงฉุกเฉิน"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"ตั้งค่าการทำงานเมื่อมีการโทรหาหมายเลขฉุกเฉิน"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"ข้อมูลส่วนบุคคล"</string>
@@ -1439,4 +1456,69 @@
     <string name="select_all" msgid="6783085295161532497">"เลือกทั้งหมด"</string>
     <string name="hdcp_checking_title" msgid="8605478913544273282">"การตรวจสอบ HDCP"</string>
     <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"ตั้งค่าการตรวจสอบ HDCP"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"การใช้ข้อมูล"</string>
+    <!-- no translation found for data_usage_cycle (5652529796195787949) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_split_4g (7417435609285381968) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_wifi (8266875319417201085) -->
+    <skip />
+    <!-- no translation found for data_usage_change_cycle (7776556448920114866) -->
+    <skip />
+    <!-- no translation found for data_usage_pick_cycle_day (4470796861757050966) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_mobile_limit (289740911281022322) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_4g_limit (5808210773758699800) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_3g_limit (3856971004328238231) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_wifi (1728851922959017766) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_mobile (454140350007299045) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_4g (1301978716067512235) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_3g (6092169523081538718) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_mobile (986782622560157977) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_3g (6304006671869578254) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_4g (3635854097335036738) -->
+    <skip />
+    <!-- no translation found for data_usage_app_settings (3727561362090820369) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background (8856643905291165256) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background_summary (1503361245973512092) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog_title (8110736468987743260) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog (100001698378554777) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_title (1373797281540188533) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_subtitle (5512903797979928416) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_positive (4565302264487526138) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_title (3023111643632996097) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_mobile (7931094451923591578) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_3g (5478553071420316963) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_4g (6134008906742403777) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_3g_title (4221584306492812040) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_4g_title (715585612162185936) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_mobile_title (209516216265000221) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog (2874031671067845964) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_enable (5738467047490662678) -->
+    <skip />
 </resources>
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 a9bd26a..8b12108 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>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Hindi pinagana ng administrator, patakaran sa pag-encrypt, o storage ng kredensyal"</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,19 @@
     <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>
+    <!-- no translation found for wallpaper_settings_title (5449180116365824625) -->
+    <skip />
+    <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>
@@ -643,8 +656,9 @@
     <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <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_msid_number" msgid="909010114445780530">"MSID"</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,6 +907,8 @@
     <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>
@@ -1026,7 +1042,8 @@
     <string name="pointer_settings_category" msgid="6090176550039035130">"Mga setting ng mouse at trackpad"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Bilis ng pointer"</string>
     <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>
@@ -1035,6 +1052,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>
@@ -1106,6 +1124,7 @@
     <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>
+    <string name="settings_button" msgid="3006713718908152930">"Mga Setting"</string>
     <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>
@@ -1218,6 +1237,10 @@
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> (na) setting"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"Pinagana ang <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"Hindi pinagana ang <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
+    <!-- no translation found for tts_engine_settings_section (2346105138448751893) -->
+    <skip />
+    <!-- no translation found for tts_engine_settings_title (3499112142425680334) -->
+    <skip />
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"Mga wika at boses"</string>
     <string name="pico_installed" msgid="2452546687858267414">"Naka-install"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"Hindi naka-install"</string>
@@ -1308,30 +1331,24 @@
     <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>
+    <string name="credentials_reset_summary" msgid="3369361230171260282">"Alisin ang lahat ng certificate"</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>
+    <string name="credentials_reset_hint" msgid="1566409057833618877">"Aalisin ang lahat ng nilalaman. Sigurado ka ba tungkol doon?"</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>
+    <string name="credentials_not_erased" msgid="397954733557821269">"Hindi mabubura ang storage ng kredensyal."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Pinagana ang imbakan ng kredensyal."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6816970208840577219">"Dapat kang magtakda ng PIN ng lock screen o password bago mo magamit ang storage ng kredensyal. Gusto mo ba iyong gawin ngayon?"</string>
     <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>
@@ -1440,4 +1457,69 @@
     <string name="select_all" msgid="6783085295161532497">"Piliin Lahat"</string>
     <string name="hdcp_checking_title" msgid="8605478913544273282">"Pagsusuring HDCP"</string>
     <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Itakda kilos ng pagsusuri ng HDCP"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Paggamit ng data"</string>
+    <!-- no translation found for data_usage_cycle (5652529796195787949) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_split_4g (7417435609285381968) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_wifi (8266875319417201085) -->
+    <skip />
+    <!-- no translation found for data_usage_change_cycle (7776556448920114866) -->
+    <skip />
+    <!-- no translation found for data_usage_pick_cycle_day (4470796861757050966) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_mobile_limit (289740911281022322) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_4g_limit (5808210773758699800) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_3g_limit (3856971004328238231) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_wifi (1728851922959017766) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_mobile (454140350007299045) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_4g (1301978716067512235) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_3g (6092169523081538718) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_mobile (986782622560157977) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_3g (6304006671869578254) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_4g (3635854097335036738) -->
+    <skip />
+    <!-- no translation found for data_usage_app_settings (3727561362090820369) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background (8856643905291165256) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background_summary (1503361245973512092) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog_title (8110736468987743260) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog (100001698378554777) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_title (1373797281540188533) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_subtitle (5512903797979928416) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_positive (4565302264487526138) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_title (3023111643632996097) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_mobile (7931094451923591578) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_3g (5478553071420316963) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_4g (6134008906742403777) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_3g_title (4221584306492812040) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_4g_title (715585612162185936) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_mobile_title (209516216265000221) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog (2874031671067845964) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_enable (5738467047490662678) -->
+    <skip />
 </resources>
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 f8058df..d7327c7 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>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"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,19 @@
     <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>
+    <!-- no translation found for wallpaper_settings_title (5449180116365824625) -->
+    <skip />
+    <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>
@@ -643,8 +656,9 @@
     <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"Telefon numaram"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MİN"</string>
+    <string name="status_msid_number" msgid="909010114445780530">"MSID"</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,6 +907,8 @@
     <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>
@@ -1026,7 +1042,8 @@
     <string name="pointer_settings_category" msgid="6090176550039035130">"Fare ve izleme yüzeyi ayarları"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"İşaretçi hızı"</string>
     <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>
@@ -1035,6 +1052,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>
@@ -1106,6 +1124,7 @@
     <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>
+    <string name="settings_button" msgid="3006713718908152930">"Ayarlar"</string>
     <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>
@@ -1218,6 +1237,10 @@
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> ayarları"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> etkinleştirildi"</string>
     <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> devre dışı bırakıldı"</string>
+    <!-- no translation found for tts_engine_settings_section (2346105138448751893) -->
+    <skip />
+    <!-- no translation found for tts_engine_settings_title (3499112142425680334) -->
+    <skip />
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"Diller ve sesler"</string>
     <string name="pico_installed" msgid="2452546687858267414">"Yüklendi"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"Yüklü değil"</string>
@@ -1308,30 +1331,24 @@
     <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>
+    <string name="credentials_reset_summary" msgid="3369361230171260282">"Tüm sertifikaları kaldır"</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>
+    <string name="credentials_reset_hint" msgid="1566409057833618877">"Tüm içerik kaldırılacak. Bundan 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>
+    <string name="credentials_not_erased" msgid="397954733557821269">"Kimlik bilgileri deposu silinemedi."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Kimlik bilgileri deposu etkin."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6816970208840577219">"Kimlik bilgileri depolamasını kullanabilmek için önce ekran PIN\'i veya şifre ayarlamalısınız. Bunu şimdi yapmak ister misiniz?"</string>
     <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>
@@ -1439,4 +1456,69 @@
     <string name="select_all" msgid="6783085295161532497">"Tümünü Seç"</string>
     <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP denetimi"</string>
     <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"HDCP denetimini ayarla"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Veri kullanımı"</string>
+    <!-- no translation found for data_usage_cycle (5652529796195787949) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_split_4g (7417435609285381968) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_wifi (8266875319417201085) -->
+    <skip />
+    <!-- no translation found for data_usage_change_cycle (7776556448920114866) -->
+    <skip />
+    <!-- no translation found for data_usage_pick_cycle_day (4470796861757050966) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_mobile_limit (289740911281022322) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_4g_limit (5808210773758699800) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_3g_limit (3856971004328238231) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_wifi (1728851922959017766) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_mobile (454140350007299045) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_4g (1301978716067512235) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_3g (6092169523081538718) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_mobile (986782622560157977) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_3g (6304006671869578254) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_4g (3635854097335036738) -->
+    <skip />
+    <!-- no translation found for data_usage_app_settings (3727561362090820369) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background (8856643905291165256) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background_summary (1503361245973512092) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog_title (8110736468987743260) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog (100001698378554777) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_title (1373797281540188533) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_subtitle (5512903797979928416) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_positive (4565302264487526138) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_title (3023111643632996097) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_mobile (7931094451923591578) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_3g (5478553071420316963) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_4g (6134008906742403777) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_3g_title (4221584306492812040) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_4g_title (715585612162185936) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_mobile_title (209516216265000221) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog (2874031671067845964) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_enable (5738467047490662678) -->
+    <skip />
 </resources>
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 d9b9d24..7f4fced 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>
+    <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,19 @@
     <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>
+    <!-- no translation found for wallpaper_settings_title (5449180116365824625) -->
+    <skip />
+    <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>
@@ -643,8 +656,9 @@
     <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"Мій номер телеф."</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
+    <string name="status_msid_number" msgid="909010114445780530">"MSID"</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,6 +907,8 @@
     <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>
@@ -1026,7 +1042,8 @@
     <string name="pointer_settings_category" msgid="6090176550039035130">"Налаштування миші та сенсорної панелі"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Швидкість указівника"</string>
     <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>
@@ -1035,6 +1052,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>
@@ -1106,6 +1124,7 @@
     <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>
+    <string name="settings_button" msgid="3006713718908152930">"Налаштування"</string>
     <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>
@@ -1218,6 +1237,10 @@
     <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>
+    <!-- no translation found for tts_engine_settings_section (2346105138448751893) -->
+    <skip />
+    <!-- no translation found for tts_engine_settings_title (3499112142425680334) -->
+    <skip />
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"Мови та голоси"</string>
     <string name="pico_installed" msgid="2452546687858267414">"Установлено"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"Не встановл."</string>
@@ -1308,30 +1331,24 @@
     <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>
+    <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>
+    <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>
+    <string name="credentials_not_erased" msgid="397954733557821269">"Сховище облік. даних неможливо видал."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Сховище облік. даних увімкнено."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6816970208840577219">"Потрібно встановити PIN-код або пароль блокування екрана, перш ніж ви зможете використовувати сховище облікових даних. Зробити це зараз?"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Аварійний сингал"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Устан. поведінку при розміщ. аварійного виклику"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"Конфід-сть"</string>
@@ -1440,4 +1457,69 @@
     <string name="select_all" msgid="6783085295161532497">"Вибрати все"</string>
     <string name="hdcp_checking_title" msgid="8605478913544273282">"Перевірка HDCP"</string>
     <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Устан.режим перевірки HDCP"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Використання даних"</string>
+    <!-- no translation found for data_usage_cycle (5652529796195787949) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_split_4g (7417435609285381968) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_wifi (8266875319417201085) -->
+    <skip />
+    <!-- no translation found for data_usage_change_cycle (7776556448920114866) -->
+    <skip />
+    <!-- no translation found for data_usage_pick_cycle_day (4470796861757050966) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_mobile_limit (289740911281022322) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_4g_limit (5808210773758699800) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_3g_limit (3856971004328238231) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_wifi (1728851922959017766) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_mobile (454140350007299045) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_4g (1301978716067512235) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_3g (6092169523081538718) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_mobile (986782622560157977) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_3g (6304006671869578254) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_4g (3635854097335036738) -->
+    <skip />
+    <!-- no translation found for data_usage_app_settings (3727561362090820369) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background (8856643905291165256) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background_summary (1503361245973512092) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog_title (8110736468987743260) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog (100001698378554777) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_title (1373797281540188533) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_subtitle (5512903797979928416) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_positive (4565302264487526138) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_title (3023111643632996097) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_mobile (7931094451923591578) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_3g (5478553071420316963) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_4g (6134008906742403777) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_3g_title (4221584306492812040) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_4g_title (715585612162185936) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_mobile_title (209516216265000221) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog (2874031671067845964) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_enable (5738467047490662678) -->
+    <skip />
 </resources>
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 4836d40..96ebe3a 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>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Bị vô hiệu do quản trị viên, chính sách mã hóa hoặc bộ nhớ thông tin xác thực"</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,19 @@
     <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>
+    <!-- no translation found for wallpaper_settings_title (5449180116365824625) -->
+    <skip />
+    <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>
@@ -643,8 +656,9 @@
     <string name="status_number" product="tablet" msgid="1138837891091222272">"SỐ THƯ MỤC DI ĐỘNG (MDN)"</string>
     <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_msid_number" msgid="909010114445780530">"MSID"</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,6 +907,8 @@
     <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>
@@ -1026,7 +1042,8 @@
     <string name="pointer_settings_category" msgid="6090176550039035130">"Cài đặt chuột và ô di chuột"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Tốc độ con trỏ"</string>
     <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>
@@ -1035,6 +1052,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>
@@ -1106,6 +1124,7 @@
     <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>
+    <string name="settings_button" msgid="3006713718908152930">"Cài đặt"</string>
     <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>
@@ -1218,6 +1237,10 @@
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Cài đặt <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> đã được bật"</string>
     <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> đã bị vô hiệu hoá"</string>
+    <!-- no translation found for tts_engine_settings_section (2346105138448751893) -->
+    <skip />
+    <!-- no translation found for tts_engine_settings_title (3499112142425680334) -->
+    <skip />
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"Ngôn ngữ và giọng nói"</string>
     <string name="pico_installed" msgid="2452546687858267414">"Đã cài đặt"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"Chưa cài đặt"</string>
@@ -1308,30 +1331,24 @@
     <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>
+    <string name="credentials_reset_summary" msgid="3369361230171260282">"Xóa tất cả chứng chỉ"</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>
+    <string name="credentials_reset_hint" msgid="1566409057833618877">"Tất cả nội dung sẽ bị xóa. Bạn có chắc chắn về điều đó 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>
+    <string name="credentials_not_erased" msgid="397954733557821269">"Ko thể xóa b.nhớ t.tin x.thực."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Bộ nhớ thông tin xác thực đã bật."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6816970208840577219">"Bạn phải đặt mật khẩu hoặc PIN khóa màn hình trước khi bạn có thể sử dụng bộ nhớ thông tin xác thực. Bạn có muốn thực hiện việc đó ngay bây giờ không?"</string>
     <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>
@@ -1440,4 +1457,69 @@
     <string name="select_all" msgid="6783085295161532497">"Chọn tất cả"</string>
     <string name="hdcp_checking_title" msgid="8605478913544273282">"Kiểm tra HDCP"</string>
     <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Đặt hành vi kiểm tra HDCP"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Sử dụng dữ liệu"</string>
+    <!-- no translation found for data_usage_cycle (5652529796195787949) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_split_4g (7417435609285381968) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_wifi (8266875319417201085) -->
+    <skip />
+    <!-- no translation found for data_usage_change_cycle (7776556448920114866) -->
+    <skip />
+    <!-- no translation found for data_usage_pick_cycle_day (4470796861757050966) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_mobile_limit (289740911281022322) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_4g_limit (5808210773758699800) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_3g_limit (3856971004328238231) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_wifi (1728851922959017766) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_mobile (454140350007299045) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_4g (1301978716067512235) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_3g (6092169523081538718) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_mobile (986782622560157977) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_3g (6304006671869578254) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_4g (3635854097335036738) -->
+    <skip />
+    <!-- no translation found for data_usage_app_settings (3727561362090820369) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background (8856643905291165256) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background_summary (1503361245973512092) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog_title (8110736468987743260) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog (100001698378554777) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_title (1373797281540188533) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_subtitle (5512903797979928416) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_positive (4565302264487526138) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_title (3023111643632996097) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_mobile (7931094451923591578) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_3g (5478553071420316963) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_4g (6134008906742403777) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_3g_title (4221584306492812040) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_4g_title (715585612162185936) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_mobile_title (209516216265000221) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog (2874031671067845964) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_enable (5738467047490662678) -->
+    <skip />
 </resources>
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 b49947f..e6f57f5 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>
+    <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,19 @@
     <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>
+    <!-- no translation found for wallpaper_settings_title (5449180116365824625) -->
+    <skip />
+    <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>
@@ -643,8 +656,9 @@
     <string name="status_number" product="tablet" msgid="1138837891091222272">"移动目录编号 (MDN)"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"本机号码"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
+    <string name="status_msid_number" msgid="909010114445780530">"MSID"</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,6 +907,8 @@
     <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>
@@ -1026,7 +1042,8 @@
     <string name="pointer_settings_category" msgid="6090176550039035130">"鼠标和触摸板设置"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"指针速度"</string>
     <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>
@@ -1035,6 +1052,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>
@@ -1106,6 +1124,7 @@
     <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>
+    <string name="settings_button" msgid="3006713718908152930">"设置"</string>
     <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>
@@ -1218,6 +1237,10 @@
     <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>
+    <!-- no translation found for tts_engine_settings_section (2346105138448751893) -->
+    <skip />
+    <!-- no translation found for tts_engine_settings_title (3499112142425680334) -->
+    <skip />
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"语言和语音"</string>
     <string name="pico_installed" msgid="2452546687858267414">"已安装"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"未安装"</string>
@@ -1308,30 +1331,24 @@
     <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>
+    <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>
+    <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>
+    <string name="credentials_not_erased" msgid="397954733557821269">"系统无法清除凭据存储。"</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"凭证存储已启用。"</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6816970208840577219">"您必须设置一个锁定屏幕 PIN 或密码，然后才能使用凭据存储。您愿意现在就进行设置吗？"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"紧急提示音"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"设置进行紧急呼救时的行为"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"隐私权"</string>
@@ -1439,4 +1456,69 @@
     <string name="select_all" msgid="6783085295161532497">"全选"</string>
     <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP 检查"</string>
     <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"设置 HDCP 检查行为"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"数据使用情况"</string>
+    <!-- no translation found for data_usage_cycle (5652529796195787949) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_split_4g (7417435609285381968) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_wifi (8266875319417201085) -->
+    <skip />
+    <!-- no translation found for data_usage_change_cycle (7776556448920114866) -->
+    <skip />
+    <!-- no translation found for data_usage_pick_cycle_day (4470796861757050966) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_mobile_limit (289740911281022322) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_4g_limit (5808210773758699800) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_3g_limit (3856971004328238231) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_wifi (1728851922959017766) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_mobile (454140350007299045) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_4g (1301978716067512235) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_3g (6092169523081538718) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_mobile (986782622560157977) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_3g (6304006671869578254) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_4g (3635854097335036738) -->
+    <skip />
+    <!-- no translation found for data_usage_app_settings (3727561362090820369) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background (8856643905291165256) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background_summary (1503361245973512092) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog_title (8110736468987743260) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog (100001698378554777) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_title (1373797281540188533) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_subtitle (5512903797979928416) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_positive (4565302264487526138) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_title (3023111643632996097) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_mobile (7931094451923591578) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_3g (5478553071420316963) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_4g (6134008906742403777) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_3g_title (4221584306492812040) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_4g_title (715585612162185936) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_mobile_title (209516216265000221) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog (2874031671067845964) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_enable (5738467047490662678) -->
+    <skip />
 </resources>
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 e6ac218..eb62eb8 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>
+    <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,19 @@
     <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>
+    <!-- no translation found for wallpaper_settings_title (5449180116365824625) -->
+    <skip />
+    <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>
@@ -643,8 +656,9 @@
     <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"我的電話號碼"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
+    <string name="status_msid_number" msgid="909010114445780530">"MSID"</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,6 +907,8 @@
     <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>
@@ -1026,7 +1042,8 @@
     <string name="pointer_settings_category" msgid="6090176550039035130">"滑鼠和觸控板設定"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"指標速度"</string>
     <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>
@@ -1035,6 +1052,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>
@@ -1106,6 +1124,7 @@
     <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>
+    <string name="settings_button" msgid="3006713718908152930">"設定"</string>
     <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>
@@ -1218,6 +1237,10 @@
     <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>
+    <!-- no translation found for tts_engine_settings_section (2346105138448751893) -->
+    <skip />
+    <!-- no translation found for tts_engine_settings_title (3499112142425680334) -->
+    <skip />
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"語言及語音"</string>
     <string name="pico_installed" msgid="2452546687858267414">"已安裝"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"未安裝"</string>
@@ -1308,30 +1331,24 @@
     <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>
+    <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>
+    <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>
+    <string name="credentials_not_erased" msgid="397954733557821269">"不能移除認證儲存空間。"</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"已啟用認證儲存空間。"</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6816970208840577219">"您必須先設定螢幕鎖定 PIN 或密碼，才能使用認證儲存空間。您要現在設定嗎？"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"緊急警示音"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"設定撥打緊急電話時的運作方式"</string>
     <string name="privacy_settings" msgid="9206631214140954954">"隱私設定"</string>
@@ -1439,4 +1456,69 @@
     <string name="select_all" msgid="6783085295161532497">"全選"</string>
     <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP 檢查"</string>
     <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"設定 HDCP 檢查行為"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"資料用量"</string>
+    <!-- no translation found for data_usage_cycle (5652529796195787949) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_split_4g (7417435609285381968) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_wifi (8266875319417201085) -->
+    <skip />
+    <!-- no translation found for data_usage_change_cycle (7776556448920114866) -->
+    <skip />
+    <!-- no translation found for data_usage_pick_cycle_day (4470796861757050966) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_mobile_limit (289740911281022322) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_4g_limit (5808210773758699800) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_3g_limit (3856971004328238231) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_wifi (1728851922959017766) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_mobile (454140350007299045) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_4g (1301978716067512235) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_3g (6092169523081538718) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_mobile (986782622560157977) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_3g (6304006671869578254) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_4g (3635854097335036738) -->
+    <skip />
+    <!-- no translation found for data_usage_app_settings (3727561362090820369) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background (8856643905291165256) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background_summary (1503361245973512092) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog_title (8110736468987743260) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog (100001698378554777) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_title (1373797281540188533) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_subtitle (5512903797979928416) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_positive (4565302264487526138) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_title (3023111643632996097) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_mobile (7931094451923591578) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_3g (5478553071420316963) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_4g (6134008906742403777) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_3g_title (4221584306492812040) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_4g_title (715585612162185936) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_mobile_title (209516216265000221) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog (2874031671067845964) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_enable (5738467047490662678) -->
+    <skip />
 </resources>
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..0d23b56
--- /dev/null
+++ b/res/values-zu/arrays.xml
@@ -0,0 +1,229 @@
+<?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>
+  <string-array name="screen_timeout_entries">
+    <item msgid="3342301044271143016">"amasekhondi angu-15"</item>
+    <item msgid="8881760709354815449">"amasekhondi angu-30"</item>
+    <item msgid="7589406073232279088">"Iminithi elingu-1"</item>
+    <item msgid="7001195990902244174">"amaminithi angu-2"</item>
+    <item msgid="7489864775127957179">"amaminithii angu-5"</item>
+    <item msgid="2314124409517439288">"amaminithi angu-10"</item>
+    <item msgid="6864027152847611413">"amaminithi angu-30"</item>
+  </string-array>
+    <!-- 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) -->
+  <string-array name="lock_after_timeout_entries">
+    <item msgid="5416834369150305288">"ngokushesha"</item>
+    <item msgid="6736512735606834431">"amasekhondi angu-5"</item>
+    <item msgid="8044619388267891375">"amasekhondi angu-15"</item>
+    <item msgid="1822002388249545488">"amasekhondi angu-30"</item>
+    <item msgid="8538071621211916519">"iminithi elingu-1"</item>
+    <item msgid="5663439580228932882">"amaminithi angu-2"</item>
+    <item msgid="49888496216106852">"amaminithi angu-5"</item>
+    <item msgid="9002737361305019353">"amaminithi angu-10"</item>
+    <item msgid="4322676235684793329">"amaminithi angu-30"</item>
+  </string-array>
+    <!-- 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) -->
+  <string-array name="wifi_frequency_band_entries">
+    <item msgid="624340809384223320">"Okuzenzakalelayo"</item>
+    <item msgid="6670588712989942178">"i-5 GHz kuphela"</item>
+    <item msgid="2715516524973207876">"i-2.4 GHz kuphela"</item>
+  </string-array>
+  <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>
+  <string-array name="wifi_network_setup">
+    <item msgid="784271777398638325">"Ngokulawulwa"</item>
+    <item msgid="700386742589384062">"Inkinobho yokuphusha i-WPS"</item>
+    <item msgid="7131487972018976724">"I-PIN ye-WPS kwindawo yokungena"</item>
+    <item msgid="4809199848225172977">"i-pin ye-WPS kwidivaysi"</item>
+  </string-array>
+  <string-array name="wifi_ip_settings">
+    <item msgid="3906714200993111074">"i-DHCP"</item>
+    <item msgid="628395202971532382">"Isibalo"</item>
+  </string-array>
+  <string-array name="wifi_proxy_settings">
+    <item msgid="4473276491748503377">"Lutho"</item>
+    <!-- outdated translation 6267482274276126058 -->     <item msgid="8673874894887358090">"Kumile"</item>
+  </string-array>
+  <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..4749fd5
--- /dev/null
+++ b/res/values-zu/strings.xml
@@ -0,0 +1,1981 @@
+<?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 />
+    <string name="sdcard_unmount" product="nosdcard" msgid="6325292633327972272">"Yehlisa ukugcina nge-USB"</string>
+    <!-- outdated translation 6325292633327972272 -->     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Yehlisa ukugcina nge-USB"</string>
+    <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Sula ukugcina nge-USB"</string>
+    <string name="sdcard_format" product="default" msgid="6713185532039187532">"Sula 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 />
+    <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"Ukugcina nge-USB"</string>
+    <!-- outdated translation 8281011784066476192 -->     <string name="sdcard_setting" product="default" msgid="5922637503871474866">"Ukugcina nge-USB"</string>
+    <!-- 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 />
+    <string name="battery_info_health_cold" msgid="3835692786176707318">"Kuyabanda"</string>
+    <!-- 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>
+    <string name="bluetooth_notif_message" msgid="618099089987569242">"Khetha ukubhanqa ne-<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <!-- 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>
+    <string name="bluetooth_ask_enablement" msgid="8211158472876087588">"Uhlelo lokusebenza efonini yakho lucela imvume yokuvula i-Bluetooth. Ingabe ufuna ukwenza lokhu?"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="5950965604673262829">"Uhlelo lokusebenza kwithebhulethi yakho lucela imbume yokwenza ifoni yakho itholwe amanye amadivaysi e-Bluetooth ngamasekhondi angu-<xliff:g id="TIMEOUT">%1$d</xliff:g>. Ingabe ufuna ukwenza lokhu?"</string>
+    <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 />
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="5716077575971497298">"Uhlelo lokusebenza kwithebhulethi yakho lucela imvume yokuvula i-Bluetooth nokwenza ithebhulethi yakho itholwe amanye amadivaysi ngamasekhondi angu-<xliff:g id="TIMEOUT">%1$d</xliff:g>. Ingabe ufuna ukwenza lokhu?"</string>
+    <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>
+    <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Ukuxhuma okuzenzakalelayo"</string>
+    <!-- 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>
+    <string name="proxy_settings_title" msgid="5912878565897294401">"Izilungiselelo zommeleli"</string>
+    <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 />
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="2902787003418172125">"Ukugcina nge-USB kwehlisiwe"</string>
+    <!-- outdated translation 2902787003418172125 -->     <string name="sdcard_settings_not_present_status" product="default" msgid="6666688653496819947">"Ukugcina nge-USB kwehlisiwe"</string>
+    <!-- no translation found for sdcard_settings_available_bytes_label (763232429899373001) -->
+    <skip />
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="2736378870889777857">"Ikhadi le-SD lisebenziswa njengedivaysi yokugcina ephezulu"</string>
+    <!-- outdated translation 2736378870889777857 -->     <string name="sdcard_settings_mass_storage_status" product="default" msgid="4786433969313661655">"Ikhadi le-SD lisebenziswa njengedivaysi yokugcina ephezulu"</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="7503300818792750913">"Kuphephile manje ukuba ukhiphe ikhadi le-SD"</string>
+    <!-- outdated translation 7503300818792750913 -->     <string name="sdcard_settings_unmounted_status" product="default" msgid="3812022095683863087">"Kuphephile manje ukuba ukhiphe ikhadi le-SD"</string>
+    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"Ikhadi le-SD likhishwe ngenkathi lisasebenza!"</string>
+    <!-- outdated translation 7761390725880773697 -->     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"Ikhadi le-SD likhishwe ngenkathi lisasebenza!"</string>
+    <!-- no translation found for sdcard_settings_used_bytes_label (8820289486001170836) -->
+    <skip />
+    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Iskena ukugcina nge-USB kwemidiya..."</string>
+    <!-- outdated translation 7503429447676219564 -->     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Iskena ukugcina nge-USB kwemidiya..."</string>
+    <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3771783090621312312">"Ukugcina nge-USB kukhushulwe ukufunda kuphela"</string>
+    <!-- outdated translation 3771783090621312312 -->     <string name="sdcard_settings_read_only_status" product="default" msgid="5706115860484118911">"Ukugcina nge-USB kukhushulwe ukufunda kuphela"</string>
+    <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 />
+    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Ukwaziswa kwethebhulethi"</string>
+    <!-- outdated translation 7820855350955963628 -->     <string name="phone_info_label" product="default" msgid="2127552523124277664">"Ukwaziswa kwethebhulethi"</string>
+    <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"Ukugcina nge-USB"</string>
+    <!-- outdated translation 8101475181301178428 -->     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Ukugcina nge-USB"</string>
+    <!-- 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>
+    <string name="settings_shortcut" msgid="8597387747077828217">"Khetha isinqamuleli sezilungiselelo"</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>
+    <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Okungenantambo &amp; amanethiwekhi"</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>
+    <string name="date_picker_title" msgid="1338210036394128512">"Idethi"</string>
+    <string name="time_picker_title" msgid="483460752287255019">"Isikhathi"</string>
+    <string name="lock_after_timeout" msgid="940509402681580537">"Isikhathi siphelile"</string>
+    <string name="lock_after_timeout_summary" msgid="4726009794344934278">"Vala isikrini <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> emva kokuba isikrini sivale ngokuzenzakalelayo"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Bonisa ukwaziswa komnikazi ekuvaleni isikrini"</string>
+    <string name="owner_info_settings_title" msgid="2723190010708381889">"Imininingwane yomnikazi"</string>
+    <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
+    <string name="owner_info_settings_edit_text_hint" msgid="2382525043173672857">"Faka umbhalo ukubonisa kwisikrini sokuvala"</string>
+    <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 />
+    <string name="lock_settings_picker_title" msgid="8665454308380158195">"Misa ukuvala isikrini"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="4461562893699328786">"Misa 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>
+    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Khetha indlela yokuvula isikrini"</string>
+    <string name="unlock_set_unlock_off_title" msgid="1613932765246180079">"Valiwe"</string>
+    <string name="unlock_set_unlock_off_summary" msgid="2791013557563587655">"Ungavali isikrini"</string>
+    <!-- outdated translation 5165705762615690332 -->     <string name="unlock_set_unlock_none_title" msgid="7560817055143323842">"Akuvikelekile"</string>
+    <string name="unlock_set_unlock_none_summary" msgid="2609139908913114644">"Awudingi iphathini, i-PIN, noma iphasiwedi ukuvula isikrini"</string>
+    <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Iphathini"</string>
+    <string name="unlock_set_unlock_pattern_summary" msgid="8467282436608077882">"Idinga iphathini ukuvula isikrini"</string>
+    <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"i-PIN"</string>
+    <string name="unlock_set_unlock_pin_summary" msgid="5556722736289132512">"Idinga i-PIN yezinombolo ukuvula isikrini"</string>
+    <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Iphasiwedi"</string>
+    <string name="unlock_set_unlock_password_summary" msgid="7871968012198279034">"Idinga iphasiwedi ukuvula isikrini"</string>
+    <!-- outdated translation 8816944391772300580 -->     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Kuvimbelwe umphathi wedivaysi okude"</string>
+    <string name="unlock_set_unlock_mode_off" msgid="378729687629105388">"Valiwe"</string>
+    <!-- outdated translation 7953821968316697309 -->     <string name="unlock_set_unlock_mode_none" msgid="7137296704741184239">"Akuvikelekile"</string>
+    <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Ivikelwe ngephathini"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Ivikelwe nge-PIN"</string>
+    <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Ivikelwe ngephasiwedi"</string>
+    <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>
+    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Khansela"</string>
+    <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Okulandelayo"</string>
+    <string name="device_admin_title" msgid="3562216873644263804">"Ukuphatha idivaysi"</string>
+    <string name="manage_device_admin" msgid="5059296715271077278">"Abaphathi bedivaysi"</string>
+    <string name="manage_device_admin_summary" msgid="7672709110988761075">"Buka noma yenza abaphathi bedivaysi bengasebenzi"</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>
+    <string name="bluetooth_enter_pin_msg" msgid="1499285355129256289">\n"Faka i-PIN ukubhanqa ne-\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". (Zama 0000 noma 1234.) Ungase udinge ukufaka i-PIN efanayo kwidivaysi ye-Bluetooth."</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="8301499416158195044">\n"Faka ukhiye wokudlula ukubhangqa ne-\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\""</string>
+    <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>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="9139892462102104755">"Faka \"<xliff:g id="PASSKEY">%2$s</xliff:g>\" e- \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" ukubhanqa kulandelwe ukubuyisa noma ukufaka."</string>
+    <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>
+    <string name="bluetooth_preference_find_nearby_title" msgid="5087410003465463318">"Thola amadivaysi aseduze"</string>
+    <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"Izilungiselelo zedivaysi"</string>
+    <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Amadivaysi abhanqene"</string>
+    <string name="bluetooth_preference_found_devices" msgid="3133019331974936204">"Ithole amadivaysi"</string>
+    <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>
+    <string name="bluetooth_profile_headset" msgid="81844079120986198">"Ihendsfri"</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>
+    <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ingeke ixhumeke kumsindo wemidiya."</string>
+    <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ngeke ixhumeke kumsindo wehendsfri."</string>
+    <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ngeke ixhumeke kwidivaysi yokufakwayo."</string>
+    <!-- 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>
+    <string name="bluetooth_device_advanced_device_actions_title" msgid="3793430949811946844">"Izenzo zedivaysi"</string>
+    <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>
+    <string name="bluetooth_device_advanced_rename_device" msgid="350508394033808532">"Qamba kabusha idivaysi"</string>
+    <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Vumela ukudlulisa amafayela angenayo"</string>
+    <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>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Sebenzisa ukufinyelela i-Inthanethi"</string>
+    <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>
+    <string name="nfc_quick_toggle_summary" msgid="1988408027741447231">"Sebenzisa Uxhumano Lwenkambu Eseduze ukufunda nokushintsha izilengiso"</string>
+    <string name="nfc_toggle_error" msgid="2233172102497535522">"Kuvele iphutha."</string>
+    <!-- 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 />
+    <string name="wifi_wps_pin_output" msgid="8682102965680650853">"Faka i-pin <xliff:g id="WPS_PIN">%1$s</xliff:g> kwindawo yokungena"</string>
+    <!-- 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>
+    <string name="wifi_open_with_wps" msgid="2606968531452521147">"i-WPS iyatholakala"</string>
+    <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>
+    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Ibhendi yokuvama kwe-Wi-Fi"</string>
+    <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Cacisa ibanga lokuvama komsebenzi"</string>
+    <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Kube nenkinga yokuhlela ibhendi yokuvama."</string>
+    <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 />
+    <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Sicela uthayiphe ikheli le-IP elilungile."</string>
+    <string name="wifi_ip_settings_invalid_gateway" msgid="6383012465511093067">"Sicela uthayiphe ikheli le-IP elilungile."</string>
+    <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Sicela uthayiphe ikheli le-IP elilungile."</string>
+    <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="8145730615716855433">"Sicela uthayiphe ubude bephrifiksi yenethiwekhi phakathi kuka-0 no-32."</string>
+    <!-- no translation found for wifi_dns1 (7344118050720080045) -->
+    <skip />
+    <!-- no translation found for wifi_dns2 (1368601006824882659) -->
+    <skip />
+    <!-- no translation found for wifi_gateway (163914742461092086) -->
+    <skip />
+    <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Ubude begama eliqalayo lenethiwekhi"</string>
+    <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>
+    <string name="display_settings_title" msgid="2378894265964357591">"Isikrini"</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>
+    <string name="ringtone_title" msgid="7037881886694206550">"Iringithoni yekholi engenayo"</string>
+    <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>
+    <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"Ithebhulethi ayidokhiwe"</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>
+    <string name="dock_not_found_text" product="tablet" msgid="7935403744079168804">"Ithebhulethi kumele idokhwe ukumisa umsinndo wokudokha"</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>
+    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Dlala umsindo lapho ufaka noma ukhipha ithebhulethi kwidokhi"</string>
+    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Dlala umsindo lapho ufaka noma ukhipha ifoni kudokhi"</string>
+    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Ungadlali umsindo lapho ufaka noma ukhipha ithebhulethi kwidokhi"</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>
+    <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Shintsha ukujikeleleza ngokuzenzakalela lapho ujikelezisa ithebhulethi"</string>
+    <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Shintsha ukujikeleleza ngokuzenzakalela lapho ujikelezisa ifoni"</string>
+    <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Shintsha ukujikeleleza ngokuzenzakalela lapho ujikelezisa ithebhulethi"</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>
+    <string name="screen_timeout" msgid="6962654593018319466">"Isikhathi siphelile"</string>
+    <string name="screen_timeout_summary" msgid="4471347210332380587">"Isikrini sizivala ngokuzenzakalalayo emva-<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <!-- no translation found for wallpaper_settings_title (5449180116365824625) -->
+    <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 />
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Udinga i-PIN ukusebenzisa ithebhulethi"</string>
+    <!-- outdated translation 5058355081270397764 -->     <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Udinga i-PIN ukusebenzisa ithebhulethi"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Udinga i-PIN ukusebenzisa ithebhulethi"</string>
+    <!-- outdated translation 2813800553917012356 -->     <string name="sim_lock_off" product="default" msgid="258981978215428916">"Udinga i-PIN ukusebenzisa ithebhulethi"</string>
+    <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 />
+    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Isimo sethebhulethi"</string>
+    <!-- outdated translation 1119755927536987178 -->     <string name="device_info_settings" product="default" msgid="475872867864762157">"Isimo sethebhulethi"</string>
+    <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 />
+    <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Isimo sebhetri, inethiwekhi, nokunye ukwaziswa"</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>
+    <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Yehlisa ukugcina nge-USB, buka ukugcina okutholakalayo"</string>
+    <!-- outdated translation 3543813623294870759 -->     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Yehlisa ukugcina nge-USB, buka ukugcina okutholakalayo"</string>
+    <!-- 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>
+    <!-- no translation found for status_msid_number (909010114445780530) -->
+    <skip />
+    <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 />
+    <string name="internal_memory" msgid="9129595691484260784">"Ukugcina kwangaphakathi"</string>
+    <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Ukugcina nge-USB"</string>
+    <!-- outdated translation 2510246194083052841 -->     <string name="sd_memory" product="default" msgid="151871913888051515">"Ukugcina nge-USB"</string>
+    <!-- no translation found for memory_available (5052397223077021181) -->
+    <skip />
+    <!-- no translation found for memory_size (6629067715017232195) -->
+    <skip />
+    <string name="memory_calculating_size" msgid="2188358544203768588">"Iyabala..."</string>
+    <!-- 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>
+    <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Yehlisa ukugcina nge-USB kwangaphakathi"</string>
+    <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Yehlisa ikhadi le-SD ukuze ulikhiphe ngokuphephile"</string>
+    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Faka ukugcina nge-USB ukukhuphula"</string>
+    <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Faka ikhadi le-SD lokukhuphula"</string>
+    <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Khweza ukugcina nge-USB"</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>
+    <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"Susa ukugcina nge-USB"</string>
+    <string name="sd_format" product="default" msgid="2576054280507119870">"Sula ikhadi le-SD"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Sula yonke idatha ekugcineni nge-USB kwangaphakathi, njengomculo nezithombe"</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"Isula yonke idatha ekhadini le-SD, njengomculo nezithombe"</string>
+    <!-- no translation found for read_only (6702420168629076340) -->
+    <skip />
+    <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"Yehlisa ukugcina nge-USB"</string>
+    <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"Khipha ikhadi le-SD"</string>
+    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"Uma wehlisa ukugcina nge-USB, ezinye izinhlelo zokusebenza ozisebenzisayo zizoma futhi zingase zingatholakali kuze kube yilapho ukhwelisa futhi ukugcina nge-USB."</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>
+    <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"Ukwehlisa ukugcina nge-USB kwehlulekile"</string>
+    <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"Khipha ikhadi le-SD"</string>
+    <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"Ayikwazi ukwehlisa ukugcina nge-USB. Sicela uzame futhi emva kwesikhathi."</string>
+    <string name="dlg_error_unmount_text" product="default" msgid="9188972789897713180">"Ayikwazi ukwehlisa ikhadi le-SD. Zama futhi emva kwesikhathi."</string>
+    <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"Ukugcina nge-USB kuzokwehliswa."</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 />
+    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Isula yonke idatha kwithebhulethi"</string>
+    <!-- outdated translation 4036344100254678429 -->     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Isula yonke idatha kwithebhulethi"</string>
+    <!-- outdated translation 1305457209008369655 -->     <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"Lokhu kuzosula yonke idatha ekugcineni kwangaphakathi"<b>"ithebhulethi yakho"</b>", kuhlanganise:"\n\n<li>"i-akhawunti yakho ye-Google"</li>\n<li>"Uhlelo nedatha yohlelo lokusebenza kanye nezilungiselelo"</li>\n<li>"Izinhlelo zokusebenza ezilandiwe"</li></string>
+    <!-- outdated translation 1305457209008369655 -->     <string name="master_clear_desc" product="default" msgid="3251400937758241249">"Lokhu kuzosula yonke idatha ekugcineni kwangaphakathi"<b>"ithebhulethi yakho"</b>", kuhlanganise:"\n\n<li>"i-akhawunti yakho ye-Google"</li>\n<li>"Uhlelo nedatha yohlelo lokusebenza kanye nezilungiselelo"</li>\n<li>"Izinhlelo zokusebenza ezilandiwe"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n"Okwamanje ungene ngemvume kuma-akhawunti alandelayo:"\n\n</string>
+    <!-- no translation found for master_clear_desc_also_erases_external (1903185203791274237) -->
+    <skip />
+    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Ukusula futhi umculo, izithombe, nenye idatha yomsebenzisi, "<b>"ukugcina nge-USB"</b>"kudinga ukusulwa."</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="7339100478676372901">\n\n"Ukusula umculo, izithombe, nenye idatha yomsebenzisi, "<b>"ikhadi le-SD"</b>"kumele lisuswe."</string>
+    <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Susa ukugcina nge-USB"</string>
+    <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Sula ikhadi le-SD"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="444834593696342279">"Sula yonke idatha ekugcineni nge-USB , njengomculo noma izithombe."</string>
+    <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"Sula yonke idatha ekhadini le-SD, njengomculo noma izithombe."</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Setha kabusha ithebhulethi"</string>
+    <!-- outdated translation 3130786116528304116 -->     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Setha kabusha ithebhulethi"</string>
+    <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>
+    <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"Kumelwe udwebe iphathini yakho yokuvula ukuqinisekisa ukusetha kabusha idatha."</string>
+    <!-- no translation found for master_clear_failed (8655202125010189406) -->
+    <skip />
+    <string name="master_clear_confirm_title" msgid="4845794266129586839">"Qinisekisa ukusetha kabusha"</string>
+    <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Sula ukugcina nge-USB"</string>
+    <string name="media_format_title" product="default" msgid="4427528440306787972">"Sula ikhadi le-SD"</string>
+    <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Isusa yonke idatha ekugcineni nge-USB"</string>
+    <string name="media_format_summary" product="default" msgid="3805714639375830120">"Isula yonke idatha ekhadini le-SD"</string>
+    <string name="media_format_desc" product="nosdcard" msgid="4553860683952763905">"Lesi sinyathelo sizosusa ukugcina nge-USB . Uzolahlekelwa "<b>" yiyo "</b>" yonke idatha egcinwe lapho!"</string>
+    <string name="media_format_desc" product="default" msgid="1598627584181935513">"Lesi senzo sizosusa ikhadi le-SD efonini. Uzolahlekelwa yiyo "<b>"yonke"</b>" idatha ekhadini!"</string>
+    <string name="media_format_button_text" product="nosdcard" msgid="6293669371185352810">"Sula ukugcina nge-USB"</string>
+    <string name="media_format_button_text" product="default" msgid="6721544380069373626">"Susa ikhadi le-SD"</string>
+    <string name="media_format_final_desc" product="nosdcard" msgid="8094635533378487255">"Sula ukugcina nge-USB, isula wonke amafayela agcinwe lapho? Isinyathelo asikwazi ukuguqulwa!"</string>
+    <string name="media_format_final_desc" product="default" msgid="9015504991522581434">"Sula ikhadi le-SD, isula wonke amafayela agcinwe lapho? Isinyathelo asikwazi ukuguqulwa!"</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>
+    <string name="media_format_gesture_explanation" product="nosdcard" msgid="1379736318750958338">"Kumele udwebe iphathini yakho yokuvula ukuqinisekisa ukuthi ufuna ukusula ukugcina nge-USB."</string>
+    <string name="media_format_gesture_explanation" product="default" msgid="1681213416497647321">"Kumele udwebe iphathini yakho yokuvula ukuqinisekisa ukuba ufuna ukusula ikhadi 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>
+    <string name="tether_settings_summary_usb" product="tablet" msgid="785883365108362248">"Yabelana ngoxhumano lwedatha yethebhulethi yakho nge-USB"</string>
+    <string name="tether_settings_summary_usb" product="default" msgid="3562431455625637370">"Yabelana noxhumano lwedatha yefoni yakho nge-USB"</string>
+    <string name="tether_settings_summary_wifi" msgid="5474383125137372164">"Yabelana ngoxhumano lwedatha yefoni yakho njengendawo yembobo ye-Wi-Fi"</string>
+    <string name="tether_settings_summary_bluetooth" msgid="2407506656353819750">"Yabelana ngoxhumano lwedatha yefoni yakho nge-Bluetooth"</string>
+    <string name="tether_settings_summary_usb_wifi" product="tablet" msgid="3834674129575844910">"Yabelana nethebhulethi yakho ngoxhumano lwedatha yefoni nge-USB noma njengendawo yembobo ye-Wi-Fi"</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>
+    <string name="tether_settings_summary_usb_bluetooth" product="tablet" msgid="1245080236509560839">"Yabelana ngoxhumano lwedatha yethebhulethi 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>
+    <string name="tether_settings_summary_wifi_bluetooth" product="tablet" msgid="1924576461932311140">"Yabelana ngoxhumano lwedtha yefoni yethebhulethi nge-Bluetooth noma njengendawo yembobo 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>
+    <string name="tether_settings_summary_all" product="tablet" msgid="6612660164315153427">"Yabelana ngoxhumano lwedatha yefini yethebhulethi 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>
+    <string name="use_location_title" msgid="3659340070401464551">"Sebenzisa indawo Yokusesha nge-Google"</string>
+    <string name="use_location_summary_disabled" msgid="6518008620918354403">"Sebenzisa Indawo Yami yemiphumela yokusesha ye-Google nezinye izinsizakalo ze-Google"</string>
+    <string name="use_location_summary_enabled" msgid="8110246289085796179">"Indawo esetshenziselwa ukuthuthukisa imiphumela Yokusesha nge-Google nezinye izinsizakalo ze-Google"</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"Mayelana nethebhulethi"</string>
+    <!-- outdated translation 593457295516533765 -->     <string name="about_settings" product="default" msgid="1743378368185371685">"Mayelana nethebhulethi"</string>
+    <string name="about_settings_summary" msgid="3371517697156165959">"Buka ukwaziswa komthetho, umumo wefoni, inguqulo yesofthiwe"</string>
+    <!-- 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>
+    <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>
+    <string name="settings_safetylegal_activity_unreachable" msgid="170670055116721810">"Awunalo uxhumano lwedatha. Ukubuka lokhu kwaziswa manje, iya ku %s kunoma iyiphi ikhompyutha exhunywe kwi-Inthanethi."</string>
+    <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Iyalayisha…"</string>
+    <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Khetha iphasiwedi yakho"</string>
+    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Khetha iphathini yakho"</string>
+    <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>
+    <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Qinisekisa iphathini yakho"</string>
+    <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>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Okukhethwa kukho kokuvula"</string>
+    <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>
+    <string name="lock_settings_title" msgid="8943058958424073651">"Vala 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 />
+    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Ivikela ithebhulethi yakho"</string>
+    <!-- outdated translation 2909697418179419990 -->     <string name="lock_title" product="default" msgid="4059246467204273930">"Ivikela ithebhulethi yakho"</string>
+    <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"Vikela ithebhulethi yakho ekusetshenzisweni okungavumelekile ngokwenza iphathini yokuvula isikrini. Sebenzisa umunwe wakho ukuxhuma amachashazi nganoma yikuphi ukuhleleka kwsikrini esilandelayo. Kumele uxhume okungenani amachashazi amane. "\n\n"Ukulungele ukuqalisa? Thinta \"Okulandelayo\"."</string>
+    <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>
+    <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"Ithebhulethi yakho nedatha yangasese zisemathubeni okuhlaselwa izinhlelo zokusebenza kwimithombo engaziwe. Uyavuma ukuthi unecala lanoma yikuphi ukonakala kwithebhulethi 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>
+    <string name="show_running_services" msgid="5736278767975544570">"Bonisa izinsizakalo ezisebenzayo"</string>
+    <string name="show_background_processes" msgid="2009840211972293429">"Bonisa izinqubo zokulondoloza kwesikhashana"</string>
+    <!-- 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>
+    <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Ukugcina nge-USB"</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>
+    <string name="internal_storage" msgid="1584700623164275282">"Ukugcina kwangaphakathi"</string>
+    <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Ukugcina nge-USB"</string>
+    <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Ukugcina ngekhadi le-SD"</string>
+    <!-- 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>
+    <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>
+    <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Yisa kwithebhulethi"</string>
+    <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Hambisa kwifoni"</string>
+    <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Hambisa ekugcineni nge-USB"</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>
+    <string name="cached" msgid="1059590879740175019">"Inqubo yasemuva yokulondoloza okwesikhashana"</string>
+    <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 />
+    <string name="service_background_processes" msgid="6844156253576174488">"<xliff:g id="MEMORY">%1$s</xliff:g> vulekile"</string>
+    <string name="service_foreground_processes" msgid="7583975676795574276">"<xliff:g id="MEMORY">%1$s</xliff:g> isetshenzisiwe"</string>
+    <string name="memory" msgid="6609961111091483458">"i-RAM"</string>
+    <!-- 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>
+    <string name="background_process_stop_description" msgid="1728354083304746737">"Lena inqubo yohlelo lokusebenza yakudala egcinelwe isivinini esingcono uma kwenzeka idingeka futhi. Ngokuvamile asikho isizathu sokuyimisa."</string>
+    <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>
+    <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Misa insizakalo yohlelo?"</string>
+    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="5420033091144016389">"Uqinisekile ukuba ufuna ukumisa lensizakalo yohlelo? Uma kunjalo, ezinyeizici zethebhulethi yakho zingase ziyeke ukusebenza kahle kuze kube yilapho uyivala noma uyivula futhi."</string>
+    <string name="runningservicedetails_stop_dlg_text" product="default" msgid="6929716497425738387">"Uqinisekile ukuba ufuna ukumisa lensizakalo yohlelo? Uma wenza kanjalo, ezinye izici zefoni yakho zingayeka ukusebenza kahle kuze kube yilapho uyivala bese uyayivula futhi."</string>
+    <string name="language_settings" msgid="5292716747264442359">"Ulimi &amp; olufakwayo"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Ulimi &amp; okufakwayo"</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 />
+    <string name="auto_caps" msgid="6379232078052591265">"Ukwenza ofeleba okuzenzakalelayo"</string>
+    <!-- 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 />
+    <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Ukwaziswa kwethebhulethi"</string>
+    <!-- outdated translation 193561832258534798 -->     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Ukwaziswa kwethebhulethi"</string>
+    <!-- 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>
+    <string name="current_input_method" msgid="2146807723398303917">"Indlela yokufakwayo kwamanje"</string>
+    <string name="input_method_selector" msgid="4311213129681430709">"Isikhethi sendlela efakwayo"</string>
+    <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"Okuzenzakalelayo"</string>
+    <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"Bonisa njalo"</string>
+    <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"Fihla njalo"</string>
+    <string name="configure_input_method" msgid="7773992829158322455">"Misa izindlela zokufakwayo"</string>
+    <string name="input_method_settings" msgid="5801295625486269553">"Izilungiselelo"</string>
+    <string name="active_input_method_subtypes" msgid="3596398805424733238">"Izindlela zokufakwayo okusebenzayo"</string>
+    <string name="use_system_language_to_select_input_method_subtypes" msgid="3346751753141428573">"Sebenzisa ulimi lohlelo"</string>
+    <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> izilungiselelo"</string>
+    <string name="input_methods_and_subtype_enabler_title" msgid="4018402267502337338">"Khetha izindlela yokufakwayo ezisebenzayo"</string>
+    <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>
+    <string name="accessibility_script_injection_security_warning" product="tablet" msgid="1113600871264359828">"Ezinye izinhlelo zokusebenza zingacela i-Google ukulanda imibhalo kwithebhulethi yakho eyenza okuqukethwe kwakho kufinyeleleke kalula. Uqinisekile ukuba ufuna ukuvumela i-Google ukufaka imibhalo efinyelelekayo kwithebhulethi 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>
+    <string name="power_usage_not_available" msgid="3583407442633768046">"Idatha yokusebenzisa ibhetri ayitholakali"</string>
+    <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>
+    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"I-Wi-Fi"</string>
+    <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Phaphama"</string>
+    <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Isiginali yenethiwekhi yefoni"</string>
+    <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
+    <skip />
+    <string name="awake" msgid="387122265874485088">"Isikhathi sokuvuka kwedivaysi"</string>
+    <string name="wifi_on_time" msgid="6310209835617490616">"i-Wi-Fi isesikhathini"</string>
+    <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>
+    <string name="history_details_title" msgid="3608240585315506067">"Imininingwane yomlando"</string>
+    <string name="details_title" msgid="3792801565213935385">"Sebenzisa imininingwane"</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>
+    <string name="power_idle" product="tablet" msgid="4612478572401640759">"Ithebhulethi 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>
+    <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Ithebhulethi"</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>
+    <string name="battery_action_wifi" msgid="2272741639606146903">"Izilungiselelo ze-Wi-Fi"</string>
+    <string name="battery_action_bluetooth" msgid="8374789049507723142">"Izilungiselelo ze-Bluetooth"</string>
+    <string name="battery_desc_voice" msgid="8980322055722959211">"Ibhetri esebenziswe izincingo zezwi"</string>
+    <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Ibhetri esebenziswe lapho ithebhulethi 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>
+    <!-- no translation found for tts_engine_settings_section (2346105138448751893) -->
+    <skip />
+    <!-- no translation found for tts_engine_settings_title (3499112142425680334) -->
+    <skip />
+    <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>
+    <string name="vpn_details_title" msgid="418806440938510331">"Imininingwane ye-VPN"</string>
+    <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>
+    <string name="backup_data_summary" msgid="6515285107793232815">"Sekela ngokulondoloza idatha yohlelo lokusebenza, amaphasiwedi e-Wi-Fi, nezinye izilungiselelo kwiseva ye-Google"</string>
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"Sekela ngokulondoloza i-akhawunti"</string>
+    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Ayikho i-akhawunti okwamanje egcina ukusekela ngokulondoloza idatha"</string>
+    <string name="auto_restore_title" msgid="5397528966329126506">"Ukubuyisela esimweni okuzenzakalelayo"</string>
+    <string name="auto_restore_summary" msgid="83177150536734378">"Uma ngifaka futhi uhlelo lokusebenza, buyisela esimweni ukusekela ngokulondoloza izilungiselelo noma enye idatha"</string>
+    <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Sekela ngokulondoloza"</string>
+    <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Uqinisekile ukuthi ufuna ukumisa ukusekela ngokulondoloza amaphasiwedi akho e-Wi-Fi, amabhukhimaki, nezinye izilungiselelo nedatha yohlelo lokusebenza futhi usule wonke amakhophi kwiseva ye-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>
+    <string name="wifi_setup_title" msgid="661074868726906436">"Ukumisa i-Wi-Fi"</string>
+    <!-- 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>
+    <string name="wifi_setup_back" msgid="144777383739164044">"Emuva"</string>
+    <string name="wifi_setup_detail" msgid="2336990478140503605">"Imininingwane yenethiwekhi"</string>
+    <string name="wifi_setup_connect" msgid="7954456989590237049">"Xhuma kwi-inthanethi"</string>
+    <string name="wifi_setup_forget" msgid="2562847595567347526">"Khohlwa"</string>
+    <string name="wifi_setup_save" msgid="3659235094218508211">"Londoloza"</string>
+    <string name="wifi_setup_cancel" msgid="3185216020264410239">"Khansela"</string>
+    <string name="wifi_setup_status_scanning" msgid="7424598483871053657">"Ithwebula amanethiwekhi..."</string>
+    <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"Thinta inethiwekhi ukuxhuma kuyo"</string>
+    <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Xhuma kwinethiwekhi"</string>
+    <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"Xhuma kwinethiwekhi engavikelekile"</string>
+    <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>
+    <string name="wifi_setup_status_eap_not_supported" msgid="3196386445567501484">"I-EAP ayisekelwa"</string>
+    <!-- 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 />
+    <string name="account_sync_settings_title" msgid="4578227872921044660">"Vumelanisa izilungiselelo"</string>
+    <!-- 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>
+    <string name="settings_backup" msgid="2274732978260797031">"Sekela ngokulondoloza izilungiselelo"</string>
+    <string name="settings_backup_summary" msgid="7916877705938054035">"Sekela ngokulondoloza izilungiselelo zami"</string>
+    <!-- no translation found for sync_menu_sync_now (6154608350395805683) -->
+    <skip />
+    <!-- no translation found for sync_menu_sync_cancel (8292379009626966949) -->
+    <skip />
+    <string name="sync_one_time_sync" msgid="6766593624598183090">"Thinta ukuvumelanisa manje<xliff:g id="LAST_SYNC_TIME">
+%1$s</xliff:g>"</string>
+    <!-- no translation found for sync_gmail (714886122098006477) -->
+    <skip />
+    <!-- no translation found for sync_calendar (9056527206714733735) -->
+    <skip />
+    <!-- no translation found for sync_contacts (9174914394377828043) -->
+    <skip />
+    <string name="sync_plug" msgid="5952575609349860569"><font fgcolor="#ffffffff">"Siyakwamukela ekuvumelaniseni kwe-Google!"</font>" "\n"Indlela ye-Google yokuvumelanisa idatha ukuvumela ukufinyelela othintana nabo bakho, ama-aphontimenti, nokunye kusuka noma yikuphi okhona."</string>
+    <string name="header_application_sync_settings" msgid="5514539555293976035">"Izilungiselelo zokuvumelanisa uhlelo lokusebenza"</string>
+    <string name="header_data_and_synchronization" msgid="5165024023936509896">"Ukuvumelanisa &amp; idatha"</string>
+    <string name="preference_change_password_title" msgid="8955581790270130056">"Shintsha iphasiwedi"</string>
+    <string name="header_account_settings" msgid="5382475087121880626">"Izilungiselelo ze-akhawunti"</string>
+    <string name="remove_account_label" msgid="5921986026504804119">"Susa i-akhawunti"</string>
+    <string name="header_add_an_account" msgid="756108499532023798">"Yengeza i-akhawunti"</string>
+    <string name="finish_button_label" msgid="481587707657751116">"Qeda"</string>
+    <string name="really_remove_account_title" msgid="6574643117748564960">"Susa i-akhawunti"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="4448645571715719563">"Ingabe ngempela ufuna ukukhipha le-akhawunti? Ukukukhipha kuzosusa yonke imiyalezo yayo, othintana nabo, nenye idatha esuka kwifoni. "\n"Qhubeka?"</string>
+    <string name="really_remove_account_message" product="default" msgid="1005751790899989319">"Ingabe ngempela ufuna ukukhipha le-akhawunti? Ukukukhipha kuzosusa yonke imiyalezo yayo, othintana nabo, nenye idatha esuka kwifoni. "\n"Qhubeka?"</string>
+    <string name="remove_account_failed" product="tablet" msgid="1093911989149396624">"Le akhawunti idingwa ezinye izinhlelo zokusebenza. Ungayikhipha kuphela ngokuhlela kabusha ithebhulethi kokumisiwe kwasembonini (okususa yonke idatha yakho yomuntu siqu). Wenza lokho ohlelweni lokusebenza Lezilungiselelo, ngaphansi Kwemfihlo."</string>
+    <string name="remove_account_failed" product="default" msgid="9174390193652391412">"Le akhawunti idingwa ezinye izinhlelo zokusebenza. Ungayikhipha kuphela ngokuhlela kabusha ifoni kokumisiwe kwasembonini (okususa yonke idatha yakho yomuntu siqu). Wenza lokho ohlelweni lokusebenza Lezilungiselelo, ngaphansi Kwemfihlo."</string>
+    <string name="provider_label" msgid="7724593781904508866">"Dudula imali ekhishelwayo"</string>
+    <string name="sync_item_title" msgid="1931551540462877488">"Vumelanisa <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
+    <string name="cant_sync_dialog_title" msgid="7185199796123573317">"Ayikwazi ukuvumelanisa ngesandla"</string>
+    <string name="cant_sync_dialog_message" msgid="2372359241135295930">"Ukuvumelanisa kwalentwana kuvimbelwe okwamanje. Ukushintsha okukhethwayo kwakho, vula idatha yasemuva nokuvumelanisa okuzenzakalelayo."</string>
+    <string name="enter_password" msgid="3268224850821675915">"Faka iphasiwedi ukungabhali ngokwemfuhlo ukugcina"</string>
+    <string name="try_again" msgid="5904121494468643129">"Uxolo, zama futhi"</string>
+    <!-- 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 />
+    <!-- no translation found for data_usage_summary_title (3804110657238092929) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle (5652529796195787949) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_split_4g (7417435609285381968) -->
+    <skip />
+    <!-- no translation found for data_usage_menu_show_wifi (8266875319417201085) -->
+    <skip />
+    <!-- no translation found for data_usage_change_cycle (7776556448920114866) -->
+    <skip />
+    <!-- no translation found for data_usage_pick_cycle_day (4470796861757050966) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_mobile_limit (289740911281022322) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_4g_limit (5808210773758699800) -->
+    <skip />
+    <!-- no translation found for data_usage_disable_3g_limit (3856971004328238231) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_wifi (1728851922959017766) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_mobile (454140350007299045) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_4g (1301978716067512235) -->
+    <skip />
+    <!-- no translation found for data_usage_tab_3g (6092169523081538718) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_mobile (986782622560157977) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_3g (6304006671869578254) -->
+    <skip />
+    <!-- no translation found for data_usage_enable_4g (3635854097335036738) -->
+    <skip />
+    <!-- no translation found for data_usage_app_settings (3727561362090820369) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background (8856643905291165256) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_background_summary (1503361245973512092) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog_title (8110736468987743260) -->
+    <skip />
+    <!-- no translation found for data_usage_app_restrict_dialog (100001698378554777) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_title (1373797281540188533) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_subtitle (5512903797979928416) -->
+    <skip />
+    <!-- no translation found for data_usage_cycle_editor_positive (4565302264487526138) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_title (3023111643632996097) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_mobile (7931094451923591578) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_3g (5478553071420316963) -->
+    <skip />
+    <!-- no translation found for data_usage_limit_dialog_4g (6134008906742403777) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_3g_title (4221584306492812040) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_4g_title (715585612162185936) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_mobile_title (209516216265000221) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog (2874031671067845964) -->
+    <skip />
+    <!-- no translation found for data_usage_disabled_dialog_enable (5738467047490662678) -->
+    <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/attrs.xml b/res/values/attrs.xml
index 7cff69c..06d2650 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -49,4 +49,26 @@
         <!-- Minimum tick width for each slice in the bar chart. -->
         <attr name="minTickWidth" format="dimension" />
     </declare-styleable>
+
+    <declare-styleable name="ChartSweepView">
+        <attr name="sweepDrawable" format="reference" />
+        <attr name="followAxis">
+            <enum name="horizontal" value="0" />
+            <enum name="vertical" value="1" />
+        </attr>
+        <attr name="showLabel" format="boolean" />
+    </declare-styleable>
+
+    <declare-styleable name="ChartGridView">
+        <attr name="primaryDrawable" format="reference" />
+        <attr name="secondaryDrawable" format="reference" />
+        <attr name="borderDrawable" format="reference" />
+        <attr name="labelColor" format="color" />
+    </declare-styleable>
+
+    <declare-styleable name="ChartNetworkSeriesView">
+        <attr name="strokeColor" format="color" />
+        <attr name="fillColor" format="color" />
+        <attr name="fillColorSecondary" format="color" />
+    </declare-styleable>
 </resources>
diff --git a/res/values/bools.xml b/res/values/bools.xml
index f4a95f3..3d5c380 100644
--- a/res/values/bools.xml
+++ b/res/values/bools.xml
@@ -22,4 +22,7 @@
     <bool name="has_dock_settings">false</bool>
     <!-- Whether there is a silent mode checkbox  -->
     <bool name="has_silent_mode">true</bool>
+    <!-- Whether the power control widget is enabled for this device. Should be overridden for 
+         specific product builds. -->
+    <bool name="has_powercontrol_widget">true</bool>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 418121b..dd0cb60 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -20,4 +20,6 @@
     <dimen name="vpn_connect_input_box_label_width">90sp</dimen>
     <dimen name="device_memory_usage_button_width">16dip</dimen>
     <dimen name="device_memory_usage_button_height">32dip</dimen>
+    <dimen name="data_usage_chart_height">220dip</dimen>
+    <dimen name="action_bar_switch_padding">16dip</dimen>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e5291eb..5839934 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -24,6 +24,16 @@
     <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
     <string name="device_info_default">Unknown</string>
 
+    <!-- Category headings in left-pane header menu --> <skip />
+    <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
+    <string name="header_category_wireless_networks">WIRELESS &amp; NETWORKS</string>
+    <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
+    <string name="header_category_device">DEVICE</string>
+    <!-- Settings main menu category heading. Personal (Accounts, security, language, backup...). [CHAR LIMIT=40] -->
+    <string name="header_category_personal">PERSONAL</string>
+    <!-- Settings main menu category heading. System (Updates, data, accessibility, about phone). [CHAR LIMIT=40] -->
+    <string name="header_category_system">SYSTEM</string>
+
     <!-- Phone info -->
     <!-- Phone Info screen. Button label to turn on the radio . Only shown in diagnostic screen, so precise translation is not needed. -->
     <string name="turn_on_radio">Turn on radio</string>
@@ -514,8 +524,8 @@
     <string name="airplane_mode_turning_on">Disabling wireless connections\u2026</string>
     <!-- Wireless controls settings screen, setting option summary text as airplane mode is being disabled (so it is re-enabling all the wireless conenctions) -->
     <string name="airplane_mode_turning_off">Enabling wireless connections\u2026</string>
-    <!-- Main Settings screen settings title for things like Wi-Fi, bluetooth, airplane mode.  This will take you to another screen with those settings. -->
-    <string name="radio_controls_title">Wireless &amp; networks</string>
+    <!-- Main Settings screen settings title for things like airplane mode, tethering, NFC, VPN.  This will take you to another screen with those settings. -->
+    <string name="radio_controls_title">More\u2026</string>
     <!-- Wireless Settings screen title for things like Wi-Fi, bluetooth, airplane mode. -->
     <string name="wireless_networks_settings_title">Wireless &amp; networks</string>
     <!-- Main Settings screen settings summary text for the "Wireless controls" setting -->
@@ -598,10 +608,10 @@
     <string name="owner_info_settings_summary"></string>
     <!-- Hint text shown in owner info edit text [CHAR LIMIT=50] -->
     <string name="owner_info_settings_edit_text_hint">Enter text to display on the lock screen</string>
-    <!-- Main Settings screen setting option title for the item to take you the security and location screen -->
-    <string name="security_settings_title">Location &amp; security</string>
-    <!-- Location & security settings screen title -->
-    <string name="location_security_settings_title">Location &amp; security settings</string>
+    <!-- Main Settings screen setting option title for the item to take you to the location screen -->
+    <string name="location_settings_title">Location services</string>
+    <!-- Main Settings screen setting option title for the item to take you to the security screen -->
+    <string name="security_settings_title">Security</string>
     <!-- Main Settings screen setting option summary text for the item tot ake you to the security and location screen -->
     <string name="security_settings_summary">Set My Location, screen unlock, SIM card lock, credential storage lock</string>
     <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
@@ -753,8 +763,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>
@@ -884,9 +894,9 @@
     <!-- Bluetooth settings check box summary for turning on bluetooth -->
     <string name="bluetooth_quick_toggle_summary">Turn on Bluetooth</string>
     <!--Used as title on second screen after selecting Bluetooth settings -->
-    <string name="bluetooth_settings">Bluetooth settings</string>
+    <string name="bluetooth_settings">Bluetooth</string>
     <!--Wireless controls screen, settings title for the item to take you to the bluetooth settings screen -->
-    <string name="bluetooth_settings_title">Bluetooth settings</string>
+    <string name="bluetooth_settings_title">Bluetooth</string>
     <!--Wireless controls screen, settings summary for the item tot ake you to the bluetooth settings screen -->
     <string name="bluetooth_settings_summary">Manage connections, set device name &amp; discoverability</string>
 
@@ -946,6 +956,15 @@
     <string name="bluetooth_device_context_disconnect_unpair">Disconnect &amp; unpair</string>
     <!-- Bluetooth settings.  Context menu item for a device.  Action will take the user to another screen where they can choose exactly which profiles to connect to. -->
     <string name="bluetooth_device_context_connect_advanced">Options\u2026</string>
+    <!-- Bluetooth settings.  Menu option to Bluetooth advanced settings [CHAR LIMIT=20]-->
+    <string name="bluetooth_menu_advanced">Advanced</string>
+    <!-- Bluetooth settings. Title of the advanced bluetooth settings screen [CHAR LIMIT=30]-->
+    <string name="bluetooth_advanced_titlebar">Advanced Bluetooth</string>
+    <!-- Bluetooth Advanced settings.  Used as a label under the shortcut icon that goes to Bluetooth advanced settings. [CHAR LIMIT=20]-->
+    <string name="bluetooth_advanced_settings_label">Advanced Bluetooth</string>
+    <!-- Bluetooth settings. Text displayed when Bluetooth is off and device list is empty [CHAR LIMIT=50]-->
+    <string name="bluetooth_empty_list_bluetooth_off">Turn on bluetooth to see available devices</string>
+
 
     <!-- Bluetooth settings.  The title of the screen to pick which profiles to connect to on the device.  For example, headphones may have both A2DP and headset, this allows the user to choose which one he wants to connect to. -->
     <string name="bluetooth_connect_specific_profiles_title">Connect to\u2026</string>
@@ -1041,16 +1060,18 @@
     <string name="wifi_quick_toggle_title">Wi-Fi</string>
     <!-- Used in the 1st-level settings screen as the turn-on summary -->
     <string name="wifi_quick_toggle_summary">Turn on Wi-Fi</string>
-    <!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen -->
-    <string name="wifi_settings">Wi-Fi settings</string>
+    <!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen  [CHAR LIMIT=20]-->
+    <string name="wifi_settings">Wi-Fi</string>
     <!-- Title of the Wi-fi settings screen -->
     <string name="wifi_settings_category">Wi-Fi settings</string>
+    <!-- Title of the Wi-fi settings entry in the left top level menu -->
+    <string name="wifi_settings_title">Wi-Fi</string>
     <!-- Summary text of the Wi-fi settings screen -->
     <string name="wifi_settings_summary">Set up &amp; manage wireless access points</string>
     <!-- Summary text when turning Wi-Fi or bluetooth on -->
-    <string name="wifi_starting">Turning on\u2026</string>
+    <string name="wifi_starting">Turning on Wi-Fi\u2026</string>
     <!-- Summary text when turning Wi-Fi or bluetooth off -->
-    <string name="wifi_stopping">Turning off\u2026</string>
+    <string name="wifi_stopping">Turning off Wi-Fi\u2026</string>
     <!-- Summary text when Wi-Fi or bluetooth has error -->
     <string name="wifi_error">Error</string>
     <!-- Toast message when Wi-Fi or bluetooth is disallowed in airplane mode -->
@@ -1069,8 +1090,8 @@
     <string name="wifi_setting_sleep_policy_summary_wifi_only">Specify when to disconnect from Wi-Fi</string>
     <!-- Generic error message when the sleep policy could not be set. -->
     <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>
+    <!-- Action bar text message to manually add a wifi network [CHAR LIMIT=20]-->
+    <string name="wifi_add_network">Add 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 -->
@@ -1083,6 +1104,8 @@
     <string name="wifi_menu_forget">Forget network</string>
     <!-- Menu option to modify a Wi-Fi network configuration -->
     <string name="wifi_menu_modify">Modify network</string>
+    <!-- Wi-Fi settings. text displayed when WiFi is off and network list is empty [CHAR LIMIT=50]-->
+    <string name="wifi_empty_list_wifi_off">Turn on wifi to see available networks</string>
 
     <!-- Dialog for Access Points --> <skip />
     <!-- Label for network setup [CHAR LIMIT=50] -->
@@ -1175,8 +1198,9 @@
     <!-- Wi-Fi settings screen, advanced, title of the item to show the Wi-Fi device's current IP address. -->
     <string name="wifi_advanced_ip_address_title">IP address</string>
 
-    <string name="wifi_ip_settings_titlebar">IP settings</string>
-    <!-- Menu ietm to save the IP settings -->
+    <!-- Wifi Advanced settings.  Used as a label under the shortcut icon that goes to Wifi advanced settings. [CHAR LIMIT=20]-->
+    <string name="wifi_advanced_settings_label">IP settings</string>
+    <!-- Menu item to save the IP settings -->
     <string name="wifi_ip_settings_menu_save">Save</string>
     <!-- Menu ietm to cancel the IP settings -->
     <string name="wifi_ip_settings_menu_cancel">Cancel</string>
@@ -1457,8 +1481,30 @@
     <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>
+    <!-- Wallpaper settings title [CHAR LIMIT=30] -->
+    <string name="wallpaper_settings_title">Wallpaper</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>
@@ -1903,6 +1949,10 @@
     <!-- Tethering help button - calls up a web view with general tethering info -->
     <string name="tethering_help_button_text">Help</string>
 
+    <!-- Wireless controls, header for the general category (airplane mode, VPN, NFC, tethering...) [CHAR LIMIT=40]-->
+    <string name="wireless_category_general">General</string>
+    <!-- Wireless controls, header for the mobile networks category (4G/ network operator...) [CHAR LIMIT=40]-->
+    <string name="wireless_category_mobile_networks">Mobile networks</string>
     <!-- Wireless controls, item title to go into the network settings -->
     <string name="network_settings_title">Mobile networks</string>
     <!-- Wireless controls, the item summary for the user to go into the network settings -->
@@ -2111,6 +2161,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. -->
@@ -2403,8 +2457,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. -->
@@ -2421,6 +2477,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>
@@ -2603,6 +2661,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] -->
@@ -2854,6 +2915,14 @@
     <string name="tts_engine_name_is_enabled_summary"><xliff:g id="tts_plugin_engine_name">%s</xliff:g> is enabled</string>
     <!-- On main TTS Settings screen, text preceded by the TTS engine name to indicate the engine cannot be used by the user -->
     <string name="tts_engine_name_is_disabled_summary"><xliff:g id="tts_plugin_engine_name">%s</xliff:g> is disabled</string>
+    <!-- On the main TTS settings screen, text for a divider under which
+         the engine specific settings and the "engine install data" option
+         are listed [CHAR LIMIT=30]-->
+    <string name="tts_engine_settings_section">Engine settings</string>
+    <!-- Title for a preference in the main TTS settings screen, which
+         launches the settings screen for a given TTS engine when clicked
+         [CHAR LIMIT=30]-->
+    <string name="tts_engine_settings_title">Settings for <xliff:g id="tts_engine_name">%s</xliff:g></string>
     <!-- On Pico TTS Settings screen, text to mark the section for the various languages and voices that are available -->
     <string name="pico_languages_and_voices">Languages and voices</string>
     <!-- On Pico TTS Settings screen, text to mark a voice as installed -->
@@ -3016,10 +3085,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] -->
@@ -3028,31 +3093,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>
@@ -3062,8 +3115,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>
@@ -3346,4 +3403,82 @@
     <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>
+    <!-- Title for option to pick visible time range from a list available usage periods. [CHAR LIMIT=25] -->
+    <string name="data_usage_cycle">Data usage cycle</string>
+    <!-- Title for checkbox menu option to show 4G mobile data usage separate from other mobile data usage. [CHAR LIMIT=32] -->
+    <string name="data_usage_menu_split_4g">Split 4G usage</string>
+    <!-- Title for checkbox menu option to show Wi-Fi data usage. [CHAR LIMIT=32] -->
+    <string name="data_usage_menu_show_wifi">Show Wi-Fi usage</string>
+    <!-- Title for option to change data usage cycle day. [CHAR LIMIT=32] -->
+    <string name="data_usage_change_cycle">Change cycle\u2026</string>
+    <!-- Body of dialog prompting user to change numerical day of month that data usage cycle should reset. [CHAR LIMIT=64] -->
+    <string name="data_usage_pick_cycle_day">Day of month to reset data usage cycle:</string>
+
+    <!-- Checkbox label that will disable mobile network data connection when user-defined limit is reached. [CHAR LIMIT=32] -->
+    <string name="data_usage_disable_mobile_limit">Disable mobile data at limit</string>
+    <!-- Checkbox label that will disable 4G network data connection when user-defined limit is reached. [CHAR LIMIT=32] -->
+    <string name="data_usage_disable_4g_limit">Disable 4G data at limit</string>
+    <!-- Checkbox label that will disable 2G-3G network data connection when user-defined limit is reached. [CHAR LIMIT=32] -->
+    <string name="data_usage_disable_3g_limit">Disable 2G-3G data at limit</string>
+
+    <!-- Tab title for showing Wi-Fi data usage. [CHAR LIMIT=10] -->
+    <string name="data_usage_tab_wifi">Wi-Fi</string>
+    <!-- Tab title for showing combined mobile data usage. [CHAR LIMIT=10] -->
+    <string name="data_usage_tab_mobile">Mobile</string>
+    <!-- Tab title for showing 4G data usage. [CHAR LIMIT=10] -->
+    <string name="data_usage_tab_4g">4G</string>
+    <!-- Tab title for showing 2G and 3G data usage. [CHAR LIMIT=10] -->
+    <string name="data_usage_tab_3g">2G-3G</string>
+
+    <!-- Toggle switch title for enabling all mobile data network connections. [CHAR LIMIT=32] -->
+    <string name="data_usage_enable_mobile">Mobile data</string>
+    <!-- Toggle switch title for enabling 2G and 3G data network connections. [CHAR LIMIT=32] -->
+    <string name="data_usage_enable_3g">2G-3G data</string>
+    <!-- Toggle switch title for enabling 4G data network connection. [CHAR LIMIT=32] -->
+    <string name="data_usage_enable_4g">4G data</string>
+
+    <!-- Button title for launching application-specific data usage settings. [CHAR LIMIT=32] -->
+    <string name="data_usage_app_settings">View application settings</string>
+    <!-- Checkbox label that restricts background data usage of a specific application. [CHAR LIMIT=32] -->
+    <string name="data_usage_app_restrict_background">Restrict background data usage</string>
+    <!-- Summary message for checkbox that restricts background data usage of a specific application. [CHAR LIMIT=64] -->
+    <string name="data_usage_app_restrict_background_summary">Only allow application background data when using an unlimited network</string>
+    <!-- Title of dialog shown when user restricts background data usage of a specific application. [CHAR LIMIT=48] -->
+    <string name="data_usage_app_restrict_dialog_title">Restricting background data</string>
+    <!-- Body of dialog shown when user restricts background data usage of a specific application. [CHAR LIMIT=NONE] -->
+    <string name="data_usage_app_restrict_dialog">This feature may negatively impact applications which depend on background data usage.\n\nMore appropriate data usage controls may be found within this application\'s settings.</string>
+
+    <!-- Title of dialog for editing data usage cycle reset date. [CHAR LIMIT=48] -->
+    <string name="data_usage_cycle_editor_title">Usage cycle reset date</string>
+    <!-- Subtitle of dialog for editing data usage cycle reset date. [CHAR LIMIT=32] -->
+    <string name="data_usage_cycle_editor_subtitle">Date of each month:</string>
+    <!-- Positive button title for data usage cycle editor, confirming that changes should be saved. [CHAR LIMIT=32] -->
+    <string name="data_usage_cycle_editor_positive">Set</string>
+
+    <!-- Title of dialog shown before user limits data usage. [CHAR LIMIT=48] -->
+    <string name="data_usage_limit_dialog_title">Limiting data usage</string>
+    <!-- Body of dialog shown before user limits mobile data usage. [CHAR LIMIT=NONE] -->
+    <string name="data_usage_limit_dialog_mobile">Your mobile data connection will be disabled when the specified limit is reached.\n\nTo avoid overage charges, consider using a reduced limit, as device and carrier accounting methods may vary.</string>
+    <!-- Body of dialog shown before user limits 3G data usage. [CHAR LIMIT=NONE] -->
+    <string name="data_usage_limit_dialog_3g">Your 2G-3G data connection will be disabled when the specified limit is reached.\n\nTo avoid overage charges, consider using a reduced limit, as device and carrier accounting methods may vary.</string>
+    <!-- Body of dialog shown before user limits 4G data usage. [CHAR LIMIT=NONE] -->
+    <string name="data_usage_limit_dialog_4g">Your 4G data connection will be disabled when the specified limit is reached.\n\nTo avoid overage charges, consider using a reduced limit, as device and carrier accounting methods may vary.</string>
+
+    <!-- Title of dialog shown when 2G-3G data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+    <string name="data_usage_disabled_dialog_3g_title">2G-3G data disabled</string>
+    <!-- Title of dialog shown when 4G data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+    <string name="data_usage_disabled_dialog_4g_title">4G data disabled</string>
+    <!-- Title of dialog shown when mobile data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+    <string name="data_usage_disabled_dialog_mobile_title">Mobile data disabled</string>
+    <!-- Body of dialog shown when data usage has exceeded limit and has been disabled. [CHAR LIMIT=NONE] -->
+    <string name="data_usage_disabled_dialog">The specified data usage limit has been reached.\n\nAdditional data use may incur carrier charges.</string>
+    <!-- Dialog button indicating that data connection should be re-enabled. [CHAR LIMIT=28] -->
+    <string name="data_usage_disabled_dialog_enable">Re-enable data</string>
+
+    <!-- Label displaying current network data usage warning threshold. [CHAR LIMIT=18] -->
+    <string name="data_usage_sweep_warning"><font size="32"><xliff:g id="number" example="128">%1$s</xliff:g></font> <font size="12"><xliff:g id="unit" example="KB">%2$s</xliff:g></font>\n<font size="12">warning</font></string>
+
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 1a6380f..e2d7fe2 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -83,7 +83,7 @@
     </style>
 
     <style name="wifi_item">
-        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_width">200dip</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_marginTop">8dip</item>
         <item name="android:layout_marginLeft">16dip</item>
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/bluetooth_advanced_settings.xml b/res/xml/bluetooth_advanced_settings.xml
new file mode 100644
index 0000000..345b3bf
--- /dev/null
+++ b/res/xml/bluetooth_advanced_settings.xml
@@ -0,0 +1,47 @@
+<?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.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/bluetooth_advanced_titlebar">
+
+    <com.android.settings.bluetooth.BluetoothNamePreference
+        android:key="bt_name"
+        android:title="@string/bluetooth_device_name"
+        android:summary="@string/bluetooth_name_not_set"
+        android:dialogTitle="@string/bluetooth_device_name"
+        android:persistent="false"
+        android:singleLine="true" />
+
+    <CheckBoxPreference
+        android:key="bt_discoverable"
+        android:title="@string/bluetooth_visibility"
+        android:summaryOn="@string/bluetooth_is_discoverable"
+        android:summaryOff="@string/bluetooth_not_discoverable"
+        android:persistent="false" />
+
+    <ListPreference
+        android:key="bt_discoverable_timeout"
+        android:title="@string/bluetooth_visibility_timeout"
+        android:summary="@string/bluetooth_visibility_timeout_summary"
+        android:entries="@array/bluetooth_visibility_timeout_entries"
+        android:entryValues="@array/bluetooth_visibility_timeout_values" />
+
+    <Preference
+        android:key="bt_show_received_files"
+        android:title="@string/bluetooth_show_received_files_title"
+        android:summary="@string/bluetooth_show_received_files_summary" />
+
+</PreferenceScreen>
diff --git a/res/xml/bluetooth_settings.xml b/res/xml/bluetooth_settings.xml
index 042eed5..783a860 100644
--- a/res/xml/bluetooth_settings.xml
+++ b/res/xml/bluetooth_settings.xml
@@ -18,54 +18,4 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:title="@string/bluetooth_settings" >
 
-    <PreferenceCategory
-        android:title="@string/bluetooth_preference_device_settings"/>
-
-    <CheckBoxPreference
-        android:key="bt_checkbox"
-        android:title="@string/bluetooth"
-        android:summary="@string/bluetooth_quick_toggle_summary" />
-
-    <com.android.settings.bluetooth.BluetoothNamePreference
-        android:key="bt_name"
-        android:title="@string/bluetooth_device_name"
-        android:summary="@string/bluetooth_name_not_set"
-        android:dialogTitle="@string/bluetooth_device_name"
-        android:dependency="bt_checkbox"
-        android:persistent="false"
-        android:singleLine="true" />
-
-    <CheckBoxPreference
-        android:key="bt_discoverable"
-        android:title="@string/bluetooth_visibility"
-        android:dependency="bt_checkbox"
-        android:summaryOn="@string/bluetooth_is_discoverable"
-        android:summaryOff="@string/bluetooth_not_discoverable"
-        android:persistent="false" />
-
-    <ListPreference
-        android:key="bt_discoverable_timeout"
-        android:title="@string/bluetooth_visibility_timeout"
-        android:dependency="bt_discoverable"
-        android:summary="@string/bluetooth_visibility_timeout_summary"
-        android:entries="@array/bluetooth_visibility_timeout_entries"
-        android:entryValues="@array/bluetooth_visibility_timeout_values" />
-
-    <Preference
-        android:key="bt_show_received_files"
-        android:dependency="bt_checkbox"
-        android:title="@string/bluetooth_show_received_files_title"
-        android:summary="@string/bluetooth_show_received_files_summary" />
-
-    <PreferenceCategory
-        android:key="bt_device_list"
-        android:title="@string/bluetooth_preference_paired_devices"
-        android:orderingFromXml="false" />
-
-    <Preference
-        android:key="bt_find_nearby"
-        android:dependency="bt_checkbox"
-        android:fragment="com.android.settings.bluetooth.BluetoothFindNearby"
-        android:title="@string/bluetooth_preference_find_nearby_title" />
-
 </PreferenceScreen>
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index 7fe7f76..b0abd9a 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -41,4 +41,26 @@
                 android:persistent="false"
                 android:entries="@array/screen_timeout_entries"
                 android:entryValues="@array/screen_timeout_values" />
+
+        <PreferenceScreen
+                android:key="wallpaper"
+                android:title="@string/wallpaper_settings_title"
+                android:fragment="com.android.settings.WallpaperTypeSettings"
+            />
+
+        <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/location_settings.xml b/res/xml/location_settings.xml
new file mode 100644
index 0000000..94133d0
--- /dev/null
+++ b/res/xml/location_settings.xml
@@ -0,0 +1,41 @@
+<?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.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/location_settings_title">
+
+        <CheckBoxPreference
+            android:key="location_network"
+            android:title="@string/location_network_based"
+            android:summaryOn="@string/location_neighborhood_level"
+            android:summaryOff="@string/location_networks_disabled"/>
+
+        <CheckBoxPreference
+            android:key="location_gps"
+            android:title="@string/location_gps"
+            android:summaryOn="@string/location_street_level"
+            android:summaryOff="@string/location_gps_disabled"/>
+
+<!-- Disabled to avoid confusion on devices with no AGPS
+     For Google experience devices we want AGPS on by default (if supported) so we don't really need this.
+        <CheckBoxPreference
+            android:key="assisted_gps"
+            android:title="@string/assisted_gps"
+            android:summaryOn="@string/assisted_gps_enabled"
+            android:summaryOff="@string/assisted_gps_disabled"/>
+-->
+
+</PreferenceScreen>
diff --git a/res/xml/security_settings.xml b/res/xml/security_settings.xml
index d0e200a5..228b7f1 100644
--- a/res/xml/security_settings.xml
+++ b/res/xml/security_settings.xml
@@ -15,33 +15,6 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        android:title="@string/location_security_settings_title">
-
-    <PreferenceCategory
-        android:key="location_category"
-        android:title="@string/location_title">
-
-        <CheckBoxPreference
-            android:key="location_network"
-            android:title="@string/location_network_based"
-            android:summaryOn="@string/location_neighborhood_level"
-            android:summaryOff="@string/location_networks_disabled"/>
-
-        <CheckBoxPreference
-            android:key="location_gps"
-            android:title="@string/location_gps"
-            android:summaryOn="@string/location_street_level"
-            android:summaryOff="@string/location_gps_disabled"/>
-
-<!-- Disabled to avoid confusion on devices with no AGPS
-     For Google experience devices we want AGPS on by default (if supported) so we don't really need this.
-        <CheckBoxPreference
-            android:key="assisted_gps"
-            android:title="@string/assisted_gps"
-            android:summaryOn="@string/assisted_gps_enabled"
-            android:summaryOff="@string/assisted_gps_disabled"/>
--->
-
-    </PreferenceCategory>
+        android:title="@string/security_settings_title">
 
 </PreferenceScreen>
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/settings_headers.xml b/res/xml/settings_headers.xml
index 5411308..063d103 100644
--- a/res/xml/settings_headers.xml
+++ b/res/xml/settings_headers.xml
@@ -17,32 +17,32 @@
 <preference-headers
         xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <!-- Operator hook -->
 
+    <!-- WIRELESS and NETWORKS -->
+    <header android:title="@string/header_category_wireless_networks" />
+
+    <!-- Wifi -->
     <header
-        android:fragment="com.android.settings.WirelessSettings"
-        android:id="@+id/operator_settings">
-        <intent android:action="com.android.settings.OPERATOR_APPLICATION_SETTING" />
-    </header>
-
-    <!-- Manufacturer hook -->
-
-    <header
-        android:fragment="com.android.settings.WirelessSettings"
-        android:id="@+id/manufacturer_settings">
-        <intent android:action="com.android.settings.MANUFACTURER_APPLICATION_SETTING" />
-    </header>
-
-    <!-- Wireless controls -->
-
-    <header
-        android:id="@+id/wireless_settings"
-        android:title="@string/radio_controls_title"
-        android:fragment="com.android.settings.WirelessSettings"
+        android:id="@+id/wifi_settings"
+        android:fragment="com.android.settings.wifi.WifiSettings"
+        android:title="@string/wifi_settings_title"
         android:icon="@drawable/ic_settings_wireless" />
 
-    <!-- Call settings - this is in the phone process -->
+    <!-- Bluetooth -->
+    <header
+        android:id="@+id/bluetooth_settings"
+        android:fragment="com.android.settings.bluetooth.BluetoothSettings"
+        android:title="@string/bluetooth_settings_title"
+        android:icon="@drawable/ic_settings_bluetooth2" />
 
+    <!-- Data Usage -->
+    <header
+        android:id="@+id/data_usage_settings"
+        android:fragment="com.android.settings.DataUsageSummary"
+        android:title="@string/data_usage_summary_title"
+        android:icon="@drawable/ic_settings_data_usage" />
+
+    <!-- Call settings - this is in the phone process -->
     <header
         android:id="@+id/call_settings"
         android:icon="@drawable/ic_settings_call"
@@ -53,8 +53,25 @@
             android:targetClass="com.android.phone.CallFeaturesSetting" />
     </header>
 
-    <!-- Sound -->
+    <!-- Operator hook -->
+    <header
+        android:fragment="com.android.settings.WirelessSettings"
+        android:id="@+id/operator_settings">
+        <intent android:action="com.android.settings.OPERATOR_APPLICATION_SETTING" />
+    </header>
 
+    <!-- Other wireless and network controls -->
+    <header
+        android:id="@+id/wireless_settings"
+        android:title="@string/radio_controls_title"
+        android:fragment="com.android.settings.WirelessSettings"
+        android:icon="@drawable/ic_settings_more_wireless" />
+
+
+    <!-- DEVICE -->
+    <header android:title="@string/header_category_device" />
+
+    <!-- Sound -->
     <header
         android:id="@+id/sound_settings"
         android:icon="@drawable/ic_settings_sound"
@@ -62,73 +79,79 @@
         android:title="@string/sound_settings_title" />
 
     <!-- Display -->
-
     <header
         android:id="@+id/display_settings"
         android:icon="@drawable/ic_settings_display"
         android:fragment="com.android.settings.DisplaySettings"
         android:title="@string/display_settings_title" />
 
-    <!-- Security & Location -->
-
-    <header
-        android:fragment="com.android.settings.SecuritySettings"
-        android:icon="@drawable/ic_settings_security"
-        android:title="@string/security_settings_title"
-        android:id="@+id/security_settings" />
-
-    <!-- Application Settings -->
-
-    <header
-        android:fragment="com.android.settings.ApplicationSettings"
-        android:icon="@drawable/ic_settings_applications"
-        android:title="@string/applications_settings"
-        android:id="@+id/application_settings" />
-
-    <!-- Data Sync. The settings activity will ensure this is resolved to an
-         activity on the system image, otherwise it will remove this
-         preference. -->
-
-    <header
-        android:fragment="com.android.settings.accounts.ManageAccountsSettings"
-        android:icon="@drawable/ic_settings_sync"
-        android:title="@string/sync_settings"
-        android:id="@+id/sync_settings" />
-
-    <!-- Privacy -->
-
-    <header
-        android:fragment="com.android.settings.PrivacySettings"
-        android:icon="@drawable/ic_settings_privacy"
-        android:title="@string/privacy_settings"
-        android:id="@+id/privacy_settings" />
-
     <!-- Storage -->
-
     <header
         android:id="@+id/storage_settings"
         android:fragment="com.android.settings.deviceinfo.Memory"
         android:icon="@drawable/ic_settings_storage"
         android:title="@string/storage_settings" />
 
-    <!-- Language -->
+    <!-- Application Settings -->
+    <header
+        android:fragment="com.android.settings.ApplicationSettings"
+        android:icon="@drawable/ic_settings_applications"
+        android:title="@string/applications_settings"
+        android:id="@+id/application_settings" />
 
+    <!-- Manufacturer hook -->
+    <header
+        android:fragment="com.android.settings.WirelessSettings"
+        android:id="@+id/manufacturer_settings">
+        <intent android:action="com.android.settings.MANUFACTURER_APPLICATION_SETTING" />
+    </header>
+
+
+    <!-- PERSONAL -->
+    <header android:title="@string/header_category_personal" />
+
+    <!-- Data Sync. The settings activity will ensure this is resolved to an
+         activity on the system image, otherwise it will remove this
+         preference. -->
+    <header
+        android:fragment="com.android.settings.accounts.ManageAccountsSettings"
+        android:icon="@drawable/ic_settings_sync"
+        android:title="@string/sync_settings"
+        android:id="@+id/sync_settings" />
+
+    <!-- Location -->
+    <header
+        android:fragment="com.android.settings.LocationSettings"
+        android:icon="@drawable/ic_settings_location"
+        android:title="@string/location_settings_title"
+        android:id="@+id/location_settings" />
+
+    <!-- Security -->
+    <header
+        android:fragment="com.android.settings.SecuritySettings"
+        android:icon="@drawable/ic_settings_security"
+        android:title="@string/security_settings_title"
+        android:id="@+id/security_settings" />
+
+    <!-- Privacy -->
+    <header
+        android:fragment="com.android.settings.PrivacySettings"
+        android:icon="@drawable/ic_settings_privacy"
+        android:title="@string/privacy_settings"
+        android:id="@+id/privacy_settings" />
+
+    <!-- Language -->
     <header
         android:id="@+id/language_settings"
         android:fragment="com.android.settings.inputmethod.InputMethodAndLanguageSettings"
         android:icon="@drawable/ic_settings_language"
         android:title="@string/language_settings" />
 
-    <!-- Accessibility feedback -->
 
-    <header
-        android:id="@+id/accessibility_settings"
-        android:fragment="com.android.settings.AccessibilitySettings"
-        android:icon="@drawable/ic_settings_accessibility"
-        android:title="@string/accessibility_settings" />
+    <!-- SYSTEM -->
+    <header android:title="@string/header_category_system" />
 
     <!-- Dock -->
-
     <header
         android:id="@+id/dock_settings"
         android:fragment="com.android.settings.DockSettings"
@@ -136,15 +159,20 @@
         android:title="@string/dock_settings" />
 
     <!-- Date & Time -->
-
     <header
         android:id="@+id/date_time_settings"
         android:fragment="com.android.settings.DateTimeSettings"
         android:icon="@drawable/ic_settings_date_time"
         android:title="@string/date_and_time_settings_title" />
 
-    <!-- About Device -->
+    <!-- Accessibility feedback -->
+    <header
+        android:id="@+id/accessibility_settings"
+        android:fragment="com.android.settings.AccessibilitySettings"
+        android:icon="@drawable/ic_settings_accessibility"
+        android:title="@string/accessibility_settings" />
 
+    <!-- About Device -->
     <header
         android:id="@+id/about_settings"
         android:fragment="com.android.settings.DeviceInfoSettings"
diff --git a/res/xml/tts_settings.xml b/res/xml/tts_settings.xml
index c378f64..ecccc10 100644
--- a/res/xml/tts_settings.xml
+++ b/res/xml/tts_settings.xml
@@ -4,9 +4,9 @@
      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.
@@ -18,17 +18,11 @@
         android:title="@string/tts_settings_title">
 
         <Preference
-                android:key="tts_play_example"
-                android:persistent="false"
-                android:title="@string/tts_play_example_title" 
-                android:summary="@string/tts_play_example_summary" />
+            android:key="tts_play_example"
+            android:persistent="false"
+            android:title="@string/tts_play_example_title"
+            android:summary="@string/tts_play_example_summary" />
 
-        <CheckBoxPreference
-            android:key="toggle_use_default_tts_settings"
-            android:title="@string/use_default_tts_settings_title"
-            android:summary="@string/use_default_tts_settings_summary"
-            android:persistent="false" />
-                    
         <PreferenceCategory
             android:title="@string/tts_default_settings_section">
             <ListPreference
@@ -39,12 +33,6 @@
                 android:entries="@array/tts_engine_entries"
                 android:entryValues="@array/tts_engine_values" />
 
-            <Preference
-                android:key="tts_install_data"
-                android:persistent="false"
-                android:title="@string/tts_install_data_title" 
-                android:summary="@string/tts_install_data_summary" />
-
             <ListPreference
                 android:key="tts_default_rate"
                 android:title="@string/tts_default_rate_title"
@@ -63,8 +51,19 @@
 
         </PreferenceCategory>
 
-        <PreferenceCategory android:key="tts_engines_section"
-                android:title="@string/tts_engines_section" />
+        <PreferenceCategory android:key="tts_engine_settings_section"
+            android:title="@string/tts_engine_settings_section">
+            <Preference
+                android:key="tts_engine_settings"
+                android:persistent="false"
+                android:title="@string/tts_engine_settings_title" />
+
+            <Preference
+                android:key="tts_install_data"
+                android:persistent="false"
+                android:title="@string/tts_install_data_title"
+                android:summary="@string/tts_install_data_summary" />
+       </PreferenceCategory>
 
 
 </PreferenceScreen>
diff --git a/res/xml/wallpaper_settings.xml b/res/xml/wallpaper_settings.xml
new file mode 100644
index 0000000..63346f7
--- /dev/null
+++ b/res/xml/wallpaper_settings.xml
@@ -0,0 +1,20 @@
+<?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.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/wallpaper_settings_title">
+
+</PreferenceScreen>
diff --git a/res/xml/wifi_access_points_for_wifi_setup_xl.xml b/res/xml/wifi_access_points_for_wifi_setup_xl.xml
index 013c62c..14266f5 100644
--- a/res/xml/wifi_access_points_for_wifi_setup_xl.xml
+++ b/res/xml/wifi_access_points_for_wifi_setup_xl.xml
@@ -15,7 +15,4 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <com.android.settings.wifi.AccessPointCategoryForSetupWizardXL
-         android:key="access_points"
-         android:persistent="false" />
 </PreferenceScreen>
diff --git a/res/xml/wifi_advanced_settings.xml b/res/xml/wifi_advanced_settings.xml
index 4d85178..1444de1 100644
--- a/res/xml/wifi_advanced_settings.xml
+++ b/res/xml/wifi_advanced_settings.xml
@@ -17,6 +17,22 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
         android:title="@string/wifi_advanced_titlebar">
 
+    <!-- android:dependency="enable_wifi" -->
+    <CheckBoxPreference
+            android:key="notify_open_networks"
+            android:title="@string/wifi_notify_open_networks"
+            android:summary="@string/wifi_notify_open_networks_summary"
+            android:persistent="false" />
+
+    <ListPreference
+            android:key="sleep_policy"
+            android:title="@string/wifi_setting_sleep_policy_title"
+            android:summary="@string/wifi_setting_sleep_policy_summary"
+            android:persistent="false"
+            android:entries="@array/wifi_sleep_policy_entries"
+            android:entryValues="@array/wifi_sleep_policy_values"
+            />
+
     <ListPreference
             android:key="frequency_band"
             android:title="@string/wifi_setting_frequency_band_title"
diff --git a/res/xml/wifi_settings.xml b/res/xml/wifi_settings.xml
index 24f4432..d984d8f 100644
--- a/res/xml/wifi_settings.xml
+++ b/res/xml/wifi_settings.xml
@@ -17,38 +17,4 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
         android:title="@string/wifi_settings_category">
 
-    <CheckBoxPreference
-            android:key="enable_wifi"
-            android:title="@string/wifi_quick_toggle_title"
-            android:summary="@string/wifi_quick_toggle_summary"
-            android:persistent="false" />
-
-    <CheckBoxPreference
-            android:key="notify_open_networks"
-            android:dependency="enable_wifi"
-            android:title="@string/wifi_notify_open_networks"
-            android:summary="@string/wifi_notify_open_networks_summary"
-            android:persistent="false" />
-
-    <ListPreference
-            android:key="sleep_policy"
-            android:title="@string/wifi_setting_sleep_policy_title"
-            android:summary="@string/wifi_setting_sleep_policy_summary"
-            android:persistent="false"
-            android:entries="@array/wifi_sleep_policy_entries"
-            android:entryValues="@array/wifi_sleep_policy_values"
-            />
-
-    <com.android.settings.ProgressCategory
-            android:key="access_points"
-            android:dependency="enable_wifi"
-            android:title="@string/wifi_access_points"
-            android:persistent="false" />
-
-    <Preference
-            android:key="add_network"
-            android:dependency="enable_wifi"
-            android:title="@string/wifi_add_network"
-            android:persistent="false" />
-
 </PreferenceScreen>
diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml
index 466df7b..f3de7ec 100644
--- a/res/xml/wireless_settings.xml
+++ b/res/xml/wireless_settings.xml
@@ -17,6 +17,9 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
         android:title="@string/wireless_networks_settings_title">
 
+    <PreferenceCategory
+        android:title="@string/wireless_category_general" />
+
     <CheckBoxPreference
         android:key="toggle_airplane"
         android:title="@string/airplane_mode"
@@ -24,31 +27,17 @@
         android:persistent="false"
         android:disableDependentsState="true" />
 
-    <!-- Programmatically will have dynamic summary, but we provide the fallback summary. -->
     <CheckBoxPreference
-        android:key="toggle_wifi"
-        android:title="@string/wifi_quick_toggle_title"
-        android:summary="@string/wifi_quick_toggle_summary"
+        android:key="toggle_nfc"
+        android:title="@string/nfc_quick_toggle_title"
+        android:summary="@string/nfc_quick_toggle_summary"
         android:persistent="false" />
 
     <PreferenceScreen
-        android:fragment="com.android.settings.wifi.WifiSettings"
-        android:key="wifi_settings"
-        android:title="@string/wifi_settings"
-        android:summary="@string/wifi_settings_summary" >
-    </PreferenceScreen>
-
-    <CheckBoxPreference
-        android:key="toggle_bluetooth"
-        android:title="@string/bluetooth_quick_toggle_title"
-        android:summary="@string/bluetooth_quick_toggle_summary"
-        android:persistent="false" />
-
-    <PreferenceScreen
-        android:fragment="com.android.settings.bluetooth.BluetoothSettings"
-        android:key="bt_settings"
-        android:title="@string/bluetooth_settings_title"
-        android:summary="@string/bluetooth_settings_summary">
+        android:fragment="com.android.settings.vpn.VpnSettings"
+        android:key="vpn_settings"
+        android:title="@string/vpn_settings_title"
+        android:summary="@string/vpn_settings_summary" >
     </PreferenceScreen>
 
     <PreferenceScreen
@@ -58,18 +47,8 @@
         android:summary="@string/tether_settings_summary_all">
     </PreferenceScreen>
 
-    <PreferenceScreen
-        android:fragment="com.android.settings.vpn.VpnSettings"
-        android:key="vpn_settings"
-        android:title="@string/vpn_settings_title"
-        android:summary="@string/vpn_settings_summary" >
-    </PreferenceScreen>
-
-    <CheckBoxPreference
-        android:key="toggle_nfc"
-        android:title="@string/nfc_quick_toggle_title"
-        android:summary="@string/nfc_quick_toggle_summary"
-        android:persistent="false" />
+    <PreferenceCategory
+        android:title="@string/wireless_category_mobile_networks" />
 
     <PreferenceScreen
         android:key="mobile_network_settings"
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/BrightnessPreference.java b/src/com/android/settings/BrightnessPreference.java
index 9bbb66a..df50ada 100644
--- a/src/com/android/settings/BrightnessPreference.java
+++ b/src/com/android/settings/BrightnessPreference.java
@@ -26,7 +26,7 @@
 import android.os.Parcelable;
 import android.os.RemoteException;
 import android.os.ServiceManager;
-import android.preference.SeekBarPreference;
+import android.preference.SeekBarDialogPreference;
 import android.provider.Settings;
 import android.provider.Settings.SettingNotFoundException;
 import android.util.AttributeSet;
@@ -35,7 +35,7 @@
 import android.widget.CompoundButton;
 import android.widget.SeekBar;
 
-public class BrightnessPreference extends SeekBarPreference implements
+public class BrightnessPreference extends SeekBarDialogPreference implements
         SeekBar.OnSeekBarChangeListener, CheckBox.OnCheckedChangeListener {
 
     private SeekBar mSeekBar;
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/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java
index edf00d5..20bf7ce 100644
--- a/src/com/android/settings/CryptKeeper.java
+++ b/src/com/android/settings/CryptKeeper.java
@@ -342,9 +342,11 @@
 
         KeyboardView keyboardView = (PasswordEntryKeyboardView) findViewById(R.id.keyboard);
 
-        PasswordEntryKeyboardHelper keyboardHelper = new PasswordEntryKeyboardHelper(this,
-                keyboardView, mPasswordEntry, false);
-        keyboardHelper.setKeyboardMode(PasswordEntryKeyboardHelper.KEYBOARD_MODE_ALPHA);
+        if (keyboardView != null) {
+            PasswordEntryKeyboardHelper keyboardHelper = new PasswordEntryKeyboardHelper(this,
+                    keyboardView, mPasswordEntry, false);
+            keyboardHelper.setKeyboardMode(PasswordEntryKeyboardHelper.KEYBOARD_MODE_ALPHA);
+        }
     }
 
     private IMountService getMountService() {
@@ -357,7 +359,7 @@
 
     @Override
     public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-        if (actionId == EditorInfo.IME_NULL) {
+        if (actionId == EditorInfo.IME_NULL || actionId == EditorInfo.IME_ACTION_DONE) {
             // Get the password
             String password = v.getText().toString();
 
diff --git a/src/com/android/settings/CryptKeeperConfirm.java b/src/com/android/settings/CryptKeeperConfirm.java
index ba8ce10..d177cb4 100644
--- a/src/com/android/settings/CryptKeeperConfirm.java
+++ b/src/com/android/settings/CryptKeeperConfirm.java
@@ -62,6 +62,8 @@
                 public void run() {
                     IBinder service = ServiceManager.getService("mount");
                     if (service == null) {
+                        Log.e("CryptKeeper", "Failed to find the mount service");
+                        finish();
                         return;
                     }
 
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/DataUsageAppDetail.java b/src/com/android/settings/DataUsageAppDetail.java
new file mode 100644
index 0000000..6294ad3
--- /dev/null
+++ b/src/com/android/settings/DataUsageAppDetail.java
@@ -0,0 +1,309 @@
+/*
+ * 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.net.NetworkPolicyManager.POLICY_NONE;
+import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;
+import static com.android.settings.DataUsageSummary.getHistoryBounds;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.app.Fragment;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.graphics.Color;
+import android.net.INetworkPolicyManager;
+import android.net.INetworkStatsService;
+import android.net.NetworkPolicyManager;
+import android.net.NetworkStats;
+import android.net.NetworkStatsHistory;
+import android.net.NetworkTemplate;
+import android.os.Bundle;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.preference.CheckBoxPreference;
+import android.preference.Preference;
+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.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.android.settings.widget.DataUsageChartView;
+import com.android.settings.widget.DataUsageChartView.DataUsageChartListener;
+
+public class DataUsageAppDetail extends Fragment {
+    private static final String TAG = "DataUsage";
+    private static final boolean LOGD = true;
+
+    public static final String EXTRA_UID = "uid";
+    public static final String EXTRA_NETWORK_TEMPLATE = "networkTemplate";
+
+    private int mUid;
+    private NetworkTemplate mTemplate;
+
+    private Intent mAppSettingsIntent;
+
+    private static final String TAG_CONFIRM_RESTRICT = "confirmRestrict";
+
+    private INetworkStatsService mStatsService;
+    private INetworkPolicyManager mPolicyService;
+
+    private CheckBoxPreference mRestrictBackground;
+    private View mRestrictBackgroundView;
+
+    private FrameLayout mChartContainer;
+    private TextView mTitle;
+    private TextView mText1;
+    private Button mAppSettings;
+    private LinearLayout mSwitches;
+
+    private DataUsageChartView mChart;
+    private NetworkStatsHistory mHistory;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        mStatsService = INetworkStatsService.Stub.asInterface(
+                ServiceManager.getService(Context.NETWORK_STATS_SERVICE));
+        mPolicyService = INetworkPolicyManager.Stub.asInterface(
+                ServiceManager.getService(Context.NETWORK_POLICY_SERVICE));
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+
+        final Context context = inflater.getContext();
+        final View view = inflater.inflate(R.layout.data_usage_detail, container, false);
+
+        mChartContainer = (FrameLayout) view.findViewById(R.id.chart_container);
+        mTitle = (TextView) view.findViewById(android.R.id.title);
+        mText1 = (TextView) view.findViewById(android.R.id.text1);
+        mAppSettings = (Button) view.findViewById(R.id.data_usage_app_settings);
+        mSwitches = (LinearLayout) view.findViewById(R.id.switches);
+
+        mRestrictBackground = new CheckBoxPreference(context);
+        mRestrictBackground.setTitle(R.string.data_usage_app_restrict_background);
+        mRestrictBackground.setSummary(R.string.data_usage_app_restrict_background_summary);
+
+        // kick refresh once to force-create views
+        refreshPreferenceViews();
+
+        mSwitches.addView(mRestrictBackgroundView);
+        mRestrictBackgroundView.setOnClickListener(mRestrictBackgroundListener);
+
+        mAppSettings.setOnClickListener(mAppSettingsListener);
+
+        mChart = new DataUsageChartView(context);
+        mChartContainer.addView(mChart);
+
+        mChart.setListener(mChartListener);
+        mChart.setChartColor(Color.parseColor("#d88d3a"), Color.parseColor("#c0ba7f3e"),
+                Color.parseColor("#88566abc"));
+
+        return view;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        updateBody();
+    }
+
+    private void updateBody() {
+        final PackageManager pm = getActivity().getPackageManager();
+
+        mUid = getArguments().getInt(EXTRA_UID);
+        mTemplate = getArguments().getParcelable(EXTRA_NETWORK_TEMPLATE);
+
+        mTitle.setText(pm.getNameForUid(mUid));
+
+        // enable settings button when package provides it
+        // TODO: target torwards entire UID instead of just first package
+        final String[] packageNames = pm.getPackagesForUid(mUid);
+        if (packageNames != null && packageNames.length > 0) {
+            mAppSettingsIntent = new Intent(Intent.ACTION_MANAGE_NETWORK_USAGE);
+            mAppSettingsIntent.setPackage(packageNames[0]);
+            mAppSettingsIntent.addCategory(Intent.CATEGORY_DEFAULT);
+
+            final boolean matchFound = pm.resolveActivity(mAppSettingsIntent, 0) != null;
+            mAppSettings.setEnabled(matchFound);
+
+        } else {
+            mAppSettingsIntent = null;
+            mAppSettings.setEnabled(false);
+        }
+
+        try {
+            // load stats for current uid and template
+            // TODO: read template from extras
+            mHistory = mStatsService.getHistoryForUid(mTemplate, mUid, NetworkStats.TAG_NONE);
+        } catch (RemoteException e) {
+            // since we can't do much without history, and we don't want to
+            // leave with half-baked UI, we bail hard.
+            throw new RuntimeException("problem reading network stats", e);
+        }
+
+        // bind chart to historical stats
+        mChart.bindNetworkStats(mHistory);
+
+        // show entire history known
+        final long[] bounds = getHistoryBounds(mHistory);
+        mChart.setVisibleRange(bounds[0], bounds[1] + DateUtils.WEEK_IN_MILLIS, bounds[1]);
+        updateDetailData();
+
+        final Context context = getActivity();
+        if (NetworkPolicyManager.isUidValidForPolicy(context, mUid)) {
+            mRestrictBackgroundView.setVisibility(View.VISIBLE);
+
+            final int uidPolicy;
+            try {
+                uidPolicy = mPolicyService.getUidPolicy(mUid);
+            } catch (RemoteException e) {
+                // since we can't do much without policy, we bail hard.
+                throw new RuntimeException("problem reading network policy", e);
+            }
+
+            // update policy checkbox
+            final boolean restrictBackground = (uidPolicy & POLICY_REJECT_METERED_BACKGROUND) != 0;
+            mRestrictBackground.setChecked(restrictBackground);
+
+            // kick preference views so they rebind from changes above
+            refreshPreferenceViews();
+
+        } else {
+            mRestrictBackgroundView.setVisibility(View.GONE);
+        }
+    }
+
+    private void updateDetailData() {
+        if (LOGD) Log.d(TAG, "updateDetailData()");
+
+        final Context context = mChart.getContext();
+        final long[] range = mChart.getInspectRange();
+        final long[] total = mHistory.getTotalData(range[0], range[1], null);
+        final long totalCombined = total[0] + total[1];
+        mText1.setText(Formatter.formatFileSize(context, totalCombined));
+    }
+
+    private void setRestrictBackground(boolean restrictBackground) {
+        if (LOGD) Log.d(TAG, "setRestrictBackground()");
+        try {
+            mPolicyService.setUidPolicy(
+                    mUid, restrictBackground ? POLICY_REJECT_METERED_BACKGROUND : POLICY_NONE);
+        } catch (RemoteException e) {
+            throw new RuntimeException("unable to save policy", e);
+        }
+
+        mRestrictBackground.setChecked(restrictBackground);
+        refreshPreferenceViews();
+    }
+
+    /**
+     * Force rebind of hijacked {@link Preference} views.
+     */
+    private void refreshPreferenceViews() {
+        mRestrictBackgroundView = mRestrictBackground.getView(mRestrictBackgroundView, mSwitches);
+    }
+
+    private DataUsageChartListener mChartListener = new DataUsageChartListener() {
+        /** {@inheritDoc} */
+        public void onInspectRangeChanged() {
+            if (LOGD) Log.d(TAG, "onInspectRangeChanged()");
+            updateDetailData();
+        }
+
+        /** {@inheritDoc} */
+        public void onWarningChanged() {
+            // ignored
+        }
+
+        /** {@inheritDoc} */
+        public void onLimitChanged() {
+            // ignored
+        }
+    };
+
+    private OnClickListener mAppSettingsListener = new OnClickListener() {
+        /** {@inheritDoc} */
+        public void onClick(View v) {
+            // TODO: target torwards entire UID instead of just first package
+            startActivity(mAppSettingsIntent);
+        }
+    };
+
+    private OnClickListener mRestrictBackgroundListener = new OnClickListener() {
+        /** {@inheritDoc} */
+        public void onClick(View v) {
+            final boolean restrictBackground = !mRestrictBackground.isChecked();
+
+            if (restrictBackground) {
+                // enabling restriction; show confirmation dialog which
+                // eventually calls setRestrictBackground() once user confirms.
+                ConfirmRestrictFragment.show(DataUsageAppDetail.this);
+            } else {
+                setRestrictBackground(false);
+            }
+        }
+    };
+
+    /**
+     * Dialog to request user confirmation before setting
+     * {@link #POLICY_REJECT_METERED_BACKGROUND}.
+     */
+    public static class ConfirmRestrictFragment extends DialogFragment {
+        public static void show(DataUsageAppDetail parent) {
+            final ConfirmRestrictFragment dialog = new ConfirmRestrictFragment();
+            dialog.setTargetFragment(parent, 0);
+            dialog.show(parent.getFragmentManager(), TAG_CONFIRM_RESTRICT);
+        }
+
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            final Context context = getActivity();
+
+            final AlertDialog.Builder builder = new AlertDialog.Builder(context);
+            builder.setTitle(R.string.data_usage_app_restrict_dialog_title);
+            builder.setMessage(R.string.data_usage_app_restrict_dialog);
+
+            builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+                public void onClick(DialogInterface dialog, int which) {
+                    final DataUsageAppDetail target = (DataUsageAppDetail) getTargetFragment();
+                    if (target != null) {
+                        target.setRestrictBackground(true);
+                    }
+                }
+            });
+            builder.setNegativeButton(android.R.string.cancel, null);
+
+            return builder.create();
+        }
+    }
+
+}
diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
new file mode 100644
index 0000000..692c753
--- /dev/null
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -0,0 +1,1086 @@
+/*
+ * 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.net.ConnectivityManager.TYPE_MOBILE;
+import static android.net.ConnectivityManager.TYPE_WIMAX;
+import static android.net.NetworkPolicy.LIMIT_DISABLED;
+import static android.net.NetworkPolicyManager.ACTION_DATA_USAGE_LIMIT;
+import static android.net.NetworkPolicyManager.EXTRA_NETWORK_TEMPLATE;
+import static android.net.NetworkPolicyManager.computeLastCycleBoundary;
+import static android.net.NetworkPolicyManager.computeNextCycleBoundary;
+import static android.net.NetworkTemplate.MATCH_MOBILE_3G_LOWER;
+import static android.net.NetworkTemplate.MATCH_MOBILE_4G;
+import static android.net.NetworkTemplate.MATCH_MOBILE_ALL;
+import static android.net.NetworkTemplate.MATCH_WIFI;
+import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.app.Fragment;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.net.ConnectivityManager;
+import android.net.INetworkPolicyManager;
+import android.net.INetworkStatsService;
+import android.net.NetworkPolicy;
+import android.net.NetworkPolicyManager;
+import android.net.NetworkStats;
+import android.net.NetworkStatsHistory;
+import android.net.NetworkTemplate;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.preference.Preference;
+import android.preference.PreferenceActivity;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+import android.text.format.DateUtils;
+import android.text.format.Formatter;
+import android.text.format.Time;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.AdapterView.OnItemSelectedListener;
+import android.widget.ArrayAdapter;
+import android.widget.BaseAdapter;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
+import android.widget.CompoundButton.OnCheckedChangeListener;
+import android.widget.LinearLayout;
+import android.widget.ListView;
+import android.widget.NumberPicker;
+import android.widget.Spinner;
+import android.widget.Switch;
+import android.widget.TabHost;
+import android.widget.TabHost.OnTabChangeListener;
+import android.widget.TabHost.TabContentFactory;
+import android.widget.TabHost.TabSpec;
+import android.widget.TabWidget;
+import android.widget.TextView;
+
+import com.android.internal.telephony.Phone;
+import com.android.settings.net.NetworkPolicyEditor;
+import com.android.settings.widget.DataUsageChartView;
+import com.android.settings.widget.DataUsageChartView.DataUsageChartListener;
+import com.google.android.collect.Lists;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Locale;
+
+/**
+ * Panel show data usage history across various networks, including options to
+ * inspect based on usage cycle and control through {@link NetworkPolicy}.
+ */
+public class DataUsageSummary extends Fragment {
+    private static final String TAG = "DataUsage";
+    private static final boolean LOGD = true;
+
+    private static final int TEMPLATE_INVALID = -1;
+
+    private static final String TAB_3G = "3g";
+    private static final String TAB_4G = "4g";
+    private static final String TAB_MOBILE = "mobile";
+    private static final String TAB_WIFI = "wifi";
+
+    private static final String TAG_CONFIRM_LIMIT = "confirmLimit";
+    private static final String TAG_CYCLE_EDITOR = "cycleEditor";
+    private static final String TAG_POLICY_LIMIT = "policyLimit";
+
+    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 INetworkPolicyManager mPolicyService;
+    private ConnectivityManager mConnService;
+
+    private static final String PREF_FILE = "data_usage";
+    private static final String PREF_SHOW_WIFI = "show_wifi";
+
+    private SharedPreferences mPrefs;
+
+    private TabHost mTabHost;
+    private TabWidget mTabWidget;
+    private ListView mListView;
+    private DataUsageAdapter mAdapter;
+
+    private View mHeader;
+    private LinearLayout mSwitches;
+
+    private Switch mDataEnabled;
+    private CheckBox mDisableAtLimit;
+    private View mDataEnabledView;
+    private View mDisableAtLimitView;
+
+    private DataUsageChartView mChart;
+
+    private Spinner mCycleSpinner;
+    private CycleAdapter mCycleAdapter;
+
+    private boolean mShowWifi = false;
+
+    private NetworkTemplate mTemplate = null;
+
+    private NetworkPolicyEditor mPolicyEditor;
+    private NetworkStatsHistory mHistory;
+
+    private String mIntentTab = null;
+
+    /** Flag used to ignore listeners during binding. */
+    private boolean mBinding;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        mStatsService = INetworkStatsService.Stub.asInterface(
+                ServiceManager.getService(Context.NETWORK_STATS_SERVICE));
+        mPolicyService = INetworkPolicyManager.Stub.asInterface(
+                ServiceManager.getService(Context.NETWORK_POLICY_SERVICE));
+        mConnService = (ConnectivityManager) getActivity().getSystemService(
+                Context.CONNECTIVITY_SERVICE);
+        mPrefs = getActivity().getSharedPreferences(PREF_FILE, Context.MODE_PRIVATE);
+
+        mPolicyEditor = new NetworkPolicyEditor(mPolicyService);
+        mPolicyEditor.read();
+
+        mShowWifi = mPrefs.getBoolean(PREF_SHOW_WIFI, false);
+
+        setHasOptionsMenu(true);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+
+        final Context context = inflater.getContext();
+        final View view = inflater.inflate(R.layout.data_usage_summary, container, false);
+
+        mTabHost = (TabHost) view.findViewById(android.R.id.tabhost);
+        mTabWidget = (TabWidget) view.findViewById(android.R.id.tabs);
+        mListView = (ListView) view.findViewById(android.R.id.list);
+
+        mTabHost.setup();
+        mTabHost.setOnTabChangedListener(mTabListener);
+
+        mHeader = inflater.inflate(R.layout.data_usage_header, mListView, false);
+        mListView.addHeaderView(mHeader, null, false);
+
+        mDataEnabled = new Switch(inflater.getContext());
+        mDataEnabledView = inflatePreference(inflater, mSwitches, mDataEnabled);
+        mDataEnabled.setOnCheckedChangeListener(mDataEnabledListener);
+
+        mDisableAtLimit = new CheckBox(inflater.getContext());
+        mDisableAtLimit.setClickable(false);
+        mDisableAtLimitView = inflatePreference(inflater, mSwitches, mDisableAtLimit);
+        mDisableAtLimitView.setOnClickListener(mDisableAtLimitListener);
+
+        mSwitches = (LinearLayout) mHeader.findViewById(R.id.switches);
+        mSwitches.addView(mDataEnabledView);
+        mSwitches.addView(mDisableAtLimitView);
+
+        mCycleSpinner = (Spinner) mHeader.findViewById(R.id.cycles);
+        mCycleAdapter = new CycleAdapter(context);
+        mCycleSpinner.setAdapter(mCycleAdapter);
+        mCycleSpinner.setOnItemSelectedListener(mCycleListener);
+
+        mChart = (DataUsageChartView) inflater.inflate(R.layout.data_usage_chart, mListView, false);
+        mChart.setListener(mChartListener);
+        mListView.addHeaderView(mChart, null, false);
+
+        mAdapter = new DataUsageAdapter();
+        mListView.setOnItemClickListener(mListListener);
+        mListView.setAdapter(mAdapter);
+
+        return view;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        // pick default tab based on incoming intent
+        final Intent intent = getActivity().getIntent();
+        mIntentTab = computeTabFromIntent(intent);
+
+        // this kicks off chain reaction which creates tabs, binds the body to
+        // selected network, and binds chart, cycles and detail list.
+        updateTabs();
+
+        // template and tab has been selected; show dialog if limit passed
+        final String action = intent.getAction();
+        if (ACTION_DATA_USAGE_LIMIT.equals(action)) {
+            PolicyLimitFragment.show(this);
+        }
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        inflater.inflate(R.menu.data_usage, menu);
+    }
+
+    @Override
+    public void onPrepareOptionsMenu(Menu menu) {
+        final Context context = getActivity();
+
+        final MenuItem split4g = menu.findItem(R.id.action_split_4g);
+        split4g.setVisible(hasMobile4gRadio(context));
+        split4g.setChecked(isMobilePolicySplit());
+
+        final MenuItem showWifi = menu.findItem(R.id.action_show_wifi);
+        showWifi.setVisible(hasMobileRadio(context) && hasWifiRadio(context));
+        showWifi.setChecked(mShowWifi);
+
+        final MenuItem settings = menu.findItem(R.id.action_settings);
+        settings.setVisible(split4g.isVisible() || showWifi.isVisible());
+
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.action_split_4g: {
+                final boolean mobileSplit = !item.isChecked();
+                setMobilePolicySplit(mobileSplit);
+                item.setChecked(isMobilePolicySplit());
+                updateTabs();
+                return true;
+            }
+            case R.id.action_show_wifi: {
+                mShowWifi = !item.isChecked();
+                mPrefs.edit().putBoolean(PREF_SHOW_WIFI, mShowWifi).apply();
+                item.setChecked(mShowWifi);
+                updateTabs();
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+
+        mDataEnabledView = null;
+        mDisableAtLimitView = null;
+    }
+
+    /**
+     * Rebuild all tabs based on {@link NetworkPolicyEditor} and
+     * {@link #mShowWifi}, hiding the tabs entirely when applicable. Selects
+     * first tab, and kicks off a full rebind of body contents.
+     */
+    private void updateTabs() {
+        final Context context = getActivity();
+        mTabHost.clearAllTabs();
+
+        final boolean mobileSplit = isMobilePolicySplit();
+        if (mobileSplit && hasMobile4gRadio(context)) {
+            mTabHost.addTab(buildTabSpec(TAB_3G, R.string.data_usage_tab_3g));
+            mTabHost.addTab(buildTabSpec(TAB_4G, R.string.data_usage_tab_4g));
+        }
+
+        if (mShowWifi && hasWifiRadio(context) && hasMobileRadio(context)) {
+            if (!mobileSplit) {
+                mTabHost.addTab(buildTabSpec(TAB_MOBILE, R.string.data_usage_tab_mobile));
+            }
+            mTabHost.addTab(buildTabSpec(TAB_WIFI, R.string.data_usage_tab_wifi));
+        }
+
+        final boolean hasTabs = mTabWidget.getTabCount() > 0;
+        mTabWidget.setVisibility(hasTabs ? View.VISIBLE : View.GONE);
+        if (hasTabs) {
+            if (mIntentTab != null) {
+                // select default tab, which will kick off updateBody()
+                mTabHost.setCurrentTabByTag(mIntentTab);
+            } else {
+                // select first tab, which will kick off updateBody()
+                mTabHost.setCurrentTab(0);
+            }
+        } else {
+            // no tabs visible; update body manually
+            updateBody();
+        }
+    }
+
+    /**
+     * Factory that provide empty {@link View} to make {@link TabHost} happy.
+     */
+    private TabContentFactory mEmptyTabContent = new TabContentFactory() {
+        /** {@inheritDoc} */
+        public View createTabContent(String tag) {
+            return new View(mTabHost.getContext());
+        }
+    };
+
+    /**
+     * Build {@link TabSpec} with thin indicator, and empty content.
+     */
+    private TabSpec buildTabSpec(String tag, int titleRes) {
+        final LayoutInflater inflater = LayoutInflater.from(mTabWidget.getContext());
+        final View indicator = inflater.inflate(
+                R.layout.tab_indicator_thin_holo, mTabWidget, false);
+        final TextView title = (TextView) indicator.findViewById(android.R.id.title);
+        title.setText(titleRes);
+        return mTabHost.newTabSpec(tag).setIndicator(indicator).setContent(mEmptyTabContent);
+    }
+
+    private OnTabChangeListener mTabListener = new OnTabChangeListener() {
+        /** {@inheritDoc} */
+        public void onTabChanged(String tabId) {
+            // user changed tab; update body
+            updateBody();
+        }
+    };
+
+    /**
+     * Update body content based on current tab. Loads
+     * {@link NetworkStatsHistory} and {@link NetworkPolicy} from system, and
+     * binds them to visible controls.
+     */
+    private void updateBody() {
+        mBinding = true;
+
+        final Context context = getActivity();
+        final String tabTag = mTabHost.getCurrentTabTag();
+
+        final String currentTab;
+        if (tabTag != null) {
+            currentTab = tabTag;
+        } else if (hasMobileRadio(context)) {
+            currentTab = TAB_MOBILE;
+        } else if (hasWifiRadio(context)) {
+            currentTab = TAB_WIFI;
+        } else {
+            throw new IllegalStateException("no mobile or wifi radios");
+        }
+
+        if (LOGD) Log.d(TAG, "updateBody() with currentTab=" + currentTab);
+
+        if (TAB_WIFI.equals(currentTab)) {
+            // wifi doesn't have any controls
+            mDataEnabledView.setVisibility(View.GONE);
+            mDisableAtLimitView.setVisibility(View.GONE);
+            mTemplate = new NetworkTemplate(MATCH_WIFI, null);
+
+        } else {
+            // make sure we show for non-wifi
+            mDataEnabledView.setVisibility(View.VISIBLE);
+            mDisableAtLimitView.setVisibility(View.VISIBLE);
+        }
+
+        final String subscriberId = getActiveSubscriberId(context);
+        if (TAB_MOBILE.equals(currentTab)) {
+            setPreferenceTitle(mDataEnabledView, R.string.data_usage_enable_mobile);
+            setPreferenceTitle(mDisableAtLimitView, R.string.data_usage_disable_mobile_limit);
+            mDataEnabled.setChecked(mConnService.getMobileDataEnabled());
+            mTemplate = new NetworkTemplate(MATCH_MOBILE_ALL, subscriberId);
+
+        } else if (TAB_3G.equals(currentTab)) {
+            setPreferenceTitle(mDataEnabledView, R.string.data_usage_enable_3g);
+            setPreferenceTitle(mDisableAtLimitView, R.string.data_usage_disable_3g_limit);
+            // TODO: bind mDataEnabled to 3G radio state
+            mTemplate = new NetworkTemplate(MATCH_MOBILE_3G_LOWER, subscriberId);
+
+        } else if (TAB_4G.equals(currentTab)) {
+            setPreferenceTitle(mDataEnabledView, R.string.data_usage_enable_4g);
+            setPreferenceTitle(mDisableAtLimitView, R.string.data_usage_disable_4g_limit);
+            // TODO: bind mDataEnabled to 4G radio state
+            mTemplate = new NetworkTemplate(MATCH_MOBILE_4G, subscriberId);
+        }
+
+        try {
+            // load stats for current template
+            mHistory = mStatsService.getHistoryForNetwork(mTemplate);
+        } catch (RemoteException e) {
+            // since we can't do much without policy or history, and we don't
+            // want to leave with half-baked UI, we bail hard.
+            throw new RuntimeException("problem reading network policy or stats", e);
+        }
+
+        // bind chart to historical stats
+        mChart.bindNetworkStats(mHistory);
+
+        updatePolicy(true);
+
+        // force scroll to top of body
+        mListView.smoothScrollToPosition(0);
+
+        mBinding = false;
+    }
+
+    private void setPolicyCycleDay(int cycleDay) {
+        if (LOGD) Log.d(TAG, "setPolicyCycleDay()");
+        mPolicyEditor.setPolicyCycleDay(mTemplate, cycleDay);
+        updatePolicy(true);
+    }
+
+    private void setPolicyWarningBytes(long warningBytes) {
+        if (LOGD) Log.d(TAG, "setPolicyWarningBytes()");
+        mPolicyEditor.setPolicyWarningBytes(mTemplate, warningBytes);
+        updatePolicy(false);
+    }
+
+    private void setPolicyLimitBytes(long limitBytes) {
+        if (LOGD) Log.d(TAG, "setPolicyLimitBytes()");
+        mPolicyEditor.setPolicyLimitBytes(mTemplate, limitBytes);
+        updatePolicy(false);
+    }
+
+    /**
+     * Update chart sweeps and cycle list to reflect {@link NetworkPolicy} for
+     * current {@link #mTemplate}.
+     */
+    private void updatePolicy(boolean refreshCycle) {
+        final NetworkPolicy policy = mPolicyEditor.getPolicy(mTemplate);
+
+        // reflect policy limit in checkbox
+        mDisableAtLimit.setChecked(policy != null && policy.limitBytes != LIMIT_DISABLED);
+        mChart.bindNetworkPolicy(policy);
+
+        if (refreshCycle) {
+            // generate cycle list based on policy and available history
+            updateCycleList(policy);
+        }
+    }
+
+    /**
+     * Return full time bounds (earliest and latest time recorded) of the given
+     * {@link NetworkStatsHistory}.
+     */
+    public static long[] getHistoryBounds(NetworkStatsHistory history) {
+        final long currentTime = System.currentTimeMillis();
+
+        long start = currentTime;
+        long end = currentTime;
+        if (history.bucketCount > 0) {
+            start = history.bucketStart[0];
+            end = history.bucketStart[history.bucketCount - 1];
+        }
+
+        return new long[] { start, end };
+    }
+
+    /**
+     * Rebuild {@link #mCycleAdapter} based on {@link NetworkPolicy#cycleDay}
+     * and available {@link NetworkStatsHistory} data. Always selects the newest
+     * item, updating the inspection range on {@link #mChart}.
+     */
+    private void updateCycleList(NetworkPolicy policy) {
+        mCycleAdapter.clear();
+
+        final Context context = mCycleSpinner.getContext();
+
+        final long[] bounds = getHistoryBounds(mHistory);
+        final long historyStart = bounds[0];
+        final long historyEnd = bounds[1];
+
+        if (policy != null) {
+            // find the next cycle boundary
+            long cycleEnd = computeNextCycleBoundary(historyEnd, policy);
+
+            int guardCount = 0;
+
+            // walk backwards, generating all valid cycle ranges
+            while (cycleEnd > historyStart) {
+                final long cycleStart = computeLastCycleBoundary(cycleEnd, policy);
+                Log.d(TAG, "generating cs=" + cycleStart + " to ce=" + cycleEnd + " waiting for hs="
+                        + historyStart);
+                mCycleAdapter.add(new CycleItem(context, cycleStart, cycleEnd));
+                cycleEnd = cycleStart;
+
+                // TODO: remove this guard once we have better testing
+                if (guardCount++ > 50) {
+                    Log.wtf(TAG, "stuck generating ranges for bounds=" + Arrays.toString(bounds)
+                            + " and policy=" + policy);
+                }
+            }
+
+            // one last cycle entry to modify policy cycle day
+            mCycleAdapter.add(new CycleChangeItem(context));
+
+        } else {
+            // no valid cycle; show all data
+            // TODO: offer simple ranges like "last week" etc
+            mCycleAdapter.add(new CycleItem(context, historyStart, historyEnd));
+
+        }
+
+        // force pick the current cycle (first item)
+        mCycleSpinner.setSelection(0);
+        mCycleListener.onItemSelected(mCycleSpinner, null, 0, 0);
+    }
+
+    private OnCheckedChangeListener mDataEnabledListener = new OnCheckedChangeListener() {
+        /** {@inheritDoc} */
+        public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+            if (mBinding) return;
+
+            final boolean dataEnabled = isChecked;
+            mDataEnabled.setChecked(dataEnabled);
+
+            switch (mTemplate.getMatchRule()) {
+                case MATCH_MOBILE_ALL: {
+                    mConnService.setMobileDataEnabled(dataEnabled);
+                }
+            }
+        }
+    };
+
+    private View.OnClickListener mDisableAtLimitListener = new View.OnClickListener() {
+        /** {@inheritDoc} */
+        public void onClick(View v) {
+            final boolean disableAtLimit = !mDisableAtLimit.isChecked();
+            if (disableAtLimit) {
+                // enabling limit; show confirmation dialog which eventually
+                // calls setPolicyLimitBytes() once user confirms.
+                ConfirmLimitFragment.show(DataUsageSummary.this);
+            } else {
+                setPolicyLimitBytes(LIMIT_DISABLED);
+            }
+        }
+    };
+
+    private OnItemClickListener mListListener = new OnItemClickListener() {
+        /** {@inheritDoc} */
+        public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+            final AppUsageItem app = (AppUsageItem) parent.getItemAtPosition(position);
+
+            final Bundle args = new Bundle();
+            args.putParcelable(DataUsageAppDetail.EXTRA_NETWORK_TEMPLATE, mTemplate);
+            args.putInt(DataUsageAppDetail.EXTRA_UID, app.uid);
+
+            final PreferenceActivity activity = (PreferenceActivity) getActivity();
+            activity.startPreferencePanel(DataUsageAppDetail.class.getName(), args,
+                    R.string.data_usage_summary_title, null, null, 0);
+        }
+    };
+
+    private OnItemSelectedListener mCycleListener = new OnItemSelectedListener() {
+        /** {@inheritDoc} */
+        public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+            final CycleItem cycle = (CycleItem) parent.getItemAtPosition(position);
+            if (cycle instanceof CycleChangeItem) {
+                // show cycle editor; will eventually call setPolicyCycleDay()
+                // when user finishes editing.
+                CycleEditorFragment.show(DataUsageSummary.this);
+
+                // reset spinner to something other than "change cycle..."
+                mCycleSpinner.setSelection(0);
+
+            } else {
+                if (LOGD) {
+                    Log.d(TAG, "showing cycle " + cycle + ", start=" + cycle.start + ", end="
+                            + cycle.end + "]");
+                }
+
+                // update chart to show selected cycle, and update detail data
+                // to match updated sweep bounds.
+                final long[] bounds = getHistoryBounds(mHistory);
+                mChart.setVisibleRange(cycle.start, cycle.end, bounds[1]);
+
+                updateDetailData();
+            }
+        }
+
+        /** {@inheritDoc} */
+        public void onNothingSelected(AdapterView<?> parent) {
+            // ignored
+        }
+    };
+
+    /**
+     * Update {@link #mAdapter} with sorted list of applications data usage,
+     * based on current inspection from {@link #mChart}.
+     */
+    private void updateDetailData() {
+        if (LOGD) Log.d(TAG, "updateDetailData()");
+
+        new AsyncTask<Void, Void, NetworkStats>() {
+            @Override
+            protected NetworkStats doInBackground(Void... params) {
+                try {
+                    final long[] range = mChart.getInspectRange();
+                    return mStatsService.getSummaryForAllUid(mTemplate, range[0], range[1], false);
+                } catch (RemoteException e) {
+                    Log.w(TAG, "problem reading stats");
+                }
+                return null;
+            }
+
+            @Override
+            protected void onPostExecute(NetworkStats stats) {
+                if (stats != null) {
+                    mAdapter.bindStats(stats);
+                }
+            }
+        }.execute();
+    }
+
+    private boolean isMobilePolicySplit() {
+        final String subscriberId = getActiveSubscriberId(getActivity());
+        return mPolicyEditor.isMobilePolicySplit(subscriberId);
+    }
+
+    private void setMobilePolicySplit(boolean split) {
+        final String subscriberId = getActiveSubscriberId(getActivity());
+        mPolicyEditor.setMobilePolicySplit(subscriberId, split);
+    }
+
+    private static String getActiveSubscriberId(Context context) {
+        final TelephonyManager telephony = (TelephonyManager) context.getSystemService(
+                Context.TELEPHONY_SERVICE);
+        return telephony.getSubscriberId();
+    }
+
+    private DataUsageChartListener mChartListener = new DataUsageChartListener() {
+        /** {@inheritDoc} */
+        public void onInspectRangeChanged() {
+            if (LOGD) Log.d(TAG, "onInspectRangeChanged()");
+            updateDetailData();
+        }
+
+        /** {@inheritDoc} */
+        public void onWarningChanged() {
+            setPolicyWarningBytes(mChart.getWarningBytes());
+        }
+
+        /** {@inheritDoc} */
+        public void onLimitChanged() {
+            setPolicyLimitBytes(mChart.getLimitBytes());
+        }
+    };
+
+
+    /**
+     * List item that reflects a specific data usage cycle.
+     */
+    public static class CycleItem {
+        public CharSequence label;
+        public long start;
+        public long end;
+
+        private static final StringBuilder sBuilder = new StringBuilder(50);
+        private static final java.util.Formatter sFormatter = new java.util.Formatter(
+                sBuilder, Locale.getDefault());
+
+        CycleItem(CharSequence label) {
+            this.label = label;
+        }
+
+        public CycleItem(Context context, long start, long end) {
+            this.label = formatDateRangeUtc(context, start, end);
+            this.start = start;
+            this.end = end;
+        }
+
+        private static String formatDateRangeUtc(Context context, long start, long end) {
+            synchronized (sBuilder) {
+                sBuilder.setLength(0);
+                return DateUtils.formatDateRange(context, sFormatter, start, end,
+                        DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_ABBREV_MONTH,
+                        Time.TIMEZONE_UTC).toString();
+            }
+        }
+
+        @Override
+        public String toString() {
+            return label.toString();
+        }
+    }
+
+    /**
+     * Special-case data usage cycle that triggers dialog to change
+     * {@link NetworkPolicy#cycleDay}.
+     */
+    public static class CycleChangeItem extends CycleItem {
+        public CycleChangeItem(Context context) {
+            super(context.getString(R.string.data_usage_change_cycle));
+        }
+    }
+
+    public static class CycleAdapter extends ArrayAdapter<CycleItem> {
+        public CycleAdapter(Context context) {
+            super(context, android.R.layout.simple_spinner_item);
+            setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        }
+    }
+
+    private static class AppUsageItem implements Comparable<AppUsageItem> {
+        public int uid;
+        public long total;
+
+        /** {@inheritDoc} */
+        public int compareTo(AppUsageItem another) {
+            return Long.compare(another.total, total);
+        }
+    }
+
+    /**
+     * Adapter of applications, sorted by total usage descending.
+     */
+    public static class DataUsageAdapter extends BaseAdapter {
+        private ArrayList<AppUsageItem> mItems = Lists.newArrayList();
+
+        public void bindStats(NetworkStats stats) {
+            mItems.clear();
+
+            for (int i = 0; i < stats.size; i++) {
+                final long total = stats.rx[i] + stats.tx[i];
+                final AppUsageItem item = new AppUsageItem();
+                item.uid = stats.uid[i];
+                item.total = total;
+                mItems.add(item);
+            }
+
+            Collections.sort(mItems);
+            notifyDataSetChanged();
+        }
+
+        @Override
+        public int getCount() {
+            return mItems.size();
+        }
+
+        @Override
+        public Object getItem(int position) {
+            return mItems.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(
+                        R.layout.data_usage_item, 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 AppUsageItem item = mItems.get(position);
+            text1.setText(resolveLabelForUid(pm, item.uid));
+            text2.setText(Formatter.formatFileSize(context, item.total));
+
+            return convertView;
+        }
+
+    }
+
+    /**
+     * Dialog to request user confirmation before setting
+     * {@link NetworkPolicy#limitBytes}.
+     */
+    public static class ConfirmLimitFragment extends DialogFragment {
+        public static final String EXTRA_MESSAGE_ID = "messageId";
+        public static final String EXTRA_LIMIT_BYTES = "limitBytes";
+
+        public static void show(DataUsageSummary parent) {
+            final Bundle args = new Bundle();
+
+            // TODO: customize default limits based on network template
+            switch (parent.mTemplate.getMatchRule()) {
+                case MATCH_MOBILE_3G_LOWER: {
+                    args.putInt(EXTRA_MESSAGE_ID, R.string.data_usage_limit_dialog_3g);
+                    args.putLong(EXTRA_LIMIT_BYTES, 5 * GB_IN_BYTES);
+                    break;
+                }
+                case MATCH_MOBILE_4G: {
+                    args.putInt(EXTRA_MESSAGE_ID, R.string.data_usage_limit_dialog_4g);
+                    args.putLong(EXTRA_LIMIT_BYTES, 5 * GB_IN_BYTES);
+                    break;
+                }
+                case MATCH_MOBILE_ALL: {
+                    args.putInt(EXTRA_MESSAGE_ID, R.string.data_usage_limit_dialog_mobile);
+                    args.putLong(EXTRA_LIMIT_BYTES, 5 * GB_IN_BYTES);
+                    break;
+                }
+            }
+
+            final ConfirmLimitFragment dialog = new ConfirmLimitFragment();
+            dialog.setArguments(args);
+            dialog.setTargetFragment(parent, 0);
+            dialog.show(parent.getFragmentManager(), TAG_CONFIRM_LIMIT);
+        }
+
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            final Context context = getActivity();
+
+            final int messageId = getArguments().getInt(EXTRA_MESSAGE_ID);
+            final long limitBytes = getArguments().getLong(EXTRA_LIMIT_BYTES);
+
+            final AlertDialog.Builder builder = new AlertDialog.Builder(context);
+            builder.setTitle(R.string.data_usage_limit_dialog_title);
+            builder.setMessage(messageId);
+
+            builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+                public void onClick(DialogInterface dialog, int which) {
+                    final DataUsageSummary target = (DataUsageSummary) getTargetFragment();
+                    if (target != null) {
+                        target.setPolicyLimitBytes(limitBytes);
+                    }
+                }
+            });
+
+            return builder.create();
+        }
+    }
+
+    /**
+     * Dialog to edit {@link NetworkPolicy#cycleDay}.
+     */
+    public static class CycleEditorFragment extends DialogFragment {
+        public static final String EXTRA_CYCLE_DAY = "cycleDay";
+
+        public static void show(DataUsageSummary parent) {
+            final NetworkPolicy policy = parent.mPolicyEditor.getPolicy(parent.mTemplate);
+            final Bundle args = new Bundle();
+            args.putInt(CycleEditorFragment.EXTRA_CYCLE_DAY, policy.cycleDay);
+
+            final CycleEditorFragment dialog = new CycleEditorFragment();
+            dialog.setArguments(args);
+            dialog.setTargetFragment(parent, 0);
+            dialog.show(parent.getFragmentManager(), TAG_CYCLE_EDITOR);
+        }
+
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            final Context context = getActivity();
+
+            final AlertDialog.Builder builder = new AlertDialog.Builder(context);
+            final LayoutInflater dialogInflater = LayoutInflater.from(builder.getContext());
+
+            final View view = dialogInflater.inflate(R.layout.data_usage_cycle_editor, null, false);
+            final NumberPicker cycleDayPicker = (NumberPicker) view.findViewById(R.id.cycle_day);
+
+            final int oldCycleDay = getArguments().getInt(EXTRA_CYCLE_DAY, 1);
+
+            cycleDayPicker.setMinValue(1);
+            cycleDayPicker.setMaxValue(31);
+            cycleDayPicker.setValue(oldCycleDay);
+            cycleDayPicker.setWrapSelectorWheel(true);
+
+            builder.setTitle(R.string.data_usage_cycle_editor_title);
+            builder.setView(view);
+
+            builder.setPositiveButton(R.string.data_usage_cycle_editor_positive,
+                    new DialogInterface.OnClickListener() {
+                        public void onClick(DialogInterface dialog, int which) {
+                            final int cycleDay = cycleDayPicker.getValue();
+                            final DataUsageSummary target = (DataUsageSummary) getTargetFragment();
+                            if (target != null) {
+                                target.setPolicyCycleDay(cycleDay);
+                            }
+                        }
+                    });
+
+            return builder.create();
+        }
+    }
+
+    /**
+     * Dialog explaining that {@link NetworkPolicy#limitBytes} has been passed,
+     * and giving the user an option to bypass.
+     */
+    public static class PolicyLimitFragment extends DialogFragment {
+        public static final String EXTRA_TITLE_ID = "titleId";
+
+        public static void show(DataUsageSummary parent) {
+            final Bundle args = new Bundle();
+
+            switch (parent.mTemplate.getMatchRule()) {
+                case MATCH_MOBILE_3G_LOWER: {
+                    args.putInt(EXTRA_TITLE_ID, R.string.data_usage_disabled_dialog_3g_title);
+                    break;
+                }
+                case MATCH_MOBILE_4G: {
+                    args.putInt(EXTRA_TITLE_ID, R.string.data_usage_disabled_dialog_4g_title);
+                    break;
+                }
+                case MATCH_MOBILE_ALL: {
+                    args.putInt(EXTRA_TITLE_ID, R.string.data_usage_disabled_dialog_mobile_title);
+                    break;
+                }
+            }
+
+            final PolicyLimitFragment dialog = new PolicyLimitFragment();
+            dialog.setArguments(args);
+            dialog.setTargetFragment(parent, 0);
+            dialog.show(parent.getFragmentManager(), TAG_POLICY_LIMIT);
+        }
+
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            final Context context = getActivity();
+
+            final int titleId = getArguments().getInt(EXTRA_TITLE_ID);
+
+            final AlertDialog.Builder builder = new AlertDialog.Builder(context);
+            builder.setTitle(titleId);
+            builder.setMessage(R.string.data_usage_disabled_dialog);
+
+            builder.setPositiveButton(android.R.string.ok, null);
+            builder.setNegativeButton(R.string.data_usage_disabled_dialog_enable,
+                    new DialogInterface.OnClickListener() {
+                        public void onClick(DialogInterface dialog, int which) {
+                            final DataUsageSummary target = (DataUsageSummary) getTargetFragment();
+                            if (target != null) {
+                                // TODO: consider "allow 100mb more data", or
+                                // only bypass limit for current cycle.
+                                target.setPolicyLimitBytes(LIMIT_DISABLED);
+                            }
+                        }
+                    });
+
+            return builder.create();
+        }
+    }
+
+    /**
+     * Compute default tab that should be selected, based on
+     * {@link NetworkPolicyManager#EXTRA_NETWORK_TEMPLATE} extra.
+     */
+    private static String computeTabFromIntent(Intent intent) {
+        final int networkTemplate = intent.getIntExtra(EXTRA_NETWORK_TEMPLATE, TEMPLATE_INVALID);
+        switch (networkTemplate) {
+            case MATCH_MOBILE_3G_LOWER:
+                return TAB_3G;
+            case MATCH_MOBILE_4G:
+                return TAB_4G;
+            case MATCH_MOBILE_ALL:
+                return TAB_MOBILE;
+            case MATCH_WIFI:
+                return TAB_WIFI;
+            default:
+                return null;
+        }
+    }
+
+    /**
+     * Resolve best descriptive label for the given UID.
+     */
+    public static CharSequence resolveLabelForUid(PackageManager pm, int uid) {
+        final String[] packageNames = pm.getPackagesForUid(uid);
+        final int length = packageNames != null ? packageNames.length : 0;
+
+        CharSequence label = pm.getNameForUid(uid);
+        try {
+            if (length == 1) {
+                final ApplicationInfo info = pm.getApplicationInfo(packageNames[0], 0);
+                label = info.loadLabel(pm);
+            } else if (length > 1) {
+                for (String packageName : packageNames) {
+                    final PackageInfo info = pm.getPackageInfo(packageName, 0);
+                    if (info.sharedUserLabel != 0) {
+                        label = pm.getText(packageName, info.sharedUserLabel, info.applicationInfo);
+                        if (!TextUtils.isEmpty(label)) {
+                            break;
+                        }
+                    }
+                }
+            }
+        } catch (NameNotFoundException e) {
+        }
+
+        if (TextUtils.isEmpty(label)) {
+            label = Integer.toString(uid);
+        }
+        return label;
+    }
+
+    /**
+     * Test if device has a mobile data radio.
+     */
+    private static boolean hasMobileRadio(Context context) {
+        final ConnectivityManager conn = (ConnectivityManager) context.getSystemService(
+                Context.CONNECTIVITY_SERVICE);
+
+        // mobile devices should have MOBILE network tracker regardless of
+        // connection status.
+        return conn.getNetworkInfo(TYPE_MOBILE) != null;
+    }
+
+    /**
+     * Test if device has a mobile 4G data radio.
+     */
+    private static boolean hasMobile4gRadio(Context context) {
+        final ConnectivityManager conn = (ConnectivityManager) context.getSystemService(
+                Context.CONNECTIVITY_SERVICE);
+        final TelephonyManager telephony = (TelephonyManager) context.getSystemService(
+                Context.TELEPHONY_SERVICE);
+
+        // WiMAX devices should have WiMAX network tracker regardless of
+        // connection status.
+        final boolean hasWimax = conn.getNetworkInfo(TYPE_WIMAX) != null;
+        final boolean hasLte = telephony.getLteOnCdmaMode() == Phone.LTE_ON_CDMA_TRUE;
+        return hasWimax || hasLte;
+    }
+
+    /**
+     * Test if device has a Wi-Fi data radio.
+     */
+    private static boolean hasWifiRadio(Context context) {
+        return context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WIFI);
+    }
+
+    /**
+     * Inflate a {@link Preference} style layout, adding the given {@link View}
+     * widget into {@link android.R.id#widget_frame}.
+     */
+    private static View inflatePreference(LayoutInflater inflater, ViewGroup root, View widget) {
+        final View view = inflater.inflate(R.layout.preference, root, false);
+        final LinearLayout widgetFrame = (LinearLayout) view.findViewById(
+                android.R.id.widget_frame);
+        widgetFrame.addView(widget, new LinearLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT));
+        return view;
+    }
+
+    /**
+     * Set {@link android.R.id#title} for a preference view inflated with
+     * {@link #inflatePreference(LayoutInflater, ViewGroup, View)}.
+     */
+    private static void setPreferenceTitle(View parent, int resId) {
+        final TextView title = (TextView) parent.findViewById(android.R.id.title);
+        title.setText(resId);
+    }
+
+}
diff --git a/src/com/android/settings/DateTimeSettings.java b/src/com/android/settings/DateTimeSettings.java
index d2c5973..31e6a33 100644
--- a/src/com/android/settings/DateTimeSettings.java
+++ b/src/com/android/settings/DateTimeSettings.java
@@ -88,7 +88,6 @@
         boolean isFirstRun = intent.getBooleanExtra(EXTRA_IS_FIRST_RUN, false);
 
         mDummyDate = Calendar.getInstance();
-        mDummyDate.set(mDummyDate.get(Calendar.YEAR), 11, 31, 13, 0, 0);
 
         mAutoTimePref = (CheckBoxPreference) findPreference(KEY_AUTO_TIME);
         mAutoTimePref.setChecked(autoTimeEnabled);
@@ -171,6 +170,8 @@
     public void updateTimeAndDateDisplay(Context context) {
         java.text.DateFormat shortDateFormat = DateFormat.getDateFormat(context);
         final Calendar now = Calendar.getInstance();
+        mDummyDate.setTimeZone(now.getTimeZone());
+        mDummyDate.set(now.get(Calendar.YEAR), 11, 31, 13, 0, 0);
         Date dummyDate = mDummyDate.getTime();
         mTimePref.setSummary(DateFormat.getTimeFormat(getActivity()).format(now.getTime()));
         mTimeZone.setSummary(getTimeZoneText(now.getTimeZone()));
diff --git a/src/com/android/settings/DateTimeSettingsSetupWizard.java b/src/com/android/settings/DateTimeSettingsSetupWizard.java
index 4ff7fc8..e63153e 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;
@@ -136,8 +136,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/GoogleLocationSettingHelper.java b/src/com/android/settings/GoogleLocationSettingHelper.java
index 0d4861e..be4a02c 100644
--- a/src/com/android/settings/GoogleLocationSettingHelper.java
+++ b/src/com/android/settings/GoogleLocationSettingHelper.java
@@ -122,6 +122,7 @@
         try {
             context.startActivity(i);
         } catch (ActivityNotFoundException e) {
+            Log.e("GoogleLocationSettingHelper", "Problem while starting GSF location activity");
         }
     }
 
diff --git a/src/com/android/settings/LocationSettings.java b/src/com/android/settings/LocationSettings.java
new file mode 100644
index 0000000..645e6d7
--- /dev/null
+++ b/src/com/android/settings/LocationSettings.java
@@ -0,0 +1,193 @@
+/*
+ * 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.ContentQueryMap;
+import android.content.ContentResolver;
+import android.content.Intent;
+import android.database.Cursor;
+import android.location.LocationManager;
+import android.preference.CheckBoxPreference;
+import android.preference.Preference;
+import android.preference.Preference.OnPreferenceChangeListener;
+import android.preference.PreferenceScreen;
+import android.provider.Settings;
+
+import java.util.Observable;
+import java.util.Observer;
+
+/**
+ * Gesture lock pattern settings.
+ */
+public class LocationSettings extends SettingsPreferenceFragment
+        implements OnPreferenceChangeListener {
+
+    // Location Settings
+    private static final String KEY_LOCATION_NETWORK = "location_network";
+    private static final String KEY_LOCATION_GPS = "location_gps";
+    private static final String KEY_ASSISTED_GPS = "assisted_gps";
+    private static final String KEY_USE_LOCATION = "location_use_for_services";
+
+    private CheckBoxPreference mNetwork;
+    private CheckBoxPreference mGps;
+    private CheckBoxPreference mAssistedGps;
+    private CheckBoxPreference mUseLocation;
+
+    // These provide support for receiving notification when Location Manager settings change.
+    // This is necessary because the Network Location Provider can change settings
+    // if the user does not confirm enabling the provider.
+    private ContentQueryMap mContentQueryMap;
+
+    private Observer mSettingsObserver;
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        // listen for Location Manager settings changes
+        Cursor settingsCursor = getContentResolver().query(Settings.Secure.CONTENT_URI, null,
+                "(" + Settings.System.NAME + "=?)",
+                new String[]{Settings.Secure.LOCATION_PROVIDERS_ALLOWED},
+                null);
+        mContentQueryMap = new ContentQueryMap(settingsCursor, Settings.System.NAME, true, null);
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        if (mSettingsObserver != null) {
+            mContentQueryMap.deleteObserver(mSettingsObserver);
+        }
+    }
+
+    private PreferenceScreen createPreferenceHierarchy() {
+        PreferenceScreen root = getPreferenceScreen();
+        if (root != null) {
+            root.removeAll();
+        }
+        addPreferencesFromResource(R.xml.location_settings);
+        root = getPreferenceScreen();
+
+        mNetwork = (CheckBoxPreference) root.findPreference(KEY_LOCATION_NETWORK);
+        mGps = (CheckBoxPreference) root.findPreference(KEY_LOCATION_GPS);
+        mAssistedGps = (CheckBoxPreference) root.findPreference(KEY_ASSISTED_GPS);
+        if (GoogleLocationSettingHelper.isAvailable(getActivity())) {
+            // GSF present, Add setting for 'Use My Location'
+            CheckBoxPreference useLocation = new CheckBoxPreference(getActivity());
+            useLocation.setKey(KEY_USE_LOCATION);
+            useLocation.setTitle(R.string.use_location_title);
+            useLocation.setSummaryOn(R.string.use_location_summary_enabled);
+            useLocation.setSummaryOff(R.string.use_location_summary_disabled);
+            useLocation.setChecked(
+                    GoogleLocationSettingHelper.getUseLocationForServices(getActivity())
+                    == GoogleLocationSettingHelper.USE_LOCATION_FOR_SERVICES_ON);
+            useLocation.setPersistent(false);
+            useLocation.setOnPreferenceChangeListener(this);
+            getPreferenceScreen().addPreference(useLocation);
+            mUseLocation = useLocation;
+        }
+
+        // Change the summary for wifi-only devices
+        if (Utils.isWifiOnly()) {
+            mNetwork.setSummaryOn(R.string.location_neighborhood_level_wifi);
+        }
+
+        return root;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        // Make sure we reload the preference hierarchy since some of these settings
+        // depend on others...
+        createPreferenceHierarchy();
+        updateLocationToggles();
+
+        if (mSettingsObserver == null) {
+            mSettingsObserver = new Observer() {
+                public void update(Observable o, Object arg) {
+                    updateLocationToggles();
+                }
+            };
+            mContentQueryMap.addObserver(mSettingsObserver);
+        }
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
+
+        if (preference == mNetwork) {
+            Settings.Secure.setLocationProviderEnabled(getContentResolver(),
+                    LocationManager.NETWORK_PROVIDER, mNetwork.isChecked());
+        } else if (preference == mGps) {
+            boolean enabled = mGps.isChecked();
+            Settings.Secure.setLocationProviderEnabled(getContentResolver(),
+                    LocationManager.GPS_PROVIDER, enabled);
+            if (mAssistedGps != null) {
+                mAssistedGps.setEnabled(enabled);
+            }
+        } else if (preference == mAssistedGps) {
+            Settings.Secure.putInt(getContentResolver(), Settings.Secure.ASSISTED_GPS_ENABLED,
+                    mAssistedGps.isChecked() ? 1 : 0);
+        } else {
+            // If we didn't handle it, let preferences handle it.
+            return super.onPreferenceTreeClick(preferenceScreen, preference);
+        }
+
+        return true;
+    }
+
+    /*
+     * Creates toggles for each available location provider
+     */
+    private void updateLocationToggles() {
+        ContentResolver res = getContentResolver();
+        boolean gpsEnabled = Settings.Secure.isLocationProviderEnabled(
+                res, LocationManager.GPS_PROVIDER);
+        mNetwork.setChecked(Settings.Secure.isLocationProviderEnabled(
+                res, LocationManager.NETWORK_PROVIDER));
+        mGps.setChecked(gpsEnabled);
+        if (mAssistedGps != null) {
+            mAssistedGps.setChecked(Settings.Secure.getInt(res,
+                    Settings.Secure.ASSISTED_GPS_ENABLED, 2) == 1);
+            mAssistedGps.setEnabled(gpsEnabled);
+        }
+    }
+
+    /**
+     * see confirmPatternThenDisableAndClear
+     */
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        createPreferenceHierarchy();
+    }
+
+    public boolean onPreferenceChange(Preference preference, Object value) {
+        if (preference == mUseLocation) {
+            boolean newValue = (value == null ? false : (Boolean) value);
+            GoogleLocationSettingHelper.setUseLocationForServices(getActivity(), newValue);
+            // We don't want to change the value immediately here, since the user may click
+            // disagree in the dialog that pops up. When the activity we just launched exits, this
+            // activity will be restated and the new value re-read, so the checkbox will get its
+            // new value then.
+            return false;
+        }
+        return true;
+    }
+}
diff --git a/src/com/android/settings/PointerSpeedPreference.java b/src/com/android/settings/PointerSpeedPreference.java
index e9704fd..6a6a71f 100644
--- a/src/com/android/settings/PointerSpeedPreference.java
+++ b/src/com/android/settings/PointerSpeedPreference.java
@@ -25,7 +25,7 @@
 import android.os.Parcelable;
 import android.os.RemoteException;
 import android.os.ServiceManager;
-import android.preference.SeekBarPreference;
+import android.preference.SeekBarDialogPreference;
 import android.provider.Settings;
 import android.provider.Settings.SettingNotFoundException;
 import android.util.AttributeSet;
@@ -33,7 +33,7 @@
 import android.view.View;
 import android.widget.SeekBar;
 
-public class PointerSpeedPreference extends SeekBarPreference implements
+public class PointerSpeedPreference extends SeekBarDialogPreference implements
         SeekBar.OnSeekBarChangeListener {
     private SeekBar mSeekBar;
 
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..fc91e78 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -19,15 +19,9 @@
 
 import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;
 
-import com.android.internal.widget.LockPatternUtils;
-
 import android.app.admin.DevicePolicyManager;
-import android.content.ContentQueryMap;
-import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
-import android.database.Cursor;
-import android.location.LocationManager;
 import android.os.Bundle;
 import android.os.Vibrator;
 import android.preference.CheckBoxPreference;
@@ -41,9 +35,9 @@
 import android.telephony.TelephonyManager;
 import android.util.Log;
 
+import com.android.internal.widget.LockPatternUtils;
+
 import java.util.ArrayList;
-import java.util.Observable;
-import java.util.Observer;
 
 /**
  * Gesture lock pattern settings.
@@ -60,45 +54,22 @@
     private static final String KEY_LOCK_AFTER_TIMEOUT = "lock_after_timeout";
     private static final int SET_OR_CHANGE_LOCK_METHOD_REQUEST = 123;
 
-    // Location Settings
-    private static final String KEY_LOCATION_CATEGORY = "location_category";
-    private static final String KEY_LOCATION_NETWORK = "location_network";
-    private static final String KEY_LOCATION_GPS = "location_gps";
-    private static final String KEY_ASSISTED_GPS = "assisted_gps";
-    private static final String KEY_USE_LOCATION = "location_use_for_services";
-
     // 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";
-
-    private CheckBoxPreference mNetwork;
-    private CheckBoxPreference mGps;
-    private CheckBoxPreference mAssistedGps;
-    private CheckBoxPreference mUseLocation;
-
     DevicePolicyManager mDPM;
 
-    // These provide support for receiving notification when Location Manager settings change.
-    // This is necessary because the Network Location Provider can change settings
-    // if the user does not confirm enabling the provider.
-    private ContentQueryMap mContentQueryMap;
-
     private ChooseLockSettingsHelper mChooseLockSettingsHelper;
     private LockPatternUtils mLockPatternUtils;
     private ListPreference mLockAfter;
 
-    private Observer mSettingsObserver;
-
     private CheckBoxPreference mVisiblePattern;
     private CheckBoxPreference mTactileFeedback;
 
     private CheckBoxPreference mShowPassword;
 
-    private CheckBoxPreference mEnableCredentials;
     private Preference mResetCredentials;
 
     @Override
@@ -112,25 +83,6 @@
         mChooseLockSettingsHelper = new ChooseLockSettingsHelper(getActivity());
     }
 
-    @Override
-    public void onStart() {
-        super.onStart();
-        // listen for Location Manager settings changes
-        Cursor settingsCursor = getContentResolver().query(Settings.Secure.CONTENT_URI, null,
-                "(" + Settings.System.NAME + "=?)",
-                new String[]{Settings.Secure.LOCATION_PROVIDERS_ALLOWED},
-                null);
-        mContentQueryMap = new ContentQueryMap(settingsCursor, Settings.System.NAME, true, null);
-    }
-
-    @Override
-    public void onStop() {
-        super.onStop();
-        if (mSettingsObserver != null) {
-            mContentQueryMap.deleteObserver(mSettingsObserver);
-        }
-    }
-
     private PreferenceScreen createPreferenceHierarchy() {
         PreferenceScreen root = getPreferenceScreen();
         if (root != null) {
@@ -139,32 +91,6 @@
         addPreferencesFromResource(R.xml.security_settings);
         root = getPreferenceScreen();
 
-        mNetwork = (CheckBoxPreference) root.findPreference(KEY_LOCATION_NETWORK);
-        mGps = (CheckBoxPreference) root.findPreference(KEY_LOCATION_GPS);
-        mAssistedGps = (CheckBoxPreference) root.findPreference(KEY_ASSISTED_GPS);
-        if (GoogleLocationSettingHelper.isAvailable(getActivity())) {
-            // GSF present, Add setting for 'Use My Location'
-            PreferenceGroup locationCat =
-                    (PreferenceGroup) root.findPreference(KEY_LOCATION_CATEGORY);
-            CheckBoxPreference useLocation = new CheckBoxPreference(getActivity());
-            useLocation.setKey(KEY_USE_LOCATION);
-            useLocation.setTitle(R.string.use_location_title);
-            useLocation.setSummaryOn(R.string.use_location_summary_enabled);
-            useLocation.setSummaryOff(R.string.use_location_summary_disabled);
-            useLocation.setChecked(
-                    GoogleLocationSettingHelper.getUseLocationForServices(getActivity())
-                    == GoogleLocationSettingHelper.USE_LOCATION_FOR_SERVICES_ON);
-            useLocation.setPersistent(false);
-            useLocation.setOnPreferenceChangeListener(this);
-            locationCat.addPreference(useLocation);
-            mUseLocation = useLocation;
-        }
-
-        // Change the summary for wifi-only devices
-        if (Utils.isWifiOnly()) {
-            mNetwork.setSummaryOn(R.string.location_neighborhood_level_wifi);
-        }
-
         // Add options for lock/unlock screen
         int resid = 0;
         if (!mLockPatternUtils.isSecure()) {
@@ -239,8 +165,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;
@@ -315,16 +239,6 @@
         // Make sure we reload the preference hierarchy since some of these settings
         // depend on others...
         createPreferenceHierarchy();
-        updateLocationToggles();
-
-        if (mSettingsObserver == null) {
-            mSettingsObserver = new Observer() {
-                public void update(Observable o, Object arg) {
-                    updateLocationToggles();
-                }
-            };
-            mContentQueryMap.addObserver(mSettingsObserver);
-        }
 
         final LockPatternUtils lockPatternUtils = mChooseLockSettingsHelper.utils();
         if (mVisiblePattern != null) {
@@ -337,15 +251,12 @@
         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
-    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen,
-            Preference preference) {
+    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
         final String key = preference.getKey();
 
         final LockPatternUtils lockPatternUtils = mChooseLockSettingsHelper.utils();
@@ -361,19 +272,6 @@
         } else if (preference == mShowPassword) {
             Settings.System.putInt(getContentResolver(), Settings.System.TEXT_SHOW_PASSWORD,
                     mShowPassword.isChecked() ? 1 : 0);
-        } else if (preference == mNetwork) {
-            Settings.Secure.setLocationProviderEnabled(getContentResolver(),
-                    LocationManager.NETWORK_PROVIDER, mNetwork.isChecked());
-        } else if (preference == mGps) {
-            boolean enabled = mGps.isChecked();
-            Settings.Secure.setLocationProviderEnabled(getContentResolver(),
-                    LocationManager.GPS_PROVIDER, enabled);
-            if (mAssistedGps != null) {
-                mAssistedGps.setEnabled(enabled);
-            }
-        } else if (preference == mAssistedGps) {
-            Settings.Secure.putInt(getContentResolver(), Settings.Secure.ASSISTED_GPS_ENABLED,
-                    mAssistedGps.isChecked() ? 1 : 0);
         } else {
             // If we didn't handle it, let preferences handle it.
             return super.onPreferenceTreeClick(preferenceScreen, preference);
@@ -382,29 +280,12 @@
         return true;
     }
 
-    /*
-     * Creates toggles for each available location provider
-     */
-    private void updateLocationToggles() {
-        ContentResolver res = getContentResolver();
-        boolean gpsEnabled = Settings.Secure.isLocationProviderEnabled(
-                res, LocationManager.GPS_PROVIDER);
-        mNetwork.setChecked(Settings.Secure.isLocationProviderEnabled(
-                res, LocationManager.NETWORK_PROVIDER));
-        mGps.setChecked(gpsEnabled);
-        if (mAssistedGps != null) {
-            mAssistedGps.setChecked(Settings.Secure.getInt(res,
-                    Settings.Secure.ASSISTED_GPS_ENABLED, 2) == 1);
-            mAssistedGps.setEnabled(gpsEnabled);
-        }
-    }
-
     private boolean isToggled(Preference pref) {
         return ((CheckBoxPreference) pref).isChecked();
     }
 
     /**
-     * @see #confirmPatternThenDisableAndClear
+     * see confirmPatternThenDisableAndClear
      */
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
@@ -422,21 +303,6 @@
                 Log.e("SecuritySettings", "could not persist lockAfter timeout setting", e);
             }
             updateLockAfterPreferenceSummary();
-        } else if (preference == mUseLocation) {
-            boolean newValue = (value == null ? false : (Boolean) value);
-            GoogleLocationSettingHelper.setUseLocationForServices(getActivity(), newValue);
-            // We don't want to change the value immediately here, since the user may click
-            // disagree in the dialog that pops up. When the activity we just launched exits, this
-            // 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..cbdd37b 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -17,17 +17,30 @@
 package com.android.settings;
 
 import android.content.ComponentName;
+import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
+import android.text.TextUtils;
 import android.util.Log;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
 import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.ListAdapter;
+import android.widget.Switch;
+import android.widget.TextView;
 
+import com.android.settings.bluetooth.BluetoothEnabler;
+import com.android.settings.wifi.WifiEnabler;
+
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
@@ -36,10 +49,11 @@
  */
 public class Settings extends PreferenceActivity implements ButtonBarHandler {
 
+    private static final String LOG_TAG = "Settings";
     private static final String META_DATA_KEY_HEADER_ID =
-            "com.android.settings.TOP_LEVEL_HEADER_ID";
+        "com.android.settings.TOP_LEVEL_HEADER_ID";
     private static final String META_DATA_KEY_FRAGMENT_CLASS =
-            "com.android.settings.FRAGMENT_CLASS";
+        "com.android.settings.FRAGMENT_CLASS";
     private static final String META_DATA_KEY_PARENT_TITLE =
         "com.android.settings.PARENT_FRAGMENT_TITLE";
     private static final String META_DATA_KEY_PARENT_FRAGMENT_CLASS =
@@ -58,6 +72,7 @@
     // TODO: Update Call Settings based on airplane mode state.
 
     protected HashMap<Integer, Integer> mHeaderIndexMap = new HashMap<Integer, Integer>();
+    private List<Header> mHeaders;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -107,6 +122,26 @@
         }
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        ListAdapter listAdapter = getListAdapter();
+        if (listAdapter instanceof HeaderAdapter) {
+            ((HeaderAdapter) listAdapter).resume();
+        }
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+
+        ListAdapter listAdapter = getListAdapter();
+        if (listAdapter instanceof HeaderAdapter) {
+            ((HeaderAdapter) listAdapter).pause();
+        }
+    }
+
     private void switchToHeaderLocal(Header header) {
         mInLocalHeaderSwitch = true;
         switchToHeader(header);
@@ -148,7 +183,7 @@
                 mParentHeader.title = parentInfo.metaData.getString(META_DATA_KEY_PARENT_TITLE);
             }
         } catch (NameNotFoundException nnfe) {
-            Log.w("Settings", "Could not find parent activity : " + className);
+            Log.w(LOG_TAG, "Could not find parent activity : " + className);
         }
     }
 
@@ -174,21 +209,22 @@
 
     @Override
     public Intent getIntent() {
-        String startingFragment = getStartingFragmentClass(super.getIntent());
+        Intent superIntent = super.getIntent();
+        String startingFragment = getStartingFragmentClass(superIntent);
         if (startingFragment != null && !onIsMultiPane()) {
-            Intent modIntent = new Intent(super.getIntent());
+            Intent modIntent = new Intent(superIntent);
             modIntent.putExtra(EXTRA_SHOW_FRAGMENT, startingFragment);
-            Bundle args = super.getIntent().getExtras();
+            Bundle args = superIntent.getExtras();
             if (args != null) {
                 args = new Bundle(args);
             } else {
                 args = new Bundle();
             }
-            args.putParcelable("intent", super.getIntent());
-            modIntent.putExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS, super.getIntent().getExtras());
+            args.putParcelable("intent", superIntent);
+            modIntent.putExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS, superIntent.getExtras());
             return modIntent;
         }
-        return super.getIntent();
+        return superIntent;
     }
 
     /**
@@ -204,7 +240,7 @@
         if ("com.android.settings.ManageApplications".equals(intentClass)
                 || "com.android.settings.RunningServices".equals(intentClass)
                 || "com.android.settings.applications.StorageUse".equals(intentClass)) {
-            // Old name of manage apps.
+            // Old names of manage apps.
             intentClass = com.android.settings.applications.ManageApplications.class.getName();
         }
 
@@ -226,17 +262,39 @@
             mCurrentHeader = header;
             return header;
         }
-        return super.onGetInitialHeader();
+
+        // Find first non-category header
+        int position = 0;
+        while (position < mHeaders.size()) {
+            Header header = mHeaders.get(position);
+            if (HeaderAdapter.getHeaderType(header) != HeaderAdapter.HEADER_TYPE_CATEGORY)
+                return header;
+            position++;
+        }
+
+        Log.e(LOG_TAG, "Unable to find a non-category header");
+        return null;
     }
 
+    @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.
      */
     @Override
-    public void onBuildHeaders(List<Header> target) {
-        loadHeadersFromResource(R.xml.settings_headers, target);
+    public void onBuildHeaders(List<Header> headers) {
+        loadHeadersFromResource(R.xml.settings_headers, headers);
 
-        updateHeaderList(target);
+        updateHeaderList(headers);
+
+        mHeaders = headers;
     }
 
     private void updateHeaderList(List<Header> target) {
@@ -253,7 +311,18 @@
             } else if (id == R.id.call_settings) {
                 if (!Utils.isVoiceCapable(this))
                     target.remove(header);
+            } else if (id == R.id.wifi_settings) {
+                // Remove WiFi Settings if WiFi service is not available.
+                if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_WIFI)) {
+                    target.remove(header);
+                }
+            } else if (id == R.id.bluetooth_settings) {
+                // Remove Bluetooth Settings if Bluetooth service is not available.
+                if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)) {
+                    target.remove(header);
+                }
             }
+
             // Increment if the current one wasn't removed by the Utils code.
             if (target.get(i) == header) {
                 // Hold on to the first header, when we need to reset to the top-level
@@ -287,6 +356,7 @@
                 }
             }
         } catch (NameNotFoundException nnfe) {
+            // No recovery
         }
     }
 
@@ -300,38 +370,197 @@
         return super.getNextButton();
     }
 
+    private static class HeaderAdapter extends ArrayAdapter<Header> {
+        static final int HEADER_TYPE_CATEGORY = 0;
+        static final int HEADER_TYPE_NORMAL = 1;
+        static final int HEADER_TYPE_SWITCH = 2;
+        private static final int HEADER_TYPE_COUNT = HEADER_TYPE_SWITCH + 1;
+
+        private final WifiEnabler mWifiEnabler;
+        private final BluetoothEnabler mBluetoothEnabler;
+
+        private static class HeaderViewHolder {
+            ImageView icon;
+            TextView title;
+            TextView summary;
+            Switch switch_;
+        }
+
+        private LayoutInflater mInflater;
+
+        static int getHeaderType(Header header) {
+            if (header.fragment == null && header.intent == null) {
+                return HEADER_TYPE_CATEGORY;
+            } else if (header.id == R.id.wifi_settings || header.id == R.id.bluetooth_settings) {
+                return HEADER_TYPE_SWITCH;
+            } else {
+                return HEADER_TYPE_NORMAL;
+            }
+        }
+
+        @Override
+        public int getItemViewType(int position) {
+            Header header = getItem(position);
+            return getHeaderType(header);
+        }
+
+        @Override
+        public boolean areAllItemsEnabled() {
+            return false; // because of categories
+        }
+
+        @Override
+        public boolean isEnabled(int position) {
+            return getItemViewType(position) != HEADER_TYPE_CATEGORY;
+        }
+
+        @Override
+        public int getViewTypeCount() {
+            return HEADER_TYPE_COUNT;
+        }
+
+        @Override
+        public boolean hasStableIds() {
+            return true;
+        }
+
+        public HeaderAdapter(Context context, List<Header> objects) {
+            super(context, 0, objects);
+            mInflater = (LayoutInflater)context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+            
+            // These Switches are provided as placeholder until the adapter replaces these with actual
+            // Switches inflated from their layouts. Must be done before adapter is set in super
+            mWifiEnabler = new WifiEnabler(context, new Switch(context));
+            mBluetoothEnabler = new BluetoothEnabler(context, new Switch(context));
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            HeaderViewHolder holder;
+            Header header = getItem(position);
+            int headerType = getHeaderType(header);
+            View view = null;
+
+            if (convertView == null) {
+                holder = new HeaderViewHolder();
+                switch (headerType) {
+                    case HEADER_TYPE_CATEGORY:
+                        view = new TextView(getContext(), null, android.R.attr.listSeparatorTextViewStyle);
+                        holder.title = (TextView) view;
+                        break;
+
+                    case HEADER_TYPE_SWITCH:
+                        view = mInflater.inflate(R.layout.preference_header_switch_item, parent, false);
+                        holder.icon = (ImageView) view.findViewById(R.id.icon);
+                        holder.title = (TextView) view.findViewById(com.android.internal.R.id.title);
+                        holder.summary = (TextView) view.findViewById(com.android.internal.R.id.summary);
+                        holder.switch_ = (Switch) view.findViewById(R.id.switchWidget);
+                        break;
+
+                    case HEADER_TYPE_NORMAL:
+                        view = mInflater.inflate(com.android.internal.R.layout.preference_header_item, parent, false);
+                        holder.icon = (ImageView) view.findViewById(com.android.internal.R.id.icon);
+                        holder.title = (TextView) view.findViewById(com.android.internal.R.id.title);
+                        holder.summary = (TextView) view.findViewById(com.android.internal.R.id.summary);
+                        break;
+                }
+                view.setTag(holder);
+            } else {
+                view = convertView;
+                holder = (HeaderViewHolder) view.getTag();
+            }
+
+            // All view fields must be updated every time, because the view may be recycled
+            switch (headerType) {
+                case HEADER_TYPE_CATEGORY:
+                    holder.title.setText(header.getTitle(getContext().getResources()));
+                    break;
+
+                case HEADER_TYPE_SWITCH:
+                    // Would need a different treatment if the main menu had more switches
+                    if (header.id == R.id.wifi_settings) {
+                        mWifiEnabler.setSwitch(holder.switch_);
+                    } else {
+                        mBluetoothEnabler.setSwitch(holder.switch_);
+                    }
+                    // No break, fall through on purpose to update common fields
+
+                    //$FALL-THROUGH$
+                case HEADER_TYPE_NORMAL:
+                    holder.icon.setImageResource(header.iconRes);
+                    holder.title.setText(header.getTitle(getContext().getResources()));
+                    CharSequence summary = header.getSummary(getContext().getResources());
+                    if (!TextUtils.isEmpty(summary)) {
+                        holder.summary.setVisibility(View.VISIBLE);
+                        holder.summary.setText(summary);
+                    } else {
+                        holder.summary.setVisibility(View.GONE);
+                    }
+                    break;
+            }
+
+            return view;
+        }
+
+        public void resume() {
+            mWifiEnabler.resume();
+            mBluetoothEnabler.resume();
+        }
+        
+        public void pause() {
+            mWifiEnabler.pause();
+            mBluetoothEnabler.pause();
+        }
+    }
+
+    @Override
+    public void setListAdapter(ListAdapter adapter) {
+        if (mHeaders == null) {
+            mHeaders = new ArrayList<Header>();
+            // When the saved state provides the list of headers, onBuildHeaders is not called
+            // Copy the list of Headers from the adapter, preserving their order
+            for (int i = 0; i < adapter.getCount(); i++) {
+                mHeaders.add((Header) adapter.getItem(i));
+            }
+        }
+
+        // Ignore the adapter provided by PreferenceActivity and substitute ours instead
+        super.setListAdapter(new HeaderAdapter(this, mHeaders));
+    }
+
     /*
      * Settings subclasses for launching independently.
      */
-
-    public static class BluetoothSettingsActivity extends Settings { }
-    public static class WirelessSettingsActivity extends Settings { }
-    public static class TetherSettingsActivity extends Settings { }
-    public static class VpnSettingsActivity extends Settings { }
-    public static class DateTimeSettingsActivity extends Settings { }
-    public static class StorageSettingsActivity extends Settings { }
-    public static class WifiSettingsActivity extends Settings { }
-    public static class InputMethodAndLanguageSettingsActivity extends Settings { }
-    public static class InputMethodConfigActivity extends Settings { }
-    public static class InputMethodAndSubtypeEnablerActivity extends Settings { }
-    public static class LocalePickerActivity extends Settings { }
-    public static class UserDictionarySettingsActivity extends Settings { }
-    public static class SoundSettingsActivity extends Settings { }
-    public static class DisplaySettingsActivity extends Settings { }
-    public static class DeviceInfoSettingsActivity extends Settings { }
-    public static class ApplicationSettingsActivity extends Settings { }
-    public static class ManageApplicationsActivity extends Settings { }
-    public static class StorageUseActivity extends Settings { }
-    public static class DevelopmentSettingsActivity extends Settings { }
-    public static class AccessibilitySettingsActivity extends Settings { }
-    public static class SecuritySettingsActivity extends Settings { }
-    public static class PrivacySettingsActivity extends Settings { }
-    public static class DockSettingsActivity extends Settings { }
-    public static class RunningServicesActivity extends Settings { }
-    public static class ManageAccountsSettingsActivity extends Settings { }
-    public static class PowerUsageSummaryActivity extends Settings { }
-    public static class AccountSyncSettingsActivity extends Settings { }
-    public static class AccountSyncSettingsInAddAccountActivity extends Settings { }
-    public static class CryptKeeperSettingsActivity extends Settings { }
-    public static class DeviceAdminSettingsActivity extends Settings { }
+    public static class BluetoothSettingsActivity extends Settings { /* empty */ }
+    public static class WirelessSettingsActivity extends Settings { /* empty */ }
+    public static class TetherSettingsActivity extends Settings { /* empty */ }
+    public static class VpnSettingsActivity extends Settings { /* empty */ }
+    public static class DateTimeSettingsActivity extends Settings { /* empty */ }
+    public static class StorageSettingsActivity extends Settings { /* empty */ }
+    public static class WifiSettingsActivity extends Settings { /* empty */ }
+    public static class InputMethodAndLanguageSettingsActivity extends Settings { /* empty */ }
+    public static class InputMethodConfigActivity extends Settings { /* empty */ }
+    public static class InputMethodAndSubtypeEnablerActivity extends Settings { /* empty */ }
+    public static class LocalePickerActivity extends Settings { /* empty */ }
+    public static class UserDictionarySettingsActivity extends Settings { /* empty */ }
+    public static class SoundSettingsActivity extends Settings { /* empty */ }
+    public static class DisplaySettingsActivity extends Settings { /* empty */ }
+    public static class DeviceInfoSettingsActivity extends Settings { /* empty */ }
+    public static class ApplicationSettingsActivity extends Settings { /* empty */ }
+    public static class ManageApplicationsActivity extends Settings { /* empty */ }
+    public static class StorageUseActivity extends Settings { /* empty */ }
+    public static class DevelopmentSettingsActivity extends Settings { /* empty */ }
+    public static class AccessibilitySettingsActivity extends Settings { /* empty */ }
+    public static class SecuritySettingsActivity extends Settings { /* empty */ }
+    public static class LocationSettingsActivity extends Settings { /* empty */ }
+    public static class PrivacySettingsActivity extends Settings { /* empty */ }
+    public static class DockSettingsActivity extends Settings { /* empty */ }
+    public static class RunningServicesActivity extends Settings { /* empty */ }
+    public static class ManageAccountsSettingsActivity extends Settings { /* empty */ }
+    public static class PowerUsageSummaryActivity extends Settings { /* empty */ }
+    public static class AccountSyncSettingsActivity extends Settings { /* empty */ }
+    public static class AccountSyncSettingsInAddAccountActivity extends Settings { /* empty */ }
+    public static class CryptKeeperSettingsActivity extends Settings { /* empty */ }
+    public static class DeviceAdminSettingsActivity extends Settings { /* empty */ }
+    public static class DataUsageSummaryActivity extends Settings { /* empty */ }
 }
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..f7945d8 100644
--- a/src/com/android/settings/TextToSpeechSettings.java
+++ b/src/com/android/settings/TextToSpeechSettings.java
@@ -21,28 +21,26 @@
 import static android.provider.Settings.Secure.TTS_DEFAULT_RATE;
 import static android.provider.Settings.Secure.TTS_DEFAULT_SYNTH;
 import static android.provider.Settings.Secure.TTS_DEFAULT_VARIANT;
-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.speech.tts.TextToSpeech.EngineInfo;
+import android.speech.tts.TtsEngines;
+import android.text.TextUtils;
 import android.util.Log;
 
 import java.util.ArrayList;
@@ -56,7 +54,6 @@
 
     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 +62,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_ENGINE_SETTINGS = "tts_engine_settings";
 
     private static final String KEY_PLUGIN_ENABLED_PREFIX = "ENABLED_";
     private static final String KEY_PLUGIN_SETTINGS_PREFIX = "SETTINGS_";
@@ -76,19 +74,18 @@
 
     private static final String LOCALE_DELIMITER = "-";
 
-    private static final String FALLBACK_TTS_DEFAULT_SYNTH =
-            TextToSpeech.Engine.DEFAULT_SYNTH;
+    private Preference mPlayExample = null;
 
-    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 ListPreference mDefaultRatePref = null;
+    private ListPreference mDefaultLocPref = null;
+    private ListPreference mDefaultSynthPref = null;
+
+    private Preference mInstallData = null;
+    private Preference mEngineSettings = null;
+
     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.
@@ -98,6 +95,7 @@
     private boolean mVoicesMissing = false;
 
     private TextToSpeech mTts = null;
+    private TtsEngines mEnginesHelper = null;
     private boolean mTtsStarted = false;
 
     /**
@@ -112,10 +110,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 +120,25 @@
         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);
+
+        mDefaultSynthPref = (ListPreference) findPreference(KEY_TTS_DEFAULT_SYNTH);
+        mDefaultRatePref = (ListPreference) findPreference(KEY_TTS_DEFAULT_RATE);
+        mDefaultLocPref = (ListPreference) findPreference(KEY_TTS_DEFAULT_LANG);
+
+        mEngineSettings = findPreference(KEY_TTS_ENGINE_SETTINGS);
+        mEngineSettings.setEnabled(false);
+
+        mTts = new TextToSpeech(getActivity().getApplicationContext(), this);
+        mEnginesHelper = new TtsEngines(getActivity().getApplicationContext());
+
+        initDefaultSettings();
+        initEngineSpecificSettings();
+    }
 
     @Override
     public void onStart() {
@@ -142,7 +152,6 @@
         }
     }
 
-
     @Override
     public void onDestroy() {
         super.onDestroy();
@@ -165,97 +174,39 @@
         }
     }
 
-    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++) {
-            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);
-            }
-            if (pluginHasSettings(pluginPackageName)) {
-                Preference pref = new Preference(context);
-                prefKey = KEY_PLUGIN_SETTINGS_PREFIX + pluginPackageName;
-                pref.setKey(prefKey);
-                pref.setTitle(enginesArray[i].loadLabel(pm));
-                CharSequence settingsLabel = getResources().getString(
-                        R.string.tts_engine_name_settings, enginesArray[i].loadLabel(pm));
-                pref.setSummary(settingsLabel);
-                pref.setOnPreferenceClickListener(new OnPreferenceClickListener(){
-                            public boolean onPreferenceClick(Preference preference){
-                                Intent i = new Intent();
-                                i.setClassName(pluginPackageName,
-                                        pluginPackageName + ".EngineSettings");
-                                startActivity(i);
-                                return true;
-                            }
-                        });
-                enginesCategory.addPreference(pref);
-            }
+    private void initEngineSpecificSettings() {
+        final String engineName = mEnginesHelper.getDefaultEngine();
+        final EngineInfo engine = mEnginesHelper.getEngineInfo(engineName);
+
+        mEngineSettings.setTitle(getResources().getString(R.string.tts_engine_settings_title,
+                engine.label));
+
+        final Intent settingsIntent = mEnginesHelper.getSettingsIntent(engineName);
+        if (settingsIntent != null) {
+            mEngineSettings.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+                public boolean onPreferenceClick(Preference preference) {
+                    startActivity(settingsIntent);
+                    return true;
+                }
+            });
+            mEngineSettings.setEnabled(true);
+        } else {
+            mEngineSettings.setEnabled(false);
         }
+
     }
 
-    private boolean pluginHasSettings(String pluginPackageName) {
-        PackageManager pm = getPackageManager();
-        Intent i = new Intent();
-        i.setClassName(pluginPackageName, pluginPackageName + ".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();
 
         // Find the default TTS values in the settings, initialize and store the
         // 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);
-        }
-        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 +216,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 +246,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 +264,22 @@
      * 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 +296,6 @@
                 mDefaultLocVariant = new String();
             }
             mTts.setLanguage(new Locale(mDefaultLanguage, mDefaultCountry, mDefaultLocVariant));
-            initDefaultSettings();
             updateWidgetState();
             checkVoiceData();
             mTtsStarted = true;
@@ -370,142 +307,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 +472,24 @@
                 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);
-            if (mTts != null) {
-                mTts.setEngineByPackageName(mDefaultEng);
-                mEnableDemo = false;
-                mVoicesMissing = false;
-                updateWidgetState();
-                checkVoiceData();
+            final String name = objValue.toString();
+            final EngineInfo info = mEnginesHelper.getEngineInfo(name);
+
+            if (info.system) {
+                // For system engines, do away with the alert dialog.
+                updateDefaultEngine(name);
+                initEngineSpecificSettings();
+            } else {
+                // For all other engines, display a warning message before
+                // turning them on.
+                displayDataAlert(preference, name);
             }
-            Log.v("Settings", "The default synth is: " + objValue.toString());
+
+            // We'll deal with updating the UI ourselves.
+            return false;
         }
 
         return true;
@@ -550,61 +505,18 @@
             // 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) {
-            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;
-            }
-        }
-        return false;
-    }
-
-
     private void updateWidgetState() {
         mPlayExample.setEnabled(mEnableDemo);
-        mUseDefaultPref.setEnabled(mEnableDemo);
         mDefaultRatePref.setEnabled(mEnableDemo);
         mDefaultLocPref.setEnabled(mEnableDemo);
 
@@ -617,14 +529,18 @@
         mDefaultLanguage = "";
         mDefaultCountry = "";
         mDefaultLocVariant = "";
-        if (tokenizer.hasMoreTokens()) {
-            mDefaultLanguage = tokenizer.nextToken().trim();
-        }
-        if (tokenizer.hasMoreTokens()) {
-            mDefaultCountry = tokenizer.nextToken().trim();
-        }
-        if (tokenizer.hasMoreTokens()) {
-            mDefaultLocVariant = tokenizer.nextToken().trim();
+
+        if (locale != null) {
+            String[] components = locale.split(LOCALE_DELIMITER);
+            if (components.length > 0) {
+                mDefaultLanguage = components[0];
+            }
+            if (components.length > 1) {
+                mDefaultCountry = components[1];
+            }
+            if (components.length > 2) {
+                mDefaultLocVariant = components[2];
+            }
         }
     }
 
@@ -716,50 +632,78 @@
         Settings.Secure.putString(resolver, TTS_DEFAULT_VARIANT, DEFAULT_VARIANT_VAL);
     }
 
-
     private void loadEngines() {
-        mDefaultSynthPref = (ListPreference) findPreference(KEY_TTS_DEFAULT_SYNTH);
+        List<EngineInfo> engines = mEnginesHelper.getEngines();
+        CharSequence entries[] = new CharSequence[engines.size()];
+        CharSequence values[] = new CharSequence[engines.size()];
 
-        // 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);
-        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 + " ";
-                }
-            }
+        final int count = engines.size();
+        for (int i = 0; i < count; ++i) {
+            final EngineInfo engine = engines.get(i);
+            entries[i] = engine.label;
+            values[i] = engine.name;
         }
-        ContentResolver resolver = getContentResolver();
-        Settings.Secure.putString(resolver, TTS_ENABLED_PLUGINS, enabledEngines);
 
-        CharSequence entriesArray[] = new CharSequence[entries.size()];
-        CharSequence valuesArray[] = new CharSequence[values.size()];
-
-        mDefaultSynthPref.setEntries(entries.toArray(entriesArray));
-        mDefaultSynthPref.setEntryValues(values.toArray(valuesArray));
+        mDefaultSynthPref.setEntries(entries);
+        mDefaultSynthPref.setEntryValues(values);
 
         // Set the selected engine based on the saved preference
         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(
+                    mEnginesHelper.getHighestRankedEngineName());
         }
-        mDefaultSynthPref.setValueIndex(selectedEngineIndex);
+        if (selectedEngineIndex >= 0) {
+            mDefaultSynthPref.setValueIndex(selectedEngineIndex);
+        }
+    }
+
+    private void displayDataAlert(Preference pref, final String key) {
+        Log.v(TAG, "Displaying data alert for :" + key);
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        builder.setTitle(android.R.string.dialog_alert_title);
+        builder.setIcon(android.R.drawable.ic_dialog_alert);
+        builder.setMessage(getActivity().getString(
+                R.string.tts_engine_security_warning, pref.getTitle()));
+        builder.setCancelable(true);
+        builder.setPositiveButton(android.R.string.ok,
+                new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int which) {
+                       updateDefaultEngine(key);
+                       loadEngines();
+                       initEngineSpecificSettings();
+                    }
+                });
+        builder.setNegativeButton(android.R.string.cancel, null);
+
+        AlertDialog dialog = builder.create();
+        dialog.show();
+    }
+
+    private void updateDefaultEngine(String engine) {
+        Log.v(TAG, "Updating default synth to : " + engine);
+        if (mTts != null) {
+            try {
+                mTts.shutdown();
+                mTts = null;
+            } catch (Exception e) {
+                Log.e(TAG, "Error shutting down TTS engine" + e);
+            }
+        }
+
+        mTts = new TextToSpeech(getActivity().getApplicationContext(), this, engine);
+        mEnableDemo = false;
+        mVoicesMissing = false;
+        updateWidgetState();
+        checkVoiceData();
+
+        // Finally, persist this value to settings.
+        Settings.Secure.putString(getContentResolver(), TTS_DEFAULT_SYNTH, engine);
+        // .. and update the UI.
+        mDefaultSynthPref.setValue(engine);
+
+        Log.v(TAG, "The default synth is now: " + engine);
     }
 
 }
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/WallpaperTypeSettings.java b/src/com/android/settings/WallpaperTypeSettings.java
new file mode 100644
index 0000000..fa0b4e4
--- /dev/null
+++ b/src/com/android/settings/WallpaperTypeSettings.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;
+
+import android.content.ComponentName;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.preference.Preference;
+
+import java.util.List;
+
+public class WallpaperTypeSettings extends SettingsPreferenceFragment {
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        addPreferencesFromResource(R.xml.wallpaper_settings);
+
+        populateWallpaperTypes();
+    }
+
+    private void populateWallpaperTypes() {
+        // Search for activities that satisfy the ACTION_SET_WALLPAPER action
+        Intent intent = new Intent(Intent.ACTION_SET_WALLPAPER);
+        final PackageManager pm = getPackageManager();
+        List<ResolveInfo> rList = pm.queryIntentActivities(intent,
+                PackageManager.MATCH_DEFAULT_ONLY);
+
+        // Add Preference items for each of the matching activities
+        for (ResolveInfo info : rList) {
+            Preference pref = new Preference(getActivity());
+            Intent prefIntent = new Intent(intent);
+            prefIntent.setComponent(new ComponentName(
+                    info.activityInfo.packageName, info.activityInfo.name));
+            pref.setIntent(prefIntent);
+            CharSequence label = info.loadLabel(pm);
+            if (label == null) label = info.activityInfo.packageName;
+            pref.setTitle(label);
+            getPreferenceScreen().addPreference(pref);
+        }
+    }
+}
diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java
index 2844f3b..d09fcc5 100644
--- a/src/com/android/settings/WirelessSettings.java
+++ b/src/com/android/settings/WirelessSettings.java
@@ -16,35 +16,27 @@
 
 package com.android.settings;
 
-import com.android.internal.telephony.TelephonyIntents;
-import com.android.internal.telephony.TelephonyProperties;
-import com.android.settings.bluetooth.BluetoothEnabler;
-import com.android.settings.wifi.WifiEnabler;
-import com.android.settings.nfc.NfcEnabler;
-
 import android.app.Activity;
 import android.app.admin.DevicePolicyManager;
-import android.bluetooth.BluetoothAdapter;
 import android.content.Context;
 import android.content.Intent;
 import android.net.ConnectivityManager;
 import android.nfc.NfcAdapter;
 import android.os.Bundle;
-import android.os.ServiceManager;
 import android.os.SystemProperties;
 import android.preference.CheckBoxPreference;
 import android.preference.Preference;
 import android.preference.PreferenceScreen;
 import android.provider.Settings;
 
+import com.android.internal.telephony.TelephonyIntents;
+import com.android.internal.telephony.TelephonyProperties;
+import com.android.settings.nfc.NfcEnabler;
+
 public class WirelessSettings extends SettingsPreferenceFragment {
 
     private static final String KEY_TOGGLE_AIRPLANE = "toggle_airplane";
-    private static final String KEY_TOGGLE_BLUETOOTH = "toggle_bluetooth";
-    private static final String KEY_TOGGLE_WIFI = "toggle_wifi";
     private static final String KEY_TOGGLE_NFC = "toggle_nfc";
-    private static final String KEY_WIFI_SETTINGS = "wifi_settings";
-    private static final String KEY_BT_SETTINGS = "bt_settings";
     private static final String KEY_VPN_SETTINGS = "vpn_settings";
     private static final String KEY_TETHER_SETTINGS = "tether_settings";
     private static final String KEY_PROXY_SETTINGS = "proxy_settings";
@@ -55,9 +47,7 @@
 
     private AirplaneModeEnabler mAirplaneModeEnabler;
     private CheckBoxPreference mAirplaneModePreference;
-    private WifiEnabler mWifiEnabler;
     private NfcEnabler mNfcEnabler;
-    private BluetoothEnabler mBtEnabler;
 
     /**
      * Invoked on each preference click in this hierarchy, overrides
@@ -95,15 +85,10 @@
         addPreferencesFromResource(R.xml.wireless_settings);
 
         final Activity activity = getActivity();
-        CheckBoxPreference airplane = (CheckBoxPreference) findPreference(KEY_TOGGLE_AIRPLANE);
-        CheckBoxPreference wifi = (CheckBoxPreference) findPreference(KEY_TOGGLE_WIFI);
-        CheckBoxPreference bt = (CheckBoxPreference) findPreference(KEY_TOGGLE_BLUETOOTH);
+        mAirplaneModePreference = (CheckBoxPreference) findPreference(KEY_TOGGLE_AIRPLANE);
         CheckBoxPreference nfc = (CheckBoxPreference) findPreference(KEY_TOGGLE_NFC);
 
-        mAirplaneModeEnabler = new AirplaneModeEnabler(activity, airplane);
-        mAirplaneModePreference = (CheckBoxPreference) findPreference(KEY_TOGGLE_AIRPLANE);
-        mWifiEnabler = new WifiEnabler(activity, wifi);
-        mBtEnabler = new BluetoothEnabler(activity, bt);
+        mAirplaneModeEnabler = new AirplaneModeEnabler(activity, mAirplaneModePreference);
         mNfcEnabler = new NfcEnabler(activity, nfc);
 
         String toggleable = Settings.System.getString(activity.getContentResolver(),
@@ -111,21 +96,12 @@
 
         // Manually set dependencies for Wifi when not toggleable.
         if (toggleable == null || !toggleable.contains(Settings.System.RADIO_WIFI)) {
-            wifi.setDependency(KEY_TOGGLE_AIRPLANE);
-            findPreference(KEY_WIFI_SETTINGS).setDependency(KEY_TOGGLE_AIRPLANE);
             findPreference(KEY_VPN_SETTINGS).setDependency(KEY_TOGGLE_AIRPLANE);
         }
 
         // Manually set dependencies for Bluetooth when not toggleable.
         if (toggleable == null || !toggleable.contains(Settings.System.RADIO_BLUETOOTH)) {
-            bt.setDependency(KEY_TOGGLE_AIRPLANE);
-            findPreference(KEY_BT_SETTINGS).setDependency(KEY_TOGGLE_AIRPLANE);
-        }
-
-        // Remove Bluetooth Settings if Bluetooth service is not available.
-        if (ServiceManager.getService(BluetoothAdapter.BLUETOOTH_SERVICE) == null) {
-            getPreferenceScreen().removePreference(bt);
-            getPreferenceScreen().removePreference(findPreference(KEY_BT_SETTINGS));
+            // No bluetooth-dependent items in the list. Code kept in case one is added later.
         }
 
         // Remove NFC if its not available
@@ -191,8 +167,6 @@
         super.onResume();
 
         mAirplaneModeEnabler.resume();
-        mWifiEnabler.resume();
-        mBtEnabler.resume();
         mNfcEnabler.resume();
     }
 
@@ -201,8 +175,6 @@
         super.onPause();
 
         mAirplaneModeEnabler.pause();
-        mWifiEnabler.pause();
-        mBtEnabler.pause();
         mNfcEnabler.pause();
     }
 
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/applications/ApplicationsState.java b/src/com/android/settings/applications/ApplicationsState.java
index 11e4aae..31fd078 100644
--- a/src/com/android/settings/applications/ApplicationsState.java
+++ b/src/com/android/settings/applications/ApplicationsState.java
@@ -392,6 +392,14 @@
 
             for (int i=0; i<mApplications.size(); i++) {
                 final ApplicationInfo info = mApplications.get(i);
+                // Need to trim out any applications that are disabled by
+                // something different than the user.
+                if (!info.enabled && info.enabledSetting
+                        != PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER) {
+                    mApplications.remove(i);
+                    i--;
+                    continue;
+                }
                 final AppEntry entry = mEntriesMap.get(info.packageName);
                 if (entry != null) {
                     entry.info = info;
diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index a0a568b..caf7aef 100644
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -79,7 +79,7 @@
         implements View.OnClickListener, CompoundButton.OnCheckedChangeListener,
         ApplicationsState.Callbacks {
     private static final String TAG="InstalledAppDetails";
-    static final boolean SUPPORT_DISABLE_APPS = false;
+    static final boolean SUPPORT_DISABLE_APPS = true;
     private static final boolean localLOGV = false;
     
     public static final String ARG_PACKAGE_NAME = "package";
@@ -829,7 +829,7 @@
             } else {
                 if ((mAppEntry.info.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
                     new DisableChanger(this, mAppEntry.info, mAppEntry.info.enabled ?
-                            PackageManager.COMPONENT_ENABLED_STATE_DISABLED
+                            PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER
                             : PackageManager.COMPONENT_ENABLED_STATE_DEFAULT).execute((Object)null);
                 } else {
                     uninstallPkg(packageName);
diff --git a/src/com/android/settings/bluetooth/AdvancedBluetoothSettings.java b/src/com/android/settings/bluetooth/AdvancedBluetoothSettings.java
new file mode 100644
index 0000000..83371cd
--- /dev/null
+++ b/src/com/android/settings/bluetooth/AdvancedBluetoothSettings.java
@@ -0,0 +1,96 @@
+/*
+ * 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.bluetooth;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.preference.CheckBoxPreference;
+import android.preference.ListPreference;
+import android.preference.Preference;
+import android.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+
+public class AdvancedBluetoothSettings extends SettingsPreferenceFragment
+        implements Preference.OnPreferenceChangeListener {
+
+    private static final String KEY_BT_DISCOVERABLE = "bt_discoverable";
+    private static final String KEY_BT_DISCOVERABLE_TIMEOUT = "bt_discoverable_timeout";
+    private static final String KEY_BT_NAME = "bt_name";
+    private static final String KEY_BT_SHOW_RECEIVED = "bt_show_received_files";
+
+    /* Private intent to show the list of received files */
+    private static final String BTOPP_ACTION_OPEN_RECEIVED_FILES =
+            "android.btopp.intent.action.OPEN_RECEIVED_FILES";
+
+    private BluetoothDiscoverableEnabler mDiscoverableEnabler;
+    private BluetoothNamePreference mNamePreference;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        addPreferencesFromResource(R.xml.bluetooth_advanced_settings);
+
+        LocalBluetoothManager localManager = LocalBluetoothManager.getInstance(getActivity());
+        if (localManager != null) {
+            LocalBluetoothAdapter localAdapter = localManager.getBluetoothAdapter();
+            mDiscoverableEnabler = new BluetoothDiscoverableEnabler(getActivity(),
+                    localAdapter,
+                    (CheckBoxPreference) findPreference(KEY_BT_DISCOVERABLE),
+                    (ListPreference) findPreference(KEY_BT_DISCOVERABLE_TIMEOUT));
+        }
+
+        mNamePreference = (BluetoothNamePreference) findPreference(KEY_BT_NAME);
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        mDiscoverableEnabler.resume();
+        mNamePreference.resume();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+
+        mNamePreference.pause();
+        mDiscoverableEnabler.pause();
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
+        if (KEY_BT_SHOW_RECEIVED.equals(preference.getKey())) {
+            Intent intent = new Intent(BTOPP_ACTION_OPEN_RECEIVED_FILES);
+            getActivity().sendBroadcast(intent);
+            return true;
+        }
+
+        return super.onPreferenceTreeClick(preferenceScreen, preference);
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        return true;
+    }
+}
diff --git a/src/com/android/settings/bluetooth/BluetoothEnabler.java b/src/com/android/settings/bluetooth/BluetoothEnabler.java
index 79f23bb..f08e083 100644
--- a/src/com/android/settings/bluetooth/BluetoothEnabler.java
+++ b/src/com/android/settings/bluetooth/BluetoothEnabler.java
@@ -16,28 +16,27 @@
 
 package com.android.settings.bluetooth;
 
-import com.android.settings.R;
-import com.android.settings.WirelessSettings;
-
 import android.bluetooth.BluetoothAdapter;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.preference.Preference;
-import android.preference.CheckBoxPreference;
 import android.provider.Settings;
+import android.widget.CompoundButton;
+import android.widget.Switch;
 import android.widget.Toast;
 
+import com.android.settings.R;
+import com.android.settings.WirelessSettings;
+
 /**
  * BluetoothEnabler is a helper to manage the Bluetooth on/off checkbox
  * preference. It turns on/off Bluetooth and ensures the summary of the
  * preference reflects the current state.
  */
-public final class BluetoothEnabler implements Preference.OnPreferenceChangeListener {
+public final class BluetoothEnabler implements CompoundButton.OnCheckedChangeListener {
     private final Context mContext;
-    private final CheckBoxPreference mCheckBox;
-    private final CharSequence mOriginalSummary;
+    private Switch mSwitch;
 
     private final LocalBluetoothAdapter mLocalAdapter;
     private final IntentFilter mIntentFilter;
@@ -50,17 +49,15 @@
         }
     };
 
-    public BluetoothEnabler(Context context, CheckBoxPreference checkBox) {
+    public BluetoothEnabler(Context context, Switch switch_) {
         mContext = context;
-        mCheckBox = checkBox;
-        mOriginalSummary = checkBox.getSummary();
-        checkBox.setPersistent(false);
+        mSwitch = switch_;
 
         LocalBluetoothManager manager = LocalBluetoothManager.getInstance(context);
         if (manager == null) {
             // Bluetooth is not supported
             mLocalAdapter = null;
-            checkBox.setEnabled(false);
+            mSwitch.setEnabled(false);
         } else {
             mLocalAdapter = manager.getBluetoothAdapter();
         }
@@ -69,6 +66,7 @@
 
     public void resume() {
         if (mLocalAdapter == null) {
+            mSwitch.setEnabled(false);
             return;
         }
 
@@ -76,7 +74,7 @@
         handleStateChanged(mLocalAdapter.getBluetoothState());
 
         mContext.registerReceiver(mReceiver, mIntentFilter);
-        mCheckBox.setOnPreferenceChangeListener(this);
+        mSwitch.setOnCheckedChangeListener(this);
     }
 
     public void pause() {
@@ -85,51 +83,57 @@
         }
 
         mContext.unregisterReceiver(mReceiver);
-        mCheckBox.setOnPreferenceChangeListener(null);
+        mSwitch.setOnCheckedChangeListener(null);
     }
 
-    public boolean onPreferenceChange(Preference preference, Object value) {
-        boolean enable = (Boolean) value;
+    public void setSwitch(Switch switch_) {
+        if (mSwitch == switch_) return;
+        mSwitch.setOnCheckedChangeListener(null);
+        mSwitch = switch_;
+        mSwitch.setOnCheckedChangeListener(this);
 
+        int bluetoothState = BluetoothAdapter.STATE_OFF;
+        if (mLocalAdapter != null) bluetoothState = mLocalAdapter.getBluetoothState();
+        boolean isOn = bluetoothState == BluetoothAdapter.STATE_ON;
+        boolean isOff = bluetoothState == BluetoothAdapter.STATE_OFF;
+        mSwitch.setChecked(isOn);
+        mSwitch.setEnabled(isOn || isOff);
+    }
+
+    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
         // Show toast message if Bluetooth is not allowed in airplane mode
-        if (enable && !WirelessSettings
-                .isRadioAllowed(mContext, Settings.System.RADIO_BLUETOOTH)) {
-            Toast.makeText(mContext, R.string.wifi_in_airplane_mode,
-                    Toast.LENGTH_SHORT).show();
-            return false;
+        if (isChecked &&
+                !WirelessSettings.isRadioAllowed(mContext, Settings.System.RADIO_BLUETOOTH)) {
+            Toast.makeText(mContext, R.string.wifi_in_airplane_mode, Toast.LENGTH_SHORT).show();
+            // Reset switch to off
+            buttonView.setChecked(false);
         }
 
-        mLocalAdapter.setBluetoothEnabled(enable);
-        mCheckBox.setEnabled(false);
-
-        // Don't update UI to opposite state until we're sure
-        return false;
+        if (mLocalAdapter != null) {
+            mLocalAdapter.setBluetoothEnabled(isChecked);
+        }
+        mSwitch.setEnabled(false);
     }
 
     void handleStateChanged(int state) {
         switch (state) {
             case BluetoothAdapter.STATE_TURNING_ON:
-                mCheckBox.setSummary(R.string.wifi_starting);
-                mCheckBox.setEnabled(false);
+                mSwitch.setEnabled(false);
                 break;
             case BluetoothAdapter.STATE_ON:
-                mCheckBox.setChecked(true);
-                mCheckBox.setSummary(null);
-                mCheckBox.setEnabled(true);
+                mSwitch.setChecked(true);
+                mSwitch.setEnabled(true);
                 break;
             case BluetoothAdapter.STATE_TURNING_OFF:
-                mCheckBox.setSummary(R.string.wifi_stopping);
-                mCheckBox.setEnabled(false);
+                mSwitch.setEnabled(false);
                 break;
             case BluetoothAdapter.STATE_OFF:
-                mCheckBox.setChecked(false);
-                mCheckBox.setSummary(mOriginalSummary);
-                mCheckBox.setEnabled(true);
+                mSwitch.setChecked(false);
+                mSwitch.setEnabled(true);
                 break;
             default:
-                mCheckBox.setChecked(false);
-                mCheckBox.setSummary(R.string.wifi_error);
-                mCheckBox.setEnabled(true);
+                mSwitch.setChecked(false);
+                mSwitch.setEnabled(true);
         }
     }
 }
diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java
index 5e4e130..9c90b20 100644
--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java
@@ -16,15 +16,20 @@
 
 package com.android.settings.bluetooth;
 
+import android.app.ActionBar;
+import android.app.Activity;
+import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
-import android.content.Intent;
-import android.preference.CheckBoxPreference;
-import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceScreen;
 import android.util.Log;
+import android.view.Gravity;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
+import android.widget.Switch;
 
 import com.android.settings.R;
 
@@ -35,77 +40,120 @@
 public final class BluetoothSettings extends DeviceListPreferenceFragment {
     private static final String TAG = "BluetoothSettings";
 
-    private static final String KEY_BT_CHECKBOX = "bt_checkbox";
-    private static final String KEY_BT_DISCOVERABLE = "bt_discoverable";
-    private static final String KEY_BT_DISCOVERABLE_TIMEOUT = "bt_discoverable_timeout";
-    private static final String KEY_BT_NAME = "bt_name";
-    private static final String KEY_BT_SHOW_RECEIVED = "bt_show_received_files";
+    private static final int MENU_ID_MAKE_DISCOVERABLE = Menu.FIRST;
+    private static final int MENU_ID_SCAN = Menu.FIRST + 1;
+    private static final int MENU_ID_ADVANCED = Menu.FIRST + 2;
 
-    private BluetoothEnabler mEnabler;
-    private BluetoothDiscoverableEnabler mDiscoverableEnabler;
-    private BluetoothNamePreference mNamePreference;
-
-    /* Private intent to show the list of received files */
-    private static final String BTOPP_ACTION_OPEN_RECEIVED_FILES =
-            "android.btopp.intent.action.OPEN_RECEIVED_FILES";
+    private BluetoothEnabler mBluetoothEnabler;
 
     /** Initialize the filter to show bonded devices only. */
-    public BluetoothSettings() {
-        super(BluetoothDeviceFilter.BONDED_DEVICE_FILTER);
-    }
+    //public BluetoothSettings() {
+    //    super(BluetoothDeviceFilter.BONDED_DEVICE_FILTER);
+    //}
 
     @Override
     void addPreferencesForActivity() {
         addPreferencesFromResource(R.xml.bluetooth_settings);
 
-        mEnabler = new BluetoothEnabler(getActivity(),
-                (CheckBoxPreference) findPreference(KEY_BT_CHECKBOX));
+        Activity activity = getActivity();
 
-        mDiscoverableEnabler = new BluetoothDiscoverableEnabler(getActivity(),
-                mLocalAdapter,
-                (CheckBoxPreference) findPreference(KEY_BT_DISCOVERABLE),
-                    (ListPreference) findPreference(KEY_BT_DISCOVERABLE_TIMEOUT));
+        Switch actionBarSwitch = new Switch(activity);
 
-        mNamePreference = (BluetoothNamePreference) findPreference(KEY_BT_NAME);
+        if (activity instanceof PreferenceActivity) {
+            PreferenceActivity preferenceActivity = (PreferenceActivity) activity;
+            if (preferenceActivity.onIsHidingHeaders() || !preferenceActivity.onIsMultiPane()) {
+                final int padding = activity.getResources().getDimensionPixelSize(
+                        R.dimen.action_bar_switch_padding);
+                actionBarSwitch.setPadding(0, 0, padding, 0);
+                activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
+                        ActionBar.DISPLAY_SHOW_CUSTOM);
+                activity.getActionBar().setCustomView(actionBarSwitch, new ActionBar.LayoutParams(
+                        ActionBar.LayoutParams.WRAP_CONTENT,
+                        ActionBar.LayoutParams.WRAP_CONTENT,
+                        Gravity.CENTER_VERTICAL | Gravity.RIGHT));
+            }
+        }
+
+        mBluetoothEnabler = new BluetoothEnabler(activity, actionBarSwitch);
+
+        if (mLocalAdapter != null && mLocalAdapter.isEnabled()) {
+            activity.getActionBar().setSubtitle(mLocalAdapter.getName());
+        }
+
+        // TODO activity.setTheme(android.R.style.Theme_Holo_SplitActionBarWhenNarrow);
+
+        setHasOptionsMenu(true);
     }
 
     @Override
     public void onResume() {
         super.onResume();
 
-        // Repopulate (which isn't too bad since it's cached in the settings
-        // bluetooth manager)
-        addDevices();
+        mBluetoothEnabler.resume();
 
-        mEnabler.resume();
-        mDiscoverableEnabler.resume();
-        mNamePreference.resume();
+        updateContent(mLocalAdapter.getBluetoothState());
     }
 
     @Override
     public void onPause() {
         super.onPause();
 
-        mNamePreference.pause();
-        mDiscoverableEnabler.pause();
-        mEnabler.pause();
+        mBluetoothEnabler.pause();
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        boolean bluetoothIsEnabled = mLocalAdapter.getBluetoothState() == BluetoothAdapter.STATE_ON;
+        menu.add(Menu.NONE, MENU_ID_MAKE_DISCOVERABLE, 0, R.string.bluetooth_visibility)
+                .setEnabled(bluetoothIsEnabled);
+        menu.add(Menu.NONE, MENU_ID_SCAN, 0, R.string.bluetooth_preference_find_nearby_title)
+                .setIcon(R.drawable.ic_menu_scan_network).setEnabled(bluetoothIsEnabled);
+        menu.add(Menu.NONE, MENU_ID_ADVANCED, 0, R.string.bluetooth_menu_advanced)
+                .setIcon(android.R.drawable.ic_menu_manage);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case MENU_ID_MAKE_DISCOVERABLE:
+                // TODO
+//                if (mLocalAdapter.getBluetoothState() == BluetoothAdapter.STATE_ON) {
+//                    onAddNetworkPressed();
+//                }
+                return true;
+            case MENU_ID_SCAN:
+                if (mLocalAdapter.getBluetoothState() == BluetoothAdapter.STATE_ON) {
+                    mLocalAdapter.startScanning(true);
+                }
+                return true;
+            case MENU_ID_ADVANCED:
+                if (getActivity() instanceof PreferenceActivity) {
+                    ((PreferenceActivity) getActivity()).startPreferencePanel(
+                            AdvancedBluetoothSettings.class.getCanonicalName(),
+                            null,
+                            R.string.bluetooth_advanced_titlebar, null,
+                            this, 0);
+                } else {
+                    startFragment(this, AdvancedBluetoothSettings.class.getCanonicalName(), -1, null);
+                }
+                return true;
+        }
+        return super.onOptionsItemSelected(item);
     }
 
     private final View.OnClickListener mListener = new View.OnClickListener() {
         public void onClick(View v) {
             // User clicked on advanced options icon for a device in the list
             if (v.getTag() instanceof CachedBluetoothDevice) {
-                CachedBluetoothDevice
-                        device = (CachedBluetoothDevice) v.getTag();
+                CachedBluetoothDevice device = (CachedBluetoothDevice) v.getTag();
 
                 Preference pref = new Preference(getActivity());
                 pref.setTitle(device.getName());
                 pref.setFragment(DeviceProfilesSettings.class.getName());
                 pref.getExtras().putParcelable(DeviceProfilesSettings.EXTRA_DEVICE,
                         device.getDevice());
-                ((PreferenceActivity) getActivity())
-                        .onPreferenceStartFragment(BluetoothSettings.this,
-                                pref);
+                ((PreferenceActivity) getActivity()).onPreferenceStartFragment(
+                        BluetoothSettings.this, pref);
             } else {
                 Log.w(TAG, "onClick() called for other View: " + v);
             }
@@ -113,19 +161,54 @@
     };
 
     @Override
-    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen,
-            Preference preference) {
-        if (KEY_BT_SHOW_RECEIVED.equals(preference.getKey())) {
-            Intent intent = new Intent(BTOPP_ACTION_OPEN_RECEIVED_FILES);
-            getActivity().sendBroadcast(intent);
-            return true;
-        }
-
-        return super.onPreferenceTreeClick(preferenceScreen, preference);
+    void onDevicePreferenceClick(BluetoothDevicePreference btPreference) {
+        mLocalAdapter.stopScanning();
+        super.onDevicePreferenceClick(btPreference);
     }
 
-    public void onDeviceBondStateChanged(CachedBluetoothDevice cachedDevice,
-            int bondState) {
+    @Override
+    public void onBluetoothStateChanged(int bluetoothState) {
+        super.onBluetoothStateChanged(bluetoothState);
+        updateContent(bluetoothState);
+    }
+
+    private void updateContent(int bluetoothState) {
+        final PreferenceScreen preferenceScreen = getPreferenceScreen();
+        getActivity().invalidateOptionsMenu();
+        int messageId = 0;
+
+        switch (bluetoothState) {
+            case BluetoothAdapter.STATE_ON:
+                preferenceScreen.removeAll();
+                // Repopulate (which isn't too bad since it's cached in the settings bluetooth manager)
+                addDevices();
+                mLocalAdapter.startScanning(false);
+                return;
+
+            case BluetoothAdapter.STATE_TURNING_OFF:
+                int preferenceCount = preferenceScreen.getPreferenceCount();
+                for (int i = 0; i < preferenceCount; i++) {
+                    preferenceScreen.getPreference(i).setEnabled(false);
+                }
+                return;
+
+            case BluetoothAdapter.STATE_OFF:
+                messageId = R.string.bluetooth_empty_list_bluetooth_off;
+                break;
+
+            case BluetoothAdapter.STATE_TURNING_ON:
+                messageId = R.string.bluetooth_turning_on;
+                break;
+        }
+
+        removeAllDevices();
+        // TODO: from xml, add top padding. Same as in wifi
+        Preference emptyListPreference = new Preference(getActivity());
+        emptyListPreference.setTitle(messageId);
+        preferenceScreen.addPreference(emptyListPreference);
+    }
+
+    public void onDeviceBondStateChanged(CachedBluetoothDevice cachedDevice, int bondState) {
         if (bondState == BluetoothDevice.BOND_BONDED) {
             // add to "Paired devices" list after remote-initiated pairing
             if (mDevicePreferenceMap.get(cachedDevice) == null) {
diff --git a/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
index a978e23..409edb9 100644
--- a/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
+++ b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
@@ -21,6 +21,7 @@
 import android.os.Bundle;
 import android.preference.Preference;
 import android.preference.PreferenceCategory;
+import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
 import android.util.Log;
 
@@ -36,7 +37,6 @@
  *
  * @see BluetoothSettings
  * @see DevicePickerFragment
- * @see BluetoothFindNearby
  */
 public abstract class DeviceListPreferenceFragment extends
         SettingsPreferenceFragment implements BluetoothCallback {
@@ -53,7 +53,7 @@
     LocalBluetoothAdapter mLocalAdapter;
     LocalBluetoothManager mLocalManager;
 
-    private PreferenceCategory mDeviceList;
+    private PreferenceGroup mDeviceListGroup;
 
     final WeakHashMap<CachedBluetoothDevice, BluetoothDevicePreference> mDevicePreferenceMap =
             new WeakHashMap<CachedBluetoothDevice, BluetoothDevicePreference>();
@@ -83,8 +83,13 @@
 
         addPreferencesForActivity();
 
-        mDeviceList = (PreferenceCategory) findPreference(KEY_BT_DEVICE_LIST);
-        if (mDeviceList == null) {
+        mDeviceListGroup = (PreferenceCategory) findPreference(KEY_BT_DEVICE_LIST);
+        if (mDeviceListGroup == null) {
+            // If null, device preferences are added directly to the root of the preference screen
+            mDeviceListGroup = getPreferenceScreen();
+            mDeviceListGroup.setOrderingAsAdded(false);
+        }
+        if (mDeviceListGroup == null) {
             Log.e(TAG, "Could not find device list preference object!");
         }
     }
@@ -105,13 +110,15 @@
     @Override
     public void onPause() {
         super.onPause();
-
-        mLocalAdapter.stopScanning();
+        removeAllDevices();
         mLocalManager.setForegroundActivity(null);
         mLocalManager.getEventManager().unregisterCallback(this);
+    }
 
+    void removeAllDevices() {
+        mLocalAdapter.stopScanning();
         mDevicePreferenceMap.clear();
-        mDeviceList.removeAll();
+        mDeviceListGroup.removeAll();
     }
 
     void addDevices() {
@@ -132,7 +139,7 @@
         }
 
         if (preference instanceof BluetoothDevicePreference) {
-            BluetoothDevicePreference btPreference = (BluetoothDevicePreference)preference;
+            BluetoothDevicePreference btPreference = (BluetoothDevicePreference) preference;
             CachedBluetoothDevice device = btPreference.getCachedDevice();
             mSelectedDevice = device.getDevice();
             onDevicePreferenceClick(btPreference);
@@ -152,6 +159,9 @@
             return;
         }
 
+        // No update while list shows state message
+        if (mLocalAdapter.getBluetoothState() != BluetoothAdapter.STATE_ON) return;
+
         if (mFilter.matches(cachedDevice.getDevice())) {
             createDevicePreference(cachedDevice);
         }
@@ -162,7 +172,7 @@
                 getActivity(), cachedDevice);
 
         initDevicePreference(preference);
-        mDeviceList.addPreference(preference);
+        mDeviceListGroup.addPreference(preference);
         mDevicePreferenceMap.put(cachedDevice, preference);
     }
 
@@ -170,13 +180,14 @@
      * Overridden in {@link BluetoothSettings} to add a listener.
      * @param preference the newly added preference
      */
-    void initDevicePreference(BluetoothDevicePreference preference) { }
+    void initDevicePreference(BluetoothDevicePreference preference) {
+        // Does nothing by default
+    }
 
     public void onDeviceDeleted(CachedBluetoothDevice cachedDevice) {
-        BluetoothDevicePreference preference = mDevicePreferenceMap.remove(
-                cachedDevice);
+        BluetoothDevicePreference preference = mDevicePreferenceMap.remove(cachedDevice);
         if (preference != null) {
-            mDeviceList.removePreference(preference);
+            mDeviceListGroup.removePreference(preference);
         }
     }
 
@@ -185,9 +196,10 @@
     }
 
     private void updateProgressUi(boolean start) {
-        if (mDeviceList instanceof ProgressCategory) {
-            ((ProgressCategory) mDeviceList).setProgress(start);
+        if (mDeviceListGroup instanceof ProgressCategory) {
+            ((ProgressCategory) mDeviceListGroup).setProgress(start);
         }
+        // else TODO Add a spinner at the end of the list to show in progress state
     }
 
     public void onBluetoothStateChanged(int bluetoothState) {
diff --git a/src/com/android/settings/bluetooth/DevicePickerFragment.java b/src/com/android/settings/bluetooth/DevicePickerFragment.java
index 126df02..3aeb7e2 100644
--- a/src/com/android/settings/bluetooth/DevicePickerFragment.java
+++ b/src/com/android/settings/bluetooth/DevicePickerFragment.java
@@ -89,7 +89,7 @@
         super.onBluetoothStateChanged(bluetoothState);
 
         if (bluetoothState == BluetoothAdapter.STATE_ON) {
-                mLocalAdapter.startScanning(false);
+            mLocalAdapter.startScanning(false);
         }
     }
 
diff --git a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
index 9db4baf..ecb7112 100644
--- a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
+++ b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
@@ -50,7 +50,7 @@
     private static final String KEY_RENAME_DEVICE = "rename_device";
     private static final String KEY_PROFILE_CONTAINER = "profile_container";
     private static final String KEY_UNPAIR = "unpair";
-    private static final String KEY_ALLOW_INCOMING = "allow_incoming";
+    //private static final String KEY_ALLOW_INCOMING = "allow_incoming";
 
     public static final String EXTRA_DEVICE = "device";
 
@@ -355,6 +355,7 @@
         mCachedDevice.unpair();
     }
 
+    /*
     private void setIncomingFileTransfersAllowed(boolean allow) {
         // TODO: make an IPC call into BluetoothOpp to update
         Log.d(TAG, "Set allow incoming = " + allow);
@@ -364,6 +365,7 @@
         // TODO: get this value from BluetoothOpp ???
         return true;
     }
+    */
 
     private boolean getAutoConnect(LocalBluetoothProfile prof) {
         return prof.isPreferred(mCachedDevice.getDevice());
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/InputMethodDialogActivity.java b/src/com/android/settings/inputmethod/InputMethodDialogActivity.java
new file mode 100644
index 0000000..4efbf05
--- /dev/null
+++ b/src/com/android/settings/inputmethod/InputMethodDialogActivity.java
@@ -0,0 +1,31 @@
+/*
+ * 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 android.app.Activity;
+import android.content.Context;
+import android.os.Bundle;
+import android.view.inputmethod.InputMethodManager;
+
+public class InputMethodDialogActivity extends Activity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        ((InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE)).
+                showInputMethodPicker();
+        finish();
+    }
+}
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/net/NetworkPolicyEditor.java b/src/com/android/settings/net/NetworkPolicyEditor.java
new file mode 100644
index 0000000..c50a490
--- /dev/null
+++ b/src/com/android/settings/net/NetworkPolicyEditor.java
@@ -0,0 +1,162 @@
+/*
+ * 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.net;
+
+import static android.net.NetworkTemplate.MATCH_MOBILE_3G_LOWER;
+import static android.net.NetworkTemplate.MATCH_MOBILE_4G;
+import static android.net.NetworkTemplate.MATCH_MOBILE_ALL;
+import static com.android.internal.util.Preconditions.checkNotNull;
+
+import android.net.INetworkPolicyManager;
+import android.net.NetworkPolicy;
+import android.net.NetworkTemplate;
+import android.os.AsyncTask;
+import android.os.RemoteException;
+
+import com.android.internal.util.Objects;
+import com.google.android.collect.Lists;
+
+import java.util.ArrayList;
+
+/**
+ * Utility class to modify list of {@link NetworkPolicy}. Specifically knows
+ * about which policies can coexist.
+ */
+public class NetworkPolicyEditor {
+    // TODO: be more robust when missing policies from service
+
+    private INetworkPolicyManager mPolicyService;
+    private ArrayList<NetworkPolicy> mPolicies = Lists.newArrayList();
+
+    public NetworkPolicyEditor(INetworkPolicyManager policyService) {
+        mPolicyService = checkNotNull(policyService);
+    }
+
+    public void read() {
+        try {
+            final NetworkPolicy[] policies = mPolicyService.getNetworkPolicies();
+            mPolicies.clear();
+            for (NetworkPolicy policy : policies) {
+                mPolicies.add(policy);
+            }
+        } catch (RemoteException e) {
+            throw new RuntimeException("problem reading policies", e);
+        }
+    }
+
+    public void writeAsync() {
+        // TODO: consider making more robust by passing through service
+        new AsyncTask<Void, Void, Void>() {
+            @Override
+            protected Void doInBackground(Void... params) {
+                write();
+                return null;
+            }
+        }.execute();
+    }
+
+    public void write() {
+        try {
+            final NetworkPolicy[] policies = mPolicies.toArray(new NetworkPolicy[mPolicies.size()]);
+            mPolicyService.setNetworkPolicies(policies);
+        } catch (RemoteException e) {
+            throw new RuntimeException("problem reading policies", e);
+        }
+    }
+
+    public NetworkPolicy getPolicy(NetworkTemplate template) {
+        for (NetworkPolicy policy : mPolicies) {
+            if (policy.template.equals(template)) {
+                return policy;
+            }
+        }
+        return null;
+    }
+
+    public void setPolicyCycleDay(NetworkTemplate template, int cycleDay) {
+        getPolicy(template).cycleDay = cycleDay;
+        writeAsync();
+    }
+
+    public void setPolicyWarningBytes(NetworkTemplate template, long warningBytes) {
+        getPolicy(template).warningBytes = warningBytes;
+        writeAsync();
+    }
+
+    public void setPolicyLimitBytes(NetworkTemplate template, long limitBytes) {
+        getPolicy(template).limitBytes = limitBytes;
+        writeAsync();
+    }
+
+    public boolean isMobilePolicySplit(String subscriberId) {
+        boolean has3g = false;
+        boolean has4g = false;
+        for (NetworkPolicy policy : mPolicies) {
+            final NetworkTemplate template = policy.template;
+            if (Objects.equal(subscriberId, template.getSubscriberId())) {
+                switch (template.getMatchRule()) {
+                    case MATCH_MOBILE_3G_LOWER:
+                        has3g = true;
+                        break;
+                    case MATCH_MOBILE_4G:
+                        has4g = true;
+                        break;
+                }
+            }
+        }
+        return has3g && has4g;
+    }
+
+    public void setMobilePolicySplit(String subscriberId, boolean split) {
+        final boolean beforeSplit = isMobilePolicySplit(subscriberId);
+
+        final NetworkTemplate template3g = new NetworkTemplate(MATCH_MOBILE_3G_LOWER, subscriberId);
+        final NetworkTemplate template4g = new NetworkTemplate(MATCH_MOBILE_4G, subscriberId);
+        final NetworkTemplate templateAll = new NetworkTemplate(MATCH_MOBILE_ALL, subscriberId);
+
+        if (split == beforeSplit) {
+            // already in requested state; skip
+            return;
+
+        } else if (beforeSplit && !split) {
+            // combine, picking most restrictive policy
+            final NetworkPolicy policy3g = getPolicy(template3g);
+            final NetworkPolicy policy4g = getPolicy(template4g);
+
+            final NetworkPolicy restrictive = policy3g.compareTo(policy4g) < 0 ? policy3g
+                    : policy4g;
+            mPolicies.remove(policy3g);
+            mPolicies.remove(policy4g);
+            mPolicies.add(
+                    new NetworkPolicy(templateAll, restrictive.cycleDay, restrictive.warningBytes,
+                            restrictive.limitBytes));
+            writeAsync();
+
+        } else if (!beforeSplit && split) {
+            // duplicate existing policy into two rules
+            final NetworkPolicy policyAll = getPolicy(templateAll);
+            mPolicies.remove(policyAll);
+            mPolicies.add(new NetworkPolicy(
+                    template3g, policyAll.cycleDay, policyAll.warningBytes, policyAll.limitBytes));
+            mPolicies.add(new NetworkPolicy(
+                    template4g, policyAll.cycleDay, policyAll.warningBytes, policyAll.limitBytes));
+            writeAsync();
+
+        }
+    }
+
+}
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..e761202
--- /dev/null
+++ b/src/com/android/settings/widget/ChartAxis.java
@@ -0,0 +1,36 @@
+/*
+ * 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 setBounds(long min, long max);
+    public void setSize(float size);
+
+    public float convertToPoint(long value);
+    public long convertToValue(float point);
+
+    public CharSequence getLabel(long value);
+    public CharSequence getShortLabel(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..7a83fbf
--- /dev/null
+++ b/src/com/android/settings/widget/ChartGridView.java
@@ -0,0 +1,102 @@
+/*
+ * 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.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+import android.view.View;
+
+import com.android.settings.R;
+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 {
+
+    // TODO: eventually teach about drawing chart labels
+
+    private ChartAxis mHoriz;
+    private ChartAxis mVert;
+
+    private Drawable mPrimary;
+    private Drawable mSecondary;
+    private Drawable mBorder;
+
+    public ChartGridView(Context context) {
+        this(context, null, 0);
+    }
+
+    public ChartGridView(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public ChartGridView(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+
+        setWillNotDraw(false);
+
+        final TypedArray a = context.obtainStyledAttributes(
+                attrs, R.styleable.ChartGridView, defStyle, 0);
+
+        mPrimary = a.getDrawable(R.styleable.ChartGridView_primaryDrawable);
+        mSecondary = a.getDrawable(R.styleable.ChartGridView_secondaryDrawable);
+        mBorder = a.getDrawable(R.styleable.ChartGridView_borderDrawable);
+        // TODO: eventually read labelColor
+
+        a.recycle();
+    }
+
+    void init(ChartAxis horiz, ChartAxis vert) {
+        mHoriz = Preconditions.checkNotNull(horiz, "missing horiz");
+        mVert = Preconditions.checkNotNull(vert, "missing vert");
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        final int width = getWidth();
+        final int height = getHeight();
+
+        final Drawable secondary = mSecondary;
+        final int secondaryHeight = mSecondary.getIntrinsicHeight();
+
+        final float[] vertTicks = mVert.getTickPoints();
+        for (float y : vertTicks) {
+            final int bottom = (int) Math.min(y + secondaryHeight, height);
+            secondary.setBounds(0, (int) y, width, bottom);
+            secondary.draw(canvas);
+        }
+
+        final Drawable primary = mPrimary;
+        final int primaryWidth = mPrimary.getIntrinsicWidth();
+        final int primaryHeight = mPrimary.getIntrinsicHeight();
+
+        final float[] horizTicks = mHoriz.getTickPoints();
+        for (float x : horizTicks) {
+            final int right = (int) Math.min(x + primaryWidth, width);
+            primary.setBounds((int) x, 0, right, height);
+            primary.draw(canvas);
+        }
+
+        mBorder.setBounds(0, 0, width, height);
+        mBorder.draw(canvas);
+    }
+}
diff --git a/src/com/android/settings/widget/ChartNetworkSeriesView.java b/src/com/android/settings/widget/ChartNetworkSeriesView.java
new file mode 100644
index 0000000..0a34565
--- /dev/null
+++ b/src/com/android/settings/widget/ChartNetworkSeriesView.java
@@ -0,0 +1,210 @@
+/*
+ * 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.content.res.TypedArray;
+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.AttributeSet;
+import android.util.Log;
+import android.view.View;
+
+import com.android.settings.R;
+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 = true;
+
+    private ChartAxis mHoriz;
+    private ChartAxis mVert;
+
+    private Paint mPaintStroke;
+    private Paint mPaintFill;
+    private Paint mPaintFillSecondary;
+
+    private NetworkStatsHistory mStats;
+
+    private Path mPathStroke;
+    private Path mPathFill;
+
+    private long mPrimaryLeft;
+    private long mPrimaryRight;
+
+    public ChartNetworkSeriesView(Context context) {
+        this(context, null, 0);
+    }
+
+    public ChartNetworkSeriesView(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public ChartNetworkSeriesView(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+
+        final TypedArray a = context.obtainStyledAttributes(
+                attrs, R.styleable.ChartNetworkSeriesView, defStyle, 0);
+
+        final int stroke = a.getColor(R.styleable.ChartNetworkSeriesView_strokeColor, Color.RED);
+        final int fill = a.getColor(R.styleable.ChartNetworkSeriesView_fillColor, Color.RED);
+        final int fillSecondary = a.getColor(
+                R.styleable.ChartNetworkSeriesView_fillColorSecondary, Color.RED);
+
+        setChartColor(stroke, fill, fillSecondary);
+
+        a.recycle();
+
+        mPathStroke = new Path();
+        mPathFill = new Path();
+    }
+
+    void init(ChartAxis horiz, ChartAxis vert) {
+        mHoriz = Preconditions.checkNotNull(horiz, "missing horiz");
+        mVert = Preconditions.checkNotNull(vert, "missing vert");
+    }
+
+    public void setChartColor(int stroke, int fill, int fillSecondary) {
+        mPaintStroke = new Paint();
+        mPaintStroke.setStrokeWidth(6.0f);
+        mPaintStroke.setColor(stroke);
+        mPaintStroke.setStyle(Style.STROKE);
+        mPaintStroke.setAntiAlias(true);
+
+        mPaintFill = new Paint();
+        mPaintFill.setColor(fill);
+        mPaintFill.setStyle(Style.FILL);
+        mPaintFill.setAntiAlias(true);
+
+        mPaintFillSecondary = new Paint();
+        mPaintFillSecondary.setColor(fillSecondary);
+        mPaintFillSecondary.setStyle(Style.FILL);
+        mPaintFillSecondary.setAntiAlias(true);
+    }
+
+    public void bindNetworkStats(NetworkStatsHistory stats) {
+        mStats = stats;
+
+        mPathStroke.reset();
+        mPathFill.reset();
+    }
+
+    public void setPrimaryRange(long left, long right) {
+        mPrimaryLeft = left;
+        mPrimaryRight = right;
+        invalidate();
+    }
+
+    @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.
+     */
+    public void generatePath() {
+        if (LOGD) Log.d(TAG, "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;
+
+        // TODO: count fractional data from first bucket crossing start;
+        // currently it only accepts first full bucket.
+
+        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() + " and totalData="
+                    + totalData);
+        }
+
+        // drop to bottom of graph from current location
+        mPathFill.lineTo(lastX, height);
+        mPathFill.lineTo(firstX, height);
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        int save;
+
+        save = canvas.save();
+        canvas.clipRect(0, 0, mPrimaryLeft, getHeight());
+        canvas.drawPath(mPathFill, mPaintFillSecondary);
+        canvas.restoreToCount(save);
+
+        save = canvas.save();
+        canvas.clipRect(mPrimaryRight, 0, getWidth(), getHeight());
+        canvas.drawPath(mPathFill, mPaintFillSecondary);
+        canvas.restoreToCount(save);
+
+        save = canvas.save();
+        canvas.clipRect(mPrimaryLeft, 0, mPrimaryRight, 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..881fde4
--- /dev/null
+++ b/src/com/android/settings/widget/ChartSweepView.java
@@ -0,0 +1,245 @@
+/*
+ * 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.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+import android.util.MathUtils;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.FrameLayout;
+
+import com.android.settings.R;
+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 FrameLayout {
+
+    // TODO: paint label when requested
+
+    private Drawable mSweep;
+    private int mFollowAxis;
+    private boolean mShowLabel;
+
+    private ChartAxis mAxis;
+    private long mValue;
+
+    public static final int HORIZONTAL = 0;
+    public static final int VERTICAL = 1;
+
+    public interface OnSweepListener {
+        public void onSweep(ChartSweepView sweep, boolean sweepDone);
+    }
+
+    private OnSweepListener mListener;
+    private MotionEvent mTracking;
+
+    public ChartSweepView(Context context) {
+        this(context, null, 0);
+    }
+
+    public ChartSweepView(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public ChartSweepView(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+
+        final TypedArray a = context.obtainStyledAttributes(
+                attrs, R.styleable.ChartSweepView, defStyle, 0);
+
+        setSweepDrawable(a.getDrawable(R.styleable.ChartSweepView_sweepDrawable));
+        setFollowAxis(a.getInt(R.styleable.ChartSweepView_followAxis, -1));
+        setShowLabel(a.getBoolean(R.styleable.ChartSweepView_showLabel, false));
+
+        a.recycle();
+
+        setClipToPadding(false);
+        setClipChildren(false);
+        setWillNotDraw(false);
+    }
+
+    void init(ChartAxis axis) {
+        mAxis = Preconditions.checkNotNull(axis, "missing axis");
+    }
+
+    public int getFollowAxis() {
+        return mFollowAxis;
+    }
+
+    public void getExtraMargins(Rect rect) {
+        mSweep.getPadding(rect);
+    }
+
+    public void addOnSweepListener(OnSweepListener listener) {
+        mListener = listener;
+    }
+
+    private void dispatchOnSweep(boolean sweepDone) {
+        if (mListener != null) {
+            mListener.onSweep(this, sweepDone);
+        }
+    }
+
+    public void setSweepDrawable(Drawable sweep) {
+        if (mSweep != null) {
+            mSweep.setCallback(null);
+            unscheduleDrawable(mSweep);
+        }
+
+        if (sweep != null) {
+            sweep.setCallback(this);
+            if (sweep.isStateful()) {
+                sweep.setState(getDrawableState());
+            }
+            sweep.setVisible(getVisibility() == VISIBLE, false);
+            mSweep = sweep;
+        } else {
+            mSweep = null;
+        }
+
+        invalidate();
+    }
+
+    public void setFollowAxis(int followAxis) {
+        mFollowAxis = followAxis;
+    }
+
+    public void setShowLabel(boolean showLabel) {
+        mShowLabel = showLabel;
+        invalidate();
+    }
+
+    @Override
+    public void jumpDrawablesToCurrentState() {
+        super.jumpDrawablesToCurrentState();
+        if (mSweep != null) {
+            mSweep.jumpToCurrentState();
+        }
+    }
+
+    @Override
+    public void setVisibility(int visibility) {
+        super.setVisibility(visibility);
+        if (mSweep != null) {
+            mSweep.setVisible(visibility == VISIBLE, false);
+        }
+    }
+
+    @Override
+    protected boolean verifyDrawable(Drawable who) {
+        return who == mSweep || super.verifyDrawable(who);
+    }
+
+    public ChartAxis getAxis() {
+        return mAxis;
+    }
+
+    public void setValue(long value) {
+        mValue = value;
+    }
+
+    public long getValue() {
+        return mValue;
+    }
+
+    public float getPoint() {
+        return mAxis.convertToPoint(mValue);
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        if (!isEnabled()) return false;
+
+        final View parent = (View) getParent();
+        switch (event.getAction()) {
+            case MotionEvent.ACTION_DOWN: {
+                mTracking = event.copy();
+                return true;
+            }
+            case MotionEvent.ACTION_MOVE: {
+                getParent().requestDisallowInterceptTouchEvent(true);
+
+                if (mFollowAxis == VERTICAL) {
+                    final float chartHeight = parent.getHeight() - parent.getPaddingTop()
+                            - parent.getPaddingBottom();
+                    final float translationY = MathUtils.constrain(
+                            event.getRawY() - mTracking.getRawY(), -getTop(),
+                            chartHeight - getTop());
+                    setTranslationY(translationY);
+                    final float point = (getTop() + getTranslationY() + (getHeight() / 2))
+                            - parent.getPaddingTop();
+                    mValue = mAxis.convertToValue(point);
+                    dispatchOnSweep(false);
+                } else {
+                    final float chartWidth = parent.getWidth() - parent.getPaddingLeft()
+                            - parent.getPaddingRight();
+                    final float translationX = MathUtils.constrain(
+                            event.getRawX() - mTracking.getRawX(), -getLeft(),
+                            chartWidth - getLeft());
+                    setTranslationX(translationX);
+                    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 drawableStateChanged() {
+        super.drawableStateChanged();
+        if (mSweep.isStateful()) {
+            mSweep.setState(getDrawableState());
+        }
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        setMeasuredDimension(mSweep.getIntrinsicWidth(), mSweep.getIntrinsicHeight());
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        final int width = getWidth();
+        final int height = getHeight();
+
+        mSweep.setBounds(0, 0, width, height);
+        mSweep.draw(canvas);
+    }
+
+}
diff --git a/src/com/android/settings/widget/ChartView.java b/src/com/android/settings/widget/ChartView.java
new file mode 100644
index 0000000..d762631
--- /dev/null
+++ b/src/com/android/settings/widget/ChartView.java
@@ -0,0 +1,117 @@
+/*
+ * 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 com.google.common.base.Preconditions.checkNotNull;
+
+import android.content.Context;
+import android.graphics.Rect;
+import android.util.AttributeSet;
+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
+
+    ChartAxis mHoriz;
+    ChartAxis mVert;
+
+    private Rect mContent = new Rect();
+
+    public ChartView(Context context) {
+        this(context, null, 0);
+    }
+
+    public ChartView(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public ChartView(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+
+        setClipToPadding(false);
+        setClipChildren(false);
+    }
+
+    void init(ChartAxis horiz, ChartAxis vert) {
+        mHoriz = checkNotNull(horiz, "missing horiz");
+        mVert = checkNotNull(vert, "missing vert");
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int l, int t, int r, int b) {
+        mContent.set(getPaddingLeft(), getPaddingTop(), r - l - getPaddingRight(),
+                b - t - 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();
+        final Rect extraMargins = 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 float point = sweep.getPoint();
+                sweep.getExtraMargins(extraMargins);
+
+                if (sweep.getFollowAxis() == ChartSweepView.HORIZONTAL) {
+                    parentRect.left = parentRect.right = (int) point + getPaddingLeft();
+                    parentRect.top -= extraMargins.top;
+                    parentRect.bottom += extraMargins.bottom;
+                    Gravity.apply(params.gravity, child.getMeasuredWidth(), parentRect.height(),
+                            parentRect, childRect);
+
+                } else {
+                    parentRect.top = parentRect.bottom = (int) point + getPaddingTop();
+                    parentRect.left -= extraMargins.left;
+                    parentRect.right += extraMargins.right;
+                    Gravity.apply(params.gravity, parentRect.width(), child.getMeasuredHeight(),
+                            parentRect, childRect);
+                }
+            }
+
+            child.layout(childRect.left, childRect.top, childRect.right, childRect.bottom);
+        }
+    }
+
+}
diff --git a/src/com/android/settings/widget/DataUsageChartView.java b/src/com/android/settings/widget/DataUsageChartView.java
new file mode 100644
index 0000000..1c76291
--- /dev/null
+++ b/src/com/android/settings/widget/DataUsageChartView.java
@@ -0,0 +1,380 @@
+/*
+ * 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.net.NetworkPolicy;
+import android.net.NetworkStatsHistory;
+import android.text.format.DateUtils;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.View;
+
+import com.android.settings.R;
+import com.android.settings.widget.ChartSweepView.OnSweepListener;
+
+/**
+ * Specific {@link ChartView} that displays {@link ChartNetworkSeriesView} along
+ * with {@link ChartSweepView} for inspection ranges and warning/limits.
+ */
+public class DataUsageChartView extends ChartView {
+
+    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;
+
+    // TODO: enforce that sweeps cant cross each other
+    // TODO: limit sweeps at graph boundaries
+
+    private ChartGridView mGrid;
+    private ChartNetworkSeriesView mSeries;
+
+    private ChartSweepView mSweepLeft;
+    private ChartSweepView mSweepRight;
+    private ChartSweepView mSweepWarning;
+    private ChartSweepView mSweepLimit;
+
+    public interface DataUsageChartListener {
+        public void onInspectRangeChanged();
+        public void onWarningChanged();
+        public void onLimitChanged();
+    }
+
+    private DataUsageChartListener mListener;
+
+    public DataUsageChartView(Context context) {
+        this(context, null, 0);
+    }
+
+    public DataUsageChartView(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public DataUsageChartView(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        init(new TimeAxis(), new InvertedChartAxis(new DataAxis()));
+    }
+
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+
+        mGrid = (ChartGridView) findViewById(R.id.grid);
+        mSeries = (ChartNetworkSeriesView) findViewById(R.id.series);
+
+        mSweepLeft = (ChartSweepView) findViewById(R.id.sweep_left);
+        mSweepRight = (ChartSweepView) findViewById(R.id.sweep_right);
+        mSweepLimit = (ChartSweepView) findViewById(R.id.sweep_limit);
+        mSweepWarning = (ChartSweepView) findViewById(R.id.sweep_warning);
+
+        mSweepLeft.addOnSweepListener(mSweepListener);
+        mSweepRight.addOnSweepListener(mSweepListener);
+        mSweepWarning.addOnSweepListener(mWarningListener);
+        mSweepLimit.addOnSweepListener(mLimitListener);
+
+        // tell everyone about our axis
+        mGrid.init(mHoriz, mVert);
+        mSeries.init(mHoriz, mVert);
+        mSweepLeft.init(mHoriz);
+        mSweepRight.init(mHoriz);
+        mSweepWarning.init(mVert);
+        mSweepLimit.init(mVert);
+
+        setActivated(false);
+    }
+
+    @Override
+    public void setActivated(boolean activated) {
+        super.setActivated(activated);
+
+        mSweepLeft.setEnabled(activated);
+        mSweepRight.setEnabled(activated);
+        mSweepWarning.setEnabled(activated);
+        mSweepLimit.setEnabled(activated);
+    }
+
+    @Deprecated
+    public void setChartColor(int stroke, int fill, int disabled) {
+        mSeries.setChartColor(stroke, fill, disabled);
+    }
+
+    public void setListener(DataUsageChartListener listener) {
+        mListener = listener;
+    }
+
+    public void bindNetworkStats(NetworkStatsHistory stats) {
+        mSeries.bindNetworkStats(stats);
+    }
+
+    public void bindNetworkPolicy(NetworkPolicy policy) {
+        if (policy == null) {
+            mSweepLimit.setVisibility(View.INVISIBLE);
+            mSweepWarning.setVisibility(View.INVISIBLE);
+            return;
+        }
+
+        if (policy.limitBytes != NetworkPolicy.LIMIT_DISABLED) {
+            mSweepLimit.setVisibility(View.VISIBLE);
+            mSweepLimit.setValue(policy.limitBytes);
+            mSweepLimit.setEnabled(true);
+        } else {
+            // TODO: set limit default based on axis maximum
+            mSweepLimit.setVisibility(View.VISIBLE);
+            mSweepLimit.setValue(5 * GB_IN_BYTES);
+            mSweepLimit.setEnabled(false);
+        }
+
+        if (policy.warningBytes != NetworkPolicy.WARNING_DISABLED) {
+            mSweepWarning.setVisibility(View.VISIBLE);
+            mSweepWarning.setValue(policy.warningBytes);
+        } else {
+            mSweepWarning.setVisibility(View.INVISIBLE);
+        }
+
+        requestLayout();
+
+        // TODO: eventually remove this; was to work around lack of sweep clamping
+        if (policy.limitBytes < -1 || policy.limitBytes > 5 * GB_IN_BYTES) {
+            policy.limitBytes = 5 * GB_IN_BYTES;
+            mLimitListener.onSweep(mSweepLimit, true);
+        }
+        if (policy.warningBytes < -1 || policy.warningBytes > 5 * GB_IN_BYTES) {
+            policy.warningBytes = 4 * GB_IN_BYTES;
+            mWarningListener.onSweep(mSweepWarning, true);
+        }
+
+    }
+
+    private OnSweepListener mSweepListener = new OnSweepListener() {
+        public void onSweep(ChartSweepView sweep, boolean sweepDone) {
+            mSeries.setPrimaryRange(mSweepLeft.getValue(), mSweepRight.getValue());
+
+            // update detail list only when done sweeping
+            if (sweepDone && mListener != null) {
+                mListener.onInspectRangeChanged();
+            }
+        }
+    };
+
+    private OnSweepListener mWarningListener = new OnSweepListener() {
+        public void onSweep(ChartSweepView sweep, boolean sweepDone) {
+            if (sweepDone && mListener != null) {
+                mListener.onWarningChanged();
+            }
+        }
+    };
+
+    private OnSweepListener mLimitListener = new OnSweepListener() {
+        public void onSweep(ChartSweepView sweep, boolean sweepDone) {
+            if (sweepDone && mListener != null) {
+                mListener.onLimitChanged();
+            }
+        }
+    };
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        if (isActivated()) return false;
+        switch (event.getAction()) {
+            case MotionEvent.ACTION_DOWN: {
+                return true;
+            }
+            case MotionEvent.ACTION_UP: {
+                setActivated(true);
+                return true;
+            }
+            default: {
+                return false;
+            }
+        }
+    }
+
+    /**
+     * Return current inspection range (start and end time) based on internal
+     * {@link ChartSweepView} positions.
+     */
+    public long[] getInspectRange() {
+        final long start = mSweepLeft.getValue();
+        final long end = mSweepRight.getValue();
+        return new long[] { start, end };
+    }
+
+    public long getWarningBytes() {
+        return mSweepWarning.getValue();
+    }
+
+    public long getLimitBytes() {
+        return mSweepLimit.getValue();
+    }
+
+    /**
+     * Set the exact time range that should be displayed, updating how
+     * {@link ChartNetworkSeriesView} paints. Moves inspection ranges to be the
+     * last "week" of available data, without triggering listener events.
+     */
+    public void setVisibleRange(long start, long end, long dataBoundary) {
+        mHoriz.setBounds(start, end);
+
+        // default sweeps to last week of data
+        final long halfRange = (end + start) / 2;
+        final long sweepMax = Math.min(end, dataBoundary);
+        final long sweepMin = Math.max(start, (sweepMax - DateUtils.WEEK_IN_MILLIS));
+
+        mSweepLeft.setValue(sweepMin);
+        mSweepRight.setValue(sweepMax);
+        mSeries.setPrimaryRange(sweepMin, sweepMax);
+
+        requestLayout();
+        mSeries.generatePath();
+        mSeries.invalidate();
+    }
+
+    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() {
+            final long currentTime = System.currentTimeMillis();
+            setBounds(currentTime - DateUtils.DAY_IN_MILLIS * 30, currentTime);
+        }
+
+        /** {@inheritDoc} */
+        public void setBounds(long min, long max) {
+            mMin = min;
+            mMax = max;
+        }
+
+        /** {@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 CharSequence getShortLabel(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;
+        }
+    }
+
+    public static class DataAxis implements ChartAxis {
+        private long mMin;
+        private long mMax;
+        private long mMinLog;
+        private long mMaxLog;
+        private float mSize;
+
+        public DataAxis() {
+            // TODO: adapt ranges to show when history >5GB, and handle 4G
+            // interfaces with higher limits.
+            setBounds(1 * MB_IN_BYTES, 5 * GB_IN_BYTES);
+        }
+
+        /** {@inheritDoc} */
+        public void setBounds(long min, long max) {
+            mMin = min;
+            mMax = max;
+            mMinLog = (long) Math.log(mMin);
+            mMaxLog = (long) Math.log(mMax);
+        }
+
+        /** {@inheritDoc} */
+        public void setSize(float size) {
+            this.mSize = size;
+        }
+
+        /** {@inheritDoc} */
+        public float convertToPoint(long value) {
+            return (mSize * (value - mMin)) / (mMax - mMin);
+
+            // TODO: finish tweaking log scale
+//            if (value > mMin) {
+//                return (float) ((mSize * (Math.log(value) - mMinLog)) / (mMaxLog - mMinLog));
+//            } else {
+//                return 0;
+//            }
+        }
+
+        /** {@inheritDoc} */
+        public long convertToValue(float point) {
+            return (long) (mMin + ((point * (mMax - mMin)) / mSize));
+
+            // TODO: finish tweaking log scale
+//            return (long) Math.pow(Math.E, (mMinLog + ((point * (mMaxLog - mMinLog)) / mSize)));
+        }
+
+        /** {@inheritDoc} */
+        public CharSequence getLabel(long value) {
+
+            // TODO: use exploded string here
+
+
+            // TODO: convert to string
+            return Long.toString(value);
+        }
+
+        /** {@inheritDoc} */
+        public CharSequence getShortLabel(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/widget/InvertedChartAxis.java b/src/com/android/settings/widget/InvertedChartAxis.java
new file mode 100644
index 0000000..a30d24c
--- /dev/null
+++ b/src/com/android/settings/widget/InvertedChartAxis.java
@@ -0,0 +1,69 @@
+/*
+ * 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 setBounds(long min, long max) {
+        mWrapped.setBounds(min, max);
+    }
+
+    /** {@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 CharSequence getShortLabel(long value) {
+        return mWrapped.getShortLabel(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/AdvancedSettings.java b/src/com/android/settings/wifi/AdvancedSettings.java
index faea9f2..4855c99 100644
--- a/src/com/android/settings/wifi/AdvancedSettings.java
+++ b/src/com/android/settings/wifi/AdvancedSettings.java
@@ -16,21 +16,23 @@
 
 package com.android.settings.wifi;
 
-import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.Utils;
-
-import android.app.Activity;
 import android.content.Context;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import android.os.Bundle;
-import android.os.SystemProperties;
+import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
+import android.preference.PreferenceScreen;
+import android.provider.Settings;
+import android.provider.Settings.Secure;
 import android.text.TextUtils;
-import android.widget.Toast;
 import android.util.Log;
+import android.widget.Toast;
+
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.Utils;
 
 public class AdvancedSettings extends SettingsPreferenceFragment
         implements Preference.OnPreferenceChangeListener {
@@ -39,6 +41,8 @@
     private static final String KEY_MAC_ADDRESS = "mac_address";
     private static final String KEY_CURRENT_IP_ADDRESS = "current_ip_address";
     private static final String KEY_FREQUENCY_BAND = "frequency_band";
+    private static final String KEY_NOTIFY_OPEN_NETWORKS = "notify_open_networks";
+    private static final String KEY_SLEEP_POLICY = "sleep_policy";
 
     private WifiManager mWifiManager;
 
@@ -62,27 +66,61 @@
     }
 
     private void initPreferences() {
+        CheckBoxPreference notifyOpenNetworks =
+                (CheckBoxPreference) findPreference(KEY_NOTIFY_OPEN_NETWORKS);
+        notifyOpenNetworks.setChecked(Secure.getInt(getContentResolver(),
+                Secure.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, 0) == 1);
+        notifyOpenNetworks.setEnabled(mWifiManager.isWifiEnabled());
 
-        ListPreference pref = (ListPreference) findPreference(KEY_FREQUENCY_BAND);
+        ListPreference frequencyPref = (ListPreference) findPreference(KEY_FREQUENCY_BAND);
 
         if (mWifiManager.isDualBandSupported()) {
-            pref.setOnPreferenceChangeListener(this);
+            frequencyPref.setOnPreferenceChangeListener(this);
             int value = mWifiManager.getFrequencyBand();
             if (value != -1) {
-                pref.setValue(String.valueOf(value));
+                frequencyPref.setValue(String.valueOf(value));
             } else {
                 Log.e(TAG, "Failed to fetch frequency band");
             }
         } else {
-            getPreferenceScreen().removePreference(pref);
+            if (frequencyPref != null) {
+                // null if it has already been removed before resume
+                getPreferenceScreen().removePreference(frequencyPref);
+            }
         }
+
+        ListPreference sleepPolicyPref = (ListPreference) findPreference(KEY_SLEEP_POLICY);
+        if (sleepPolicyPref != null) {
+            if (Utils.isWifiOnly()) {
+                sleepPolicyPref.setEntries(R.array.wifi_sleep_policy_entries_wifi_only);
+                sleepPolicyPref.setSummary(R.string.wifi_setting_sleep_policy_summary_wifi_only);
+            }
+            sleepPolicyPref.setOnPreferenceChangeListener(this);
+            int value = Settings.System.getInt(getContentResolver(),
+                    Settings.System.WIFI_SLEEP_POLICY,
+                    Settings.System.WIFI_SLEEP_POLICY_NEVER);
+            sleepPolicyPref.setValue(String.valueOf(value));
+        }
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(PreferenceScreen screen, Preference preference) {
+        String key = preference.getKey();
+
+        if (KEY_NOTIFY_OPEN_NETWORKS.equals(key)) {
+            Secure.putInt(getContentResolver(),
+                    Secure.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON,
+                    ((CheckBoxPreference) preference).isChecked() ? 1 : 0);
+        } else {
+            return super.onPreferenceTreeClick(screen, preference);
+        }
+        return true;
     }
 
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         String key = preference.getKey();
-        if (key == null) return true;
 
-        if (key.equals(KEY_FREQUENCY_BAND)) {
+        if (KEY_FREQUENCY_BAND.equals(key)) {
             try {
                 mWifiManager.setFrequencyBand(Integer.parseInt(((String) newValue)), true);
             } catch (NumberFormatException e) {
@@ -92,6 +130,17 @@
             }
         }
 
+        if (KEY_SLEEP_POLICY.equals(key)) {
+            try {
+                Settings.System.putInt(getContentResolver(),
+                        Settings.System.WIFI_SLEEP_POLICY, Integer.parseInt(((String) newValue)));
+            } catch (NumberFormatException e) {
+                Toast.makeText(getActivity(), R.string.wifi_setting_sleep_policy_error,
+                        Toast.LENGTH_SHORT).show();
+                return false;
+            }
+        }
+
         return true;
     }
 
diff --git a/src/com/android/settings/wifi/AdvancedWifiSettings.java b/src/com/android/settings/wifi/AdvancedWifiSettings.java
new file mode 100644
index 0000000..1da8b68
--- /dev/null
+++ b/src/com/android/settings/wifi/AdvancedWifiSettings.java
@@ -0,0 +1,110 @@
+/*
+ * 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.wifi;
+
+import android.content.Context;
+import android.net.wifi.WifiInfo;
+import android.net.wifi.WifiManager;
+import android.os.Bundle;
+import android.preference.ListPreference;
+import android.preference.Preference;
+import android.text.TextUtils;
+import android.util.Log;
+import android.widget.Toast;
+
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.Utils;
+
+public class AdvancedWifiSettings extends SettingsPreferenceFragment
+        implements Preference.OnPreferenceChangeListener {
+
+    private static final String TAG = "AdvancedWifiSettings";
+    private static final String KEY_MAC_ADDRESS = "mac_address";
+    private static final String KEY_CURRENT_IP_ADDRESS = "current_ip_address";
+    private static final String KEY_FREQUENCY_BAND = "frequency_band";
+
+    private WifiManager mWifiManager;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        addPreferencesFromResource(R.xml.wifi_advanced_settings);
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        mWifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        initPreferences();
+        refreshWifiInfo();
+    }
+
+    private void initPreferences() {
+
+        ListPreference pref = (ListPreference) findPreference(KEY_FREQUENCY_BAND);
+
+        if (mWifiManager.isDualBandSupported()) {
+            pref.setOnPreferenceChangeListener(this);
+            int value = mWifiManager.getFrequencyBand();
+            if (value != -1) {
+                pref.setValue(String.valueOf(value));
+            } else {
+                Log.e(TAG, "Failed to fetch frequency band");
+            }
+        } else {
+            getPreferenceScreen().removePreference(pref);
+        }
+    }
+
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        String key = preference.getKey();
+        if (key == null) return true;
+
+        if (key.equals(KEY_FREQUENCY_BAND)) {
+            try {
+                mWifiManager.setFrequencyBand(Integer.parseInt(((String) newValue)), true);
+            } catch (NumberFormatException e) {
+                Toast.makeText(getActivity(), R.string.wifi_setting_frequency_band_error,
+                        Toast.LENGTH_SHORT).show();
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    private void refreshWifiInfo() {
+        WifiInfo wifiInfo = mWifiManager.getConnectionInfo();
+
+        Preference wifiMacAddressPref = findPreference(KEY_MAC_ADDRESS);
+        String macAddress = wifiInfo == null ? null : wifiInfo.getMacAddress();
+        wifiMacAddressPref.setSummary(!TextUtils.isEmpty(macAddress) ? macAddress
+                : getActivity().getString(R.string.status_unavailable));
+
+        Preference wifiIpAddressPref = findPreference(KEY_CURRENT_IP_ADDRESS);
+        String ipAddress = Utils.getWifiIpAddresses(getActivity());
+        wifiIpAddressPref.setSummary(ipAddress == null ?
+                getActivity().getString(R.string.status_unavailable) : ipAddress);
+    }
+
+}
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index 91f4110..a8ce94f 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -16,33 +16,29 @@
 
 package com.android.settings.wifi;
 
+import static android.net.wifi.WifiConfiguration.INVALID_NETWORK_ID;
+
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.res.Resources;
-import android.net.DhcpInfo;
 import android.net.LinkAddress;
 import android.net.LinkProperties;
 import android.net.NetworkInfo.DetailedState;
 import android.net.NetworkUtils;
-import android.net.Proxy;
 import android.net.ProxyProperties;
 import android.net.RouteInfo;
 import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiConfiguration.IpAssignment;
 import android.net.wifi.WifiConfiguration.AuthAlgorithm;
+import android.net.wifi.WifiConfiguration.IpAssignment;
 import android.net.wifi.WifiConfiguration.KeyMgmt;
-import android.net.wifi.WpsConfiguration;
-import android.net.wifi.WpsConfiguration.Setup;
-
-import static android.net.wifi.WifiConfiguration.INVALID_NETWORK_ID;
 import android.net.wifi.WifiConfiguration.ProxySettings;
 import android.net.wifi.WifiInfo;
+import android.net.wifi.WpsConfiguration;
+import android.net.wifi.WpsConfiguration.Setup;
 import android.security.Credentials;
 import android.security.KeyStore;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.TextWatcher;
-import android.text.format.Formatter;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
@@ -57,12 +53,10 @@
 import com.android.settings.R;
 
 import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.UnknownHostException;
 import java.util.Iterator;
 
 /**
- * The class for allowing UIs like {@link WifiDialog} and {@link WifiConfigPreference} to
+ * The class for allowing UIs like {@link WifiDialog} and {@link WifiConfigUiBase} to
  * share the logic for controlling buttons, text fields, etc.
  */
 public class WifiConfigController implements TextWatcher,
@@ -429,7 +423,9 @@
         int networkPrefixLength = -1;
         try {
             networkPrefixLength = Integer.parseInt(mNetworkPrefixLengthView.getText().toString());
-        } catch (NumberFormatException e) { }
+        } catch (NumberFormatException e) {
+            // Use -1
+        }
         if (networkPrefixLength < 0 || networkPrefixLength > 32) {
             return R.string.wifi_ip_settings_invalid_network_prefix_length;
         }
@@ -698,6 +694,7 @@
 
     private void setSelection(Spinner spinner, String value) {
         if (value != null) {
+            @SuppressWarnings("unchecked")
             ArrayAdapter<String> adapter = (ArrayAdapter<String>) spinner.getAdapter();
             for (int i = adapter.getCount() - 1; i >= 0; --i) {
                 if (value.equals(adapter.getItem(i))) {
@@ -719,10 +716,12 @@
 
     @Override
     public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+        // work done in afterTextChanged
     }
 
     @Override
     public void onTextChanged(CharSequence s, int start, int before, int count) {
+        // work done in afterTextChanged
     }
 
     @Override
@@ -750,5 +749,6 @@
 
     @Override
     public void onNothingSelected(AdapterView<?> parent) {
+        //
     }
 }
diff --git a/src/com/android/settings/wifi/WifiEnabler.java b/src/com/android/settings/wifi/WifiEnabler.java
index 7f1221e..223022d 100644
--- a/src/com/android/settings/wifi/WifiEnabler.java
+++ b/src/com/android/settings/wifi/WifiEnabler.java
@@ -16,9 +16,6 @@
 
 package com.android.settings.wifi;
 
-import com.android.settings.R;
-import com.android.settings.WirelessSettings;
-
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -27,19 +24,19 @@
 import android.net.wifi.SupplicantState;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
-import android.preference.Preference;
-import android.preference.CheckBoxPreference;
 import android.provider.Settings;
-import android.text.TextUtils;
+import android.widget.CompoundButton;
+import android.widget.Switch;
 import android.widget.Toast;
 
+import com.android.settings.R;
+import com.android.settings.WirelessSettings;
+
 import java.util.concurrent.atomic.AtomicBoolean;
 
-public class WifiEnabler implements Preference.OnPreferenceChangeListener {
+public class WifiEnabler implements CompoundButton.OnCheckedChangeListener  {
     private final Context mContext;
-    private final CheckBoxPreference mCheckBox;
-    private final CharSequence mOriginalSummary;
-
+    private Switch mSwitch;
     private AtomicBoolean mConnected = new AtomicBoolean(false);
 
     private final WifiManager mWifiManager;
@@ -65,11 +62,9 @@
         }
     };
 
-    public WifiEnabler(Context context, CheckBoxPreference checkBox) {
+    public WifiEnabler(Context context, Switch switch_) {
         mContext = context;
-        mCheckBox = checkBox;
-        mOriginalSummary = checkBox.getSummary();
-        checkBox.setPersistent(false);
+        mSwitch = switch_;
 
         mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
         mIntentFilter = new IntentFilter(WifiManager.WIFI_STATE_CHANGED_ACTION);
@@ -81,78 +76,86 @@
     public void resume() {
         // Wi-Fi state is sticky, so just let the receiver update UI
         mContext.registerReceiver(mReceiver, mIntentFilter);
-        mCheckBox.setOnPreferenceChangeListener(this);
+        mSwitch.setOnCheckedChangeListener(this);
     }
 
     public void pause() {
         mContext.unregisterReceiver(mReceiver);
-        mCheckBox.setOnPreferenceChangeListener(null);
+        mSwitch.setOnCheckedChangeListener(null);
     }
 
-    public boolean onPreferenceChange(Preference preference, Object value) {
-        boolean enable = (Boolean) value;
+    public void setSwitch(Switch switch_) {
+        if (mSwitch == switch_) return;
+        mSwitch.setOnCheckedChangeListener(null);
+        mSwitch = switch_;
+        mSwitch.setOnCheckedChangeListener(this);
 
+        final int wifiState = mWifiManager.getWifiState();
+        boolean isEnabled = wifiState == WifiManager.WIFI_STATE_ENABLED;
+        boolean isDisabled = wifiState == WifiManager.WIFI_STATE_DISABLED;
+        mSwitch.setChecked(isEnabled);
+        mSwitch.setEnabled(isEnabled || isDisabled);
+    }
+
+    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
         // Show toast message if Wi-Fi is not allowed in airplane mode
-        if (enable && !WirelessSettings
-                .isRadioAllowed(mContext, Settings.System.RADIO_WIFI)) {
-            Toast.makeText(mContext, R.string.wifi_in_airplane_mode,
-                    Toast.LENGTH_SHORT).show();
-            return false;
+        if (isChecked && !WirelessSettings.isRadioAllowed(mContext, Settings.System.RADIO_WIFI)) {
+            Toast.makeText(mContext, R.string.wifi_in_airplane_mode, Toast.LENGTH_SHORT).show();
+            // Reset switch to off. No infinite check/listenenr loop.
+            buttonView.setChecked(false);
         }
 
-        /**
-         * Disable tethering if enabling Wifi
-         */
+        // Disable tethering if enabling Wifi
         int wifiApState = mWifiManager.getWifiApState();
-        if (enable && ((wifiApState == WifiManager.WIFI_AP_STATE_ENABLING) ||
+        if (isChecked && ((wifiApState == WifiManager.WIFI_AP_STATE_ENABLING) ||
                 (wifiApState == WifiManager.WIFI_AP_STATE_ENABLED))) {
             mWifiManager.setWifiApEnabled(null, false);
         }
-        if (mWifiManager.setWifiEnabled(enable)) {
-            mCheckBox.setEnabled(false);
-        } else {
-            mCheckBox.setSummary(R.string.wifi_error);
-        }
 
-        // Don't update UI to opposite state until we're sure
-        return false;
+        if (mWifiManager.setWifiEnabled(isChecked)) {
+            // Intent has been taken into account, disable until new state is active
+            mSwitch.setEnabled(false);
+        } else {
+            // Error
+            Toast.makeText(mContext, R.string.wifi_error, Toast.LENGTH_SHORT).show();
+        }
     }
 
     private void handleWifiStateChanged(int state) {
         switch (state) {
             case WifiManager.WIFI_STATE_ENABLING:
-                mCheckBox.setSummary(R.string.wifi_starting);
-                mCheckBox.setEnabled(false);
+                mSwitch.setEnabled(false);
                 break;
             case WifiManager.WIFI_STATE_ENABLED:
-                mCheckBox.setChecked(true);
-                mCheckBox.setSummary(null);
-                mCheckBox.setEnabled(true);
+                mSwitch.setChecked(true);
+                mSwitch.setEnabled(true);
                 break;
             case WifiManager.WIFI_STATE_DISABLING:
-                mCheckBox.setSummary(R.string.wifi_stopping);
-                mCheckBox.setEnabled(false);
+                mSwitch.setEnabled(false);
                 break;
             case WifiManager.WIFI_STATE_DISABLED:
-                mCheckBox.setChecked(false);
-                mCheckBox.setSummary(mOriginalSummary);
-                mCheckBox.setEnabled(true);
+                mSwitch.setChecked(false);
+                mSwitch.setEnabled(true);
                 break;
             default:
-                mCheckBox.setChecked(false);
-                mCheckBox.setSummary(R.string.wifi_error);
-                mCheckBox.setEnabled(true);
+                mSwitch.setChecked(false);
+                mSwitch.setEnabled(true);
         }
     }
 
-    private void handleStateChanged(NetworkInfo.DetailedState state) {
+    private void handleStateChanged(@SuppressWarnings("unused") NetworkInfo.DetailedState state) {
+        // After the refactoring from a CheckBoxPreference to a Switch, this method is useless since
+        // there is nowhere to display a summary.
+        // This code is kept in case a future change re-introduces an associated text.
+        /*
         // WifiInfo is valid if and only if Wi-Fi is enabled.
-        // Here we use the state of the check box as an optimization.
-        if (state != null && mCheckBox.isChecked()) {
+        // Here we use the state of the switch as an optimization.
+        if (state != null && mSwitch.isChecked()) {
             WifiInfo info = mWifiManager.getConnectionInfo();
             if (info != null) {
-                mCheckBox.setSummary(Summary.get(mContext, info.getSSID(), state));
+                //setSummary(Summary.get(mContext, info.getSSID(), state));
             }
         }
+        */
     }
 }
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index ab5e686..a829602 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -18,6 +18,7 @@
 
 import static android.net.wifi.WifiConfiguration.INVALID_NETWORK_ID;
 
+import android.app.ActionBar;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.BroadcastReceiver;
@@ -31,40 +32,35 @@
 import android.net.wifi.ScanResult;
 import android.net.wifi.SupplicantState;
 import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiConfiguration.KeyMgmt;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import android.net.wifi.WpsResult;
-import android.net.wifi.WifiConfiguration.KeyMgmt;
-import android.net.wifi.WpsConfiguration;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.preference.CheckBoxPreference;
 import android.preference.Preference;
-import android.preference.ListPreference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceScreen;
-import android.provider.Settings.Secure;
-import android.provider.Settings;
 import android.security.Credentials;
 import android.security.KeyStore;
 import android.util.Log;
 import android.view.ContextMenu;
+import android.view.ContextMenu.ContextMenuInfo;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.ContextMenu.ContextMenuInfo;
-import android.widget.Toast;
 import android.widget.AdapterView.AdapterContextMenuInfo;
+import android.widget.Switch;
+import android.widget.Toast;
 
 import com.android.internal.util.AsyncChannel;
-import com.android.settings.ProgressCategoryBase;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.Utils;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -83,14 +79,14 @@
  * other decorations specific to that screen.
  */
 public class WifiSettings extends SettingsPreferenceFragment
-        implements DialogInterface.OnClickListener, Preference.OnPreferenceChangeListener  {
+        implements DialogInterface.OnClickListener  {
     private static final String TAG = "WifiSettings";
     private static final int MENU_ID_SCAN = Menu.FIRST;
-    private static final int MENU_ID_ADVANCED = Menu.FIRST + 1;
-    private static final int MENU_ID_CONNECT = Menu.FIRST + 2;
-    private static final int MENU_ID_FORGET = Menu.FIRST + 3;
-    private static final int MENU_ID_MODIFY = Menu.FIRST + 4;
-    private static final String KEY_SLEEP_POLICY = "sleep_policy";
+    private static final int MENU_ID_ADD_NETWORK = Menu.FIRST + 1;
+    private static final int MENU_ID_ADVANCED = Menu.FIRST + 2;
+    private static final int MENU_ID_CONNECT = Menu.FIRST + 3;
+    private static final int MENU_ID_FORGET = Menu.FIRST + 4;
+    private static final int MENU_ID_MODIFY = Menu.FIRST + 5;
 
     private final IntentFilter mFilter;
     private final BroadcastReceiver mReceiver;
@@ -98,12 +94,8 @@
 
     private WifiManager mWifiManager;
     private WifiEnabler mWifiEnabler;
-    private CheckBoxPreference mNotifyOpenNetworks;
-    private ProgressCategoryBase mAccessPoints;
-    private Preference mAddNetwork;
     // An access point being editted is stored here.
     private AccessPoint mSelectedAccessPoint;
-    private boolean mEdit;
 
     private DetailedState mLastState;
     private WifiInfo mLastInfo;
@@ -180,60 +172,48 @@
         // state, start it off in the right state
         mEnableNextOnConnection = intent.getBooleanExtra(EXTRA_ENABLE_NEXT_ON_CONNECT, false);
 
-        // Avoid re-adding on returning from an overlapping activity/fragment.
-        if (getPreferenceScreen() == null || getPreferenceScreen().getPreferenceCount() < 2) {
-            if (mEnableNextOnConnection) {
-                if (hasNextButton()) {
-                    final ConnectivityManager connectivity = (ConnectivityManager)
-                            getActivity().getSystemService(Context.CONNECTIVITY_SERVICE);
-                    if (connectivity != null) {
-                        NetworkInfo info = connectivity.getNetworkInfo(
-                                ConnectivityManager.TYPE_WIFI);
-                        changeNextButtonState(info.isConnected());
-                    }
+        if (mEnableNextOnConnection) {
+            if (hasNextButton()) {
+                final ConnectivityManager connectivity = (ConnectivityManager)
+                        getActivity().getSystemService(Context.CONNECTIVITY_SERVICE);
+                if (connectivity != null) {
+                    NetworkInfo info = connectivity.getNetworkInfo(
+                            ConnectivityManager.TYPE_WIFI);
+                    changeNextButtonState(info.isConnected());
                 }
             }
-
-            if (mInXlSetupWizard) {
-                addPreferencesFromResource(R.xml.wifi_access_points_for_wifi_setup_xl);
-            } else if (intent.getBooleanExtra("only_access_points", false)) {
-                addPreferencesFromResource(R.xml.wifi_access_points);
-            } else {
-                addPreferencesFromResource(R.xml.wifi_settings);
-                mWifiEnabler = new WifiEnabler(activity,
-                        (CheckBoxPreference) findPreference("enable_wifi"));
-                mNotifyOpenNetworks =
-                        (CheckBoxPreference) findPreference("notify_open_networks");
-                mNotifyOpenNetworks.setChecked(Secure.getInt(getContentResolver(),
-                        Secure.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, 0) == 1);
-            }
-            // This may be either ProgressCategory or AccessPointCategoryForXL.
-            final ProgressCategoryBase preference =
-                    (ProgressCategoryBase) findPreference("access_points");
-            mAccessPoints = preference;
-            mAccessPoints.setOrderingAsAdded(false);
-            mAddNetwork = findPreference("add_network");
-
-            ListPreference pref = (ListPreference) findPreference(KEY_SLEEP_POLICY);
-            if (pref != null) {
-                if (Utils.isWifiOnly()) {
-                    pref.setEntries(R.array.wifi_sleep_policy_entries_wifi_only);
-                    pref.setSummary(R.string.wifi_setting_sleep_policy_summary_wifi_only);
-                }
-                pref.setOnPreferenceChangeListener(this);
-                int value = Settings.System.getInt(getContentResolver(),
-                        Settings.System.WIFI_SLEEP_POLICY,
-                        Settings.System.WIFI_SLEEP_POLICY_NEVER);
-                pref.setValue(String.valueOf(value));
-            }
-
-            registerForContextMenu(getListView());
-            setHasOptionsMenu(true);
         }
 
+        if (mInXlSetupWizard) {
+            addPreferencesFromResource(R.xml.wifi_access_points_for_wifi_setup_xl);
+        } else {
+            addPreferencesFromResource(R.xml.wifi_settings);
+
+            Switch actionBarSwitch = new Switch(activity);
+
+            if (activity instanceof PreferenceActivity) {
+                PreferenceActivity preferenceActivity = (PreferenceActivity) activity;
+                if (preferenceActivity.onIsHidingHeaders() || !preferenceActivity.onIsMultiPane()) {
+                    final int padding = activity.getResources().getDimensionPixelSize(
+                            R.dimen.action_bar_switch_padding);
+                    actionBarSwitch.setPadding(0, 0, padding, 0);
+                    activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
+                            ActionBar.DISPLAY_SHOW_CUSTOM);
+                    activity.getActionBar().setCustomView(actionBarSwitch, new ActionBar.LayoutParams(
+                            ActionBar.LayoutParams.WRAP_CONTENT,
+                            ActionBar.LayoutParams.WRAP_CONTENT,
+                            Gravity.CENTER_VERTICAL | Gravity.RIGHT));
+                }
+            }
+
+            mWifiEnabler = new WifiEnabler(activity, actionBarSwitch);
+        }
+
+        registerForContextMenu(getListView());
+        setHasOptionsMenu(true);
+
         // After confirming PreferenceScreen is available, we call super.
         super.onActivityCreated(savedInstanceState);
-
     }
 
     @Override
@@ -245,10 +225,11 @@
 
         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;
+
         updateAccessPoints();
     }
 
@@ -270,8 +251,11 @@
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         // We don't want menus in Setup Wizard XL.
         if (!mInXlSetupWizard) {
+            final boolean wifiIsEnabled = mWifiManager.isWifiEnabled();
             menu.add(Menu.NONE, MENU_ID_SCAN, 0, R.string.wifi_menu_scan)
-                    .setIcon(R.drawable.ic_menu_scan_network);
+                    .setIcon(R.drawable.ic_menu_scan_network).setEnabled(wifiIsEnabled);
+            menu.add(Menu.NONE, MENU_ID_ADD_NETWORK, 0, R.string.wifi_add_network)
+                    .setIcon(android.R.drawable.ic_menu_add).setEnabled(wifiIsEnabled);
             menu.add(Menu.NONE, MENU_ID_ADVANCED, 0, R.string.wifi_menu_advanced)
                     .setIcon(android.R.drawable.ic_menu_manage);
         }
@@ -286,6 +270,11 @@
                     mScanner.forceScan();
                 }
                 return true;
+            case MENU_ID_ADD_NETWORK:
+                if (mWifiManager.isWifiEnabled()) {
+                    onAddNetworkPressed();
+                }
+                return true;
             case MENU_ID_ADVANCED:
                 if (getActivity() instanceof PreferenceActivity) {
                     ((PreferenceActivity) getActivity()).startPreferencePanel(
@@ -363,43 +352,17 @@
         if (preference instanceof AccessPoint) {
             mSelectedAccessPoint = (AccessPoint) preference;
             showConfigUi(mSelectedAccessPoint, false);
-        } else if (preference == mAddNetwork) {
-            onAddNetworkPressed();
-        } else if (preference == mNotifyOpenNetworks) {
-            Secure.putInt(getContentResolver(),
-                    Secure.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON,
-                    mNotifyOpenNetworks.isChecked() ? 1 : 0);
         } else {
             return super.onPreferenceTreeClick(screen, preference);
         }
         return true;
     }
 
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        String key = preference.getKey();
-        if (key == null) return true;
-
-        if (key.equals(KEY_SLEEP_POLICY)) {
-            try {
-                Settings.System.putInt(getContentResolver(),
-                        Settings.System.WIFI_SLEEP_POLICY, Integer.parseInt(((String) newValue)));
-            } catch (NumberFormatException e) {
-                Toast.makeText(getActivity(), R.string.wifi_setting_sleep_policy_error,
-                        Toast.LENGTH_SHORT).show();
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-
     /**
      * Shows an appropriate Wifi configuration component.
      * Called when a user clicks "Add network" preference or one of available networks is selected.
      */
     private void showConfigUi(AccessPoint accessPoint, boolean edit) {
-        mEdit = edit;
         if (mInXlSetupWizard) {
             ((WifiSettingsForSetupWizardXL)getActivity()).showConfigUi(accessPoint, edit);
         } else {
@@ -417,7 +380,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;
@@ -430,20 +393,40 @@
      * the strength of network and the security for it.
      */
     private void updateAccessPoints() {
-        mAccessPoints.removeAll();
+        final PreferenceScreen preferenceScreen = getPreferenceScreen();
+        preferenceScreen.removeAll();
+        final int wifiState = mWifiManager.getWifiState();
 
-        // AccessPoints are automatically sorted with TreeSet.
-        final Collection<AccessPoint> accessPoints = constructAccessPoints();
-        if (mInXlSetupWizard) {
-            ((WifiSettingsForSetupWizardXL)getActivity()).onAccessPointsUpdated(
-                    mAccessPoints, accessPoints);
-        } else {
-            for (AccessPoint accessPoint : accessPoints) {
-                mAccessPoints.addPreference(accessPoint);
-            }
+        switch (wifiState) {
+            case WifiManager.WIFI_STATE_ENABLED:
+                // AccessPoints are automatically sorted with TreeSet.
+                final Collection<AccessPoint> accessPoints = constructAccessPoints();
+                if (mInXlSetupWizard) {
+                    ((WifiSettingsForSetupWizardXL)getActivity()).onAccessPointsUpdated(
+                            getPreferenceScreen(), accessPoints);
+                } else {
+                    for (AccessPoint accessPoint : accessPoints) {
+                        getPreferenceScreen().addPreference(accessPoint);
+                    }
+                }
+                break;
+
+            case WifiManager.WIFI_STATE_DISABLING:
+                addMessagePreference(R.string.wifi_stopping);
+                break;
+
+            case WifiManager.WIFI_STATE_DISABLED:
+                addMessagePreference(R.string.wifi_empty_list_wifi_off);
+                break;
         }
     }
 
+    private void addMessagePreference(int messageId) {
+        Preference emptyListPreference = new Preference(getActivity());
+        emptyListPreference.setTitle(messageId);
+        getPreferenceScreen().addPreference(emptyListPreference);
+    }
+
     private Collection<AccessPoint> constructAccessPoints() {
         Collection<AccessPoint> accessPoints = new ArrayList<AccessPoint>();
 
@@ -542,9 +525,9 @@
             mLastState = state;
         }
 
-        for (int i = mAccessPoints.getPreferenceCount() - 1; i >= 0; --i) {
+        for (int i = getPreferenceScreen().getPreferenceCount() - 1; i >= 0; --i) {
             // Maybe there's a WifiConfigPreference
-            Preference preference = mAccessPoints.getPreference(i);
+            Preference preference = getPreferenceScreen().getPreference(i);
             if (preference instanceof AccessPoint) {
                 final AccessPoint accessPoint = (AccessPoint) preference;
                 accessPoint.update(mLastInfo, mLastState);
@@ -557,12 +540,25 @@
     }
 
     private void updateWifiState(int state) {
-        if (state == WifiManager.WIFI_STATE_ENABLED) {
-            mScanner.resume();
-        } else {
-            mScanner.pause();
-            mAccessPoints.removeAll();
+        getActivity().invalidateOptionsMenu();
+
+        switch (state) {
+            case WifiManager.WIFI_STATE_ENABLED:
+                mScanner.resume();
+                return; // not break, to avoid pause
+
+            case WifiManager.WIFI_STATE_ENABLING:
+                getPreferenceScreen().removeAll();
+                addMessagePreference(R.string.wifi_starting);
+                break;
+
+            case WifiManager.WIFI_STATE_DISABLED:
+                getPreferenceScreen().removeAll();
+                addMessagePreference(R.string.wifi_empty_list_wifi_off);
+                break;
         }
+
+        mScanner.pause();
     }
 
     private class Scanner extends Handler {
@@ -580,7 +576,6 @@
 
         void pause() {
             mRetry = 0;
-            mAccessPoints.setProgress(false);
             removeMessages(0);
         }
 
@@ -594,7 +589,6 @@
                         Toast.LENGTH_LONG).show();
                 return;
             }
-            mAccessPoints.setProgress(mRetry != 0);
             // Combo scans can take 5-6s to complete. Increase interval to 10s.
             sendEmptyMessageDelayed(0, 10000);
         }
@@ -636,6 +630,7 @@
                             }
                             break;
                     }
+                    break;
                 //TODO: more connectivity feedback
                 default:
                     //Ignore
@@ -740,7 +735,7 @@
             mScanner.resume();
         }
 
-        mAccessPoints.removeAll();
+        getPreferenceScreen().removeAll();
     }
 
     /**
@@ -753,8 +748,9 @@
     }
 
     /* package */ int getAccessPointsCount() {
-        if (mAccessPoints != null) {
-            return mAccessPoints.getPreferenceCount();
+        final boolean wifiIsEnabled = mWifiManager.isWifiEnabled();
+        if (wifiIsEnabled) {
+            return getPreferenceScreen().getPreferenceCount();
         } else {
             return 0;
         }
diff --git a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
index a73f96c..a3f1764 100644
--- a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
+++ b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
@@ -16,8 +16,6 @@
 
 package com.android.settings.wifi;
 
-import com.android.settings.R;
-
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -28,11 +26,9 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.preference.PreferenceCategory;
+import android.preference.PreferenceScreen;
 import android.text.TextUtils;
 import android.util.Log;
-import android.view.ContextMenu;
-import android.view.ContextMenu.ContextMenuInfo;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
@@ -43,6 +39,7 @@
 import android.widget.TextView;
 
 import com.android.internal.util.AsyncChannel;
+import com.android.settings.R;
 
 import java.util.Collection;
 import java.util.EnumMap;
@@ -75,12 +72,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 +157,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 +282,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 +306,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 +317,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 +466,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 +480,7 @@
         } else {
             mNetworkName = selectedAccessPoint.getTitle().toString();
             showEditingTitle();
+            showDisconnectedProgressBar();
             showEditingButtonState();
             if (selectedAccessPoint.security == AccessPoint.SECURITY_EAP) {
                 onEapNetworkSelected();
@@ -645,8 +636,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);
@@ -671,9 +663,10 @@
     /**
      * Called when the list of AccessPoints are modified and this Activity needs to refresh
      * the list.
+     * @param preferenceScreen
      */
     /* package */ void onAccessPointsUpdated(
-            PreferenceCategory holder, Collection<AccessPoint> accessPoints) {
+            PreferenceScreen preferenceScreen, Collection<AccessPoint> accessPoints) {
         // If we already show some of access points but the bar still shows "scanning" state, it
         // should be stopped.
         if (mProgressBar.isIndeterminate() && accessPoints.size() > 0) {
@@ -688,20 +681,12 @@
 
         for (AccessPoint accessPoint : accessPoints) {
             accessPoint.setLayoutResource(R.layout.custom_preference);
-            holder.addPreference(accessPoint);
+            preferenceScreen.addPreference(accessPoint);
         }
     }
 
     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();
@@ -801,11 +786,6 @@
         mWifiManager.connectNetwork(config);
     }
 
-    @Override
-    public void onCreateContextMenu(ContextMenu menu, View view, ContextMenuInfo menuInfo) {
-        super.onCreateContextMenu(menu, view, menuInfo);
-    }
-
     /**
      * Replace the current background with a new background whose id is resId if needed.
      */
diff --git a/tests/res/values-af/strings.xml b/tests/res/values-af/strings.xml
new file mode 100644
index 0000000..731a3ec
--- /dev/null
+++ b/tests/res/values-af/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">"Opspoorbaar"</string>
+    <string name="start_scan" msgid="6035699220942169744">"Begin skandering"</string>
+    <string name="stop_scan" msgid="527546916633745779">"Stop skandering"</string>
+    <string name="operator_hello" msgid="292208161864910159">"Hallo, operateur!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"Operateur"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"Operateurhoek wat gebruik kan word om voorkeuraktiwiteit te begin"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"Hallo, vervaardiger!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"Vervaardiger"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"Vervaardigerhoek wat gebruik kan word om voorkeuraktiwiteit te begin"</string>
+</resources>
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-ms/strings.xml b/tests/res/values-ms/strings.xml
new file mode 100644
index 0000000..6ff7903
--- /dev/null
+++ b/tests/res/values-ms/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">"Boleh ditemui"</string>
+    <string name="start_scan" msgid="6035699220942169744">"Mulakan pengimbasan"</string>
+    <string name="stop_scan" msgid="527546916633745779">"Hentikan pengimbasan"</string>
+    <string name="operator_hello" msgid="292208161864910159">"Helo Pengendali!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"Pembawa"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"Pengait pengendali yang boleh digunakan untuk memulakan aktiviti pilihan"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"Helo Pengeluar!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"Pengeluar"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"Pengait pengeluar yang boleh digunakan untuk memulakan aktiviti pilihan"</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>