diff --git a/Android.mk b/Android.mk
index 83df136..c08be7f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,6 +1,9 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
+LOCAL_JAVA_LIBRARIES := bouncycastle
+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..77fd94e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -23,6 +23,7 @@
     <uses-permission android:name="android.permission.ACCESS_DOWNLOAD_MANAGER" />
     <uses-permission android:name="android.permission.READ_CONTACTS" />
     <uses-permission android:name="android.permission.WRITE_CONTACTS" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -54,6 +55,7 @@
     <application android:label="@string/settings_label"
             android:icon="@mipmap/ic_launcher_settings"
             android:taskAffinity=""
+            android:theme="@android:style/Theme.Holo.SolidActionBar"
             android:hardwareAccelerated="true">
 
         <!-- Settings -->
@@ -61,9 +63,7 @@
         <activity android:name="Settings"
                 android:label="@string/settings_label_launcher"
                 android:taskAffinity="com.android.settings"
-                android:theme="@android:style/Theme.Holo"
-                android:launchMode="singleTask"
-                >
+                android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.SETTINGS" />
@@ -72,6 +72,10 @@
             </intent-filter>
         </activity>
 
+        <activity android:name=".SubSettings"
+                android:taskAffinity="com.android.settings">
+        </activity>
+
         <activity android:name="CreateShortcut" android:label="@string/settings_shortcut"
             android:theme="@style/Theme.CreateShortCut">
             <intent-filter>
@@ -83,9 +87,7 @@
         <!-- Wireless Controls -->
 
         <activity android:name="Settings$WirelessSettingsActivity"
-                android:theme="@android:style/Theme.Holo"
-                android:label="@string/wireless_networks_settings_title"
-                >
+                android:label="@string/wireless_networks_settings_title">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.WIRELESS_SETTINGS" />
@@ -103,11 +105,9 @@
         <!-- Top-level settings -->
 
         <activity android:name="Settings$WifiSettingsActivity"
-                android:theme="@android:style/Theme.Holo"
                 android:label="@string/wifi_settings"
-                android:configChanges="orientation|keyboardHidden"
-                android:clearTaskOnLaunch="true"
-                >
+                android:configChanges="orientation|keyboardHidden|screenSize"
+                android:clearTaskOnLaunch="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.WIFI_SETTINGS" />
@@ -118,15 +118,10 @@
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.wifi.WifiSettings" />
             <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/wireless_settings" />
-            <meta-data android:name="com.android.settings.PARENT_FRAGMENT_TITLE"
-                android:resource="@string/wireless_networks_settings_title" />
-            <meta-data android:name="com.android.settings.PARENT_FRAGMENT_CLASS"
-                android:value="com.android.settings.Settings$WirelessSettingsActivity" />
+                android:resource="@id/wifi_settings" />
         </activity>
 
         <activity android:name=".wifi.WifiPickerActivity"
-                  android:theme="@android:style/Theme.Holo"
                   android:clearTaskOnLaunch="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -143,17 +138,21 @@
                   android:windowSoftInputMode="adjustResize"
                   android:exported="true" />
 
-        <activity-alias android:name=".wifi.AdvancedSettings"
-                android:label="@string/wifi_ip_settings_titlebar"
-                android:targetActivity="Settings"
-                >
+        <activity android:name="Settings$AdvancedWifiSettingsActivity"
+                android:label="@string/wifi_advanced_settings_label"
+                android:configChanges="orientation|keyboardHidden|screenSize"
+                android:clearTaskOnLaunch="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.WIFI_IP_SETTINGS" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-        </activity-alias>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.wifi.AdvancedWifiSettings" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/wifi_settings" />
+        </activity>
 
         <activity android:name=".wifi.WifiInfo"
                 android:theme="@android:style/Theme.Holo.DialogWhenLarge">
@@ -191,6 +190,7 @@
             </intent-filter>
         </activity>
 
+        <!-- Suspect activity alias: targetActivity is Settings itself, does not define a name. Remove? -->
         <activity-alias android:name=".wifi.WifiApSettings"
                 android:targetActivity="Settings">
             <intent-filter>
@@ -201,9 +201,8 @@
         </activity-alias>
 
         <activity android:name="ApnSettings" android:label="@string/apn_settings"
-                  android:configChanges="orientation|keyboardHidden"
-                  android:launchMode="singleTask"
-                >
+                  android:configChanges="orientation|keyboardHidden|screenSize"
+                  android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.APN_SETTINGS" />
@@ -213,7 +212,6 @@
         </activity>
 
         <activity android:name="Settings$BluetoothSettingsActivity"
-                android:theme="@android:style/Theme.Holo"
                 android:label="@string/bluetooth_settings_title"
                 android:clearTaskOnLaunch="true">
             <intent-filter>
@@ -226,11 +224,22 @@
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.bluetooth.BluetoothSettings" />
             <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/wireless_settings" />
-            <meta-data android:name="com.android.settings.PARENT_FRAGMENT_TITLE"
-                android:resource="@string/wireless_networks_settings_title" />
-            <meta-data android:name="com.android.settings.PARENT_FRAGMENT_CLASS"
-                android:value="com.android.settings.Settings$WirelessSettingsActivity" />
+                android:resource="@id/bluetooth_settings" />
+        </activity>
+
+        <activity android:name="Settings$AdvancedBluetoothSettingsActivity"
+                android:label="@string/bluetooth_advanced_settings_label"
+                android:targetActivity="Settings">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.settings.ADVANCED_BLUETOOTH_SETTINGS" />
+                <category android:name="android.intent.category.VOICE_LAUNCH" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.bluetooth.AdvancedBluetoothSettings" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/bluetooth_settings" />
         </activity>
 
         <activity android:name=".bluetooth.DevicePickerActivity"
@@ -244,7 +253,6 @@
         </activity>
 
         <activity android:name="Settings$TetherSettingsActivity"
-                android:theme="@android:style/Theme.Holo"
                 android:clearTaskOnLaunch="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -278,8 +286,7 @@
         </activity-alias>
 
         <activity android:name="Settings$VpnSettingsActivity"
-                android:theme="@android:style/Theme.Holo"
-                android:label="@string/vpn_settings_activity_title"
+                android:label="@string/vpn_settings_title"
                 android:clearTaskOnLaunch="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -289,7 +296,7 @@
                 <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.vpn.VpnSettings" />
+                android:value="com.android.settings.vpn2.VpnSettings" />
             <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                 android:resource="@id/wireless_settings" />
             <meta-data android:name="com.android.settings.PARENT_FRAGMENT_TITLE"
@@ -299,8 +306,7 @@
         </activity>
 
         <activity android:name="Settings$DateTimeSettingsActivity"
-                android:theme="@android:style/Theme.Holo"
-                android:label="@string/date_and_time" >
+                android:label="@string/date_and_time">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.DATE_SETTINGS" />
@@ -324,7 +330,6 @@
         </activity>
 
         <activity android:name="Settings$LocalePickerActivity"
-                android:theme="@android:style/Theme.Holo"
                 android:label="@string/language_picker_title"
                 android:clearTaskOnLaunch="true">
             <intent-filter>
@@ -340,12 +345,12 @@
         </activity>
 
         <activity android:name="Settings$InputMethodAndLanguageSettingsActivity"
-                android:theme="@android:style/Theme.Holo"
                 android:label="@string/language_keyboard_settings_title"
                 android:clearTaskOnLaunch="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="com.android.settings.VOICE_INPUT_OUTPUT_SETTINGS" />
+                <action android:name="android.settings.INPUT_METHOD_SETTINGS" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="com.android.settings.SHORTCUT" />
@@ -357,7 +362,6 @@
         </activity>
 
         <activity android:name=".inputmethod.InputMethodAndSubtypeEnablerActivity"
-                android:theme="@android:style/Theme.Holo"
                 android:label="@string/input_methods_and_subtype_enabler_title"
                 android:clearTaskOnLaunch="true">
             <intent-filter>
@@ -369,25 +373,14 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="Settings$InputMethodConfigActivity"
-                android:theme="@android:style/Theme.Holo"
-                android:label="@string/configure_input_method"
-                android:clearTaskOnLaunch="true">
+        <receiver android:name=".inputmethod.InputMethodDialogReceiver"
+                android:enabled="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.settings.INPUT_METHOD_SETTINGS" />
-                <category android:name="android.intent.category.VOICE_LAUNCH" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="com.android.settings.SHORTCUT" />
+                <action android:name="android.settings.SHOW_INPUT_METHOD_PICKER" />
             </intent-filter>
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.inputmethod.InputMethodConfig" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/language_settings" />
-        </activity>
+        </receiver>
 
         <activity android:name="Settings$UserDictionarySettingsActivity"
-                android:theme="@android:style/Theme.Holo"
                 android:label="@string/user_dict_settings_titlebar"
                 android:clearTaskOnLaunch="true">
             <intent-filter>
@@ -409,7 +402,6 @@
         </activity>
 
         <activity android:name="Settings$SoundSettingsActivity"
-                android:theme="@android:style/Theme.Holo"
                 android:label="@string/sound_settings"
                 android:clearTaskOnLaunch="true">
             <intent-filter>
@@ -427,10 +419,8 @@
         </activity>
 
         <activity android:name="Settings$DisplaySettingsActivity"
-                android:theme="@android:style/Theme.Holo"
                 android:label="@string/display_settings"
-                android:clearTaskOnLaunch="true"
-                >
+                android:clearTaskOnLaunch="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="com.android.settings.DISPLAY_SETTINGS" />
@@ -446,7 +436,6 @@
         </activity>
 
         <activity android:name="Settings$DockSettingsActivity"
-                android:theme="@android:style/Theme.Holo"
                 android:label="@string/dock_settings_title"
                 android:enabled="@bool/has_dock_settings"
                 android:clearTaskOnLaunch="true">
@@ -481,7 +470,7 @@
         <activity android:name="SettingsLicenseActivity"
                 android:label="@string/settings_license_activity_title"
                 android:theme="@*android:style/Theme.Holo.Dialog.Alert"
-                android:configChanges="orientation">
+                android:configChanges="orientation|screenSize">
             <intent-filter>
                 <action android:name="android.settings.LICENSE" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -497,28 +486,12 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="Settings$ApplicationSettingsActivity"
-                android:theme="@android:style/Theme.Holo"
-                android:label="@string/applications_settings_header">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.settings.APPLICATION_SETTINGS" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.VOICE_LAUNCH" />
-            </intent-filter>
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.ApplicationSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/application_settings" />
-        </activity>
-
         <activity android:name="Settings$ManageApplicationsActivity"
-                android:theme="@android:style/Theme.Holo"
                 android:label="@string/manageapplications_settings_title"
                 android:clearTaskOnLaunch="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.intent.action.MANAGE_PACKAGE_STORAGE" />
+                <action android:name="android.settings.APPLICATION_SETTINGS" />
                 <action android:name="android.settings.MANAGE_APPLICATIONS_SETTINGS" />
                 <action android:name="android.settings.MANAGE_ALL_APPLICATIONS_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -529,10 +502,6 @@
                 android:value="com.android.settings.applications.ManageApplications" />
             <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                 android:resource="@id/application_settings" />
-            <meta-data android:name="com.android.settings.PARENT_FRAGMENT_TITLE"
-                android:resource="@string/applications_settings_header" />
-            <meta-data android:name="com.android.settings.PARENT_FRAGMENT_CLASS"
-                android:value="com.android.settings.Settings$ApplicationSettingsActivity" />
         </activity>
 
         <!-- Keep compatibility with old shortcuts. -->
@@ -550,6 +519,7 @@
                   android:label="@string/application_info_label"
                   android:exported="true">
         </activity>
+
         <activity-alias android:name=".applications.InstalledAppDetails"
                   android:label="@string/application_info_label"
                   android:targetActivity=".applications.InstalledAppDetailsTop">
@@ -562,7 +532,6 @@
 
         <!-- Provide direct entry into manage apps showing running services. -->
         <activity android:name="Settings$RunningServicesActivity"
-                android:theme="@android:style/Theme.Holo"
                 android:label="@string/runningservices_settings_title">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -575,19 +544,15 @@
                 android:value="com.android.settings.applications.ManageApplications" />
             <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                 android:resource="@id/application_settings" />
-            <meta-data android:name="com.android.settings.PARENT_FRAGMENT_TITLE"
-                android:resource="@string/applications_settings_header" />
-            <meta-data android:name="com.android.settings.PARENT_FRAGMENT_CLASS"
-                android:value="com.android.settings.Settings$ApplicationSettingsActivity" />
         </activity>
 
         <!-- Provide direct entry into manage apps showing running services. -->
         <activity android:name="Settings$StorageUseActivity"
-                android:theme="@android:style/Theme.Holo"
                 android:label="@string/storageuse_settings_title">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="android.intent.action.MANAGE_PACKAGE_STORAGE" />
                 <category android:name="android.intent.category.MONKEY" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
                 <category android:name="com.android.settings.SHORTCUT" />
@@ -596,21 +561,33 @@
                 android:value="com.android.settings.applications.ManageApplications" />
             <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                 android:resource="@id/application_settings" />
-            <meta-data android:name="com.android.settings.PARENT_FRAGMENT_TITLE"
-                android:resource="@string/applications_settings_header" />
-            <meta-data android:name="com.android.settings.PARENT_FRAGMENT_CLASS"
-                android:value="com.android.settings.Settings$ApplicationSettingsActivity" />
+        </activity>
+
+        <activity android:name="Settings$LocationSettingsActivity"
+                android:label="@string/location_settings_title"
+                android:configChanges="orientation|keyboardHidden|screenSize"
+                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:configChanges="orientation|keyboardHidden"
+                android:label="@string/security_settings_title"
+                android:configChanges="orientation|keyboardHidden|screenSize"
                 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" />
@@ -623,13 +600,13 @@
         </activity>
 
         <activity android:name="Settings$PrivacySettingsActivity"
-                android:theme="@android:style/Theme.Holo"
                 android:label="@string/privacy_settings_title"
-                android:configChanges="orientation|keyboardHidden"
+                android:configChanges="orientation|keyboardHidden|screenSize"
                 android:clearTaskOnLaunch="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.PRIVACY_SETTINGS" />
+                <action android:name="android.settings.BACKUP_AND_RESET_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
             </intent-filter>
@@ -641,11 +618,10 @@
 
         <activity android:name="CredentialStorage"
                 android:theme="@style/Transparent"
-                android:configChanges="orientation|keyboardHidden">
+                android:configChanges="orientation|keyboardHidden|screenSize">
             <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>
@@ -653,9 +629,7 @@
 
         <activity android:name="Settings$DeviceAdminSettingsActivity"
                 android:label="@string/device_admin_settings_title"
-                android:theme="@android:style/Theme.Holo"
-                android:clearTaskOnLaunch="true"
-                >
+                android:clearTaskOnLaunch="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -667,7 +641,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>
@@ -675,8 +649,7 @@
         <activity android:name="DeviceAdminAdd"
                 android:label="@string/device_admin_add_title"
                 android:theme="@android:style/Theme.Holo.DialogWhenLarge"
-                android:clearTaskOnLaunch="true"
-                >
+                android:clearTaskOnLaunch="true">
             <intent-filter>
                 <action android:name="android.app.action.ADD_DEVICE_ADMIN" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -695,7 +668,6 @@
         </activity>
 
         <activity android:name="Settings$AccessibilitySettingsActivity"
-                android:theme="@android:style/Theme.Holo"
                 android:label="@string/accessibility_settings_title">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -709,12 +681,17 @@
                 android:resource="@id/accessibility_settings" />
         </activity>
 
-        <activity android:name="TextToSpeechSettings" android:label="@string/tts_settings">
+        <activity android:name="Settings$TextToSpeechSettingsActivity"
+                android:label="@string/tts_settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="com.android.settings.TTS_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.TextToSpeechSettings" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/language_settings" />
         </activity>
 
         <!-- Second and third-level settings -->
@@ -754,7 +731,6 @@
         </activity>
 
         <activity android:name="Settings$StorageSettingsActivity"
-                android:theme="@android:style/Theme.Holo"
                 android:label="@string/storage_settings_title">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -813,7 +789,6 @@
         </activity>
 
         <activity android:name="Settings$DevelopmentSettingsActivity"
-                android:theme="@android:style/Theme.Holo"
                 android:label="@string/development_settings_title"
                 android:clearTaskOnLaunch="true">
             <intent-filter>
@@ -825,11 +800,7 @@
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.DevelopmentSettings" />
             <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/application_settings" />
-            <meta-data android:name="com.android.settings.PARENT_FRAGMENT_TITLE"
-                android:resource="@string/applications_settings_header" />
-            <meta-data android:name="com.android.settings.PARENT_FRAGMENT_CLASS"
-                android:value="com.android.settings.Settings$ApplicationSettingsActivity" />
+                android:resource="@id/development_settings" />
         </activity>
 
         <activity-alias android:name="DevelopmentSettings"
@@ -837,22 +808,51 @@
                   android:exported="true"
                   android:label="@string/development_settings_title"
                   android:targetActivity="Settings$DevelopmentSettingsActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />
-                <action android:name="com.android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.DevelopmentSettings" />
             <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/application_settings" />
-            <meta-data android:name="com.android.settings.PARENT_FRAGMENT_TITLE"
-                android:resource="@string/applications_settings_header" />
-            <meta-data android:name="com.android.settings.PARENT_FRAGMENT_CLASS"
-                android:value="com.android.settings.Settings$ApplicationSettingsActivity" />
+                android:resource="@id/development_settings" />
         </activity-alias>
 
+        <activity android:name="Settings$UsbSettingsActivity"
+                android:label="@string/storage_title_usb"
+                android:clearTaskOnLaunch="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.settings.STORAGE_USB_SETTINGS" />
+                <action android:name="com.android.settings.STORAGE_USB_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.deviceinfo.UsbSettings" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/storage_settings" />
+            <meta-data android:name="com.android.settings.PARENT_FRAGMENT_TITLE"
+                android:resource="@string/storage_settings_title" />
+            <meta-data android:name="com.android.settings.PARENT_FRAGMENT_CLASS"
+                android:value="com.android.settings.Settings$StorageSettingsActivity" />
+        </activity>
+
+        <activity-alias android:name="UsbSettings"
+                  android:clearTaskOnLaunch="true"
+                  android:exported="true"
+                  android:label="@string/storage_title_usb"
+                  android:targetActivity="Settings$DevelopmentSettingsActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.settings.STORAGE_USB_SETTINGS" />
+                <action android:name="com.android.settings.STORAGE_USB_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.deviceinfo.UsbSettings" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/storage_settings" />
+            <meta-data android:name="com.android.settings.PARENT_FRAGMENT_TITLE"
+                android:resource="@string/storage_settings_title" />
+            <meta-data android:name="com.android.settings.PARENT_FRAGMENT_CLASS"
+                android:value="com.android.settings.Settings$StorageSettingsActivity" />
+        </activity-alias>
 
         <!-- Bluetooth stuff -->
 
@@ -914,6 +914,25 @@
             </intent-filter>
         </receiver>
 
+        <receiver android:name=".bluetooth.BluetoothPermissionRequest">
+            <intent-filter>
+                <action android:name="android.bluetooth.device.action.CONNECTION_ACCESS_REQUEST" />
+                <action android:name="android.bluetooth.device.action.CONNECTION_ACCESS_CANCEL" />
+            </intent-filter>
+        </receiver>
+
+        <activity android:name=".bluetooth.BluetoothPermissionActivity"
+                  android:label="@string/bluetooth_connection_permission_request"
+                  android:excludeFromRecents="true"
+                  android:permission="android.permission.BLUETOOTH_ADMIN"
+                  android:theme="@*android:style/Theme.Holo.Dialog.Alert">
+            <intent-filter>
+                <action android:name="android.bluetooth.device.action.CONNECTION_ACCESS_REQUEST" />
+                <action android:name="android.bluetooth.device.action.CONNECTION_ACCESS_CANCEL" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
         <activity android:name="ActivityPicker"
                 android:label="@string/activity_picker_label"
                 android:theme="@*android:style/Theme.Dialog.Alert"
@@ -924,6 +943,17 @@
             </intent-filter>
         </activity>
 
+        <!-- Accessibility tutorial -->
+        <activity android:name="AccessibilityTutorialActivity"
+                android:label="@string/accessibility_tutorial_title"
+                android:configChanges="orientation"
+                android:immersive="true"
+                android:theme="@android:style/Theme.Holo">
+            <intent-filter>
+                <action android:name="android.settings.ACCESSIBILITY_TUTORIAL" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
 
 
 
@@ -968,6 +998,7 @@
             </intent-filter>
         </activity>
 
+        <!-- Suspect activity alias: targetActivity is Settings itself, does not define a name. Remove? -->
         <activity-alias android:name="ProxySelector"
             android:label="@string/proxy_settings_label"
             android:targetActivity="Settings">
@@ -1022,7 +1053,6 @@
         </activity>
 
         <activity android:name="Settings$PowerUsageSummaryActivity"
-                android:theme="@android:style/Theme.Holo"
                 android:label="@string/power_usage_summary_title">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -1034,15 +1064,10 @@
                 android:value="com.android.settings.fuelgauge.PowerUsageSummary" />
             <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                 android:resource="@id/application_settings" />
-            <meta-data android:name="com.android.settings.PARENT_FRAGMENT_TITLE"
-                android:resource="@string/applications_settings_header" />
-            <meta-data android:name="com.android.settings.PARENT_FRAGMENT_CLASS"
-                android:value="com.android.settings.Settings$ApplicationSettingsActivity" />
         </activity>
 
         <activity
                 android:name="Settings$ManageAccountsSettingsActivity"
-                android:theme="@android:style/Theme.Holo"
                 android:label="@string/sync_settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -1056,8 +1081,7 @@
         </activity>
 
         <activity android:name="Settings$AccountSyncSettingsActivity"
-            android:label="@string/account_sync_settings_title"
-            android:theme="@android:style/Theme.Holo">
+            android:label="@string/account_sync_settings_title">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.ACCOUNT_SYNC_SETTINGS" />
@@ -1111,7 +1135,6 @@
 
         <!-- Pseudo-activity used to provide an intent-filter entry point to encryption settings -->
         <activity android:name="Settings$CryptKeeperSettingsActivity"
-                android:theme="@android:style/Theme.Holo"
                 android:label="@string/crypt_keeper_encrypt_title">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -1124,10 +1147,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 +1179,6 @@
             </intent-filter>
             <meta-data android:name="android.appwidget.provider" android:resource="@xml/appwidget_info" />
         </receiver>
+
     </application>
 </manifest>
diff --git a/proguard.flags b/proguard.flags
index 8318101..6d41d17 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -10,4 +10,5 @@
 -keep class com.android.settings.MasterClear
 -keep class com.android.settings.MasterClearConfirm
 -keep class com.android.settings.accounts.*
+-keep class com.android.settings.fuelgauge.*
 
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..28efd35
--- /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..4b6f2df
--- /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..59de0d3
--- /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..d7f3a88
--- /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..ccd7ff9
--- /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..1179fde
--- /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..9ecd28b
--- /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..ec2b9df
--- /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_bt_config.png b/res/drawable-hdpi/ic_bt_config.png
index c6d2483..47b4ba2 100644
--- a/res/drawable-hdpi/ic_bt_config.png
+++ b/res/drawable-hdpi/ic_bt_config.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_emergency.png b/res/drawable-hdpi/ic_emergency.png
new file mode 100644
index 0000000..89c05e3
--- /dev/null
+++ b/res/drawable-hdpi/ic_emergency.png
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_battery.png b/res/drawable-hdpi/ic_settings_battery.png
new file mode 100755
index 0000000..e3b0fb3
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_battery.png
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_development.png b/res/drawable-hdpi/ic_settings_development.png
new file mode 100755
index 0000000..e3b0fb3
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_development.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-hdpi/stat_sys_phone_call.png b/res/drawable-hdpi/stat_sys_phone_call.png
new file mode 100755
index 0000000..9b5f075
--- /dev/null
+++ b/res/drawable-hdpi/stat_sys_phone_call.png
Binary files differ
diff --git a/res/drawable-mdpi/data_grid_border.9.png b/res/drawable-mdpi/data_grid_border.9.png
new file mode 100644
index 0000000..85912b8
--- /dev/null
+++ b/res/drawable-mdpi/data_grid_border.9.png
Binary files differ
diff --git a/res/drawable-mdpi/data_grid_primary.9.png b/res/drawable-mdpi/data_grid_primary.9.png
new file mode 100644
index 0000000..0aa9143
--- /dev/null
+++ b/res/drawable-mdpi/data_grid_primary.9.png
Binary files differ
diff --git a/res/drawable-mdpi/data_grid_secondary.9.png b/res/drawable-mdpi/data_grid_secondary.9.png
new file mode 100644
index 0000000..7a09593
--- /dev/null
+++ b/res/drawable-mdpi/data_grid_secondary.9.png
Binary files differ
diff --git a/res/drawable-mdpi/data_sweep_left_activated.9.png b/res/drawable-mdpi/data_sweep_left_activated.9.png
new file mode 100644
index 0000000..fc6764a
--- /dev/null
+++ b/res/drawable-mdpi/data_sweep_left_activated.9.png
Binary files differ
diff --git a/res/drawable-mdpi/data_sweep_left_default.9.png b/res/drawable-mdpi/data_sweep_left_default.9.png
new file mode 100644
index 0000000..31343e7
--- /dev/null
+++ b/res/drawable-mdpi/data_sweep_left_default.9.png
Binary files differ
diff --git a/res/drawable-mdpi/data_sweep_limit_activated.9.png b/res/drawable-mdpi/data_sweep_limit_activated.9.png
new file mode 100644
index 0000000..b01d5f0
--- /dev/null
+++ b/res/drawable-mdpi/data_sweep_limit_activated.9.png
Binary files differ
diff --git a/res/drawable-mdpi/data_sweep_limit_default.9.png b/res/drawable-mdpi/data_sweep_limit_default.9.png
new file mode 100644
index 0000000..a59649a
--- /dev/null
+++ b/res/drawable-mdpi/data_sweep_limit_default.9.png
Binary files differ
diff --git a/res/drawable-mdpi/data_sweep_right_activated.9.png b/res/drawable-mdpi/data_sweep_right_activated.9.png
new file mode 100644
index 0000000..5314538
--- /dev/null
+++ b/res/drawable-mdpi/data_sweep_right_activated.9.png
Binary files differ
diff --git a/res/drawable-mdpi/data_sweep_right_default.9.png b/res/drawable-mdpi/data_sweep_right_default.9.png
new file mode 100644
index 0000000..cc3b586
--- /dev/null
+++ b/res/drawable-mdpi/data_sweep_right_default.9.png
Binary files differ
diff --git a/res/drawable-mdpi/data_sweep_warning_activated.9.png b/res/drawable-mdpi/data_sweep_warning_activated.9.png
new file mode 100644
index 0000000..ed44d4d
--- /dev/null
+++ b/res/drawable-mdpi/data_sweep_warning_activated.9.png
Binary files differ
diff --git a/res/drawable-mdpi/data_sweep_warning_default.9.png b/res/drawable-mdpi/data_sweep_warning_default.9.png
new file mode 100644
index 0000000..760ea18
--- /dev/null
+++ b/res/drawable-mdpi/data_sweep_warning_default.9.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_bt_config.png b/res/drawable-mdpi/ic_bt_config.png
index eefda26..7928104 100644
--- a/res/drawable-mdpi/ic_bt_config.png
+++ b/res/drawable-mdpi/ic_bt_config.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_emergency.png b/res/drawable-mdpi/ic_emergency.png
new file mode 100755
index 0000000..c6faf1e
--- /dev/null
+++ b/res/drawable-mdpi/ic_emergency.png
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_battery.png b/res/drawable-mdpi/ic_settings_battery.png
new file mode 100644
index 0000000..e1f478b
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_battery.png
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_development.png b/res/drawable-mdpi/ic_settings_development.png
new file mode 100644
index 0000000..e1f478b
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_development.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-mdpi/stat_sys_phone_call.png b/res/drawable-mdpi/stat_sys_phone_call.png
new file mode 100644
index 0000000..c44d062
--- /dev/null
+++ b/res/drawable-mdpi/stat_sys_phone_call.png
Binary files differ
diff --git a/res/drawable-xhdpi/data_grid_border.9.png b/res/drawable-xhdpi/data_grid_border.9.png
new file mode 100644
index 0000000..2139cf2
--- /dev/null
+++ b/res/drawable-xhdpi/data_grid_border.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/data_grid_primary.9.png b/res/drawable-xhdpi/data_grid_primary.9.png
new file mode 100644
index 0000000..ae68886
--- /dev/null
+++ b/res/drawable-xhdpi/data_grid_primary.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/data_grid_secondary.9.png b/res/drawable-xhdpi/data_grid_secondary.9.png
new file mode 100644
index 0000000..7a09593
--- /dev/null
+++ b/res/drawable-xhdpi/data_grid_secondary.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/data_sweep_left_activated.9.png b/res/drawable-xhdpi/data_sweep_left_activated.9.png
new file mode 100644
index 0000000..ff9631e
--- /dev/null
+++ b/res/drawable-xhdpi/data_sweep_left_activated.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/data_sweep_left_default.9.png b/res/drawable-xhdpi/data_sweep_left_default.9.png
new file mode 100644
index 0000000..2e0651c
--- /dev/null
+++ b/res/drawable-xhdpi/data_sweep_left_default.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/data_sweep_limit_activated.9.png b/res/drawable-xhdpi/data_sweep_limit_activated.9.png
new file mode 100644
index 0000000..ae02388
--- /dev/null
+++ b/res/drawable-xhdpi/data_sweep_limit_activated.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/data_sweep_limit_default.9.png b/res/drawable-xhdpi/data_sweep_limit_default.9.png
new file mode 100644
index 0000000..7391148
--- /dev/null
+++ b/res/drawable-xhdpi/data_sweep_limit_default.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/data_sweep_right_activated.9.png b/res/drawable-xhdpi/data_sweep_right_activated.9.png
new file mode 100644
index 0000000..81c1a3c
--- /dev/null
+++ b/res/drawable-xhdpi/data_sweep_right_activated.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/data_sweep_right_default.9.png b/res/drawable-xhdpi/data_sweep_right_default.9.png
new file mode 100644
index 0000000..94a9f61
--- /dev/null
+++ b/res/drawable-xhdpi/data_sweep_right_default.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/data_sweep_warning_activated.9.png b/res/drawable-xhdpi/data_sweep_warning_activated.9.png
new file mode 100644
index 0000000..0a2d2b1
--- /dev/null
+++ b/res/drawable-xhdpi/data_sweep_warning_activated.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/data_sweep_warning_default.9.png b/res/drawable-xhdpi/data_sweep_warning_default.9.png
new file mode 100644
index 0000000..d5f6044
--- /dev/null
+++ b/res/drawable-xhdpi/data_sweep_warning_default.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_data_usage.png b/res/drawable-xhdpi/ic_settings_data_usage.png
new file mode 100644
index 0000000..176dd11
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_data_usage.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..3532cbc
--- /dev/null
+++ b/res/drawable/data_sweep_left.xml
@@ -0,0 +1,23 @@
+<?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:enterFadeDuration="@android:integer/config_mediumAnimTime"
+    android:exitFadeDuration="@android:integer/config_mediumAnimTime">
+
+    <item android:state_activated="true" android:state_enabled="true" android:drawable="@drawable/data_sweep_left_activated" />
+    <item 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..cfdbfbb
--- /dev/null
+++ b/res/drawable/data_sweep_limit.xml
@@ -0,0 +1,23 @@
+<?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:enterFadeDuration="@android:integer/config_mediumAnimTime"
+    android:exitFadeDuration="@android:integer/config_mediumAnimTime">
+
+    <item android:state_activated="true" android:state_enabled="true" android:drawable="@drawable/data_sweep_limit_activated" />
+    <item 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..cbe2a85
--- /dev/null
+++ b/res/drawable/data_sweep_right.xml
@@ -0,0 +1,23 @@
+<?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:enterFadeDuration="@android:integer/config_mediumAnimTime"
+    android:exitFadeDuration="@android:integer/config_mediumAnimTime">
+
+    <item android:state_activated="true" android:state_enabled="true" android:drawable="@drawable/data_sweep_right_activated" />
+    <item 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..8fbe8e7
--- /dev/null
+++ b/res/drawable/data_sweep_warning.xml
@@ -0,0 +1,23 @@
+<?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:enterFadeDuration="@android:integer/config_mediumAnimTime"
+    android:exitFadeDuration="@android:integer/config_mediumAnimTime">
+
+    <item android:state_activated="true" android:state_enabled="true" android:drawable="@drawable/data_sweep_warning_activated" />
+    <item 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.xml b/res/layout-land/choose_lock_pattern.xml
index 9af76d1..588d8da 100644
--- a/res/layout-land/choose_lock_pattern.xml
+++ b/res/layout-land/choose_lock_pattern.xml
@@ -82,10 +82,11 @@
          android:background="@*android:drawable/code_lock_left"
          android:layout_width="2dip"
          android:layout_height="match_parent" />
+
     <!-- right side: lock pattern -->
     <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
-         android:layout_width="wrap_content"
-         android:layout_height="wrap_content" />
+         android:layout_width="match_parent"
+         android:layout_height="match_parent" />
 
 
 </com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
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..ac693cc
--- /dev/null
+++ b/res/layout-land/choose_lock_pattern_tutorial.xml
@@ -0,0 +1,92 @@
+<?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="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <!-- Top: pattern and information -->
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1"
+        android:orientation="horizontal">
+
+        <!-- left side: lock pattern. Given the square aspect, this will be the smaller of the
+             two dimensions (height) -->
+        <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent"/>
+
+        <!-- right side: instructions and buttons -->
+        <!-- header message -->
+        <ScrollView
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            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>
+
+    <!-- Bottom: cancel/next buttons -->
+    <LinearLayout
+        style="@style/SecurityPreferenceButtonContainer"
+        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>
+
+</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-land/confirm_lock_pattern.xml b/res/layout-land/confirm_lock_pattern.xml
index 2da2b9a..8c4e912 100644
--- a/res/layout-land/confirm_lock_pattern.xml
+++ b/res/layout-land/confirm_lock_pattern.xml
@@ -56,10 +56,11 @@
          android:background="@*android:drawable/code_lock_left"
          android:layout_width="2dip"
          android:layout_height="match_parent" />
+
     <!-- right side: lock pattern -->
     <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
-         android:layout_width="wrap_content"
-         android:layout_height="wrap_content" />
+         android:layout_width="match_parent"
+         android:layout_height="match_parent" />
 
 
 </com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
diff --git a/res/layout-sw600dp/accessibility_tutorial_container.xml b/res/layout-sw600dp/accessibility_tutorial_container.xml
new file mode 100644
index 0000000..2895a29
--- /dev/null
+++ b/res/layout-sw600dp/accessibility_tutorial_container.xml
@@ -0,0 +1,107 @@
+<?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_height="fill_parent"
+    android:layout_width="fill_parent"
+    android:orientation="vertical"
+    android:paddingTop="@dimen/screen_margin_top"
+    android:paddingLeft="@dimen/screen_margin_sides"
+    android:paddingRight="@dimen/screen_margin_sides"
+    android:paddingBottom="@dimen/screen_margin_bottom">
+
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:minHeight="@dimen/title_height"
+        android:layout_marginLeft="@dimen/content_margin_left"
+        android:textAppearance="@style/AccessibilityTutorialTitle"
+        android:gravity="bottom"
+        android:clickable="false" />
+
+    <View
+        android:layout_marginTop="8dip"
+        android:layout_marginBottom="8dip"
+        android:layout_below="@id/title"
+        style="@style/AccessibilityTutorialDivider" />
+
+    <LinearLayout
+        android:id="@+id/content"
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1.0"
+        android:orientation="vertical">
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <View
+            style="@style/AccessibilityTutorialDivider" />
+
+        <TextView
+            android:id="@+id/instructions"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/description_margin_top"
+            android:layout_marginLeft="@dimen/description_margin_sides"
+            android:layout_marginRight="@dimen/description_margin_sides"
+            android:layout_marginBottom="16dip"
+            android:lineSpacingExtra="5sp"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+        <View
+            android:layout_marginBottom="16dip"
+            style="@style/AccessibilityTutorialDivider" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:gravity="right">
+
+            <Button
+                android:id="@+id/back_button"
+                style="@style/AccessibilityTutorialButton"
+                android:text="@string/accessibility_tutorial_back" />
+
+            <Button
+                android:id="@+id/next_button"
+                style="@style/AccessibilityTutorialButton"
+                android:text="@string/accessibility_tutorial_next" />
+
+            <Button
+                android:id="@+id/finish_button"
+                style="@style/AccessibilityTutorialButton"
+                android:text="@string/accessibility_tutorial_finish"
+                android:visibility="gone" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
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/accessibility_tutorial_1.xml b/res/layout/accessibility_tutorial_1.xml
new file mode 100644
index 0000000..710e327
--- /dev/null
+++ b/res/layout/accessibility_tutorial_1.xml
@@ -0,0 +1,26 @@
+<?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.
+-->
+
+<GridView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/all_apps"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:columnWidth="72dip"
+    android:numColumns="auto_fit"
+    android:verticalSpacing="10dip"
+    android:horizontalSpacing="10dip"
+    android:stretchMode="columnWidth" />
\ No newline at end of file
diff --git a/res/xml/vpn_type.xml b/res/layout/accessibility_tutorial_2.xml
similarity index 67%
copy from res/xml/vpn_type.xml
copy to res/layout/accessibility_tutorial_2.xml
index fbc7822..5f9c69d 100644
--- a/res/xml/vpn_type.xml
+++ b/res/layout/accessibility_tutorial_2.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 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.
@@ -14,8 +14,8 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
-        android:title="@string/vpn_type_title">
-
-</PreferenceScreen>   
+<ListView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/list_view"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent" />
\ No newline at end of file
diff --git a/res/xml/vpn_type.xml b/res/layout/accessibility_tutorial_app_icon.xml
similarity index 67%
copy from res/xml/vpn_type.xml
copy to res/layout/accessibility_tutorial_app_icon.xml
index fbc7822..fe8399e 100644
--- a/res/xml/vpn_type.xml
+++ b/res/layout/accessibility_tutorial_app_icon.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 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.
@@ -14,8 +14,7 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
-        android:title="@string/vpn_type_title">
-
-</PreferenceScreen>   
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/app_icon"
+    style="@style/AccessibilityTutorialIcon" />
\ No newline at end of file
diff --git a/res/layout/accessibility_tutorial_container.xml b/res/layout/accessibility_tutorial_container.xml
new file mode 100644
index 0000000..e949d2a
--- /dev/null
+++ b/res/layout/accessibility_tutorial_container.xml
@@ -0,0 +1,118 @@
+<?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="vertical"
+    android:layout_height="fill_parent"
+    android:layout_width="fill_parent">
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:paddingLeft="15dip"
+        android:paddingRight="15dip">
+
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="@style/AccessibilityTutorialTitle"
+            android:layout_marginTop="11dip" />
+
+        <View
+            android:layout_width="fill_parent"
+            android:layout_height="1dip"
+            android:layout_gravity="center"
+            android:background="@color/divider_color"
+            android:layout_marginTop="14dip"
+            android:layout_marginBottom="13dip"
+            android:focusable="false"
+            android:clickable="false" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/content"
+        android:orientation="vertical"
+        android:layout_height="0dip"
+        android:layout_width="fill_parent"
+        android:layout_weight="1.0"
+        android:paddingLeft="15dip"
+        android:paddingRight="15dip">
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_height="wrap_content"
+        android:layout_width="fill_parent"
+        android:paddingLeft="15dip"
+        android:paddingRight="15dip">
+
+        <View
+            android:layout_width="wrap_content"
+            android:layout_height="1dip"
+            android:layout_gravity="center"
+            android:background="@android:drawable/divider_horizontal_dark"
+            android:layout_marginBottom="8dip"
+            android:focusable="false"
+            android:clickable="false" />
+
+        <TextView
+            android:id="@+id/instructions"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dip"
+            android:textAppearance="@style/AccessibilityTutorialBodyTextPrimary" />
+
+    </LinearLayout>
+
+    <RelativeLayout
+        android:layout_height="wrap_content"
+        android:layout_width="fill_parent"
+        android:background="@android:drawable/bottom_bar">
+
+        <Button
+            android:id="@+id/back_button"
+            android:layout_width="150dip"
+            android:layout_height="wrap_content"
+            android:layout_margin="5dip"
+            android:layout_alignParentLeft="true"
+            android:drawablePadding="3dip"
+            android:text="@string/accessibility_tutorial_back" />
+
+        <Button
+            android:id="@+id/next_button"
+            android:layout_width="150dip"
+            android:layout_height="wrap_content"
+            android:layout_margin="5dip"
+            android:layout_alignParentRight="true"
+            android:drawablePadding="3dip"
+            android:text="@string/accessibility_tutorial_next" />
+
+        <Button
+            android:id="@+id/finish_button"
+            android:layout_width="150dip"
+            android:layout_height="wrap_content"
+            android:layout_margin="5dip"
+            android:layout_alignParentRight="true"
+            android:text="@string/accessibility_tutorial_finish"
+            android:visibility="gone" />
+
+    </RelativeLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/bluetooth_connection_access.xml b/res/layout/bluetooth_connection_access.xml
new file mode 100644
index 0000000..1e74162
--- /dev/null
+++ b/res/layout/bluetooth_connection_access.xml
@@ -0,0 +1,40 @@
+<?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.
+*/
+-->
+
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent">
+
+    <LinearLayout
+        android:layout_height="match_parent"
+        android:layout_width="match_parent"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/message"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="20dip"
+            android:layout_marginRight="20dip"
+            android:gravity="center_horizontal"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+    </LinearLayout>
+
+</ScrollView>
diff --git a/res/layout/bluetooth_pb_access.xml b/res/layout/bluetooth_pb_access.xml
new file mode 100644
index 0000000..80f78a6
--- /dev/null
+++ b/res/layout/bluetooth_pb_access.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 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.
+*/
+-->
+
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent">
+
+    <LinearLayout
+        android:layout_height="match_parent"
+        android:layout_width="match_parent"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/message"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="20dip"
+            android:layout_marginRight="20dip"
+            android:gravity="center_horizontal"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <CheckBox android:id="@+id/bluetooth_pb_alwaysallowed"
+            style="?android:attr/textAppearanceMedium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dip"
+            android:text="@string/bluetooth_pb_alwaysallowed" />
+
+    </LinearLayout>
+
+</ScrollView>
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..a356315 100644
--- a/res/layout/choose_lock_pattern.xml
+++ b/res/layout/choose_lock_pattern.xml
@@ -39,9 +39,10 @@
              android:background="@*android:drawable/code_lock_top"
              android:layout_width="match_parent"
              android:layout_height="2dip" />
+
         <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
-             android:layout_width="wrap_content"
-             android:layout_height="wrap_content" />
+             android:layout_width="match_parent"
+             android:layout_height="match_parent" />
 
         <!-- bottom line looks bad when button bar is their too, omit in this case -->
         <!--View
@@ -58,33 +59,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..742cef8 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,65 @@
 <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">
-            
+
+            <!-- Top: instructions -->
             <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"
+                android:visibility="visible"
             />
-        
-            <TextView 
+
+            <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_marginTop="10dip"
                 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">
 
+            <!-- bottom: lock pattern -->
+            <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
+                 android:layout_width="200dip"
+                 android:layout_height="200dip"
+                 android:layout_marginTop="10dip"
+                 android:layout_gravity="left"/>
+
+        </LinearLayout>
+
+    </ScrollView>
+
+    <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/confirm_lock_pattern.xml b/res/layout/confirm_lock_pattern.xml
index 01ef5b1..5c6d812 100644
--- a/res/layout/confirm_lock_pattern.xml
+++ b/res/layout/confirm_lock_pattern.xml
@@ -32,9 +32,11 @@
          android:background="@*android:drawable/code_lock_top"
          android:layout_width="match_parent"
          android:layout_height="2dip" />
+
     <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
-         android:layout_width="wrap_content"
-         android:layout_height="wrap_content" />
+         android:layout_width="match_parent"
+         android:layout_height="match_parent" />
+
     <View
          android:background="@*android:drawable/code_lock_bottom"
          android:layout_width="match_parent"
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..60dcf6a 100644
--- a/res/layout/crypt_keeper_password_entry.xml
+++ b/res/layout/crypt_keeper_password_entry.xml
@@ -30,39 +30,28 @@
                >
        <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"
+   <!-- Emergency call button.
+        Text and icon are set by CryptKeeper.updateEmergencyCallButtonState() -->
+   <Button android:id="@+id/emergencyCallButton"
+       android:layout_width="wrap_content"
+       android:layout_height="wrap_content"
+       android:layout_gravity="left"
+       android:layout_marginTop="10dip"
+       style="@*android:style/Widget.Button.Transparent"
+       android:textSize="14sp"
+       android:drawablePadding="6dip"
        />
-       
-   </LinearLayout>
-    
-</LinearLayout>
\ No newline at end of file
+
+</LinearLayout>
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/custom_preference_list_fragment.xml b/res/layout/custom_preference_list_fragment.xml
index f0bf010..4803639 100644
--- a/res/layout/custom_preference_list_fragment.xml
+++ b/res/layout/custom_preference_list_fragment.xml
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 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.
-*/
+<!-- 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.
 -->
 
 <!-- Based on preference_list_fragment.xml in framework -->
@@ -26,14 +23,20 @@
 
     <ListView android:id="@android:id/list"
         android:layout_width="match_parent"
-        android:layout_height="0px"
-        android:layout_weight="1"
+        android:layout_height="match_parent"
         android:paddingTop="0dip"
-        android:paddingBottom="0dip"
-        android:paddingLeft="0dip"
-        android:paddingRight="0dip"
+        android:paddingBottom="@*android:dimen/preference_fragment_padding_bottom"
+        android:paddingLeft="@*android:dimen/preference_fragment_padding_side"
+        android:paddingRight="@*android:dimen/preference_fragment_padding_side"
         android:clipToPadding="false"
         android:drawSelectorOnTop="false"
         android:cacheColorHint="@android:color/transparent"
         android:scrollbarAlwaysDrawVerticalTrack="true" />
+
+    <TextView android:id="@+id/empty"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:padding="5dip"
+        android:gravity="center"
+        android:visibility="gone" />
 </LinearLayout>
diff --git a/res/layout/data_usage_chart.xml b/res/layout/data_usage_chart.xml
new file mode 100644
index 0000000..a942bb3
--- /dev/null
+++ b/res/layout/data_usage_chart.xml
@@ -0,0 +1,87 @@
+<?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:id="@+id/chart"
+    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.ChartNetworkSeriesView
+        android:id="@+id/detail_series"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="left|bottom"
+        settings:strokeColor="#d88d3a"
+        settings:fillColor="#c0ba7f3e"
+        settings:fillColorSecondary="#0000" />
+
+    <com.android.settings.widget.ChartSweepView
+        android:id="@+id/sweep_left"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        settings:sweepDrawable="@drawable/data_sweep_left"
+        settings:followAxis="horizontal" />
+
+    <com.android.settings.widget.ChartSweepView
+        android:id="@+id/sweep_right"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        settings:sweepDrawable="@drawable/data_sweep_right"
+        settings:followAxis="horizontal" />
+
+    <com.android.settings.widget.ChartSweepView
+        android:id="@+id/sweep_warning"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        settings:sweepDrawable="@drawable/data_sweep_warning"
+        settings:followAxis="vertical"
+        settings:labelSize="60dip"
+        settings:labelTemplate="@string/data_usage_sweep_warning"
+        settings:labelColor="#f7931d" />
+
+    <com.android.settings.widget.ChartSweepView
+        android:id="@+id/sweep_limit"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        settings:sweepDrawable="@drawable/data_sweep_limit"
+        settings:followAxis="vertical"
+        settings:labelSize="60dip"
+        settings:labelTemplate="@string/data_usage_sweep_limit"
+        settings:labelColor="#c01a2c" />
+
+</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..2c8e490
--- /dev/null
+++ b/res/layout/data_usage_detail.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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/app_detail"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/app_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="16dip" />
+
+    <TextView
+        android:id="@+id/app_subtitle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="16dip" />
+
+    <Button
+        android:id="@+id/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/app_switches"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" />
+
+</LinearLayout>
diff --git a/res/layout/data_usage_header.xml b/res/layout/data_usage_header.xml
new file mode 100644
index 0000000..547d85d
--- /dev/null
+++ b/res/layout/data_usage_header.xml
@@ -0,0 +1,59 @@
+<?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">
+
+    <FrameLayout
+        android:id="@+id/network_switches_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <LinearLayout
+            android:id="@+id/network_switches"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:showDividers="middle|end"
+            android:divider="?android:attr/listDivider" />
+    </FrameLayout>
+
+    <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>
+
+    <include layout="@layout/data_usage_chart" />
+    <include layout="@layout/data_usage_detail" />
+
+</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..7e68143
--- /dev/null
+++ b/res/layout/data_usage_summary.xml
@@ -0,0 +1,49 @@
+<?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:id="@+id/tabs_container"
+        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/installed_app_details.xml b/res/layout/installed_app_details.xml
index 6392ee9..afec517 100644
--- a/res/layout/installed_app_details.xml
+++ b/res/layout/installed_app_details.xml
@@ -135,6 +135,43 @@
             </LinearLayout>
 
             <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:baselineAligned="true"
+                android:paddingTop="-1dip">
+                <TextView
+                    android:id="@+id/external_code_size_prefix"
+                    android:text="@string/external_code_size_label"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:maxLines="1"
+                    android:paddingTop="6dip"
+                    android:paddingLeft="6dip"/>
+                <ImageView
+                    android:id="@+id/info_size_dots"
+                    android:src="@drawable/dotted_line_480px"
+                    android:layout_width="0dip"
+                    android:layout_weight="1"
+                    android:layout_height="1px"
+                    android:layout_gravity="bottom"
+                    android:layout_marginLeft="1dip"
+                    android:layout_marginRight="1dip"
+                    android:layout_marginBottom="4dip"
+                    android:scaleType="center" />
+                <TextView
+                    android:id="@+id/external_code_size_text"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:paddingTop="6dip"
+                    android:paddingRight="6dip"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:maxLines="1" />
+
+            </LinearLayout>
+
+            <LinearLayout
                 android:id="@+id/info_size"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -179,8 +216,8 @@
                 android:baselineAligned="true"
                 android:paddingTop="-1dip">
                 <TextView
-                    android:id="@+id/external_size_prefix"
-                    android:text="@string/external_size_label"
+                    android:id="@+id/external_data_size_prefix"
+                    android:text="@string/external_data_size_label"
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
@@ -199,7 +236,7 @@
                     android:layout_marginBottom="4dip"
                     android:scaleType="center" />
                 <TextView
-                    android:id="@+id/external_size_text"
+                    android:id="@+id/external_data_size_text"
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:paddingTop="6dip"
                     android:paddingRight="6dip"
diff --git a/res/layout/list_content_with_empty_view.xml b/res/layout/list_content_with_empty_view.xml
deleted file mode 100644
index 1d4dcdc..0000000
--- a/res/layout/list_content_with_empty_view.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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.
--->
-
- 
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
-    <ListView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/list"
-        android:layout_width="match_parent" 
-        android:layout_height="match_parent"
-        android:drawSelectorOnTop="false"
-        />
-
-    <TextView android:id="@+id/empty"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:padding="5dip"
-        android:gravity="center"
-        android:visibility="gone" />
-
-</FrameLayout>    
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_inputmethod.xml b/res/layout/preference_inputmethod.xml
new file mode 100644
index 0000000..227b165
--- /dev/null
+++ b/res/layout/preference_inputmethod.xml
@@ -0,0 +1,85 @@
+<?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="?android:attr/listPreferredItemHeight"
+    android:gravity="center_vertical">
+    <LinearLayout
+        android:id="@+id/inputmethod_pref"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:gravity="center_vertical"
+        android:clickable="true"
+        android:focusable="true"
+        android:background="?android:attr/selectableItemBackground">
+        <LinearLayout
+            android:id="@android:id/widget_frame"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="10dip"
+            android:gravity="center_vertical"
+            android:orientation="vertical" />
+        <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:textSize="13sp"
+                android:textColor="?android:attr/textColorSecondary"
+                android:maxLines="4" />
+        </RelativeLayout>
+    </LinearLayout>
+    <View
+        android:layout_width="2dip"
+        android:layout_height="match_parent"
+        android:layout_marginTop="5dip"
+        android:layout_marginBottom="5dip"
+        android:background="@android:drawable/divider_horizontal_dark" />
+    <ImageView
+        android:id="@+id/inputmethod_settings"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:paddingLeft="15dip"
+        android:paddingRight="?android:attr/scrollbarSize"
+        android:src="@drawable/ic_sysbar_quicksettings"
+        android:layout_gravity="center"
+        android:clickable="true"
+        android:focusable="true"
+        android:background="?android:attr/selectableItemBackground" />
+</LinearLayout>
diff --git a/res/xml/vpn_type.xml b/res/layout/preference_inputmethod_widget.xml
similarity index 63%
copy from res/xml/vpn_type.xml
copy to res/layout/preference_inputmethod_widget.xml
index fbc7822..ee573ad 100644
--- a/res/xml/vpn_type.xml
+++ b/res/layout/preference_inputmethod_widget.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 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.
@@ -14,8 +14,11 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
-        android:title="@string/vpn_type_title">
-
-</PreferenceScreen>   
+<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"/>
\ No newline at end of file
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/trusted_credential.xml b/res/layout/trusted_credential.xml
new file mode 100644
index 0000000..a2b84e2
--- /dev/null
+++ b/res/layout/trusted_credential.xml
@@ -0,0 +1,57 @@
+<?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="fill_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_vertical"
+    android:paddingRight="?android:attr/scrollbarSize"
+    android:background="?android:attr/selectableItemBackground"
+    android:padding="15dip"
+    >
+    <RelativeLayout
+        android:layout_width="0px"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        >
+        <TextView
+            android:id="@+id/trusted_credential_subject_primary"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+        />
+        <TextView
+            android:id="@+id/trusted_credential_subject_secondary"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/trusted_credential_subject_primary"
+            android:layout_alignLeft="@id/trusted_credential_subject_primary"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="?android:attr/textColorSecondary"
+        />
+    </RelativeLayout>
+    <!-- checkbox is invisible and not gone so that the height is consistent between tabs -->
+    <CheckBox
+        android:id="@+id/trusted_credential_status"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="invisible"
+        android:clickable="false"
+        android:focusable="false"
+        android:layout_weight="0"
+    />
+</LinearLayout>
diff --git a/res/xml/vpn_type.xml b/res/layout/trusted_credential_details.xml
similarity index 64%
copy from res/xml/vpn_type.xml
copy to res/layout/trusted_credential_details.xml
index fbc7822..e220e1c 100644
--- a/res/xml/vpn_type.xml
+++ b/res/layout/trusted_credential_details.xml
@@ -1,21 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 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.
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
-        android:title="@string/vpn_type_title">
-
-</PreferenceScreen>   
+<Button
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/cert_remove_button"
+    android:layout_height="wrap_content"
+    android:layout_width="wrap_content"
+    android:layout_gravity="right"
+    android:layout_margin="6dip"
+    />
diff --git a/res/layout/trusted_credentials.xml b/res/layout/trusted_credentials.xml
new file mode 100644
index 0000000..a96fefe
--- /dev/null
+++ b/res/layout/trusted_credentials.xml
@@ -0,0 +1,80 @@
+<?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:layout_width="match_parent"
+    android:layout_height="match_parent"
+    >
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:padding="5dp"
+        >
+        <TabWidget
+            android:id="@android:id/tabs"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+         />
+        <FrameLayout
+            android:id="@android:id/tabcontent"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:padding="5dp"
+            >
+            <FrameLayout
+                android:id="@+id/system_tab"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                >
+                <ProgressBar
+                    android:id="@+id/system_progress"
+		    style="?android:attr/progressBarStyleHorizontal"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:visibility="gone"
+                />
+                <ListView
+                    android:id="@+id/system_list"
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:visibility="gone"
+                    >
+                </ListView>
+            </FrameLayout>
+            <FrameLayout
+                android:id="@+id/user_tab"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                >
+                <ProgressBar
+                    android:id="@+id/user_progress"
+                    style="?android:attr/progressBarStyleLarge"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:visibility="gone"
+                />
+                <ListView
+                    android:id="@+id/user_list"
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:visibility="gone"
+                    >
+                </ListView>
+            </FrameLayout>
+        </FrameLayout>
+    </LinearLayout>
+</TabHost>
diff --git a/res/layout/vpn_connect_dialog_view.xml b/res/layout/vpn_connect_dialog_view.xml
deleted file mode 100644
index 3b6d0db..0000000
--- a/res/layout/vpn_connect_dialog_view.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?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.
--->
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-            android:orientation="vertical"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:padding="10dip">
-
-        <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:orientation="horizontal"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-            <TextView android:id="@+id/username_str"
-                    android:layout_width="@dimen/vpn_connect_input_box_label_width"
-                    android:layout_height="wrap_content"
-                    android:textSize="@dimen/vpn_connect_normal_text_size"
-                    android:gravity="right"
-                    android:layout_marginRight="@dimen/vpn_connect_margin_right"
-                    android:text="@string/vpn_username_colon" />
-            <EditText android:id="@+id/username_value"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:singleLine="True"/>
-        </LinearLayout>
-
-        <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:orientation="horizontal"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-            <TextView android:id="@+id/password_str"
-                    android:layout_width="@dimen/vpn_connect_input_box_label_width"
-                    android:layout_height="wrap_content"
-                    android:textSize="@dimen/vpn_connect_normal_text_size"
-                    android:gravity="right"
-                    android:layout_marginRight="@dimen/vpn_connect_margin_right"
-                    android:text="@string/vpn_password_colon" />
-            <EditText android:id="@+id/password_value"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:password="True"
-                    android:singleLine="True"/>
-        </LinearLayout>
-
-        <CheckBox android:id="@+id/save_username"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="66dip"
-                android:text="@string/vpn_save_username" />
-
-    </LinearLayout>
-</ScrollView>
diff --git a/res/layout/vpn_dialog.xml b/res/layout/vpn_dialog.xml
new file mode 100644
index 0000000..ffbfd4d
--- /dev/null
+++ b/res/layout/vpn_dialog.xml
@@ -0,0 +1,128 @@
+<?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="wrap_content"
+        android:layout_height="wrap_content">
+    <LinearLayout android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:padding="3mm">
+
+        <LinearLayout android:id="@+id/editor"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:visibility="gone">
+
+            <TextView style="@style/vpn_label" android:text="@string/vpn_name"/>
+            <EditText style="@style/vpn_value" android:id="@+id/name"
+                    android:inputType="textCapWords"/>
+
+            <TextView style="@style/vpn_label" android:text="@string/vpn_type"/>
+            <Spinner style="@style/vpn_value" android:id="@+id/type"
+                    android:prompt="@string/vpn_type"
+                    android:entries="@array/vpn_types"/>
+
+            <TextView style="@style/vpn_label" android:text="@string/vpn_server"/>
+            <EditText style="@style/vpn_value" android:id="@+id/server"/>
+
+            <CheckBox style="@style/vpn_value" android:id="@+id/mppe"
+                    android:text="@string/vpn_mppe"
+                    android:singleLine="false"
+                    android:visibility="gone"/>
+
+            <LinearLayout android:id="@+id/l2tp"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:visibility="gone">
+                <TextView style="@style/vpn_label" android:text="@string/vpn_l2tp_secret"/>
+                <EditText style="@style/vpn_value" android:id="@+id/l2tp_secret"
+                        android:password="true"
+                        android:hint="@string/vpn_not_used"/>
+            </LinearLayout>
+
+            <LinearLayout android:id="@+id/ipsec_id"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:visibility="gone">
+                <TextView style="@style/vpn_label" android:text="@string/vpn_ipsec_identifier"/>
+                <EditText style="@style/vpn_value" android:id="@+id/ipsec_identifier"
+                        android:hint="@string/vpn_not_used"/>
+            </LinearLayout>
+
+            <LinearLayout android:id="@+id/ipsec_psk"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:visibility="gone">
+                <TextView style="@style/vpn_label" android:text="@string/vpn_ipsec_secret"/>
+                <EditText style="@style/vpn_value" android:id="@+id/ipsec_secret"
+                        android:password="true"/>
+            </LinearLayout>
+
+            <LinearLayout android:id="@+id/ipsec_user"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:visibility="gone">
+                <TextView style="@style/vpn_label" android:text="@string/vpn_ipsec_user_cert"/>
+                <Spinner style="@style/vpn_value" android:id="@+id/ipsec_user_cert"
+                        android:prompt="@string/vpn_ipsec_user_cert" />
+            </LinearLayout>
+
+            <LinearLayout android:id="@+id/ipsec_ca"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:visibility="gone">
+                <TextView style="@style/vpn_label" android:text="@string/vpn_ipsec_ca_cert"/>
+                <Spinner style="@style/vpn_value" android:id="@+id/ipsec_ca_cert"
+                        android:prompt="@string/vpn_ipsec_ca_cert" />
+            </LinearLayout>
+
+            <TextView style="@style/vpn_label" android:text="@string/vpn_search_domains"/>
+            <EditText style="@style/vpn_value" android:id="@+id/search_domains"
+                    android:hint="@string/vpn_not_used"/>
+
+            <!-- Not sure if we have time to make it. -->
+            <TextView style="@style/vpn_label" android:text="@string/vpn_routes"
+                    android:visibility="gone"/>
+            <EditText style="@style/vpn_value" android:id="@+id/routes"
+                    android:visibility="gone"/>
+        </LinearLayout>
+
+        <LinearLayout android:id="@+id/login"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:visibility="gone">
+
+            <TextView style="@style/vpn_label" android:text="@string/vpn_username"/>
+            <EditText style="@style/vpn_value" android:id="@+id/username"/>
+
+            <TextView style="@style/vpn_label" android:text="@string/vpn_password"/>
+            <EditText style="@style/vpn_value" android:id="@+id/password"
+                    android:password="true"/>
+
+            <CheckBox style="@style/vpn_value" android:id="@+id/save_login"
+                    android:singleLine="false"
+                    android:text="@string/vpn_save_login"/>
+        </LinearLayout>
+    </LinearLayout>
+</ScrollView>
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..ae18231
--- /dev/null
+++ b/res/menu/data_usage.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.
+-->
+
+<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/data_usage_menu_roaming"
+                android:title="@string/data_usage_menu_roaming"
+                android:checkable="true" />
+            <item
+                android:id="@+id/data_usage_menu_restrict_background"
+                android:title="@string/data_usage_menu_restrict_background"
+                android:checkable="true" />
+            <item
+                android:id="@+id/data_usage_menu_split_4g"
+                android:title="@string/data_usage_menu_split_4g"
+                android:checkable="true" />
+            <item
+                android:id="@+id/data_usage_menu_show_wifi"
+                android:title="@string/data_usage_menu_show_wifi"
+                android:checkable="true" />
+        </menu>
+    </item>
+</menu>
diff --git a/res/xml/vpn_type.xml b/res/values-af-nokeys/strings.xml
similarity index 61%
copy from res/xml/vpn_type.xml
copy to res/values-af-nokeys/strings.xml
index fbc7822..6bebdde 100644
--- a/res/xml/vpn_type.xml
+++ b/res/values-af-nokeys/strings.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
+<?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.
@@ -12,10 +12,9 @@
      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"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
-        android:title="@string/vpn_type_title">
-
-</PreferenceScreen>   
+<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..56947ce
--- /dev/null
+++ b/res/values-af/arrays.xml
@@ -0,0 +1,259 @@
+<?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) -->
+    <!-- no translation found for window_animation_scale_entries:0 (8134156599370824081) -->
+    <!-- no translation found for window_animation_scale_entries:1 (6624864048416710414) -->
+    <!-- no translation found for window_animation_scale_entries:2 (2219332261255416635) -->
+    <!-- no translation found for window_animation_scale_entries:3 (3544428804137048509) -->
+    <!-- no translation found for window_animation_scale_entries:4 (3110710404225974514) -->
+    <!-- no translation found for window_animation_scale_entries:5 (4402738611528318731) -->
+    <!-- no translation found for window_animation_scale_entries:6 (6189539267968330656) -->
+    <!-- no translation found for transition_animation_scale_entries:0 (8464255836173039442) -->
+    <!-- no translation found for transition_animation_scale_entries:1 (3375781541913316411) -->
+    <!-- no translation found for transition_animation_scale_entries:2 (1991041427801869945) -->
+    <!-- no translation found for transition_animation_scale_entries:3 (4012689927622382874) -->
+    <!-- no translation found for transition_animation_scale_entries:4 (3289156759925947169) -->
+    <!-- no translation found for transition_animation_scale_entries:5 (7705857441213621835) -->
+    <!-- no translation found for transition_animation_scale_entries:6 (6660750935954853365) -->
+    <!-- no translation found for app_process_limit_entries:0 (6799596560242275471) -->
+    <!-- no translation found for app_process_limit_entries:1 (2412794376818632575) -->
+    <!-- no translation found for app_process_limit_entries:2 (1578904888612645001) -->
+    <!-- no translation found for app_process_limit_entries:3 (8819235336299873577) -->
+    <!-- no translation found for vpn_types_long:0 (2732002039459078847) -->
+    <!-- no translation found for vpn_types_long:1 (3799752201662127867) -->
+    <!-- no translation found for vpn_types_long:2 (4725504331295252103) -->
+    <!-- no translation found for vpn_types_long:3 (7526551163264034377) -->
+    <!-- no translation found for vpn_types_long:4 (8064740940687465039) -->
+    <!-- no translation found for vpn_types_long:5 (4946199982372391490) -->
+    <!-- no translation found for vpn_states:0 (8621078286418985762) -->
+    <!-- no translation found for vpn_states:1 (6692305604213080515) -->
+    <!-- no translation found for vpn_states:2 (8001704909356800092) -->
+    <!-- no translation found for vpn_states:3 (4039737283841672166) -->
+    <!-- no translation found for vpn_states:4 (4042143101664725090) -->
+    <!-- no translation found for vpn_states:5 (2690164254699635531) -->
+</resources>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
new file mode 100644
index 0000000..597f299
--- /dev/null
+++ b/res/values-af/strings.xml
@@ -0,0 +1,2059 @@
+<?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 header_category_wireless_networks (4944823405420438623) -->
+    <skip />
+    <!-- no translation found for header_category_device (5781174212691167553) -->
+    <skip />
+    <!-- no translation found for header_category_personal (6225932173498802187) -->
+    <skip />
+    <!-- no translation found for header_category_system (2073558547468647128) -->
+    <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 (192587958424295789) -->
+    <skip />
+    <!-- no translation found for progress_tap_to_pair (4192342336107106334) -->
+    <skip />
+    <!-- no translation found for bluetooth_no_devices_found (2412462335116297668) -->
+    <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 bluetooth_connection_permission_request (4747918249032890077) -->
+    <skip />
+    <!-- no translation found for bluetooth_connection_notif_message (1833221950512058309) -->
+    <skip />
+    <!-- no translation found for bluetooth_connection_dialog_text (8455427559949998023) -->
+    <skip />
+    <!-- no translation found for date_and_time (4114084177056654663) -->
+    <skip />
+    <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00 nm"</string>
+    <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
+    <!-- no translation found for choose_timezone (7762866468013985022) -->
+    <skip />
+    <string name="normal_date_format" msgid="1982904221918374153">"Normaal (<xliff:g id="DATE">%s</xliff:g>)"</string>
+    <!-- no translation found for display_preview_label (1127597250917274792) -->
+    <skip />
+    <!-- no translation found for display_font_size_label (8941851418397475389) -->
+    <skip />
+    <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
+    <skip />
+    <string name="intent_sender_sendbroadcast_text" msgid="1415735148895872715">"Stuur <xliff:g id="BROADCAST">broadcast</xliff:g>"</string>
+    <string name="intent_sender_action_label" msgid="616458370005452389">"<xliff:g id="ACTION">Action</xliff:g>:"</string>
+    <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Begin <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
+    <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
+    <string name="intent_sender_account_label" msgid="465210404475603404">"Rekening:"</string>
+    <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 />
+    <!-- outdated translation 5868688473587168882 -->     <string name="radio_controls_title" msgid="6889937359495515769">"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>
+    <!-- no translation found for location_settings_title (8935806698251432196) -->
+    <skip />
+    <!-- outdated translation 5168491784222013179 -->     <string name="security_settings_title" msgid="7945465324818485460">"Ligging en sekuriteit"</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 (1810521656168174329) -->
+    <skip />
+    <!-- no translation found for bluetooth_settings_title (1908745291161353016) -->
+    <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>
+    <!-- no translation found for bluetooth_search_for_devices (5957007154213560390) -->
+    <skip />
+    <!-- no translation found for bluetooth_searching_for_devices (9203739709307871727) -->
+    <skip />
+    <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>
+    <!-- no translation found for bluetooth_menu_advanced (8572178316357220524) -->
+    <skip />
+    <!-- no translation found for bluetooth_advanced_titlebar (2142159726881547669) -->
+    <skip />
+    <!-- no translation found for bluetooth_advanced_settings_label (8659717781212434173) -->
+    <skip />
+    <!-- no translation found for bluetooth_empty_list_bluetooth_off (3631028334811113629) -->
+    <skip />
+    <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 (1277428034634973011) -->
+    <skip />
+    <!-- no translation found for wifi_settings_category (2810363951104753710) -->
+    <skip />
+    <!-- no translation found for wifi_settings_title (4351120897298124250) -->
+    <skip />
+    <!-- no translation found for wifi_settings_summary (668767638556052820) -->
+    <skip />
+    <!-- no translation found for wifi_starting (7732330327758522943) -->
+    <skip />
+    <!-- no translation found for wifi_stopping (244864762599017659) -->
+    <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 />
+    <!-- no translation found for wifi_enable_watchdog_service (4723544454066601706) -->
+    <skip />
+    <!-- no translation found for wifi_enable_watchdog_service_summary (8687400936839455926) -->
+    <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>
+    <!-- outdated translation 1671334951296205616 -->     <string name="wifi_add_network" msgid="6234851776910938957">"Voeg Wi-Fi-netwerk by"</string>
+    <!-- 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>
+    <!-- no translation found for wifi_empty_list_wifi_off (3682507011071029311) -->
+    <skip />
+    <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 />
+    <!-- outdated translation 5419052271935350999 -->     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"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_advanced_settings_label (3654366894867838338) -->
+    <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="1708697328627382561">"Wys"</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 storage_menu_usb (1580545228584324704) -->
+    <skip />
+    <!-- no translation found for storage_title_usb (5775322159427546546) -->
+    <skip />
+    <!-- no translation found for usb_label_mtp (4157227401755543412) -->
+    <skip />
+    <!-- no translation found for usb_label_ptp (7417254019489575819) -->
+    <skip />
+    <!-- no translation found for usb_label_installer_cd (7438467574756086977) -->
+    <skip />
+    <!-- no translation found for battery_status_title (9159414319574976203) -->
+    <skip />
+    <!-- no translation found for battery_level_title (2965679202786873272) -->
+    <skip />
+    <!-- no translation found for apn_settings (3743170484827528406) -->
+    <skip />
+    <!-- no translation found for apn_edit (1354715499708424718) -->
+    <skip />
+    <!-- no translation found for apn_not_set (7422262558097875757) -->
+    <skip />
+    <!-- no translation found for apn_name (4115580098369824123) -->
+    <skip />
+    <!-- no translation found for apn_apn (2479425126733513353) -->
+    <skip />
+    <!-- no translation found for apn_http_proxy (1826885957243696354) -->
+    <skip />
+    <!-- no translation found for apn_http_port (3763259523984976226) -->
+    <skip />
+    <!-- no translation found for apn_user (455637547356117761) -->
+    <skip />
+    <!-- no translation found for apn_password (5412301994998250968) -->
+    <skip />
+    <!-- no translation found for apn_server (2436185314756372858) -->
+    <skip />
+    <!-- no translation found for apn_mmsc (3670124402105585737) -->
+    <skip />
+    <!-- no translation found for apn_mms_proxy (5374082621073999275) -->
+    <skip />
+    <!-- no translation found for apn_mms_port (4074188088199243040) -->
+    <skip />
+    <!-- no translation found for apn_mcc (4258628382260674636) -->
+    <skip />
+    <!-- no translation found for apn_mnc (8629374076888809874) -->
+    <skip />
+    <string name="apn_auth_type" msgid="6167205395676037015">"Stawingstipe"</string>
+    <string name="apn_auth_type_none" msgid="5069592676845549926">"Geen"</string>
+    <string name="apn_auth_type_pap" msgid="1666934536996033383">"PAP"</string>
+    <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
+    <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP of CHAP"</string>
+    <!-- no translation found for apn_type (469613123902220544) -->
+    <skip />
+    <!-- no translation found for apn_protocol (3272222921649348640) -->
+    <skip />
+    <!-- no translation found for menu_delete (6981294422841124659) -->
+    <skip />
+    <!-- no translation found for menu_new (3014205883303921729) -->
+    <skip />
+    <!-- no translation found for menu_save (8109345640668285399) -->
+    <skip />
+    <!-- no translation found for menu_cancel (2194502410474697474) -->
+    <skip />
+    <!-- no translation found for error_title (1319225301794168762) -->
+    <skip />
+    <!-- no translation found for error_name_empty (1498238337687930558) -->
+    <skip />
+    <!-- no translation found for error_apn_empty (1513892291812404310) -->
+    <skip />
+    <!-- no translation found for error_mcc_not3 (4560171714156251661) -->
+    <skip />
+    <!-- no translation found for error_mnc_not23 (8418177072458379439) -->
+    <skip />
+    <string name="restore_default_apn" msgid="2724583218635739913">"Laai verstek APN-instellings terug"</string>
+    <string name="menu_restore" msgid="8260067415075573273">"Stel terug na verstek"</string>
+    <string name="restore_default_apn_completed" msgid="3990449939234957281">"Terugstel van APN- verstek instellings voltooi"</string>
+    <!-- no translation found for master_clear_title (5907939616087039756) -->
+    <skip />
+    <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 wireless_category_general (2973810407987118067) -->
+    <skip />
+    <!-- no translation found for wireless_category_mobile_networks (1254629216798424288) -->
+    <skip />
+    <!-- no translation found for network_settings_title (7967552516440151852) -->
+    <skip />
+    <!-- no translation found for network_settings_summary (5149750850846813553) -->
+    <skip />
+    <string name="location_title" msgid="1029961368397484576">"My ligging"</string>
+    <!-- no translation found for location_network_based (8815705866861993344) -->
+    <skip />
+    <!-- no translation found for location_networks_disabled (2708968452901433980) -->
+    <skip />
+    <!-- no translation found for location_neighborhood_level (4656658097932515921) -->
+    <skip />
+    <!-- no translation found for location_neighborhood_level_wifi (7457348712272184793) -->
+    <skip />
+    <string name="location_gps" msgid="6296125378829097831">"Gebruik GPS-satelliete"</string>
+    <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>
+    <!-- outdated translation 3692151094288835065 -->     <string name="lock_intro_message" product="default" msgid="5796785892741212873">"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>
+    <!-- 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 external_code_size_label (3459343140355961335) -->
+    <skip />
+    <!-- no translation found for data_size_label (8679376373625710107) -->
+    <skip />
+    <!-- no translation found for external_data_size_label (7533821466482000453) -->
+    <skip />
+    <!-- no translation found for external_data_size_label (626414192825329708) -->
+    <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 (215179176067683667) -->
+    <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>
+    <!-- no translation found for toggle_large_text_title (42259643359869436) -->
+    <skip />
+    <string name="accessibility_services_category" msgid="8127851026323672607">"Toeganklikheidsdienste"</string>
+    <!-- outdated translation 650839277066574497 -->     <string name="toggle_accessibility_title" msgid="7338739354952553958">"Toeganklikheid"</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_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 />
+    <!-- outdated translation 5180282911164282324 -->     <string name="power_usage_summary_title" msgid="7190304207330319919">"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_title" msgid="7327468307909556719">"VPN-instellings"</string>
+    <string name="vpn_settings_summary" msgid="8849924181594963972">"Stel op en bestuur virtuele private netwerke (VPN\'e)"</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>
+    <!-- no translation found for trusted_credentials (4266945289534242402) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_summary (6735221351155686632) -->
+    <skip />
+    <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>
+    <!-- outdated translation 9206631214140954954 -->     <string name="privacy_settings" msgid="5446972770562918934">"Privaatheid"</string>
+    <!-- outdated translation 1987089301293213705 -->     <string name="privacy_settings_title" msgid="4856282165773594890">"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 debug_ui_category (9023948280291055349) -->
+    <skip />
+    <!-- no translation found for strict_mode (1938795874357830695) -->
+    <skip />
+    <!-- no translation found for strict_mode_summary (142834318897332338) -->
+    <skip />
+    <!-- no translation found for pointer_location (6084434787496938001) -->
+    <skip />
+    <!-- no translation found for pointer_location_summary (840819275172753713) -->
+    <skip />
+    <!-- no translation found for show_screen_updates (8282711794220426931) -->
+    <skip />
+    <!-- no translation found for show_screen_updates_summary (1716122382094924596) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage (2389212910758076024) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage_summary (2113341923988958266) -->
+    <skip />
+    <!-- no translation found for window_animation_scale_title (6162587588166114700) -->
+    <skip />
+    <!-- no translation found for transition_animation_scale_title (387527540523595875) -->
+    <skip />
+    <!-- no translation found for debug_applications_category (6221644998451283813) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities (3622005081180597749) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities_summary (3592221124808773368) -->
+    <skip />
+    <!-- no translation found for app_process_limit_title (4121324758038197598) -->
+    <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 (8821760330497941117) -->
+    <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 (2441219164620753329) -->
+    <skip />
+    <!-- no translation found for data_usage_sweep_warning (6387081852568846982) -->
+    <skip />
+    <!-- no translation found for cryptkeeper_emergency_call (198578731586097145) -->
+    <skip />
+    <!-- no translation found for cryptkeeper_return_to_call (5613717339452772491) -->
+    <skip />
+    <!-- outdated translation 1550918148476193076 -->     <string name="vpn_name" msgid="4689699885361002297">"VPN-naam"</string>
+    <!-- no translation found for vpn_type (5435733139514388070) -->
+    <skip />
+    <!-- no translation found for vpn_server (2123096727287421913) -->
+    <skip />
+    <!-- no translation found for vpn_mppe (6639001940500288972) -->
+    <skip />
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"L2TP-geheim"</string>
+    <!-- no translation found for vpn_ipsec_identifier (4098175859460006296) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_secret (4526453255704888704) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_user_cert (6880651510020187230) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_ca_cert (91338213449148229) -->
+    <skip />
+    <!-- no translation found for vpn_search_domains (5391995501541199624) -->
+    <skip />
+    <!-- no translation found for vpn_routes (8556236801755260073) -->
+    <skip />
+    <!-- no translation found for vpn_username (1863901629860867849) -->
+    <skip />
+    <!-- no translation found for vpn_password (6756043647233596772) -->
+    <skip />
+    <!-- no translation found for vpn_save_login (6350322456427484881) -->
+    <skip />
+    <!-- no translation found for vpn_not_used (9094191054524660891) -->
+    <skip />
+    <!-- no translation found for vpn_no_ca_cert (7820884983947090538) -->
+    <skip />
+    <!-- no translation found for vpn_cancel (1979937976123659332) -->
+    <skip />
+    <!-- no translation found for vpn_save (4233484051644764510) -->
+    <skip />
+    <!-- no translation found for vpn_connect (8469608541746132301) -->
+    <skip />
+    <!-- no translation found for vpn_edit (1111459297288136079) -->
+    <skip />
+    <!-- no translation found for vpn_connect_to (7328758950427515753) -->
+    <skip />
+    <!-- no translation found for vpn_title (7982620762043790565) -->
+    <skip />
+    <!-- no translation found for vpn_create (8966010925994175306) -->
+    <skip />
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"Redigeer netwerk"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"Vee netwerk uit"</string>
+    <!-- no translation found for trusted_credentials_system_tab (3984284264816924534) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_user_tab (2244732111398939475) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_disable_label (3864493185845818506) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_enable_label (2498444573635146913) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_remove_label (3633691709300260836) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_enable_confirmation (83215982842660869) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_disable_confirmation (8199697813361646792) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_remove_confirmation (443561923016852941) -->
+    <skip />
+</resources>
diff --git a/res/xml/vpn_type.xml b/res/values-am-nokeys/strings.xml
similarity index 61%
copy from res/xml/vpn_type.xml
copy to res/values-am-nokeys/strings.xml
index fbc7822..26b226d 100644
--- a/res/xml/vpn_type.xml
+++ b/res/values-am-nokeys/strings.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
+<?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.
@@ -12,10 +12,9 @@
      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"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
-        android:title="@string/vpn_type_title">
-
-</PreferenceScreen>   
+<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..4711c96
--- /dev/null
+++ b/res/values-am/arrays.xml
@@ -0,0 +1,259 @@
+<?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) -->
+    <!-- no translation found for window_animation_scale_entries:0 (8134156599370824081) -->
+    <!-- no translation found for window_animation_scale_entries:1 (6624864048416710414) -->
+    <!-- no translation found for window_animation_scale_entries:2 (2219332261255416635) -->
+    <!-- no translation found for window_animation_scale_entries:3 (3544428804137048509) -->
+    <!-- no translation found for window_animation_scale_entries:4 (3110710404225974514) -->
+    <!-- no translation found for window_animation_scale_entries:5 (4402738611528318731) -->
+    <!-- no translation found for window_animation_scale_entries:6 (6189539267968330656) -->
+    <!-- no translation found for transition_animation_scale_entries:0 (8464255836173039442) -->
+    <!-- no translation found for transition_animation_scale_entries:1 (3375781541913316411) -->
+    <!-- no translation found for transition_animation_scale_entries:2 (1991041427801869945) -->
+    <!-- no translation found for transition_animation_scale_entries:3 (4012689927622382874) -->
+    <!-- no translation found for transition_animation_scale_entries:4 (3289156759925947169) -->
+    <!-- no translation found for transition_animation_scale_entries:5 (7705857441213621835) -->
+    <!-- no translation found for transition_animation_scale_entries:6 (6660750935954853365) -->
+    <!-- no translation found for app_process_limit_entries:0 (6799596560242275471) -->
+    <!-- no translation found for app_process_limit_entries:1 (2412794376818632575) -->
+    <!-- no translation found for app_process_limit_entries:2 (1578904888612645001) -->
+    <!-- no translation found for app_process_limit_entries:3 (8819235336299873577) -->
+    <!-- no translation found for vpn_types_long:0 (2732002039459078847) -->
+    <!-- no translation found for vpn_types_long:1 (3799752201662127867) -->
+    <!-- no translation found for vpn_types_long:2 (4725504331295252103) -->
+    <!-- no translation found for vpn_types_long:3 (7526551163264034377) -->
+    <!-- no translation found for vpn_types_long:4 (8064740940687465039) -->
+    <!-- no translation found for vpn_types_long:5 (4946199982372391490) -->
+    <!-- no translation found for vpn_states:0 (8621078286418985762) -->
+    <!-- no translation found for vpn_states:1 (6692305604213080515) -->
+    <!-- no translation found for vpn_states:2 (8001704909356800092) -->
+    <!-- no translation found for vpn_states:3 (4039737283841672166) -->
+    <!-- no translation found for vpn_states:4 (4042143101664725090) -->
+    <!-- no translation found for vpn_states:5 (2690164254699635531) -->
+</resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
new file mode 100644
index 0000000..18275ca
--- /dev/null
+++ b/res/values-am/strings.xml
@@ -0,0 +1,2061 @@
+<?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 header_category_wireless_networks (4944823405420438623) -->
+    <skip />
+    <!-- no translation found for header_category_device (5781174212691167553) -->
+    <skip />
+    <!-- no translation found for header_category_personal (6225932173498802187) -->
+    <skip />
+    <!-- no translation found for header_category_system (2073558547468647128) -->
+    <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 (192587958424295789) -->
+    <skip />
+    <!-- no translation found for progress_tap_to_pair (4192342336107106334) -->
+    <skip />
+    <!-- no translation found for bluetooth_no_devices_found (2412462335116297668) -->
+    <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 bluetooth_connection_permission_request (4747918249032890077) -->
+    <skip />
+    <!-- no translation found for bluetooth_connection_notif_message (1833221950512058309) -->
+    <skip />
+    <!-- no translation found for bluetooth_connection_dialog_text (8455427559949998023) -->
+    <skip />
+    <!-- no translation found for date_and_time (4114084177056654663) -->
+    <skip />
+    <string name="date_time_12_hour_sample" msgid="3259617262618020574">"ከሰዓት በኃላ1:00"</string>
+    <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
+    <!-- no translation found for choose_timezone (7762866468013985022) -->
+    <skip />
+    <string name="normal_date_format" msgid="1982904221918374153">"መደበኛ (<xliff:g id="DATE">%s</xliff:g>)"</string>
+    <!-- no translation found for display_preview_label (1127597250917274792) -->
+    <skip />
+    <!-- no translation found for display_font_size_label (8941851418397475389) -->
+    <skip />
+    <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
+    <skip />
+    <string name="intent_sender_sendbroadcast_text" msgid="1415735148895872715">" ይላኩ <xliff:g id="BROADCAST">broadcast</xliff:g>"</string>
+    <string name="intent_sender_action_label" msgid="616458370005452389">"<xliff:g id="ACTION">Action</xliff:g>:"</string>
+    <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"ጀምር <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
+    <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
+    <string name="intent_sender_account_label" msgid="465210404475603404">"መለያ:"</string>
+    <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 />
+    <!-- unknown quoting pattern: original -1, translation 1 -->
+    <!-- outdated translation 5868688473587168882 -->     <string name="radio_controls_title" msgid="6889937359495515769">"የገመድ አልባ &amp;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>
+    <!-- no translation found for location_settings_title (8935806698251432196) -->
+    <skip />
+    <!-- unknown quoting pattern: original -1, translation 1 -->
+    <!-- outdated translation 5168491784222013179 -->     <string name="security_settings_title" msgid="7945465324818485460">"የሥፍራ&amp;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 (1810521656168174329) -->
+    <skip />
+    <!-- no translation found for bluetooth_settings_title (1908745291161353016) -->
+    <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>
+    <!-- no translation found for bluetooth_search_for_devices (5957007154213560390) -->
+    <skip />
+    <!-- no translation found for bluetooth_searching_for_devices (9203739709307871727) -->
+    <skip />
+    <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>
+    <!-- no translation found for bluetooth_menu_advanced (8572178316357220524) -->
+    <skip />
+    <!-- no translation found for bluetooth_advanced_titlebar (2142159726881547669) -->
+    <skip />
+    <!-- no translation found for bluetooth_advanced_settings_label (8659717781212434173) -->
+    <skip />
+    <!-- no translation found for bluetooth_empty_list_bluetooth_off (3631028334811113629) -->
+    <skip />
+    <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 (1277428034634973011) -->
+    <skip />
+    <!-- no translation found for wifi_settings_category (2810363951104753710) -->
+    <skip />
+    <!-- no translation found for wifi_settings_title (4351120897298124250) -->
+    <skip />
+    <!-- no translation found for wifi_settings_summary (668767638556052820) -->
+    <skip />
+    <!-- no translation found for wifi_starting (7732330327758522943) -->
+    <skip />
+    <!-- no translation found for wifi_stopping (244864762599017659) -->
+    <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 />
+    <!-- no translation found for wifi_enable_watchdog_service (4723544454066601706) -->
+    <skip />
+    <!-- no translation found for wifi_enable_watchdog_service_summary (8687400936839455926) -->
+    <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>
+    <!-- outdated translation 1671334951296205616 -->     <string name="wifi_add_network" msgid="6234851776910938957">"Wi-Fi  አውታረ መረብ አክል"</string>
+    <!-- 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>
+    <!-- no translation found for wifi_empty_list_wifi_off (3682507011071029311) -->
+    <skip />
+    <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 />
+    <!-- outdated translation 5419052271935350999 -->     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"የላቀ"</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_advanced_settings_label (3654366894867838338) -->
+    <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="1708697328627382561">"አሳይ"</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 storage_menu_usb (1580545228584324704) -->
+    <skip />
+    <!-- no translation found for storage_title_usb (5775322159427546546) -->
+    <skip />
+    <!-- no translation found for usb_label_mtp (4157227401755543412) -->
+    <skip />
+    <!-- no translation found for usb_label_ptp (7417254019489575819) -->
+    <skip />
+    <!-- no translation found for usb_label_installer_cd (7438467574756086977) -->
+    <skip />
+    <!-- no translation found for battery_status_title (9159414319574976203) -->
+    <skip />
+    <!-- no translation found for battery_level_title (2965679202786873272) -->
+    <skip />
+    <!-- no translation found for apn_settings (3743170484827528406) -->
+    <skip />
+    <!-- no translation found for apn_edit (1354715499708424718) -->
+    <skip />
+    <!-- no translation found for apn_not_set (7422262558097875757) -->
+    <skip />
+    <!-- no translation found for apn_name (4115580098369824123) -->
+    <skip />
+    <!-- no translation found for apn_apn (2479425126733513353) -->
+    <skip />
+    <!-- no translation found for apn_http_proxy (1826885957243696354) -->
+    <skip />
+    <!-- no translation found for apn_http_port (3763259523984976226) -->
+    <skip />
+    <!-- no translation found for apn_user (455637547356117761) -->
+    <skip />
+    <!-- no translation found for apn_password (5412301994998250968) -->
+    <skip />
+    <!-- no translation found for apn_server (2436185314756372858) -->
+    <skip />
+    <!-- no translation found for apn_mmsc (3670124402105585737) -->
+    <skip />
+    <!-- no translation found for apn_mms_proxy (5374082621073999275) -->
+    <skip />
+    <!-- no translation found for apn_mms_port (4074188088199243040) -->
+    <skip />
+    <!-- no translation found for apn_mcc (4258628382260674636) -->
+    <skip />
+    <!-- no translation found for apn_mnc (8629374076888809874) -->
+    <skip />
+    <string name="apn_auth_type" msgid="6167205395676037015">"የማረጋገጫ  አይነት"</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 wireless_category_general (2973810407987118067) -->
+    <skip />
+    <!-- no translation found for wireless_category_mobile_networks (1254629216798424288) -->
+    <skip />
+    <!-- no translation found for network_settings_title (7967552516440151852) -->
+    <skip />
+    <!-- no translation found for network_settings_summary (5149750850846813553) -->
+    <skip />
+    <string name="location_title" msgid="1029961368397484576">"የኔ ሥፍራ"</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>
+    <!-- outdated translation 3692151094288835065 -->     <string name="lock_intro_message" product="default" msgid="5796785892741212873">"የግል ማያ መክፈቻ ስርዓተ ጥለት በመፍጠርጡባዊዎ ካልተፈቀደ ጥቅም ይከላከሉ።በሚቀጥለው ማያ ላይበማንኛውም ስርዓተ ነጥቦቹን ለማገናኘት  ጣትዎን ይጠቀሙ። ቢያንስ አራት ነጥቦች ማገናኘት አለብዎ።"\n\n" ለመጀመር ዝግጁ ነዎት? \"ቀጥል\" ይንኩ።"</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 external_code_size_label (3459343140355961335) -->
+    <skip />
+    <!-- no translation found for data_size_label (8679376373625710107) -->
+    <skip />
+    <!-- no translation found for external_data_size_label (7533821466482000453) -->
+    <skip />
+    <!-- no translation found for external_data_size_label (626414192825329708) -->
+    <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 (215179176067683667) -->
+    <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>
+    <!-- no translation found for toggle_large_text_title (42259643359869436) -->
+    <skip />
+    <string name="accessibility_services_category" msgid="8127851026323672607">"ተደራሽነት አገልግሎቶች"</string>
+    <!-- outdated translation 650839277066574497 -->     <string name="toggle_accessibility_title" msgid="7338739354952553958">"ተደራሽነት"</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_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 />
+    <!-- outdated translation 5180282911164282324 -->     <string name="power_usage_summary_title" msgid="7190304207330319919">"የባትሪ ጥቅም"</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_title" msgid="7327468307909556719">"የVPN ቅንብሮች"</string>
+    <string name="vpn_settings_summary" msgid="8849924181594963972">"&amp; አዘጋጅ(VPNs) አደራጅ"</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>
+    <!-- no translation found for trusted_credentials (4266945289534242402) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_summary (6735221351155686632) -->
+    <skip />
+    <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>
+    <!-- outdated translation 9206631214140954954 -->     <string name="privacy_settings" msgid="5446972770562918934">"ብሕትውነት"</string>
+    <!-- outdated translation 1987089301293213705 -->     <string name="privacy_settings_title" msgid="4856282165773594890">"የብሕትውነት ቅንብሮች"</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 debug_ui_category (9023948280291055349) -->
+    <skip />
+    <!-- no translation found for strict_mode (1938795874357830695) -->
+    <skip />
+    <!-- no translation found for strict_mode_summary (142834318897332338) -->
+    <skip />
+    <!-- no translation found for pointer_location (6084434787496938001) -->
+    <skip />
+    <!-- no translation found for pointer_location_summary (840819275172753713) -->
+    <skip />
+    <!-- no translation found for show_screen_updates (8282711794220426931) -->
+    <skip />
+    <!-- no translation found for show_screen_updates_summary (1716122382094924596) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage (2389212910758076024) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage_summary (2113341923988958266) -->
+    <skip />
+    <!-- no translation found for window_animation_scale_title (6162587588166114700) -->
+    <skip />
+    <!-- no translation found for transition_animation_scale_title (387527540523595875) -->
+    <skip />
+    <!-- no translation found for debug_applications_category (6221644998451283813) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities (3622005081180597749) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities_summary (3592221124808773368) -->
+    <skip />
+    <!-- no translation found for app_process_limit_title (4121324758038197598) -->
+    <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 (8821760330497941117) -->
+    <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 (2441219164620753329) -->
+    <skip />
+    <!-- no translation found for data_usage_sweep_warning (6387081852568846982) -->
+    <skip />
+    <!-- no translation found for cryptkeeper_emergency_call (198578731586097145) -->
+    <skip />
+    <!-- no translation found for cryptkeeper_return_to_call (5613717339452772491) -->
+    <skip />
+    <!-- outdated translation 1550918148476193076 -->     <string name="vpn_name" msgid="4689699885361002297">"VPN ስም"</string>
+    <!-- no translation found for vpn_type (5435733139514388070) -->
+    <skip />
+    <!-- no translation found for vpn_server (2123096727287421913) -->
+    <skip />
+    <!-- no translation found for vpn_mppe (6639001940500288972) -->
+    <skip />
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"L2TP ሚስጥር"</string>
+    <!-- no translation found for vpn_ipsec_identifier (4098175859460006296) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_secret (4526453255704888704) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_user_cert (6880651510020187230) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_ca_cert (91338213449148229) -->
+    <skip />
+    <!-- no translation found for vpn_search_domains (5391995501541199624) -->
+    <skip />
+    <!-- no translation found for vpn_routes (8556236801755260073) -->
+    <skip />
+    <!-- no translation found for vpn_username (1863901629860867849) -->
+    <skip />
+    <!-- no translation found for vpn_password (6756043647233596772) -->
+    <skip />
+    <!-- no translation found for vpn_save_login (6350322456427484881) -->
+    <skip />
+    <!-- no translation found for vpn_not_used (9094191054524660891) -->
+    <skip />
+    <!-- no translation found for vpn_no_ca_cert (7820884983947090538) -->
+    <skip />
+    <!-- no translation found for vpn_cancel (1979937976123659332) -->
+    <skip />
+    <!-- no translation found for vpn_save (4233484051644764510) -->
+    <skip />
+    <!-- no translation found for vpn_connect (8469608541746132301) -->
+    <skip />
+    <!-- no translation found for vpn_edit (1111459297288136079) -->
+    <skip />
+    <!-- no translation found for vpn_connect_to (7328758950427515753) -->
+    <skip />
+    <!-- no translation found for vpn_title (7982620762043790565) -->
+    <skip />
+    <!-- no translation found for vpn_create (8966010925994175306) -->
+    <skip />
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"አውታረ መረብ አርትዕ"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"አውታረ መረብ ሰርዝ"</string>
+    <!-- no translation found for trusted_credentials_system_tab (3984284264816924534) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_user_tab (2244732111398939475) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_disable_label (3864493185845818506) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_enable_label (2498444573635146913) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_remove_label (3633691709300260836) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_enable_confirmation (83215982842660869) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_disable_confirmation (8199697813361646792) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_remove_confirmation (443561923016852941) -->
+    <skip />
+</resources>
diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml
index 24d04ca..ab844a8 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>
@@ -214,4 +240,36 @@
     <item msgid="3878793616631049349">"استخدام التحقق من HDCP لمحتوى DRM فقط"</item>
     <item msgid="45075631231212732">"استخدام التحقق من HDCP دومًا"</item>
   </string-array>
+    <!-- no translation found for window_animation_scale_entries:0 (8134156599370824081) -->
+    <!-- no translation found for window_animation_scale_entries:1 (6624864048416710414) -->
+    <!-- no translation found for window_animation_scale_entries:2 (2219332261255416635) -->
+    <!-- no translation found for window_animation_scale_entries:3 (3544428804137048509) -->
+    <!-- no translation found for window_animation_scale_entries:4 (3110710404225974514) -->
+    <!-- no translation found for window_animation_scale_entries:5 (4402738611528318731) -->
+    <!-- no translation found for window_animation_scale_entries:6 (6189539267968330656) -->
+    <!-- no translation found for transition_animation_scale_entries:0 (8464255836173039442) -->
+    <!-- no translation found for transition_animation_scale_entries:1 (3375781541913316411) -->
+    <!-- no translation found for transition_animation_scale_entries:2 (1991041427801869945) -->
+    <!-- no translation found for transition_animation_scale_entries:3 (4012689927622382874) -->
+    <!-- no translation found for transition_animation_scale_entries:4 (3289156759925947169) -->
+    <!-- no translation found for transition_animation_scale_entries:5 (7705857441213621835) -->
+    <!-- no translation found for transition_animation_scale_entries:6 (6660750935954853365) -->
+    <!-- no translation found for app_process_limit_entries:0 (6799596560242275471) -->
+    <!-- no translation found for app_process_limit_entries:1 (2412794376818632575) -->
+    <!-- no translation found for app_process_limit_entries:2 (1578904888612645001) -->
+    <!-- no translation found for app_process_limit_entries:3 (8819235336299873577) -->
+  <string-array name="vpn_types_long">
+    <item msgid="2732002039459078847">"شبكة ظاهرية خاصة (VPN) عبر PPTP"</item>
+    <item msgid="3799752201662127867">"شبكة ظاهرية خاصة (VPN) لـ L2TP/IPSec مزودة بمفاتيح مشتركة مسبقًا"</item>
+    <item msgid="4725504331295252103">"شبكة ظاهرية خاصة (VPN) لـ L2TP/IPSec مزودة بشهادات"</item>
+    <item msgid="7526551163264034377">"شبكة ظاهرية خاصة (VPN) لـ IPSec مزودة بمفاتيح مشتركة مسبقًا ومصادقة Xauth"</item>
+    <item msgid="8064740940687465039">"شبكة ظاهرية خاصة (VPN) لـ IPSec مزودة بشهادات ومصادقة Xauth"</item>
+    <item msgid="4946199982372391490">"شبكة ظاهرية خاصة (VPN) لـ IPSec مزودة بشهادات ومصادقة مختلطة"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:0 (8621078286418985762) -->
+    <!-- no translation found for vpn_states:1 (6692305604213080515) -->
+    <!-- no translation found for vpn_states:2 (8001704909356800092) -->
+    <!-- no translation found for vpn_states:3 (4039737283841672166) -->
+    <!-- no translation found for vpn_states:4 (4042143101664725090) -->
+    <!-- no translation found for vpn_states:5 (2690164254699635531) -->
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 24e2d3d..37baba5 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -19,6 +19,10 @@
     <string name="yes" msgid="4676390750360727396">"نعم"</string>
     <string name="no" msgid="6731231425810196216">"لا"</string>
     <string name="device_info_default" msgid="7847265875578739287">"غير معروف"</string>
+    <string name="header_category_wireless_networks" msgid="4944823405420438623">"اللاسلكي والشبكات"</string>
+    <string name="header_category_device" msgid="5781174212691167553">"الجهاز"</string>
+    <string name="header_category_personal" msgid="6225932173498802187">"شخصي"</string>
+    <string name="header_category_system" msgid="2073558547468647128">"النظام"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"تشغيل اللاسلكي"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"إيقاف اللاسلكي"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"عرض دفتر عناوين SIM"</string>
@@ -111,7 +115,11 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"جارٍ الاقتران..."</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"تم الاقتران ولكن غير متصل"</string>
     <string name="bluetooth_device" msgid="6873461446424952003">"سماعة بدون استخدام اليدين/سماعة رأس"</string>
-    <string name="progress_scanning" msgid="3760897655335759141">"بحث"</string>
+    <!-- outdated translation 3760897655335759141 -->     <string name="progress_scanning" msgid="192587958424295789">"بحث"</string>
+    <!-- no translation found for progress_tap_to_pair (4192342336107106334) -->
+    <skip />
+    <!-- no translation found for bluetooth_no_devices_found (2412462335116297668) -->
+    <skip />
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"طلب اقتران البلوتوث"</string>
     <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>
@@ -130,6 +138,9 @@
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"يطلب أحد تطبيقات هاتفك إذنًا لتشغيل البلوتوث وجعل هاتفك قابلاً للاكتشاف بواسطة أجهزة بلوتوث أخرى. هل تريد إجراء ذلك؟"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"جارٍ تشغيل البلوتوث..."</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"اتصال تلقائي"</string>
+    <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"طلب اتصال بلوتوث"</string>
+    <string name="bluetooth_connection_notif_message" msgid="1833221950512058309">"المس للاتصال بـ \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\""</string>
+    <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"هل تريد الاتصال بـ \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"؟"</string>
     <string name="date_and_time" msgid="4114084177056654663">"إعدادات التاريخ والوقت"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00 م"</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
@@ -235,7 +246,7 @@
     <string name="airplane_mode_summary" msgid="3154817401368780988">"تعطيل جميع الاتصالات اللاسلكية"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"جارٍ تعطيل الاتصالات اللاسلكية..."</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"جارٍ تمكين الاتصالات اللاسلكية..."</string>
-    <string name="radio_controls_title" msgid="5868688473587168882">"اللاسلكي والشبكات"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"المزيد…"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"اللاسلكي والشبكات"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"إدارة Wi-Fi والبلوتوث ووضع الطائرة وشبكات الجوال والشبكات الظاهرية الخاصة (VPN)"</string>
     <string name="roaming" msgid="3596055926335478572">"تجوال البيانات"</string>
@@ -271,8 +282,8 @@
     <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">"الموقع والأمان"</string>
-    <string name="location_security_settings_title" msgid="4624434296446625554">"الموقع وإعدادات الأمان"</string>
+    <string name="location_settings_title" msgid="8935806698251432196">"خدمات الموقع"</string>
+    <string name="security_settings_title" msgid="7945465324818485460">"الأمان"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"تعيين موقعي، إلغاء تأمين الشاشة، تأمين بطاقة SIM، تأمين تخزين الاعتماد"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"تعيين موقعي، إلغاء تأمين الشاشة، تأمين تخزين الاعتماد"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"كلمات المرور"</string>
@@ -316,7 +327,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>
@@ -375,8 +386,8 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"عرض مشرفي الأجهزة أو إلغاء تنشيطهم"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"بلوتوث"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"تشغيل البلوتوث"</string>
-    <string name="bluetooth_settings" msgid="2725796451253089609">"إعدادات البلوتوث"</string>
-    <string name="bluetooth_settings_title" msgid="2824020086246268296">"إعدادات البلوتوث"</string>
+    <string name="bluetooth_settings" msgid="1810521656168174329">"بلوتوث"</string>
+    <string name="bluetooth_settings_title" msgid="1908745291161353016">"بلوتوث"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"إدارة الاتصالات، تعيين اسم الجهاز وقابلية الاكتشاف"</string>
     <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>\". (جرّب 0000 أو 1234). ربما تحتاج إلى إدخال رقم التعريف الشخصي نفسه على جهاز البلوتوث."</string>
@@ -394,7 +405,10 @@
     <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>
+    <!-- no translation found for bluetooth_search_for_devices (5957007154213560390) -->
+    <skip />
+    <!-- no translation found for bluetooth_searching_for_devices (9203739709307871727) -->
+    <skip />
     <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>
@@ -404,6 +418,10 @@
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"إلغاء الاقتران"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"قطع الاتصال وإلغاء الاقتران"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"الخيارات…"</string>
+    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"إعدادات متقدمة"</string>
+    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"إعدادات بلوتوث المتقدمة"</string>
+    <string name="bluetooth_advanced_settings_label" msgid="8659717781212434173">"بلوتوث المتقدمة"</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="3631028334811113629">"تشغيل بلوتوث للاطلاع على الأجهزة المتاحة"</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>
@@ -445,27 +463,31 @@
     <string name="nfc_toggle_error" msgid="2233172102497535522">"حدث خطأ."</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"تشغيل Wi-Fi"</string>
-    <string name="wifi_settings" msgid="4746946030627213196">"إعدادات Wi-Fi"</string>
+    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="2810363951104753710">"إعدادات Wi-Fi"</string>
+    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"إعداد وإدارة نقاط الدخول اللاسلكية"</string>
-    <string name="wifi_starting" msgid="6710266609710860129">"جارٍ التشغيل..."</string>
-    <string name="wifi_stopping" msgid="5952909472548218348">"جارٍ الإيقاف..."</string>
+    <string name="wifi_starting" msgid="7732330327758522943">"تشغيل Wi-Fi..."</string>
+    <string name="wifi_stopping" msgid="244864762599017659">"إيقاف Wi-Fi…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"خطأ"</string>
     <string name="wifi_in_airplane_mode" msgid="7618393787965366655">"في وضع الطائرة"</string>
     <string name="wifi_fail_to_scan" msgid="6194542252808587669">"يتعذر البحث عن شبكات"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"رسالة تنبيه بالشبكات"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"تنبيهي عند توفر شبكة مفتوحة"</string>
+    <string name="wifi_enable_watchdog_service" msgid="4723544454066601706">"عمليات التحقق من الاتصال بجهاز Wi-Fi اللاسلكي"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="8687400936839455926">"اكتشاف وإدارة المشاكل المحتملة للاتصال بالشبكة"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"سياسة قطع اتصال Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"تحديد وقت التبديل من Wi-Fi إلى بيانات الجوال"</string>
     <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" msgid="6234851776910938957">"إضافة شبكة"</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>
     <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_empty_list_wifi_off" msgid="3682507011071029311">"تشغيل wifi للاطلاع على الشبكات المتاحة"</string>
     <string name="wifi_network_setup" msgid="7974851890019344870">"إعداد الشبكة"</string>
     <string name="wifi_wps_pin" msgid="5471842298708321115">"أدخل الطرف من نقطة الدخول"</string>
     <string name="wifi_wps_setup_title" msgid="150518971269252336">"إعداد WPS"</string>
@@ -501,13 +523,13 @@
     <string name="wifi_save" msgid="3331121567988522826">"حفظ"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"إلغاء"</string>
     <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"تم اكتشاف جلسة WPS أخرى، الرجاء إعادة المحاولة بعد بضع دقائق."</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"متقدم"</string>
+    <!-- outdated translation 5419052271935350999 -->     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"متقدم"</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>
-    <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"إعدادات IP"</string>
+    <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"إعدادات IP"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"حفظ"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"إلغاء"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"الرجاء كتابة عنون IP صالح."</string>
@@ -525,7 +547,7 @@
     <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"نقطة اتصال Wi-Fi <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> المحمولة"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="sound_settings_title" msgid="8735891486683305886">"الصوت"</string>
-    <string name="display_settings_title" msgid="2378894265964357591">"شاشة العرض"</string>
+    <string name="display_settings_title" msgid="1708697328627382561">"عرض"</string>
     <string name="sound_settings" msgid="5007659014828162881">"إعدادات الصوت"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"وضع صامت"</string>
     <string name="silent_mode_summary" msgid="3309650676072917899">"جعل جميع الأصوات صامتة باستثناء الوسائط والمنبّات"</string>
@@ -598,7 +620,18 @@
     <string name="brightness_summary" msgid="838917350127550703">"ضبط سطوع الشاشة"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"المهلة"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"يتم إغلاق الشاشة تلقائيًا بعد <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"الخلفية"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android Dreams"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"شاشات التوقف وتحولات الخمول الأخرى"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"الحلم المحدد"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"وقت التنشيط"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"بعد انقضاء مدة <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> من الخمول"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"مطلقًا"</string>
+    <string name="dream_test" msgid="5968002644622194481">"جرِّب بنفسك."</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"سطوع تلقائي"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"حجم الخط"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"الحجم الإجمالي للخطوط"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"تحديد حجم الخط"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"إعدادات تأمين بطاقة SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"إعداد تأمين بطاقة SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"تأمين بطاقة SIM"</string>
@@ -643,8 +676,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>
@@ -696,6 +730,16 @@
     <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 storage_menu_usb (1580545228584324704) -->
+    <skip />
+    <!-- no translation found for storage_title_usb (5775322159427546546) -->
+    <skip />
+    <!-- no translation found for usb_label_mtp (4157227401755543412) -->
+    <skip />
+    <!-- no translation found for usb_label_ptp (7417254019489575819) -->
+    <skip />
+    <!-- no translation found for usb_label_installer_cd (7438467574756086977) -->
+    <skip />
     <string name="battery_status_title" msgid="9159414319574976203">"حالة البطارية"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"مستوى البطارية"</string>
     <string name="apn_settings" msgid="3743170484827528406">"أسماء نقاط الوصول (APN)"</string>
@@ -740,7 +784,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@721cdeff)  -->
     <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>
@@ -806,6 +850,8 @@
     <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>
+    <string name="wireless_category_general" msgid="2973810407987118067">"عام"</string>
+    <string name="wireless_category_mobile_networks" msgid="1254629216798424288">"شبكات الجوال"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"شبكات الجوال"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"تعيين خيارات للتجوال والشبكات وأسماء نقاط الوصول (APN)"</string>
     <string name="location_title" msgid="1029961368397484576">"موقعي"</string>
@@ -883,7 +929,7 @@
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"تأمين الجهاز اللوحي"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"تأمين الهاتف"</string>
     <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"يمكنك حماية الجهاز اللوحي من الاستخدام غير المصرح به من خلال إنشاء نقش شخصي لإلغاء تأمين الشاشة. استخدم إصبعك لتوصيل النقاط بأي ترتيب في الشاشة التالية. يجب توصيل أربع نقاط على الأقل. "\n\n"هل أنت جاهز للبدء؟ المس \"التالي\"."</string>
-    <string name="lock_intro_message" product="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>
+    <!-- outdated translation 3692151094288835065 -->     <string name="lock_intro_message" product="default" msgid="5796785892741212873">"يمكنك حماية الجهاز اللوحي من الاستخدام غير المصرح به من خلال إنشاء نقش شخصي لإلغاء تأمين الشاشة. استخدم إصبعك لتوصيل النقاط بأي ترتيب في الشاشة التالية. يجب توصيل أربع نقاط على الأقل. "\n\n"هل أنت جاهز للبدء؟ المس \"التالي\"."</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"إدارة التطبيقات"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"إدارة التطبيقات المثبتة وإزالتها"</string>
     <string name="applications_settings" msgid="3736173521008476946">"التطبيقات"</string>
@@ -893,6 +939,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>
@@ -905,9 +953,10 @@
     <string name="force_stop" msgid="7435006169872876756">"فرض الإيقاف"</string>
     <string name="total_size_label" msgid="1048676419552557254">"المجموع"</string>
     <string name="application_size_label" msgid="5055196275624686382">"التطبيق"</string>
+    <string name="external_code_size_label" msgid="3459343140355961335">"تطبيق وحدة تخزين USB"</string>
     <string name="data_size_label" msgid="8679376373625710107">"البيانات"</string>
-    <string name="external_size_label" product="nosdcard" msgid="4465530017830945766">"وحدة تخزين USB"</string>
-    <string name="external_size_label" product="default" msgid="2107155737635944440">"بطاقة SD"</string>
+    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"بيانات وحدة تخزين USB"</string>
+    <string name="external_data_size_label" product="default" msgid="626414192825329708">"بطاقة SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"إزالة"</string>
     <string name="disable_text" msgid="6544054052049395202">"تعطيل"</string>
     <string name="enable_text" msgid="9217362512327828987">"تمكين"</string>
@@ -1026,7 +1075,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 +1085,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>
@@ -1066,7 +1117,7 @@
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"إعدادات لوحة المفاتيح على الشاشة"</string>
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"لوحة مفاتيح فعلية"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"إعدادات لوحة المفاتيح الفعلية"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"التطوير"</string>
+    <string name="development_settings_title" msgid="215179176067683667">"خيارات مطور البرامج"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"تعيين خيارات لتطوير التطبيق"</string>
     <string name="enable_adb" msgid="7982306934419797485">"تصحيح أخطاء USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"وضع تصحيح الأخطاء عند توصيل USB"</string>
@@ -1091,14 +1142,14 @@
     <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="toggle_large_text_title" msgid="42259643359869436">"نص كبير"</string>
     <string name="accessibility_services_category" msgid="8127851026323672607">"خدمات إمكانية الدخول"</string>
+    <string name="toggle_accessibility_title" msgid="7338739354952553958">"السماح بخدمات تتيح إمكانية الدخول"</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>
@@ -1106,10 +1157,11 @@
     <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>
-    <string name="power_usage_summary_title" msgid="5180282911164282324">"استخدام البطارية"</string>
+    <string name="power_usage_summary_title" msgid="7190304207330319919">"البطارية"</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>
@@ -1218,6 +1270,8 @@
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"إعدادات <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"تم تمكين <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> معطّل"</string>
+    <string name="tts_engine_settings_section" msgid="2346105138448751893">"إعدادات المحرك"</string>
+    <string name="tts_engine_settings_title" msgid="3499112142425680334">"إعدادات <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"اللغات والأصوات"</string>
     <string name="pico_installed" msgid="2452546687858267414">"مثبت"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"غير مثبت"</string>
@@ -1228,114 +1282,33 @@
     <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">"إضافة الشبكة الظاهرية الخاصة (VPN) <xliff:g id="NAME">%s</xliff:g>"</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">"نطاقات بحث نظام أسماء النطاقات"</string>
-    <string name="vpn_dns_search_list" msgid="4230034234026605360">"نطاقات بحث نظام أسماء النطاقات"</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">"إعداد الشبكات الظاهرية الخاصة (VPN) وإدارتها"</string>
-    <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="trusted_credentials" msgid="4266945289534242402">"بيانات اعتماد موثوقة"</string>
+    <string name="trusted_credentials_summary" msgid="6735221351155686632">"عرض شهادات CA الموثوقة"</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>
-    <string name="privacy_settings_title" msgid="1987089301293213705">"إعدادات الخصوصية"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"النسخ الاحتياطي وإعادة التعيين"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"النسخ الاحتياطي وإعادة التعيين"</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>
@@ -1439,4 +1412,107 @@
     <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>
+    <!-- no translation found for debug_ui_category (9023948280291055349) -->
+    <skip />
+    <!-- no translation found for strict_mode (1938795874357830695) -->
+    <skip />
+    <!-- no translation found for strict_mode_summary (142834318897332338) -->
+    <skip />
+    <!-- no translation found for pointer_location (6084434787496938001) -->
+    <skip />
+    <!-- no translation found for pointer_location_summary (840819275172753713) -->
+    <skip />
+    <!-- no translation found for show_screen_updates (8282711794220426931) -->
+    <skip />
+    <!-- no translation found for show_screen_updates_summary (1716122382094924596) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage (2389212910758076024) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage_summary (2113341923988958266) -->
+    <skip />
+    <!-- no translation found for window_animation_scale_title (6162587588166114700) -->
+    <skip />
+    <!-- no translation found for transition_animation_scale_title (387527540523595875) -->
+    <skip />
+    <!-- no translation found for debug_applications_category (6221644998451283813) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities (3622005081180597749) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities_summary (3592221124808773368) -->
+    <skip />
+    <!-- no translation found for app_process_limit_title (4121324758038197598) -->
+    <skip />
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"استخدام البيانات"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"دائرة استخدام البيانات"</string>
+    <string name="data_usage_menu_split_4g" msgid="7417435609285381968">"تقسيم استخدام الجيل الرابع"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"عرض استخدام Wi-Fi"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"تغيير الدائرة…"</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"يوم من الشهر لإعادة تعيين دائرة استخدام البيانات:"</string>
+    <string name="data_usage_disable_mobile_limit" msgid="289740911281022322">"تعطيل بيانات الجوال عند بلوغ الحد"</string>
+    <string name="data_usage_disable_4g_limit" msgid="5808210773758699800">"تعطيل بيانات الجيل الرابع عند بلوغ الحد"</string>
+    <string name="data_usage_disable_3g_limit" msgid="3856971004328238231">"تعطيل بيانات الجيل الثاني والثالث عند بلوغ الحد"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_mobile" msgid="454140350007299045">"الجوال"</string>
+    <string name="data_usage_tab_4g" msgid="1301978716067512235">"الجيل الرابع"</string>
+    <string name="data_usage_tab_3g" msgid="6092169523081538718">"الجيل الثاني والثالث"</string>
+    <string name="data_usage_enable_mobile" msgid="986782622560157977">"بيانات الجوال"</string>
+    <string name="data_usage_enable_3g" msgid="6304006671869578254">"بيانات الجيل الثاني والثالث"</string>
+    <string name="data_usage_enable_4g" msgid="3635854097335036738">"بيانات شبكة الجيل الرابع"</string>
+    <string name="data_usage_app_settings" msgid="3727561362090820369">"عرض إعدادات التطبيق"</string>
+    <string name="data_usage_app_restrict_background" msgid="8856643905291165256">"تقييد استخدام بيانات الخلفية"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="1503361245973512092">"السماح فقط لبيانات الخلفية في التطبيق عند استخدام شبكة غير محدودة"</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="8110736468987743260">"تقييد بيانات الخلفية"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="100001698378554777">"قد تؤثر هذه الميزة سلبًا في التطبيقات التي تعتمد على استخدام بيانات الخلفية."\n\n"يمكن العثور على المزيد من عناصر التحكم المناسبة في استخدام البيانات بداخل إعدادات هذا التطبيق."</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"تاريخ إعادة تعيين دائرة الاستخدام"</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"تاريخ كل شهر:"</string>
+    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"تعيين"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"وضع حد لاستخدام البيانات"</string>
+    <string name="data_usage_limit_dialog_mobile" msgid="7931094451923591578">"سيتم تعطيل اتصال بيانات الجوال عند بلوغ الحد المحدد."\n\n"لتجنب الرسوم الزائدة، جرّب استخدام حد مخفض، حيث قد تتباين طرق الحساب في الأجهزة ومشغلي شبكات الجوال."</string>
+    <string name="data_usage_limit_dialog_3g" msgid="5478553071420316963">"سيتم تعطيل اتصال بيانات شبكات الجيل الثاني والثالث عند بلوغ الحد المحدد."\n\n"لتجنب الرسوم الزائدة، جرّب استخدام حد مخفض، حيث قد تتباين طرق الحساب في الأجهزة ومشغلي شبكات الجوال."</string>
+    <string name="data_usage_limit_dialog_4g" msgid="6134008906742403777">"سيتم تعطيل اتصال بيانات شبكات الجيل الرابع عند بلوغ الحد المحدد."\n\n"لتجنب الرسوم الزائدة، جرّب استخدام حد مخفض، حيث قد تتباين طرق الحساب في الأجهزة ومشغلي شبكات الجوال."</string>
+    <string name="data_usage_disabled_dialog_3g_title" msgid="4221584306492812040">"تم تعطيل بيانات شبكات الجيل الثاني والجيل الثالث"</string>
+    <string name="data_usage_disabled_dialog_4g_title" msgid="715585612162185936">"تم تعطيل بيانات شبكة الجيل الرابع"</string>
+    <string name="data_usage_disabled_dialog_mobile_title" msgid="209516216265000221">"تم تعطيل بيانات الجوال"</string>
+    <string name="data_usage_disabled_dialog" msgid="2874031671067845964">"تم بلوغ الحد المحدد لاستخدام البيانات."\n\n"قد تجلب البيانات الإضافية رسوم مشغل شبكة الجوال."</string>
+    <string name="data_usage_disabled_dialog_enable" msgid="2441219164620753329">"إعادة تمكين البيانات"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="32">"<xliff:g id="NUMBER">%1$s</xliff:g>"</font>" "<font size="12">"<xliff:g id="UNIT">%2$s</xliff:g>"</font>\n<font size="12">"تحذير"</font></string>
+    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"الاتصال بالطوارئ"</string>
+    <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"العودة إلى المكالمة"</string>
+    <string name="vpn_name" msgid="4689699885361002297">"الاسم"</string>
+    <string name="vpn_type" msgid="5435733139514388070">"النوع"</string>
+    <string name="vpn_server" msgid="2123096727287421913">"عنوان الخادم"</string>
+    <string name="vpn_mppe" msgid="6639001940500288972">"الترميز PPP‏ (MPPE)"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"سر L2TP"</string>
+    <string name="vpn_ipsec_identifier" msgid="4098175859460006296">" معرف IPSec"</string>
+    <string name="vpn_ipsec_secret" msgid="4526453255704888704">"مفتاح IPSec مشترك مسبقًا"</string>
+    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"شهادة IPSec للمستخدم"</string>
+    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"شهادة CA لـ IPSec"</string>
+    <!-- no translation found for vpn_search_domains (5391995501541199624) -->
+    <skip />
+    <!-- no translation found for vpn_routes (8556236801755260073) -->
+    <skip />
+    <string name="vpn_username" msgid="1863901629860867849">"اسم المستخدم"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"كلمة المرور"</string>
+    <!-- no translation found for vpn_save_login (6350322456427484881) -->
+    <skip />
+    <!-- no translation found for vpn_not_used (9094191054524660891) -->
+    <skip />
+    <string name="vpn_no_ca_cert" msgid="7820884983947090538">"(عدم التحقق من ملكية الخادم)"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"إلغاء"</string>
+    <string name="vpn_save" msgid="4233484051644764510">"حفظ"</string>
+    <string name="vpn_connect" msgid="8469608541746132301">"اتصال"</string>
+    <string name="vpn_edit" msgid="1111459297288136079">"تعديل شبكة ظاهرية خاصة (VPN)"</string>
+    <string name="vpn_connect_to" msgid="7328758950427515753">"الاتصال بـ <xliff:g id="NETWORK">%s</xliff:g>"</string>
+    <string name="vpn_title" msgid="7982620762043790565">"إعدادات الشبكة الظاهرية الخاصة (VPN)"</string>
+    <string name="vpn_create" msgid="8966010925994175306">"إضافة شبكة ظاهرية خاصة (VPN)"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"تعديل الشبكة"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"حذف الشبكة"</string>
+    <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"النظام"</string>
+    <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"المستخدم"</string>
+    <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"تعطيل"</string>
+    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"تمكين"</string>
+    <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"إزالة"</string>
+    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"هل تريد تمكين شهادة CA للنظام؟"</string>
+    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"هل تريد تعطيل شهادة CA للنظام؟"</string>
+    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"هل تريد إزالة شهادة CA للمستخدم بشكل دائم؟"</string>
 </resources>
diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml
index 084eb86..aa294f3 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>
@@ -214,4 +240,36 @@
     <item msgid="3878793616631049349">"Да се използва проверка с HDCP само за DRM съдържание"</item>
     <item msgid="45075631231212732">"Винаги да се използва проверка с HDCP"</item>
   </string-array>
+    <!-- no translation found for window_animation_scale_entries:0 (8134156599370824081) -->
+    <!-- no translation found for window_animation_scale_entries:1 (6624864048416710414) -->
+    <!-- no translation found for window_animation_scale_entries:2 (2219332261255416635) -->
+    <!-- no translation found for window_animation_scale_entries:3 (3544428804137048509) -->
+    <!-- no translation found for window_animation_scale_entries:4 (3110710404225974514) -->
+    <!-- no translation found for window_animation_scale_entries:5 (4402738611528318731) -->
+    <!-- no translation found for window_animation_scale_entries:6 (6189539267968330656) -->
+    <!-- no translation found for transition_animation_scale_entries:0 (8464255836173039442) -->
+    <!-- no translation found for transition_animation_scale_entries:1 (3375781541913316411) -->
+    <!-- no translation found for transition_animation_scale_entries:2 (1991041427801869945) -->
+    <!-- no translation found for transition_animation_scale_entries:3 (4012689927622382874) -->
+    <!-- no translation found for transition_animation_scale_entries:4 (3289156759925947169) -->
+    <!-- no translation found for transition_animation_scale_entries:5 (7705857441213621835) -->
+    <!-- no translation found for transition_animation_scale_entries:6 (6660750935954853365) -->
+    <!-- no translation found for app_process_limit_entries:0 (6799596560242275471) -->
+    <!-- no translation found for app_process_limit_entries:1 (2412794376818632575) -->
+    <!-- no translation found for app_process_limit_entries:2 (1578904888612645001) -->
+    <!-- no translation found for app_process_limit_entries:3 (8819235336299873577) -->
+  <string-array name="vpn_types_long">
+    <item msgid="2732002039459078847">"VPN с PPTP"</item>
+    <item msgid="3799752201662127867">"VPN с L2TP/IPSec с предварително споделени ключове"</item>
+    <item msgid="4725504331295252103">"VPN с L2TP/IPSec със сертификати"</item>
+    <item msgid="7526551163264034377">"VPN с IPSec с предварително споделени ключове и удостоверяване за Xauth"</item>
+    <item msgid="8064740940687465039">"VPN с IPSec със сертификати и удостоверяване за Xauth"</item>
+    <item msgid="4946199982372391490">"VPN с IPSec със сертификати и хибридно удостоверяване"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:0 (8621078286418985762) -->
+    <!-- no translation found for vpn_states:1 (6692305604213080515) -->
+    <!-- no translation found for vpn_states:2 (8001704909356800092) -->
+    <!-- no translation found for vpn_states:3 (4039737283841672166) -->
+    <!-- no translation found for vpn_states:4 (4042143101664725090) -->
+    <!-- no translation found for vpn_states:5 (2690164254699635531) -->
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 6519092..7e642de 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -19,6 +19,10 @@
     <string name="yes" msgid="4676390750360727396">" Да"</string>
     <string name="no" msgid="6731231425810196216">"Не"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Неизвестно"</string>
+    <string name="header_category_wireless_networks" msgid="4944823405420438623">"КАБЕЛНИ И БЕЗЖИЧНИ МРЕЖИ"</string>
+    <string name="header_category_device" msgid="5781174212691167553">"УСТРОЙСТВО"</string>
+    <string name="header_category_personal" msgid="6225932173498802187">"ЛИЧНИ"</string>
+    <string name="header_category_system" msgid="2073558547468647128">"СИСТЕМНИ"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Включване на радио"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Изключване на радио"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Преглед на указателят на SIM картата"</string>
@@ -111,7 +115,11 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Сдвояване..."</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"Сдвоено, но несвързано"</string>
     <string name="bluetooth_device" msgid="6873461446424952003">"„свободни ръце“/слушалки"</string>
-    <string name="progress_scanning" msgid="3760897655335759141">"Сканира се"</string>
+    <!-- outdated translation 3760897655335759141 -->     <string name="progress_scanning" msgid="192587958424295789">"Сканира се"</string>
+    <!-- no translation found for progress_tap_to_pair (4192342336107106334) -->
+    <skip />
+    <!-- no translation found for bluetooth_no_devices_found (2412462335116297668) -->
+    <skip />
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Заявка за сдвояване чрез Bluetooth"</string>
     <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>
@@ -130,6 +138,9 @@
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Приложение от телефона ви иска разрешение да включи Bluetooth и да го направи откриваем от други устройства. Искате ли да направите това?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Bluetooth се включва..."</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Автоматично свързване"</string>
+    <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Заявка за свързване чрез Bluetooth"</string>
+    <string name="bluetooth_connection_notif_message" msgid="1833221950512058309">"Докоснете, за да се свържете с/ъс „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“"</string>
+    <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Искате ли да се свържете с/ъс „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Настройки за дата и час"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"13:00"</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
@@ -235,7 +246,7 @@
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Деактивиране на всички безжични връзки"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"Безжичните връзки се деактивират..."</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"Безжичните връзки се активират..."</string>
-    <string name="radio_controls_title" msgid="5868688473587168882">"Кабелни и безжични мрежи"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Още…"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Кабелни и безжични мрежи"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"Управлява Wi-Fi, Bluetooth, самолетен режим, мобилни и VPN мрежи"</string>
     <string name="roaming" msgid="3596055926335478572">"Роуминг на данни"</string>
@@ -271,8 +282,8 @@
     <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">"Местоположение и сигурност"</string>
-    <string name="location_security_settings_title" msgid="4624434296446625554">"Настройки за местоположение и сигурност"</string>
+    <string name="location_settings_title" msgid="8935806698251432196">"Услуги за местоположение"</string>
+    <string name="security_settings_title" msgid="7945465324818485460">"Сигурност"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Задаване на Моето местоположение, отключване на екран, заключване на SIM картата и на хранилището за идентификационни данни"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Задаване на Моето местоположение, отключване на екран и заключване на хранилището за идентификационни данни"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Пароли"</string>
@@ -316,7 +327,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>
@@ -375,8 +386,8 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Преглед или деактивиране на администраторите на устройството"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Включване на Bluetooth"</string>
-    <string name="bluetooth_settings" msgid="2725796451253089609">"Настройки за Bluetooth"</string>
-    <string name="bluetooth_settings_title" msgid="2824020086246268296">"Настройки за Bluetooth"</string>
+    <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
+    <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Управление на връзки, задаване на име и откриваемост на устройство"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Заявка за сдвояване чрез Bluetooth"</string>
     <string name="bluetooth_enter_pin_msg" msgid="1499285355129256289">\n"Въведете PIN за сдвояване с/ъс „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“. (Опитайте с 0000 или 1234.) Може да се наложи да въведете същия PIN код на устройството с Bluetooth."</string>
@@ -394,7 +405,10 @@
     <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>
+    <!-- no translation found for bluetooth_search_for_devices (5957007154213560390) -->
+    <skip />
+    <!-- no translation found for bluetooth_searching_for_devices (9203739709307871727) -->
+    <skip />
     <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>
@@ -404,6 +418,10 @@
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Раздвояване"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Изключване и раздвояване"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Опции…"</string>
+    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Разширени"</string>
+    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Разширени настр. за Bluetooth"</string>
+    <string name="bluetooth_advanced_settings_label" msgid="8659717781212434173">"Разшир. за Bluetooth"</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="3631028334811113629">"Включете Bluetooth, за да видите наличните у-ва"</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>
@@ -445,27 +463,31 @@
     <string name="nfc_toggle_error" msgid="2233172102497535522">"Възникна грешка."</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Включване на Wi-Fi"</string>
-    <string name="wifi_settings" msgid="4746946030627213196">"Настройки за Wi-Fi"</string>
+    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="2810363951104753710">"Настройки за Wi-Fi"</string>
+    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Задаване и управление на безжични точки за достъп"</string>
-    <string name="wifi_starting" msgid="6710266609710860129">"Включва се..."</string>
-    <string name="wifi_stopping" msgid="5952909472548218348">"Изключва се..."</string>
+    <string name="wifi_starting" msgid="7732330327758522943">"Wi-Fi се включва..."</string>
+    <string name="wifi_stopping" msgid="244864762599017659">"Wi-Fi се изключва…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Грешка"</string>
     <string name="wifi_in_airplane_mode" msgid="7618393787965366655">"В самолетен режим"</string>
     <string name="wifi_fail_to_scan" msgid="6194542252808587669">"Не може да се сканира за мрежи."</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Известие за мрежа"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Известие при налична отворена мрежа"</string>
+    <string name="wifi_enable_watchdog_service" msgid="4723544454066601706">"Проверки за връзка с Wi-Fi"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="8687400936839455926">"Откриване и управляване на потенциални проблеми на връзката с мрежата"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Правила за изключване на Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Посочване на времето за превключване от Wi-Fi към мобилни данни"</string>
     <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" msgid="6234851776910938957">"Добавяне на мрежа"</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>
     <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_empty_list_wifi_off" msgid="3682507011071029311">"Включете WiFi, за да видите наличните мрежи"</string>
     <string name="wifi_network_setup" msgid="7974851890019344870">"Мрежова настройка"</string>
     <string name="wifi_wps_pin" msgid="5471842298708321115">"Въведете PIN код от точката за достъп"</string>
     <string name="wifi_wps_setup_title" msgid="150518971269252336">"Настройка на WPS"</string>
@@ -501,13 +523,13 @@
     <string name="wifi_save" msgid="3331121567988522826">"Запазване"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Отказ"</string>
     <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"Открита е друга сесия с WPS. Моля, опитайте отново след няколко минути"</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Разширени"</string>
+    <!-- outdated translation 5419052271935350999 -->     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Разширени"</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>
-    <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"Настройки за IP"</string>
+    <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Настройки за IP"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Запазване"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Отказ"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Моля, въведете валиден IP адрес."</string>
@@ -525,7 +547,7 @@
     <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">"AndroidHotspot"</string>
     <string name="sound_settings_title" msgid="8735891486683305886">"Звук"</string>
-    <string name="display_settings_title" msgid="2378894265964357591">"Екран"</string>
+    <string name="display_settings_title" msgid="1708697328627382561">"Дисплей"</string>
     <string name="sound_settings" msgid="5007659014828162881">"Настройки за звук"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Тих режим"</string>
     <string name="silent_mode_summary" msgid="3309650676072917899">"Заглушаване на всички звуци, освен от медийни файлове и будилници"</string>
@@ -598,7 +620,18 @@
     <string name="brightness_summary" msgid="838917350127550703">"Наглася яркостта на екрана"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Време за изчакване"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Екранът се изключва автоматично след <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Тапет"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Сънища в Android"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Скрийнсейвъри и други залъгалки при неактивност"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Избран сън"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Кога да се активира"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"След <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> неактивност"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Никога"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Пробвайте!"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Автоматична яркост"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Размер на шрифта"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Общ размер на шрифтовете"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Избор на размер на шрифта"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Настройки за заключването на SIM картата"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Настройване на заключването на SIM картата"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Заключване на SIM картата"</string>
@@ -643,8 +676,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>
@@ -696,6 +730,16 @@
     <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 storage_menu_usb (1580545228584324704) -->
+    <skip />
+    <!-- no translation found for storage_title_usb (5775322159427546546) -->
+    <skip />
+    <!-- no translation found for usb_label_mtp (4157227401755543412) -->
+    <skip />
+    <!-- no translation found for usb_label_ptp (7417254019489575819) -->
+    <skip />
+    <!-- no translation found for usb_label_installer_cd (7438467574756086977) -->
+    <skip />
     <string name="battery_status_title" msgid="9159414319574976203">"Състояние на батерията"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Ниво на батерията"</string>
     <string name="apn_settings" msgid="3743170484827528406">"Имена на точките за достъп (APN)"</string>
@@ -806,6 +850,8 @@
     <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>
+    <string name="wireless_category_general" msgid="2973810407987118067">"Общи"</string>
+    <string name="wireless_category_mobile_networks" msgid="1254629216798424288">"Мобилни мрежи"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Мобилни мрежи"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Задаване на опции за роуминг, мрежи и имена на точките за достъп (APN)"</string>
     <string name="location_title" msgid="1029961368397484576">"Моето местоположение"</string>
@@ -883,7 +929,7 @@
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Подсигуряване на таблета ви"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Защитаване на телефона ви"</string>
     <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"Защитете таблета си от неупълномощена употреба, като създадете лична фигура за отключване на екрана. Свържете с пръст в произволен ред точките на следващия екран. Трябва да свържете поне четири точки. "\n\n"Готови ли сте да започнете? Докоснете „Напред“."</string>
-    <string name="lock_intro_message" product="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>
+    <!-- outdated translation 3692151094288835065 -->     <string name="lock_intro_message" product="default" msgid="5796785892741212873">"Защитете таблета си от неупълномощена употреба, като създадете лична фигура за отключване на екрана. Свържете с пръст в произволен ред точките на следващия екран. Трябва да свържете поне четири точки. "\n\n"Готови ли сте да започнете? Докоснете „Напред“."</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Управление на приложенията"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Управление и премахване на инсталирани приложения"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Приложения"</string>
@@ -893,6 +939,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>
@@ -905,9 +953,10 @@
     <string name="force_stop" msgid="7435006169872876756">"Принудително спиране"</string>
     <string name="total_size_label" msgid="1048676419552557254">"Общо"</string>
     <string name="application_size_label" msgid="5055196275624686382">"Приложение"</string>
+    <string name="external_code_size_label" msgid="3459343140355961335">"Приложение за USB хранилище"</string>
     <string name="data_size_label" msgid="8679376373625710107">"Данни"</string>
-    <string name="external_size_label" product="nosdcard" msgid="4465530017830945766">"USB хранилище"</string>
-    <string name="external_size_label" product="default" msgid="2107155737635944440">"SD карта"</string>
+    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Данни за USB хранилището"</string>
+    <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD карта"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Деинсталиране"</string>
     <string name="disable_text" msgid="6544054052049395202">"Деактивиране"</string>
     <string name="enable_text" msgid="9217362512327828987">"Активиране"</string>
@@ -1026,7 +1075,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 +1085,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>
@@ -1066,7 +1117,7 @@
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Настройки за екранна клавиатура"</string>
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Физическа клавиатура"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Настройки за физическа клавиатура"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Програмиране"</string>
+    <string name="development_settings_title" msgid="215179176067683667">"Опции на програмиста"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"Задаване на опции за програмиране на приложения"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Отстраняване на грешки през USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Режим за отстраняване на грешки, когато е свързано USB"</string>
@@ -1091,14 +1142,14 @@
     <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="toggle_large_text_title" msgid="42259643359869436">"Голям текст"</string>
     <string name="accessibility_services_category" msgid="8127851026323672607">"Услуги за достъпност"</string>
+    <string name="toggle_accessibility_title" msgid="7338739354952553958">"Разрешаване на услуги за достъпност"</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"Кликнете върху „OK“, за да го инсталирате."</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>
@@ -1106,10 +1157,11 @@
     <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>
-    <string name="power_usage_summary_title" msgid="5180282911164282324">"Използване на батерията"</string>
+    <string name="power_usage_summary_title" msgid="7190304207330319919">"Батерия"</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>
@@ -1218,6 +1270,8 @@
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Настройки за <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> е активирано"</string>
     <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> е деактивирано"</string>
+    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Настройки на машината"</string>
+    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Настройки за <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"Езици и гласове"</string>
     <string name="pico_installed" msgid="2452546687858267414">"Инсталиран"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"Не е инсталирано"</string>
@@ -1228,114 +1282,33 @@
     <string name="gadget_title" msgid="7455548605888590466">"Контрол на захранването"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Актуализиране на настройките за Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Актуализиране на настройките за Bluetooth"</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">"Добавяне на VPN <xliff:g id="NAME">%s</xliff:g>"</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">"Задаване на сертификат от сертифициращ орган"</string>
-    <string name="vpn_ca_certificate" msgid="465085144064264742">"Сертификат от сертифициращ орган (СА)"</string>
-    <string name="vpn_a_ca_certificate" msgid="3374242520974884295">"сертификат от сертифициращ орган"</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> е деактивиранo"</string>
     <string name="vpn_settings_title" msgid="7327468307909556719">"Настройки за VPN"</string>
     <string name="vpn_settings_summary" msgid="8849924181594963972">"Задаване и управление на частни виртуални мрежи (VPN)"</string>
-    <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="trusted_credentials" msgid="4266945289534242402">"Надеждни идент. данни"</string>
+    <string name="trusted_credentials_summary" msgid="6735221351155686632">"Показване на надеждни сертификати от сертифициращи органи"</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>
-    <string name="privacy_settings_title" msgid="1987089301293213705">"Настройки за поверителност"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"Резервни копия и нулиране"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"Резервни копия и нулиране"</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>
@@ -1440,4 +1413,107 @@
     <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>
+    <!-- no translation found for debug_ui_category (9023948280291055349) -->
+    <skip />
+    <!-- no translation found for strict_mode (1938795874357830695) -->
+    <skip />
+    <!-- no translation found for strict_mode_summary (142834318897332338) -->
+    <skip />
+    <!-- no translation found for pointer_location (6084434787496938001) -->
+    <skip />
+    <!-- no translation found for pointer_location_summary (840819275172753713) -->
+    <skip />
+    <!-- no translation found for show_screen_updates (8282711794220426931) -->
+    <skip />
+    <!-- no translation found for show_screen_updates_summary (1716122382094924596) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage (2389212910758076024) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage_summary (2113341923988958266) -->
+    <skip />
+    <!-- no translation found for window_animation_scale_title (6162587588166114700) -->
+    <skip />
+    <!-- no translation found for transition_animation_scale_title (387527540523595875) -->
+    <skip />
+    <!-- no translation found for debug_applications_category (6221644998451283813) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities (3622005081180597749) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities_summary (3592221124808773368) -->
+    <skip />
+    <!-- no translation found for app_process_limit_title (4121324758038197598) -->
+    <skip />
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Използване на данни"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"Цикъл: Ползване на данни"</string>
+    <string name="data_usage_menu_split_4g" msgid="7417435609285381968">"Отделяне на използването на 4G"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Ползване на Wi-Fi – показване"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"Промяна на цикъла…"</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Ден от месец за възстанов. на цикъла за използване на данни:"</string>
+    <string name="data_usage_disable_mobile_limit" msgid="289740911281022322">"Моб. данни – деактив. при лимит"</string>
+    <string name="data_usage_disable_4g_limit" msgid="5808210773758699800">"4G данни – деактив. при лимит"</string>
+    <string name="data_usage_disable_3g_limit" msgid="3856971004328238231">"2G-3G данни – деактив. при лимит"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_mobile" msgid="454140350007299045">"Мобилни"</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">"Мобилни данни"</string>
+    <string name="data_usage_enable_3g" msgid="6304006671869578254">"2G-3G данни"</string>
+    <string name="data_usage_enable_4g" msgid="3635854097335036738">"4G данни"</string>
+    <string name="data_usage_app_settings" msgid="3727561362090820369">"Настройки на прилож. – преглед"</string>
+    <string name="data_usage_app_restrict_background" msgid="8856643905291165256">"Ограничаване: Данни на заден план"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="1503361245973512092">"Данни на заден план за приложението само при неограничена мрежа"</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="8110736468987743260">"Ограничаване на данните на заден план"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="100001698378554777">"Тази функция може да се отрази негативно на приложенията, които зависят от използването на данни на заден план."\n\n" По-подходящи контроли за използването на данни могат да бъдат намерени в настройките на това приложение."</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Дата на възстановяване на цикъла за използване"</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Дата от всеки месец:"</string>
+    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Задаване"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Ограничаване на използването на данни"</string>
+    <string name="data_usage_limit_dialog_mobile" msgid="7931094451923591578">"Връзката ви за мобилни данни ще бъде деактивирана при достигане на определения лимит."\n\n"За да избегнете излишно таксуване, обмислете използването на намален лимит, тъй като начините на изчисляване от устройството и оператора може да са различни."</string>
+    <string name="data_usage_limit_dialog_3g" msgid="5478553071420316963">"Връзката ви за 2G-3G данни ще бъде деактивирана при достигане на определения лимит."\n\n"За да избегнете излишно таксуване, обмислете използването на намален лимит, тъй като начините на изчисляване от устройството и оператора може да са различни."</string>
+    <string name="data_usage_limit_dialog_4g" msgid="6134008906742403777">"Връзката ви за 4G данни ще бъде деактивирана при достигане на определения лимит."\n\n"За да избегнете излишно таксуване, обмислете използването на намален лимит, тъй като начините на изчисляване от устройството и оператора може да са различни."</string>
+    <string name="data_usage_disabled_dialog_3g_title" msgid="4221584306492812040">"2G-3G данните са деактивирани"</string>
+    <string name="data_usage_disabled_dialog_4g_title" msgid="715585612162185936">"4G данните са деактивирани"</string>
+    <string name="data_usage_disabled_dialog_mobile_title" msgid="209516216265000221">"Мобилните данни са деактивирани"</string>
+    <string name="data_usage_disabled_dialog" msgid="2874031671067845964">"Определеният лимит за използване на данни е достигнат."\n\n"Допълнителната употреба може да доведе до таксуване от оператора."</string>
+    <string name="data_usage_disabled_dialog_enable" msgid="2441219164620753329">"Активиране на данните отново"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="32">"<xliff:g id="NUMBER">%1$s</xliff:g>"</font>" "<font size="12">"<xliff:g id="UNIT">%2$s</xliff:g>"</font>\n<font size="12">"предупреждение"</font></string>
+    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Спешно обаждане"</string>
+    <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Назад към обаждането"</string>
+    <string name="vpn_name" msgid="4689699885361002297">"Име"</string>
+    <string name="vpn_type" msgid="5435733139514388070">"Тип"</string>
+    <string name="vpn_server" msgid="2123096727287421913">"Адрес на сървъра"</string>
+    <string name="vpn_mppe" msgid="6639001940500288972">"PPP шифроване (MPPE)"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"L2TP тайна"</string>
+    <string name="vpn_ipsec_identifier" msgid="4098175859460006296">"Идентификатор на IPSec"</string>
+    <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Предварително споделен ключ за IPSec"</string>
+    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"Потребителски сертификат за IPSec"</string>
+    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"Сертификат от сертиф. орган за IPSec"</string>
+    <!-- no translation found for vpn_search_domains (5391995501541199624) -->
+    <skip />
+    <!-- no translation found for vpn_routes (8556236801755260073) -->
+    <skip />
+    <string name="vpn_username" msgid="1863901629860867849">"Потребителско име"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Парола"</string>
+    <!-- no translation found for vpn_save_login (6350322456427484881) -->
+    <skip />
+    <!-- no translation found for vpn_not_used (9094191054524660891) -->
+    <skip />
+    <string name="vpn_no_ca_cert" msgid="7820884983947090538">"(без потвърждаване на сървъра)"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"Отказ"</string>
+    <string name="vpn_save" msgid="4233484051644764510">"Запазване"</string>
+    <string name="vpn_connect" msgid="8469608541746132301">"Свързване"</string>
+    <string name="vpn_edit" msgid="1111459297288136079">"Редактиране на VPN мрежата"</string>
+    <string name="vpn_connect_to" msgid="7328758950427515753">"Свързване със: <xliff:g id="NETWORK">%s</xliff:g>"</string>
+    <string name="vpn_title" msgid="7982620762043790565">"Настройки за VPN"</string>
+    <string name="vpn_create" msgid="8966010925994175306">"Добавяне на VPN мрежа"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"Редактиране на мрежата"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"Изтриване на мрежа"</string>
+    <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Система"</string>
+    <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Потребител"</string>
+    <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Деактивиране"</string>
+    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Активиране"</string>
+    <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Премахване"</string>
+    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Да се активира ли сертификатът от сертифициращ орган за системата?"</string>
+    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Да се деактивира ли сертификатът от сертифициращ орган за системата?"</string>
+    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Да се премахне ли завинаги сертификатът от сертифициращ орган за потребителя?"</string>
 </resources>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index f1a69f9..8313919 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>
@@ -214,4 +240,36 @@
     <item msgid="3878793616631049349">"Utilitza la comprovació HDCP només per a contingut DRM"</item>
     <item msgid="45075631231212732">"Utilitza sempre la comprovació HDCP"</item>
   </string-array>
+    <!-- no translation found for window_animation_scale_entries:0 (8134156599370824081) -->
+    <!-- no translation found for window_animation_scale_entries:1 (6624864048416710414) -->
+    <!-- no translation found for window_animation_scale_entries:2 (2219332261255416635) -->
+    <!-- no translation found for window_animation_scale_entries:3 (3544428804137048509) -->
+    <!-- no translation found for window_animation_scale_entries:4 (3110710404225974514) -->
+    <!-- no translation found for window_animation_scale_entries:5 (4402738611528318731) -->
+    <!-- no translation found for window_animation_scale_entries:6 (6189539267968330656) -->
+    <!-- no translation found for transition_animation_scale_entries:0 (8464255836173039442) -->
+    <!-- no translation found for transition_animation_scale_entries:1 (3375781541913316411) -->
+    <!-- no translation found for transition_animation_scale_entries:2 (1991041427801869945) -->
+    <!-- no translation found for transition_animation_scale_entries:3 (4012689927622382874) -->
+    <!-- no translation found for transition_animation_scale_entries:4 (3289156759925947169) -->
+    <!-- no translation found for transition_animation_scale_entries:5 (7705857441213621835) -->
+    <!-- no translation found for transition_animation_scale_entries:6 (6660750935954853365) -->
+    <!-- no translation found for app_process_limit_entries:0 (6799596560242275471) -->
+    <!-- no translation found for app_process_limit_entries:1 (2412794376818632575) -->
+    <!-- no translation found for app_process_limit_entries:2 (1578904888612645001) -->
+    <!-- no translation found for app_process_limit_entries:3 (8819235336299873577) -->
+  <string-array name="vpn_types_long">
+    <item msgid="2732002039459078847">"VPN de PPTP"</item>
+    <item msgid="3799752201662127867">"VPN L2TP/IPSec amb claus prèviament compartides"</item>
+    <item msgid="4725504331295252103">"VPN L2TP/IPSec amb certificats"</item>
+    <item msgid="7526551163264034377">"VPN IPSec amb claus prèviament compartides i autenticació Xauth"</item>
+    <item msgid="8064740940687465039">"VPN IPSec amb certificats i autenticació Xauth"</item>
+    <item msgid="4946199982372391490">"VPN IPSec amb certificats i autenticació híbrida"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:0 (8621078286418985762) -->
+    <!-- no translation found for vpn_states:1 (6692305604213080515) -->
+    <!-- no translation found for vpn_states:2 (8001704909356800092) -->
+    <!-- no translation found for vpn_states:3 (4039737283841672166) -->
+    <!-- no translation found for vpn_states:4 (4042143101664725090) -->
+    <!-- no translation found for vpn_states:5 (2690164254699635531) -->
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 7e7078e..639fa9f 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -19,6 +19,10 @@
     <string name="yes" msgid="4676390750360727396">"Sí"</string>
     <string name="no" msgid="6731231425810196216">"No"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Desconegut"</string>
+    <string name="header_category_wireless_networks" msgid="4944823405420438623">"Sense fil i xarxes"</string>
+    <string name="header_category_device" msgid="5781174212691167553">"DISPOSITIU"</string>
+    <string name="header_category_personal" msgid="6225932173498802187">"PERSONAL"</string>
+    <string name="header_category_system" msgid="2073558547468647128">"SISTEMA"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Activa la ràdio"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Desactiva la ràdio"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Visualitza la llibreta d\'adreces de la SIM"</string>
@@ -111,7 +115,11 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"S\'està emparellant..."</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"Emparellat però no connectat"</string>
     <string name="bluetooth_device" msgid="6873461446424952003">"mans lliures/auricular"</string>
-    <string name="progress_scanning" msgid="3760897655335759141">"S\'està cercant"</string>
+    <!-- outdated translation 3760897655335759141 -->     <string name="progress_scanning" msgid="192587958424295789">"S\'està cercant"</string>
+    <!-- no translation found for progress_tap_to_pair (4192342336107106334) -->
+    <skip />
+    <!-- no translation found for bluetooth_no_devices_found (2412462335116297668) -->
+    <skip />
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Sol·licitud d\'emparellament de Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Sol·licitud d\'emparellament"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Selecciona l\'emparellament amb <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
@@ -130,6 +138,9 @@
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Una aplicació del telèfon sol·licita permís per activar el Bluetooth i perquè altres dispositius puguin detectar-lo. Vols permetre-ho?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"S\'està activant Bluetooth..."</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Connexió automàtica"</string>
+    <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Sol·licitud de connexió de Bluetooth"</string>
+    <string name="bluetooth_connection_notif_message" msgid="1833221950512058309">"Toca per connectar-te a \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\""</string>
+    <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Vols connectar-te a \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Configuració de data i hora"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00 p. m."</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
@@ -235,7 +246,7 @@
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Desactiva totes les connexions sense fil"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"S\'estan desactivant les connexions sense fil..."</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"S\'estan activant les connexions sense fil..."</string>
-    <string name="radio_controls_title" msgid="5868688473587168882">"Sense fil i xarxes"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Més..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Sense fil i xarxes"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"Gestiona la Wi-fi, el Bluetooth, el mode d\'avió, les xarxes mòbils i les VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Itinerància de dades"</string>
@@ -271,8 +282,8 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Informació de propietari"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="2382525043173672857">"Introdueix text per a la pantalla de bloqueig."</string>
-    <string name="security_settings_title" msgid="5168491784222013179">"Ubicació i seguretat"</string>
-    <string name="location_security_settings_title" msgid="4624434296446625554">"Configuració d\'ubicació i seguretat"</string>
+    <string name="location_settings_title" msgid="8935806698251432196">"Serveis d\'ubicació"</string>
+    <string name="security_settings_title" msgid="7945465324818485460">"Seguretat"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Defineix La meva ubicació, el desbloqueig de la pantalla, el bloqueig de la targeta SIM i el bloqueig de l\'emmagatzematge de credencials"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Defineix La meva ubicació, el desbloqueig de pantalla i el bloqueig d\'emmagatzematge de credencials"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Contrasenyes"</string>
@@ -316,7 +327,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>
@@ -375,8 +386,8 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Mostra o desactiva els administradors del dispositiu"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Activa el Bluetooth"</string>
-    <string name="bluetooth_settings" msgid="2725796451253089609">"Configuració de Bluetooth"</string>
-    <string name="bluetooth_settings_title" msgid="2824020086246268296">"Configuració de Bluetooth"</string>
+    <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
+    <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Gestiona les connexions, defineix el nom i la detecció del dispositiu"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Sol·licitud d\'emparellament de Bluetooth"</string>
     <string name="bluetooth_enter_pin_msg" msgid="1499285355129256289">\n"Introdueix el PIN per emparellar amb \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". Prova amb 0000 o amb 1234. Pot ser que hagis d\'introduir el mateix PIN al dispositiu Bluetooth."</string>
@@ -394,7 +405,10 @@
     <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Emparellament rebutjat per <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"S\'ha produït un problema en connectar-se a <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Cerca dispositius"</string>
-    <string name="bluetooth_preference_find_nearby_title" msgid="5087410003465463318">"Cerca dispositius propers"</string>
+    <!-- no translation found for bluetooth_search_for_devices (5957007154213560390) -->
+    <skip />
+    <!-- no translation found for bluetooth_searching_for_devices (9203739709307871727) -->
+    <skip />
     <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"Configuració del dispositiu"</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Dispositius emparellats"</string>
     <string name="bluetooth_preference_found_devices" msgid="3133019331974936204">"Dispositius trobats"</string>
@@ -404,6 +418,10 @@
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Desemparella"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Desconnecta\'t i desemparella\'l"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Opcions…"</string>
+    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Avançades"</string>
+    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth avançat"</string>
+    <string name="bluetooth_advanced_settings_label" msgid="8659717781212434173">"Bluetooth avançat"</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="3631028334811113629">"Activa Bluetooth per veure dispositius disponibles"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Connecta\'t a..."</string>
     <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"Multimèdia"</string>
     <string name="bluetooth_profile_headset" msgid="81844079120986198">"Mans lliures"</string>
@@ -445,27 +463,31 @@
     <string name="nfc_toggle_error" msgid="2233172102497535522">"S\'ha produït un error."</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Activa la Wi-fi"</string>
-    <string name="wifi_settings" msgid="4746946030627213196">"Configuració de Wi-fi"</string>
+    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="2810363951104753710">"Configuració de Wi-fi"</string>
+    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Configura i gestiona els punts d\'accés sense fil"</string>
-    <string name="wifi_starting" msgid="6710266609710860129">"S\'està activant..."</string>
-    <string name="wifi_stopping" msgid="5952909472548218348">"S\'està desactivant..."</string>
+    <string name="wifi_starting" msgid="7732330327758522943">"S\'està activant la Wi-Fi..."</string>
+    <string name="wifi_stopping" msgid="244864762599017659">"S\'està desactivant la Wi-Fi..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"Error"</string>
     <string name="wifi_in_airplane_mode" msgid="7618393787965366655">"En mode d\'avió"</string>
     <string name="wifi_fail_to_scan" msgid="6194542252808587669">"No es pot cercar xarxes"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Notificació de xarxa"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Notifica\'m quan hi hagi una xarxa oberta disponible"</string>
+    <string name="wifi_enable_watchdog_service" msgid="4723544454066601706">"Comprovacions de connexions Wi-Fi"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="8687400936839455926">"Detecta i tracta els possibles problemes de connexió de xarxes"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Política de desconnexió de Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Especifiqueu quan canviar de Wi-fi a dades mòbils"</string>
     <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" msgid="6234851776910938957">"Afegeix una xarxa"</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>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Connecta\'t a la xarxa"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Oblida la xarxa"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modifica la xarxa"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="3682507011071029311">"Activa la Wi-Fi per veure les xarxes disponibles"</string>
     <string name="wifi_network_setup" msgid="7974851890019344870">"Configuració de xarxa"</string>
     <string name="wifi_wps_pin" msgid="5471842298708321115">"Introdueix el PIN des del punt d\'accés"</string>
     <string name="wifi_wps_setup_title" msgid="150518971269252336">"Configuració WPS"</string>
@@ -501,13 +523,13 @@
     <string name="wifi_save" msgid="3331121567988522826">"Desa"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Cancel·la"</string>
     <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"S\'ha detectat una altra sessió WPS. Torna-ho a provar d\'aquí a una estona"</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Avançat"</string>
+    <!-- outdated translation 5419052271935350999 -->     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Avançat"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Banda de freqüència Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Especifica l\'interval de freqüència de funcionament"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"S\'ha produït un problema en definir la banda de freqüència."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Adreça MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"adreça IP"</string>
-    <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"Configuració d\'IP"</string>
+    <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Configuració IP"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Desa"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Cancel·la"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Escriu una adreça IP vàlida."</string>
@@ -525,7 +547,7 @@
     <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"Punt de connexió Wi-fi portàtil <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="sound_settings_title" msgid="8735891486683305886">"So"</string>
-    <string name="display_settings_title" msgid="2378894265964357591">"Pantalla"</string>
+    <string name="display_settings_title" msgid="1708697328627382561">"Visualització"</string>
     <string name="sound_settings" msgid="5007659014828162881">"Configuració del so"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Mode silenciós"</string>
     <string name="silent_mode_summary" msgid="3309650676072917899">"Silencia tots els sons excepte multimèdia i alarmes"</string>
@@ -598,7 +620,18 @@
     <string name="brightness_summary" msgid="838917350127550703">"Ajusta la brillantor de la pantalla"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Temps d\'espera esgotat"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"La pantalla es desactiva automàticament després de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Fons de pantalla"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Somnis d\'Android"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Estalvis de pantalla i altres diversions per a la inactivitat"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Somni seleccionat"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Moment de l\'activació"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"Després de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'estat inactiu"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Mai"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Prova-ho"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brillantor automàtica"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Mida del tipus de lletra"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Mida general dels tipus de lletra"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Selecciona la mida del tipus de lletra"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Configuració de bloqueig de targeta SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Configura el bloqueig de la targeta SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Bloqueig de targeta SIM"</string>
@@ -643,8 +676,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>
@@ -696,6 +730,16 @@
     <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"La targeta SD es desinstal·larà."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"S\'està desmuntant"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Desmuntatge en curs"</string>
+    <!-- no translation found for storage_menu_usb (1580545228584324704) -->
+    <skip />
+    <!-- no translation found for storage_title_usb (5775322159427546546) -->
+    <skip />
+    <!-- no translation found for usb_label_mtp (4157227401755543412) -->
+    <skip />
+    <!-- no translation found for usb_label_ptp (7417254019489575819) -->
+    <skip />
+    <!-- no translation found for usb_label_installer_cd (7438467574756086977) -->
+    <skip />
     <string name="battery_status_title" msgid="9159414319574976203">"Estat de la bateria"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Nivell de la bateria"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -806,6 +850,8 @@
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"No es pot compar. connex. amb més de <xliff:g id="MAXCONNECTION">%1$d</xliff:g> dispos."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> no compartirà connexió."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ajuda"</string>
+    <string name="wireless_category_general" msgid="2973810407987118067">"General"</string>
+    <string name="wireless_category_mobile_networks" msgid="1254629216798424288">"Xarxes mòbils"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Xarxes mòbils"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Defineix les opcions d\'itinerància, xarxes i APN"</string>
     <string name="location_title" msgid="1029961368397484576">"La meva ubicació"</string>
@@ -883,7 +929,7 @@
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Seguretat de la tauleta"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Protecció del telèfon"</string>
     <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"Protegeix la tauleta de l\'ús no autoritzat: crea un patró personal de desbloqueig de la pantalla. Fes servir el dit per connectar els punts en l\'ordre que vulguis a la pantalla següent. Has de connectar un mínim de quatre punts. "\n\n"Estàs preparat per començar? Toca \"Següent\"."</string>
-    <string name="lock_intro_message" product="default" msgid="9100785646737118042"><font size="17">"Per protegir el telèfon d\'usos no autoritzats, creeu un patró de desbloqueig de pantalla personal. "\n<font height="17">\n</font><b>"1"</b>"  A la pantalla següent veureu com es dibuixa un patró d\'exemple. "\n<font height="17">\n</font><b>"2"</b>"  Quan estigueu preparat, dibuixeu el vostre propi patró de desbloqueig personal. Experimenteu amb diversos patrons, però connecteu com a mínim quatre punts. "\n<font height="17">\n</font><b>"3"</b>"  Torneu a dibuixar el patró per confirmar-lo. "\n<font height="17">\n</font><b>"Esteu preparat per començar? Toqueu \"Següent\""</b>". "\n<font height="3">\n</font>"Per deixar el telèfon desprotegit, toqueu \"Cancel·la\"."</font></string>
+    <!-- outdated translation 3692151094288835065 -->     <string name="lock_intro_message" product="default" msgid="5796785892741212873">"Protegeix la tauleta de l\'ús no autoritzat: crea un patró personal de desbloqueig de la pantalla. Fes servir el dit per connectar els punts en l\'ordre que vulguis a la pantalla següent. Has de connectar un mínim de quatre punts. "\n\n"Estàs preparat per començar? Toca \"Següent\"."</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Gestiona les aplicacions"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Gestiona i elimina les aplicacions instal·lades"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Aplicacions"</string>
@@ -893,6 +939,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>
@@ -905,9 +953,10 @@
     <string name="force_stop" msgid="7435006169872876756">"Força l\'aturada"</string>
     <string name="total_size_label" msgid="1048676419552557254">"Total"</string>
     <string name="application_size_label" msgid="5055196275624686382">"Aplicació"</string>
+    <string name="external_code_size_label" msgid="3459343140355961335">"Aplicació d\'emmagatzematge USB"</string>
     <string name="data_size_label" msgid="8679376373625710107">"Dades"</string>
-    <string name="external_size_label" product="nosdcard" msgid="4465530017830945766">"Emmagatzematge USB"</string>
-    <string name="external_size_label" product="default" msgid="2107155737635944440">"Targeta SD"</string>
+    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Dades de l\'emmagatzematge USB"</string>
+    <string name="external_data_size_label" product="default" msgid="626414192825329708">"Targeta SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Desinstal·la"</string>
     <string name="disable_text" msgid="6544054052049395202">"Desactiva"</string>
     <string name="enable_text" msgid="9217362512327828987">"Activa"</string>
@@ -1026,7 +1075,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 +1085,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>
@@ -1066,7 +1117,7 @@
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Configuració del teclat en pantalla"</string>
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Teclat físic"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Configuració del teclat físic"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Desenvolupament"</string>
+    <string name="development_settings_title" msgid="215179176067683667">"Opcions del desenvolupador"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"Defineix les opcions per al desenvolupament d\'aplicacions"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Depuració d\'USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Mode de depuració quan l\'USB està connectat"</string>
@@ -1091,14 +1142,14 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Accessibilitat"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Configuració d\'accessibilitat"</string>
     <string name="accessibility_settings_summary" msgid="8185181964847149507">"Gestiona les opcions d\'accessibilitat"</string>
-    <string name="toggle_accessibility_title" msgid="650839277066574497">"Accessibilitat"</string>
+    <string name="toggle_large_text_title" msgid="42259643359869436">"Text gran"</string>
     <string name="accessibility_services_category" msgid="8127851026323672607">"Serveis d\'accessibilitat"</string>
+    <string name="toggle_accessibility_title" msgid="7338739354952553958">"Permet els serveis d\'accessibilitat"</string>
     <string name="no_accessibility_services_summary" msgid="694578333333808159">"No hi ha cap servei d\'accessibilitat instal·lat."</string>
     <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Pot ser que aquest servei d\'accessibilitat pugui recopilar tot el text que escriviu, incloses dades personals, com els números de les targetes de crèdit, tret de les contrasenyes. També pot registrar les interaccions que feu amb la interfície d\'usuari. Ve de l\'aplicació <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Voleu utilitzar aquest servei d\'accessibilitat?"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Voleu desactivar l\'accessibilitat?"</string>
     <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"No s\'ha trobat cap aplicació relacionada amb l\'accessibilitat"</string>
     <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"No tens instal·lades aplicacions relacionades amb l\'accessibilitat."\n\n"Pots baixar un lector de pantalla per al teu dispositiu des d\'Android Market."\n\n"Fes clic a D\'acord per instal·lar el lector de pantalla."</string>
-    <string name="accessibility_script_injection_category" msgid="8649951751131431904">"Scripts d\'accessibilitat"</string>
     <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"Baixa scripts d\'accessibilitat"</string>
     <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"Permet que les aplicacions baixin scripts d\'accessibilitat de Google"</string>
     <string name="accessibility_script_injection_security_warning" product="tablet" msgid="1113600871264359828">"Algunes aplicacions poden sol·licitar a Google que baixi scripts a la tauleta per fer que l\'accés al contingut sigui més senzill. Estàs segur que vols permetre que Google instal·li scripts d\'accessibilitat a la tauleta?"</string>
@@ -1106,10 +1157,11 @@
     <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>
-    <string name="power_usage_summary_title" msgid="5180282911164282324">"Ús de la bateria"</string>
+    <string name="power_usage_summary_title" msgid="7190304207330319919">"Bateria"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Elements que han utilitzat la bateria"</string>
     <string name="power_usage_not_available" msgid="3583407442633768046">"Dades ús bateria no disp."</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Ús de la bateria des que s\'ha desconnectat"</string>
@@ -1218,6 +1270,8 @@
     <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>
+    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Configuració del motor"</string>
+    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Configuració de: <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
     <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>
@@ -1228,114 +1282,33 @@
     <string name="gadget_title" msgid="7455548605888590466">"Control d\'energia"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"S\'està actualitzant la configuració Wi-fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"S\'està actualitzant la configuració de Bluetooth"</string>
-    <string name="vpn_settings_activity_title" msgid="7276864950701612579">"Configuració de VPN"</string>
-    <string name="vpn_connect_to" msgid="2541409082892684362">"Connecta\'t a <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpn_username_colon" msgid="7854930370861306247">"Nom d\'usuari:"</string>
-    <string name="vpn_password_colon" msgid="5716278710848606626">"Contrasenya:"</string>
-    <string name="vpn_a_username" msgid="6664733641993968692">"un nom d\'usuari"</string>
-    <string name="vpn_a_password" msgid="1537213632501483753">"una contrasenya"</string>
-    <string name="vpn_save_username" msgid="1408415289165970790">"Recorda el nom d\'usuari"</string>
-    <string name="vpn_connect_button" msgid="1699007212602470655">"Connecta"</string>
-    <string name="vpn_yes_button" msgid="8034531001149843119">"Sí"</string>
-    <string name="vpn_no_button" msgid="7620339571187119107">"No"</string>
-    <string name="vpn_back_button" msgid="192036339792734970">"Enrere"</string>
-    <string name="vpn_mistake_button" msgid="1683383660912491270">"No"</string>
-    <string name="vpn_menu_done" msgid="93528279226907926">"Desa"</string>
-    <string name="vpn_menu_cancel" msgid="7234451214611202868">"Cancel·la"</string>
-    <string name="vpn_menu_revert" msgid="4407762442281467659">"Retrocedeix"</string>
-    <string name="vpn_menu_connect" msgid="1089399414463784218">"Connecta\'t a la xarxa"</string>
-    <string name="vpn_menu_disconnect" msgid="8254492450022562235">"Desconnecta\'t de la xarxa"</string>
-    <string name="vpn_menu_edit" msgid="4526245173583195618">"Edita la xarxa"</string>
-    <string name="vpn_menu_delete" msgid="3326527392609513129">"Suprimeix la xarxa"</string>
-    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"Heu d\'introduir <xliff:g id="CODE">%s</xliff:g>."</string>
-    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"Heu de seleccionar <xliff:g id="OPTION">%s</xliff:g>."</string>
-    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"El nom de VPN \"<xliff:g id="NAME">%s</xliff:g>\" ja existeix. Cerqueu un altre nom."</string>
-    <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"Esteu segur que voleu suprimir aquesta VPN?"</string>
-    <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"Esteu segur que no voleu crear aquest perfil?"</string>
-    <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"Esteu segur que voleu descartar els canvis fets a aquest perfil?"</string>
-    <string name="vpn_confirm_reconnect" msgid="5748535476278674296">"No es pot establir la connexió a la xarxa. Voleu tornar-ho a provar?"</string>
-    <string name="vpn_reconnect_from_lost" msgid="2442844155623372118">"S\'ha perdut la connexió. Voleu tornar a establir-la?"</string>
-    <string name="vpn_unknown_server_dialog_msg" msgid="3080742299823671319">"No es pot resoldre el nom del servidor. Voleu comprovar la configuració del nom del servidor?"</string>
-    <string name="vpn_challenge_error_dialog_msg" msgid="6174901754230038601">"Error de repte. Voleu comprovar la configuració dels secrets?"</string>
-    <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"Falten un o diversos secrets en aquesta configuració de VPN. Voleu comprovar la configuració de secrets?"</string>
-    <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"El nom d\'usuari o la contrasenya que heu introduït no són correctes. Voleu tornar-ho a provar?"</string>
-    <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"El servidor ha penjat. El nom d\'usuari o la contrasenya que heu introduït podrien ser incorrectes. Voleu tornar-ho a provar?"</string>
-    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"El servidor ha penjat. Pot ser que us trobeu darrere d\'un tallafoc que us impedeixi connectar-vos al servidor. Voleu tornar-ho a provar?"</string>
-    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"S\'ha produït un error a la negociació del servidor. Pot ser que el servidor no accepti l\'opció d\'encriptació. Voleu comprovar la configuració d\'encriptació?"</string>
-    <string name="vpn_type_title" msgid="6392933604218676224">"Afegeix VPN"</string>
-    <string name="vpn_add_new_vpn" msgid="5438260689052714550">"Afegeix VPN"</string>
-    <string name="vpn_details_title" msgid="418806440938510331">"Detalls VPN"</string>
-    <string name="vpn_edit_title_add" msgid="2121313217989682890">"Afegeix la VPN <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"Detalls de: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpns" msgid="3148141862835492816">"VPN"</string>
-    <string name="vpn_connecting" msgid="8039521381692090116">"S\'està connectant..."</string>
-    <string name="vpn_disconnecting" msgid="7748050200708257066">"S\'està desconnectant..."</string>
-    <string name="vpn_connected" msgid="7641723116362845781">"Connectat"</string>
-    <string name="vpn_connect_hint" msgid="7442898962925875181">"Connecta\'t a la xarxa"</string>
-    <string name="vpn_name" msgid="1550918148476193076">"Nom de VPN"</string>
-    <string name="vpn_a_name" msgid="8445736942405283509">"un nom de VPN"</string>
-    <string name="vpn_profile_added" msgid="9061017910337129840">"S\'ha afegit \"<xliff:g id="NAME">%s</xliff:g>\""</string>
-    <string name="vpn_profile_replaced" msgid="587435576816273815">"Es fan canvis a \"<xliff:g id="NAME">%s</xliff:g>\""</string>
-    <string name="vpn_user_certificate_title" msgid="6812545893924071742">"Defineix el certificat d\'usuari"</string>
-    <string name="vpn_user_certificate" msgid="949322691686938888">"Certificat d\'usuari"</string>
-    <string name="vpn_a_user_certificate" msgid="8943983437956898649">"un certificat d\'usuari"</string>
-    <string name="vpn_ca_certificate_title" msgid="7846466160795589985">"Defineix el certificat de CA"</string>
-    <string name="vpn_ca_certificate" msgid="465085144064264742">"Certificat d\'entitat certificadora (CA)"</string>
-    <string name="vpn_a_ca_certificate" msgid="3374242520974884295">"un certificat de CA"</string>
-    <string name="vpn_l2tp_secret_string_title" msgid="5039677186748940987">"Defineix el secret L2TP"</string>
-    <string name="vpn_l2tp_secret" msgid="529359749677142076">"Secret L2TP"</string>
-    <string name="vpn_a_l2tp_secret" msgid="6612042930810981845">"un secret L2TP"</string>
-    <string name="vpn_pptp_encryption_title" msgid="2236795167467896499">"encriptació"</string>
-    <string name="vpn_pptp_encryption" msgid="2602329949737259686">"Encriptació PPTP"</string>
-    <string name="vpn_ipsec_presharedkey_title" msgid="2184060087690539175">"Defineix la clau prèviament compartida d\'IPSec"</string>
-    <string name="vpn_ipsec_presharedkey" msgid="5434316521616673741">"Clau prèviament compartida d\'IPSec"</string>
-    <string name="vpn_a_ipsec_presharedkey" msgid="1255301923217898418">"una clau prèviament compartida d\'IPSec"</string>
-    <string name="vpn_vpn_server_title" msgid="8897005887420358913">"Defineix el servidor VPN"</string>
-    <string name="vpn_vpn_server" msgid="1141754908824209260">"Servidor VPN"</string>
-    <string name="vpn_a_vpn_server" msgid="5960906152125045853">"un servidor VPN"</string>
-    <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"Nom del servidor VPN"</string>
-    <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"Dominis de cerca DNS"</string>
-    <string name="vpn_dns_search_list" msgid="4230034234026605360">"Dominis de cerca DNS"</string>
-    <string name="vpn_field_is_set" msgid="7137320847812992243">"<xliff:g id="VALUE">%s</xliff:g> s\'ha definit"</string>
-    <string name="vpn_field_not_set" msgid="2972519243515893804">"<xliff:g id="VALUE">%s</xliff:g> sense definir"</string>
-    <string name="vpn_field_not_set_optional" msgid="8840557698252556791">"<xliff:g id="VALUE">%s</xliff:g> no definit (opcional)"</string>
-    <string name="vpn_enable_field" msgid="3700967675854517191">"Activa <xliff:g id="OPTION">%s</xliff:g>"</string>
-    <string name="vpn_disable_field" msgid="6905658811179634005">"Desactiva <xliff:g id="OPTION">%s</xliff:g>"</string>
-    <string name="vpn_is_enabled" msgid="1266304230417098877">"<xliff:g id="OPTION">%s</xliff:g> està activat"</string>
-    <string name="vpn_is_disabled" msgid="2013622485867806167">"<xliff:g id="OPTION">%s</xliff:g> està desactivat"</string>
     <string name="vpn_settings_title" msgid="7327468307909556719">"Configuració de VPN"</string>
     <string name="vpn_settings_summary" msgid="8849924181594963972">"Configura i gestiona xarxes privades virtuals (VPN)"</string>
-    <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="trusted_credentials" msgid="4266945289534242402">"Credencials de confiança"</string>
+    <string name="trusted_credentials_summary" msgid="6735221351155686632">"Mostra certificats de CA de confiança"</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>
-    <string name="privacy_settings_title" msgid="1987089301293213705">"Configuració de privadesa"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"Còpia de seguretat i restabliment"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"Còpia de seguretat i restabliment"</string>
     <string name="backup_section_title" msgid="8856083167469467588">"Còpia de seguretat i restauració"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Dades personals"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Fes una còpia de seguretat de les dades"</string>
@@ -1440,4 +1413,107 @@
     <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>
+    <!-- no translation found for debug_ui_category (9023948280291055349) -->
+    <skip />
+    <!-- no translation found for strict_mode (1938795874357830695) -->
+    <skip />
+    <!-- no translation found for strict_mode_summary (142834318897332338) -->
+    <skip />
+    <!-- no translation found for pointer_location (6084434787496938001) -->
+    <skip />
+    <!-- no translation found for pointer_location_summary (840819275172753713) -->
+    <skip />
+    <!-- no translation found for show_screen_updates (8282711794220426931) -->
+    <skip />
+    <!-- no translation found for show_screen_updates_summary (1716122382094924596) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage (2389212910758076024) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage_summary (2113341923988958266) -->
+    <skip />
+    <!-- no translation found for window_animation_scale_title (6162587588166114700) -->
+    <skip />
+    <!-- no translation found for transition_animation_scale_title (387527540523595875) -->
+    <skip />
+    <!-- no translation found for debug_applications_category (6221644998451283813) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities (3622005081180597749) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities_summary (3592221124808773368) -->
+    <skip />
+    <!-- no translation found for app_process_limit_title (4121324758038197598) -->
+    <skip />
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Ús de dades"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"Cicle d\'ús de dades"</string>
+    <string name="data_usage_menu_split_4g" msgid="7417435609285381968">"Divideix l\'ús de 4G"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Mostra l\'ús de Wi-Fi"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"Canvia el cicle..."</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Dia del mes per restablir el cicle d\'ús de dades:"</string>
+    <string name="data_usage_disable_mobile_limit" msgid="289740911281022322">"Desact. dades mòbils en límit"</string>
+    <string name="data_usage_disable_4g_limit" msgid="5808210773758699800">"Desactiva dades 4G en límit"</string>
+    <string name="data_usage_disable_3g_limit" msgid="3856971004328238231">"Desactiva dades 2G-3G en límit"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_mobile" msgid="454140350007299045">"Mòbil"</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">"Dades mòbils"</string>
+    <string name="data_usage_enable_3g" msgid="6304006671869578254">"Dades 2G-3G"</string>
+    <string name="data_usage_enable_4g" msgid="3635854097335036738">"Dades 4G"</string>
+    <string name="data_usage_app_settings" msgid="3727561362090820369">"Visual. configuració aplicació"</string>
+    <string name="data_usage_app_restrict_background" msgid="8856643905291165256">"Restringeix ús de dades de fons"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="1503361245973512092">"Només permet dades de fons de l\'aplicació quan s\'utilitzi una xarxa il·limitada"</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="8110736468987743260">"Restricció de les dades de fons"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="100001698378554777">"Aquesta característica pot influir negativament en les aplicacions que depenen de l\'ús de dades de fons."\n\n"A la configuració d\'aquesta aplicació pots trobar controls d\'ús de dades més adients."</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Data de restabliment del cicle d\'ús"</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Data de cada mes:"</string>
+    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Estableix"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Limitació de l\'ús de dades"</string>
+    <string name="data_usage_limit_dialog_mobile" msgid="7931094451923591578">"La connexió de dades mòbils es desactivarà quan s\'arribi al límit especificat."\n\n"Per evitar càrrecs per excés d\'ús, pots utilitzar un límit reduït, ja que els mètodes comptables del dispositiu i de l\'operador poden diferir."</string>
+    <string name="data_usage_limit_dialog_3g" msgid="5478553071420316963">"La connexió de dades 2G-3G es desactivarà quan s\'arribi al límit especificat."\n\n"Per evitar càrrecs per excés d\'ús, pots utilitzar un límit reduït, ja que els mètodes comptables del dispositiu i de l\'operador poden diferir."</string>
+    <string name="data_usage_limit_dialog_4g" msgid="6134008906742403777">"La connexió de dades 4G es desactivarà quan s\'arribi al límit especificat."\n\n"Per evitar càrrecs per excés d\'ús, pots utilitzar un límit reduït, ja que els mètodes comptables del dispositiu i de l\'operador poden diferir."</string>
+    <string name="data_usage_disabled_dialog_3g_title" msgid="4221584306492812040">"Dades 2G-3G desactivades"</string>
+    <string name="data_usage_disabled_dialog_4g_title" msgid="715585612162185936">"Dades 4G desactivades"</string>
+    <string name="data_usage_disabled_dialog_mobile_title" msgid="209516216265000221">"Dades mòbils desactivades"</string>
+    <string name="data_usage_disabled_dialog" msgid="2874031671067845964">"S\'ha assolit el límit d\'ús de dades especificat."\n\n"Si s\'utilitzen més dades, l\'operador hi podria aplicar càrrecs."</string>
+    <string name="data_usage_disabled_dialog_enable" msgid="2441219164620753329">"Torna a activar les dades"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="32">" <xliff:g id="NUMBER">%1$s</xliff:g> "</font>" "<font size="12">" <xliff:g id="UNIT">%2$s</xliff:g> "</font>" "\n" "<font size="12">"advertència"</font></string>
+    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Trucada d\'emergència"</string>
+    <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Torna a la trucada"</string>
+    <string name="vpn_name" msgid="4689699885361002297">"Nom"</string>
+    <string name="vpn_type" msgid="5435733139514388070">"Tipus"</string>
+    <string name="vpn_server" msgid="2123096727287421913">"Adreça del servidor"</string>
+    <string name="vpn_mppe" msgid="6639001940500288972">"Encriptació PPP (MPPE)"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"Secret L2TP"</string>
+    <string name="vpn_ipsec_identifier" msgid="4098175859460006296">"Identificador d\'IPSec"</string>
+    <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Clau prèviament compartida d\'IPSec"</string>
+    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"Certificat d\'usuari IPSec"</string>
+    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"Certificat de CA IPSec"</string>
+    <!-- no translation found for vpn_search_domains (5391995501541199624) -->
+    <skip />
+    <!-- no translation found for vpn_routes (8556236801755260073) -->
+    <skip />
+    <string name="vpn_username" msgid="1863901629860867849">"Nom d\'usuari"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Contrasenya"</string>
+    <!-- no translation found for vpn_save_login (6350322456427484881) -->
+    <skip />
+    <!-- no translation found for vpn_not_used (9094191054524660891) -->
+    <skip />
+    <string name="vpn_no_ca_cert" msgid="7820884983947090538">"(no comprovis el servidor)"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"Cancel·la"</string>
+    <string name="vpn_save" msgid="4233484051644764510">"Desa"</string>
+    <string name="vpn_connect" msgid="8469608541746132301">"Connecta"</string>
+    <string name="vpn_edit" msgid="1111459297288136079">"Edició de xarxa VPN"</string>
+    <string name="vpn_connect_to" msgid="7328758950427515753">"Connexió a <xliff:g id="NETWORK">%s</xliff:g>"</string>
+    <string name="vpn_title" msgid="7982620762043790565">"Configuració de VPN"</string>
+    <string name="vpn_create" msgid="8966010925994175306">"Afegeix xarxa VPN"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"Edita la xarxa"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"Suprimeix la xarxa"</string>
+    <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Sistema"</string>
+    <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Usuari"</string>
+    <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Desactiva"</string>
+    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Activa"</string>
+    <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Elimina"</string>
+    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Vols activar el certificat de CA del sistema?"</string>
+    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Vols desactivar el certificat de CA del sistema?"</string>
+    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Vols eliminar de forma permanent el certificat de CA d\'usuari?"</string>
 </resources>
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index 2beb22a..a5dbd68 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>
@@ -214,4 +240,36 @@
     <item msgid="3878793616631049349">"Použít kontrolu HDCP pouze pro obsah DRM"</item>
     <item msgid="45075631231212732">"Vždy používat kontrolu HDCP"</item>
   </string-array>
+    <!-- no translation found for window_animation_scale_entries:0 (8134156599370824081) -->
+    <!-- no translation found for window_animation_scale_entries:1 (6624864048416710414) -->
+    <!-- no translation found for window_animation_scale_entries:2 (2219332261255416635) -->
+    <!-- no translation found for window_animation_scale_entries:3 (3544428804137048509) -->
+    <!-- no translation found for window_animation_scale_entries:4 (3110710404225974514) -->
+    <!-- no translation found for window_animation_scale_entries:5 (4402738611528318731) -->
+    <!-- no translation found for window_animation_scale_entries:6 (6189539267968330656) -->
+    <!-- no translation found for transition_animation_scale_entries:0 (8464255836173039442) -->
+    <!-- no translation found for transition_animation_scale_entries:1 (3375781541913316411) -->
+    <!-- no translation found for transition_animation_scale_entries:2 (1991041427801869945) -->
+    <!-- no translation found for transition_animation_scale_entries:3 (4012689927622382874) -->
+    <!-- no translation found for transition_animation_scale_entries:4 (3289156759925947169) -->
+    <!-- no translation found for transition_animation_scale_entries:5 (7705857441213621835) -->
+    <!-- no translation found for transition_animation_scale_entries:6 (6660750935954853365) -->
+    <!-- no translation found for app_process_limit_entries:0 (6799596560242275471) -->
+    <!-- no translation found for app_process_limit_entries:1 (2412794376818632575) -->
+    <!-- no translation found for app_process_limit_entries:2 (1578904888612645001) -->
+    <!-- no translation found for app_process_limit_entries:3 (8819235336299873577) -->
+  <string-array name="vpn_types_long">
+    <item msgid="2732002039459078847">"VPN s protokolem PPTP"</item>
+    <item msgid="3799752201662127867">"L2TP/IPSec VPN s předsdílenými klíči"</item>
+    <item msgid="4725504331295252103">"L2TP/IPSec VPN s certifikáty"</item>
+    <item msgid="7526551163264034377">"IPSec VPN s předsdílenými klíči a ověřením Xauth"</item>
+    <item msgid="8064740940687465039">"IPSec VPN s certifikáty a ověřením Xauth"</item>
+    <item msgid="4946199982372391490">"IPSec VPN s certifikáty a hybridním ověřením"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:0 (8621078286418985762) -->
+    <!-- no translation found for vpn_states:1 (6692305604213080515) -->
+    <!-- no translation found for vpn_states:2 (8001704909356800092) -->
+    <!-- no translation found for vpn_states:3 (4039737283841672166) -->
+    <!-- no translation found for vpn_states:4 (4042143101664725090) -->
+    <!-- no translation found for vpn_states:5 (2690164254699635531) -->
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index a4888d9..b7f28f3 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -19,6 +19,10 @@
     <string name="yes" msgid="4676390750360727396">"Ano"</string>
     <string name="no" msgid="6731231425810196216">"Ne"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Neznámé"</string>
+    <string name="header_category_wireless_networks" msgid="4944823405420438623">"BEZDRÁTOVÁ PŘIPOJENÍ A SÍTĚ"</string>
+    <string name="header_category_device" msgid="5781174212691167553">"ZAŘÍZENÍ"</string>
+    <string name="header_category_personal" msgid="6225932173498802187">"OSOBNÍ"</string>
+    <string name="header_category_system" msgid="2073558547468647128">"SYSTÉM"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Zapnout rádio"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Vypnout rádio"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Zobrazit adresář karty SIM"</string>
@@ -111,7 +115,11 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Párování..."</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"Spárováno, ale nepřipojeno"</string>
     <string name="bluetooth_device" msgid="6873461446424952003">"Náhlavní souprava či handsfree"</string>
-    <string name="progress_scanning" msgid="3760897655335759141">"Vyhledávání"</string>
+    <!-- outdated translation 3760897655335759141 -->     <string name="progress_scanning" msgid="192587958424295789">"Vyhledávání"</string>
+    <!-- no translation found for progress_tap_to_pair (4192342336107106334) -->
+    <skip />
+    <!-- no translation found for bluetooth_no_devices_found (2412462335116297668) -->
+    <skip />
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Požadavek na párování zařízení Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Požadavek na párování"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Vybrat k párování se zařízením <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
@@ -130,6 +138,9 @@
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Aplikace v telefonu požaduje povolení zapnout připojení Bluetooth a nastavit telefon do viditelného režimu pro ostatní zařízení. Chcete toto povolení udělit?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Zapínání zařízení Bluetooth..."</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Automatické připojení"</string>
+    <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Požadavek na připojení zařízení Bluetooth"</string>
+    <string name="bluetooth_connection_notif_message" msgid="1833221950512058309">"Klepnutím se připojíte k zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Chcete se připojit k zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Nastavení data a času"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"13:00"</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
@@ -235,7 +246,7 @@
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Vypne všechna bezdrátová připojení"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"Vypínání bezdrátových připojení..."</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"Povolování bezdrátových připojení..."</string>
-    <string name="radio_controls_title" msgid="5868688473587168882">"Bezdrátová připojení a sítě"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Další..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Bezdrátová připojení a sítě"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"Spravovat Wi-Fi, Bluetooth, režim V letadle, mobilní sítě a sítě VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Datové služby při roamingu"</string>
@@ -271,8 +282,8 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Info. o vlastníkovi"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="2382525043173672857">"Text, který se zobrazí na uzamčené obrazovce"</string>
-    <string name="security_settings_title" msgid="5168491784222013179">"Poloha a zabezpečení"</string>
-    <string name="location_security_settings_title" msgid="4624434296446625554">"Nastavení polohy a zabezpečení"</string>
+    <string name="location_settings_title" msgid="8935806698251432196">"Služby určování polohy"</string>
+    <string name="security_settings_title" msgid="7945465324818485460">"Zabezpečení"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Moje poloha, odemknutí obrazovky, zámek SIM, zámek úložiště pověření"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Nastavení funkce Moje poloha, odemknutí obrazovky a zamknutí úložiště pověření"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Hesla"</string>
@@ -316,7 +327,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>
@@ -375,8 +386,8 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Zobrazit nebo deaktivovat správce zařízení"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Zapnout Bluetooth"</string>
-    <string name="bluetooth_settings" msgid="2725796451253089609">"Nastavení Bluetooth"</string>
-    <string name="bluetooth_settings_title" msgid="2824020086246268296">"Nastavení Bluetooth"</string>
+    <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
+    <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Umožňuje spravovat připojení, nastavit název zařízení a viditelnost"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Požadavek na párování zařízení Bluetooth"</string>
     <string name="bluetooth_enter_pin_msg" msgid="1499285355129256289">\n"Párování se zařízením „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“ zahájíte zadáním kódu PIN (zkuste kód 0000 nebo 1234). Možná bude nutné zadat stejný kód PIN v zařízení Bluetooth."</string>
@@ -394,7 +405,10 @@
     <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Párování odmítnuto zařízením <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"Při připojování k zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g> došlo k potížím."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Vyhledat zařízení"</string>
-    <string name="bluetooth_preference_find_nearby_title" msgid="5087410003465463318">"Najít okolní zařízení"</string>
+    <!-- no translation found for bluetooth_search_for_devices (5957007154213560390) -->
+    <skip />
+    <!-- no translation found for bluetooth_searching_for_devices (9203739709307871727) -->
+    <skip />
     <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"Nastavení zařízení"</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Párovaná zařízení"</string>
     <string name="bluetooth_preference_found_devices" msgid="3133019331974936204">"Nalezená zařízení"</string>
@@ -404,6 +418,10 @@
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Zrušit párování"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Odpojit a zrušit párování"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Možnosti"</string>
+    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Pokročilé"</string>
+    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Pokročilé nastavení Bluetooth"</string>
+    <string name="bluetooth_advanced_settings_label" msgid="8659717781212434173">"Pokročilé nastavení Bluetooth"</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="3631028334811113629">"Dostupná zařízení se zobrazí po zapnutí rozhraní Bluetooth"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Připojit k síti…"</string>
     <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"Média"</string>
     <string name="bluetooth_profile_headset" msgid="81844079120986198">"Sada handsfree"</string>
@@ -445,27 +463,31 @@
     <string name="nfc_toggle_error" msgid="2233172102497535522">"Došlo k chybě."</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"WiFi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Zapnout WiFi"</string>
-    <string name="wifi_settings" msgid="4746946030627213196">"Nastavení WiFi"</string>
+    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="2810363951104753710">"Nastavení WiFi"</string>
+    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Umožňuje nastavit a spravovat přístupové body bezdrátové sítě"</string>
-    <string name="wifi_starting" msgid="6710266609710860129">"Zapínání WiFi..."</string>
-    <string name="wifi_stopping" msgid="5952909472548218348">"Vypínání..."</string>
+    <string name="wifi_starting" msgid="7732330327758522943">"Zapínání Wi-Fi..."</string>
+    <string name="wifi_stopping" msgid="244864762599017659">"Vypínání Wi-Fi..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"Chyba"</string>
     <string name="wifi_in_airplane_mode" msgid="7618393787965366655">"Při režimu V letadle"</string>
     <string name="wifi_fail_to_scan" msgid="6194542252808587669">"Nelze vyhledávat sítě"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Oznamování sítě"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Oznamovat dostupné nezabezpečené sítě"</string>
+    <string name="wifi_enable_watchdog_service" msgid="4723544454066601706">"Kontrola připojení Wi-Fi"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="8687400936839455926">"Zjistit a spravovat případně problémy s připojením k síti"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Zásady odpojování sítě Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Určit, kdy přepnout ze sítě Wi-Fi na mobilní datový přenos"</string>
     <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" msgid="6234851776910938957">"Přidat síť"</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>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Připojit k síti"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Odstranit záznam sítě"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Upravit síť"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="3682507011071029311">"Dostupné sítě se zobrazí po zapnutí funkce Wi-Fi"</string>
     <string name="wifi_network_setup" msgid="7974851890019344870">"Nastavení sítě"</string>
     <string name="wifi_wps_pin" msgid="5471842298708321115">"Zadejte kód PIN z přístupového bodu"</string>
     <string name="wifi_wps_setup_title" msgid="150518971269252336">"Nastavení WPS"</string>
@@ -501,13 +523,13 @@
     <string name="wifi_save" msgid="3331121567988522826">"Uložit"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Zrušit"</string>
     <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"Byla zjištěna další relace WPS, zkuste to prosím znovu za pár minut."</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Pokročilé"</string>
+    <!-- outdated translation 5419052271935350999 -->     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Pokročilé"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Frekvenční pásmo Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Uveďte provozní frekvenční rozsah"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Při nastavení frekvenčního pásma došlo k problému."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Adresa MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Adresa IP"</string>
-    <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"Nastavení adresy IP"</string>
+    <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Nastavení adresy IP"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Uložit"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Zrušit"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Zadejte prosím platnou adresu IP."</string>
@@ -525,7 +547,7 @@
     <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"Přenosný hotspot Wi-Fi <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="sound_settings_title" msgid="8735891486683305886">"Zvuk"</string>
-    <string name="display_settings_title" msgid="2378894265964357591">"Obrazovka"</string>
+    <string name="display_settings_title" msgid="1708697328627382561">"Zobrazení"</string>
     <string name="sound_settings" msgid="5007659014828162881">"Nastavení zvuku"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Tichý režim"</string>
     <string name="silent_mode_summary" msgid="3309650676072917899">"Ztlumit všechny zvuky kromě médií a budíků"</string>
@@ -598,7 +620,18 @@
     <string name="brightness_summary" msgid="838917350127550703">"Nastavení jasu displeje"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Časový limit"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Obrazovka se automaticky vypne po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>."</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Tapeta"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Sny Android"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Spořiče obrazovky a další akce při nečinnosti"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Vybraný sen"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Časový limit"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"Po nečinnosti: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Nikdy"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Vyzkoušet"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatický jas"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Velikost písma"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Celková velikost písma"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Vybrat velikost písma"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Nastavení zámku karty SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Nastavení zámku karty SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Zámek karty SIM"</string>
@@ -643,8 +676,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>
@@ -696,6 +730,16 @@
     <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"Karta SD bude odpojena."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Odpojování"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Probíhá odpojování"</string>
+    <!-- no translation found for storage_menu_usb (1580545228584324704) -->
+    <skip />
+    <!-- no translation found for storage_title_usb (5775322159427546546) -->
+    <skip />
+    <!-- no translation found for usb_label_mtp (4157227401755543412) -->
+    <skip />
+    <!-- no translation found for usb_label_ptp (7417254019489575819) -->
+    <skip />
+    <!-- no translation found for usb_label_installer_cd (7438467574756086977) -->
+    <skip />
     <string name="battery_status_title" msgid="9159414319574976203">"Stav baterie"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Stav baterie"</string>
     <string name="apn_settings" msgid="3743170484827528406">"Názvy AP"</string>
@@ -806,6 +850,8 @@
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"Maximální počet zařízení pro tethering: <xliff:g id="MAXCONNECTION">%1$d</xliff:g>"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"U zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bude ukončeno sdílené připojení."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Nápověda"</string>
+    <string name="wireless_category_general" msgid="2973810407987118067">"Obecné"</string>
+    <string name="wireless_category_mobile_networks" msgid="1254629216798424288">"Mobilní sítě"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobilní sítě"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Nastavení roamingu, sítí a názvů přístupových bodů"</string>
     <string name="location_title" msgid="1029961368397484576">"Moje poloha"</string>
@@ -883,7 +929,7 @@
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Zabezpečení tabletu"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Zabezpečení telefonu"</string>
     <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"Svůj tablet můžete chránit před neoprávněným použitím pomocí osobního gesta pro odemknutí obrazovky. Tečky na následující obrazovce spojte prstem v jakémkoli pořadí. Spojit je třeba alespoň čtyři tečky. "\n\n"Jakmile budete připraveni začít, dotkněte se tlačítka Další."</string>
-    <string name="lock_intro_message" product="default" msgid="9100785646737118042"><font size="17">"Vytvořte si osobní gesto odemknutí a chraňte tak svůj telefon před nepovoleným použitím. "\n<font height="17">\n</font><b>"1"</b>"  Na dalším snímku uvidíte příklad takového gesta. "\n<font height="17">\n</font><b>"2"</b>"  Až budete připraveni, proveďte své osobní gesto odemknutí. Vyzkoušejte více gest, ale vždy spojte alespoň čtyři tečky. "\n<font height="17">\n</font><b>"3"</b>"  Opakujte gesto a tím jej potvrďte. "\n<font height="17">\n</font><b>"Jste připraveni začít? Dotkněte se tlačítka Další "</b>". "\n<font height="3">\n</font>"Chcete-li ponechat telefon nezabezpečený, dotkněte se tlačítka Storno."</font></string>
+    <!-- outdated translation 3692151094288835065 -->     <string name="lock_intro_message" product="default" msgid="5796785892741212873">"Svůj tablet můžete chránit před neoprávněným použitím pomocí osobního gesta pro odemknutí obrazovky. Tečky na následující obrazovce spojte prstem v jakémkoli pořadí. Spojit je třeba alespoň čtyři tečky. "\n\n"Jakmile budete připraveni začít, dotkněte se tlačítka Další."</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Správa aplikací"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Umožňuje spravovat a odebírat instalované aplikace"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Aplikace"</string>
@@ -893,6 +939,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>
@@ -905,9 +953,10 @@
     <string name="force_stop" msgid="7435006169872876756">"Vynutit ukončení"</string>
     <string name="total_size_label" msgid="1048676419552557254">"Celkem"</string>
     <string name="application_size_label" msgid="5055196275624686382">"Aplikace"</string>
+    <string name="external_code_size_label" msgid="3459343140355961335">"Aplikace úložiště USB"</string>
     <string name="data_size_label" msgid="8679376373625710107">"Data"</string>
-    <string name="external_size_label" product="nosdcard" msgid="4465530017830945766">"Úložiště USB"</string>
-    <string name="external_size_label" product="default" msgid="2107155737635944440">"Karta SD"</string>
+    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Data úložiště USB"</string>
+    <string name="external_data_size_label" product="default" msgid="626414192825329708">"Karta SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Odinstalovat"</string>
     <string name="disable_text" msgid="6544054052049395202">"Vypnout"</string>
     <string name="enable_text" msgid="9217362512327828987">"Povolit"</string>
@@ -1026,7 +1075,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 +1085,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>
@@ -1066,7 +1117,7 @@
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Nastavení klávesnice na obrazovce"</string>
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Fyzická klávesnice"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Nastavení fyzické klávesnice"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Vývoj"</string>
+    <string name="development_settings_title" msgid="215179176067683667">"Možnosti pro vývojáře"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"Umožňuje nastavit možnosti pro vývoj aplikací"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Ladění USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Povolit režim ladění s připojeným zařízením USB"</string>
@@ -1091,14 +1142,14 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Usnadnění"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Nastavení usnadnění"</string>
     <string name="accessibility_settings_summary" msgid="8185181964847149507">"Možnosti správy usnadnění"</string>
-    <string name="toggle_accessibility_title" msgid="650839277066574497">"Usnadnění"</string>
+    <string name="toggle_large_text_title" msgid="42259643359869436">"Velký text"</string>
     <string name="accessibility_services_category" msgid="8127851026323672607">"Služby usnadnění"</string>
+    <string name="toggle_accessibility_title" msgid="7338739354952553958">"Povolit služby usnadnění"</string>
     <string name="no_accessibility_services_summary" msgid="694578333333808159">"Žádné nainstalované služby usnadnění."</string>
     <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Tato služba usnadnění může shromažďovat veškerý text, který napíšete, včetně osobních údajů a čísel kreditních karet, nikoli však hesla. Může také protokolovat vaše interakce s uživatelským rozhraním. Služba pochází z aplikace <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Chcete tuto službu usnadnění použít?"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Deaktivovat usnadnění?"</string>
     <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"Nebyly nalezeny žádné aplikace týkající se usnadnění"</string>
     <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"Nejsou nainstalovány žádné aplikace týkající se usnadnění přístupu."\n\n"Prostřednictvím služby Android Market můžete do svého zařízení stáhnout čtečku obrazovky."\n\n"Kliknutím na tlačítko OK čtečku obrazovky nainstalujete."</string>
-    <string name="accessibility_script_injection_category" msgid="8649951751131431904">"Skripty pro usnadnění přístupu"</string>
     <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"Skripty pro usnadnění stahování"</string>
     <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"Povolit aplikacím stahovat z Googlu skripty pro usnadnění přístupu."</string>
     <string name="accessibility_script_injection_security_warning" product="tablet" msgid="1113600871264359828">"Některé aplikace mohou požádat Google o stažení skriptů, které usnadní přístup k obsahu dané aplikace. Opravdu chcete Googlu povolit, aby do tabletu instaloval skripty pro usnadnění přístupu?"</string>
@@ -1106,10 +1157,11 @@
     <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>
-    <string name="power_usage_summary_title" msgid="5180282911164282324">"Využití baterie"</string>
+    <string name="power_usage_summary_title" msgid="7190304207330319919">"Baterie"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Co využívá baterii"</string>
     <string name="power_usage_not_available" msgid="3583407442633768046">"Údaje o spotřebě nejsou známy."</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Využití baterie od odpojení"</string>
@@ -1218,6 +1270,8 @@
     <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>
+    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Nastavení modulu"</string>
+    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Nastavení pro modul <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
     <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>
@@ -1228,114 +1282,33 @@
     <string name="gadget_title" msgid="7455548605888590466">"Ovládací prvek napájení"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Probíhá aktualizace nastavení Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Probíhá aktualizace nastavení Bluetooth"</string>
-    <string name="vpn_settings_activity_title" msgid="7276864950701612579">"Nastavení sítě VPN"</string>
-    <string name="vpn_connect_to" msgid="2541409082892684362">"Připojit k síti <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpn_username_colon" msgid="7854930370861306247">"Uživatelské jméno:"</string>
-    <string name="vpn_password_colon" msgid="5716278710848606626">"Heslo:"</string>
-    <string name="vpn_a_username" msgid="6664733641993968692">"uživatelské jméno"</string>
-    <string name="vpn_a_password" msgid="1537213632501483753">"heslo"</string>
-    <string name="vpn_save_username" msgid="1408415289165970790">"Zapamatovat uživatelské jméno"</string>
-    <string name="vpn_connect_button" msgid="1699007212602470655">"Připojit"</string>
-    <string name="vpn_yes_button" msgid="8034531001149843119">"Ano"</string>
-    <string name="vpn_no_button" msgid="7620339571187119107">"Ne"</string>
-    <string name="vpn_back_button" msgid="192036339792734970">"Zpět"</string>
-    <string name="vpn_mistake_button" msgid="1683383660912491270">"Ne"</string>
-    <string name="vpn_menu_done" msgid="93528279226907926">"Uložit"</string>
-    <string name="vpn_menu_cancel" msgid="7234451214611202868">"Zrušit"</string>
-    <string name="vpn_menu_revert" msgid="4407762442281467659">"Vrátit zpět"</string>
-    <string name="vpn_menu_connect" msgid="1089399414463784218">"Připojit k síti"</string>
-    <string name="vpn_menu_disconnect" msgid="8254492450022562235">"Odpojit od sítě"</string>
-    <string name="vpn_menu_edit" msgid="4526245173583195618">"Upravit síť"</string>
-    <string name="vpn_menu_delete" msgid="3326527392609513129">"Smazat síť"</string>
-    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"Je nutné zadat <xliff:g id="CODE">%s</xliff:g>."</string>
-    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"Musíte vybrat možnost <xliff:g id="OPTION">%s</xliff:g>."</string>
-    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"Název sítě VPN „<xliff:g id="NAME">%s</xliff:g>“ již existuje. Zvolte jiný název."</string>
-    <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"Opravdu chcete smazat tuto síť VPN?"</string>
-    <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"Opravdu nechcete vytvořit tento profil?"</string>
-    <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"Opravdu chcete zrušit změny provedené v tomto profilu?"</string>
-    <string name="vpn_confirm_reconnect" msgid="5748535476278674296">"K síti se nelze připojit. Chcete to zkusit znovu?"</string>
-    <string name="vpn_reconnect_from_lost" msgid="2442844155623372118">"Připojení bylo přerušeno. Chcete se znovu připojit?"</string>
-    <string name="vpn_unknown_server_dialog_msg" msgid="3080742299823671319">"Název serveru nelze přeložit. Chcete zkontrolovat nastavení názvu serveru?"</string>
-    <string name="vpn_challenge_error_dialog_msg" msgid="6174901754230038601">"Chybné odvolání. Chcete zkontrolovat své tajné nastavení?"</string>
-    <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"V konfiguraci této sítě VPN chybí několik tajných nastavení. Chcete své tajné nastavení zkontrolovat?"</string>
-    <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"Zadané uživatelské jméno nebo heslo je nesprávné. Chcete to zkusit znovu?"</string>
-    <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"Server zavěsil. Zadané uživatelské jméno nebo heslo je možná nesprávné. Chcete to zkusit znovu?"</string>
-    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"Server zavěsil. Je možné, že máte spuštěný firewall, který brání připojení k serveru. Chcete to zkusit znovu?"</string>
-    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"Vyjednávání se serverem se nezdařilo. Server možná nedokáže pracovat s nastavenou možností šifrování. Chcete zkontrolovat nastavení šifrování?"</string>
-    <string name="vpn_type_title" msgid="6392933604218676224">"Přidat síť VPN"</string>
-    <string name="vpn_add_new_vpn" msgid="5438260689052714550">"Přidat síť VPN"</string>
-    <string name="vpn_details_title" msgid="418806440938510331">"Podrobnosti sítě VPN"</string>
-    <string name="vpn_edit_title_add" msgid="2121313217989682890">"Přidat síť VPN <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"<xliff:g id="NAME">%s</xliff:g> – podrobnosti"</string>
-    <string name="vpns" msgid="3148141862835492816">"Sítě VPN"</string>
-    <string name="vpn_connecting" msgid="8039521381692090116">"Připojování..."</string>
-    <string name="vpn_disconnecting" msgid="7748050200708257066">"Odpojování..."</string>
-    <string name="vpn_connected" msgid="7641723116362845781">"Připojeno"</string>
-    <string name="vpn_connect_hint" msgid="7442898962925875181">"Připojit k síti"</string>
-    <string name="vpn_name" msgid="1550918148476193076">"Název sítě VPN"</string>
-    <string name="vpn_a_name" msgid="8445736942405283509">"název sítě VPN"</string>
-    <string name="vpn_profile_added" msgid="9061017910337129840">"Položka „<xliff:g id="NAME">%s</xliff:g>“ je přidána"</string>
-    <string name="vpn_profile_replaced" msgid="587435576816273815">"V profilu <xliff:g id="NAME">%s</xliff:g> probíhají změny"</string>
-    <string name="vpn_user_certificate_title" msgid="6812545893924071742">"Nastavit certifikát uživatele"</string>
-    <string name="vpn_user_certificate" msgid="949322691686938888">"Certifikát uživatele"</string>
-    <string name="vpn_a_user_certificate" msgid="8943983437956898649">"certifikát uživatele"</string>
-    <string name="vpn_ca_certificate_title" msgid="7846466160795589985">"Nastavit certifikát CA"</string>
-    <string name="vpn_ca_certificate" msgid="465085144064264742">"Certifikát certifikační autority (CA)"</string>
-    <string name="vpn_a_ca_certificate" msgid="3374242520974884295">"certifikát CA"</string>
-    <string name="vpn_l2tp_secret_string_title" msgid="5039677186748940987">"Nastavit tajný klíč L2TP"</string>
-    <string name="vpn_l2tp_secret" msgid="529359749677142076">"Tajný klíč L2TP"</string>
-    <string name="vpn_a_l2tp_secret" msgid="6612042930810981845">"tajný klíč L2TP"</string>
-    <string name="vpn_pptp_encryption_title" msgid="2236795167467896499">"šifrování"</string>
-    <string name="vpn_pptp_encryption" msgid="2602329949737259686">"Šifrování PPTP"</string>
-    <string name="vpn_ipsec_presharedkey_title" msgid="2184060087690539175">"Nastavit předsdílený klíč IPSec"</string>
-    <string name="vpn_ipsec_presharedkey" msgid="5434316521616673741">"Předsdílený klíč IPSec"</string>
-    <string name="vpn_a_ipsec_presharedkey" msgid="1255301923217898418">"předsdílený klíč IPSec"</string>
-    <string name="vpn_vpn_server_title" msgid="8897005887420358913">"Nastavit server sítě VPN"</string>
-    <string name="vpn_vpn_server" msgid="1141754908824209260">"Server sítě VPN"</string>
-    <string name="vpn_a_vpn_server" msgid="5960906152125045853">"server sítě VPN"</string>
-    <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"Název serveru sítě VPN"</string>
-    <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"Domény vyhledávání DNS"</string>
-    <string name="vpn_dns_search_list" msgid="4230034234026605360">"Domény vyhledávání DNS"</string>
-    <string name="vpn_field_is_set" msgid="7137320847812992243">"Hodnota <xliff:g id="VALUE">%s</xliff:g> je nastavena"</string>
-    <string name="vpn_field_not_set" msgid="2972519243515893804">"Hodnota <xliff:g id="VALUE">%s</xliff:g> není nastavena"</string>
-    <string name="vpn_field_not_set_optional" msgid="8840557698252556791">"Hodnota <xliff:g id="VALUE">%s</xliff:g> není nastavena (nepovinné)"</string>
-    <string name="vpn_enable_field" msgid="3700967675854517191">"Povolit možnost <xliff:g id="OPTION">%s</xliff:g>"</string>
-    <string name="vpn_disable_field" msgid="6905658811179634005">"Deaktivovat <xliff:g id="OPTION">%s</xliff:g>"</string>
-    <string name="vpn_is_enabled" msgid="1266304230417098877">"Položka <xliff:g id="OPTION">%s</xliff:g> je aktivována"</string>
-    <string name="vpn_is_disabled" msgid="2013622485867806167">"Možnost <xliff:g id="OPTION">%s</xliff:g> je deaktivována"</string>
     <string name="vpn_settings_title" msgid="7327468307909556719">"Nastavení sítě VPN"</string>
     <string name="vpn_settings_summary" msgid="8849924181594963972">"Nastavit a spravovat sítě VPN"</string>
-    <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="trusted_credentials" msgid="4266945289534242402">"Důvěryhodná pověření"</string>
+    <string name="trusted_credentials_summary" msgid="6735221351155686632">"Zobrazit důvěryhodné certifikáty CA"</string>
     <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>
-    <string name="privacy_settings_title" msgid="1987089301293213705">"Nastavení ochrany osobních údajů"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"Zálohovat a obnovit"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"Zálohovat a obnovit"</string>
     <string name="backup_section_title" msgid="8856083167469467588">"Zálohování a obnovení"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Osobní údaje"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Zálohovat moje data"</string>
@@ -1439,4 +1412,107 @@
     <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>
+    <!-- no translation found for debug_ui_category (9023948280291055349) -->
+    <skip />
+    <!-- no translation found for strict_mode (1938795874357830695) -->
+    <skip />
+    <!-- no translation found for strict_mode_summary (142834318897332338) -->
+    <skip />
+    <!-- no translation found for pointer_location (6084434787496938001) -->
+    <skip />
+    <!-- no translation found for pointer_location_summary (840819275172753713) -->
+    <skip />
+    <!-- no translation found for show_screen_updates (8282711794220426931) -->
+    <skip />
+    <!-- no translation found for show_screen_updates_summary (1716122382094924596) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage (2389212910758076024) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage_summary (2113341923988958266) -->
+    <skip />
+    <!-- no translation found for window_animation_scale_title (6162587588166114700) -->
+    <skip />
+    <!-- no translation found for transition_animation_scale_title (387527540523595875) -->
+    <skip />
+    <!-- no translation found for debug_applications_category (6221644998451283813) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities (3622005081180597749) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities_summary (3592221124808773368) -->
+    <skip />
+    <!-- no translation found for app_process_limit_title (4121324758038197598) -->
+    <skip />
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Přenesená data"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"Cyklus počítání dat"</string>
+    <string name="data_usage_menu_split_4g" msgid="7417435609285381968">"Oddělit datové přenosy 4G"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Zobrazit využití sítě Wi-Fi"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"Změnit cyklus..."</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Den v měsíci, kdy se má obnovit počítání datových přenosů:"</string>
+    <string name="data_usage_disable_mobile_limit" msgid="289740911281022322">"Zakázat nadlimitní mobilní datové přenosy"</string>
+    <string name="data_usage_disable_4g_limit" msgid="5808210773758699800">"Zakázat nadlimitní datové přenosy 4G"</string>
+    <string name="data_usage_disable_3g_limit" msgid="3856971004328238231">"Zakázat nadlimitní datové přenosy 2G a 3G"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_mobile" msgid="454140350007299045">"Mobil"</string>
+    <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
+    <string name="data_usage_tab_3g" msgid="6092169523081538718">"2G a 3G"</string>
+    <string name="data_usage_enable_mobile" msgid="986782622560157977">"Mobilní datové přenosy"</string>
+    <string name="data_usage_enable_3g" msgid="6304006671869578254">"Datové přenosy 2G a 3G"</string>
+    <string name="data_usage_enable_4g" msgid="3635854097335036738">"Datové přenosy 4G"</string>
+    <string name="data_usage_app_settings" msgid="3727561362090820369">"Zobrazit nastavení aplikací"</string>
+    <string name="data_usage_app_restrict_background" msgid="8856643905291165256">"Omezit přenos dat na pozadí"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="1503361245973512092">"Povolit aplikaci data na pozadí pouze při připojení k neomezené síti"</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="8110736468987743260">"Omezení datových přenosů na pozadí"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="100001698378554777">"Tato funkce může nepříznivě ovlivnit aplikace, které jsou závislé na přenosu dat na pozadí. "\n\n"V nastavení těchto aplikací možná naleznete vhodnější funkce k omezení množství přenesených dat."</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Datum obnovení cyklu sledování přenesených dat"</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Datum v každém měsíci:"</string>
+    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Nastavit"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Nastavuje se omezení datových přenosů"</string>
+    <string name="data_usage_limit_dialog_mobile" msgid="7931094451923591578">"Mobilní připojení bude po dosažení stanoveného limitu zakázáno."\n\n"Chcete-li se vyhnout zbytečným poplatkům, zkuste použít snížený limit, protože způsoby účtování zařízení a operátora se mohou lišit."</string>
+    <string name="data_usage_limit_dialog_3g" msgid="5478553071420316963">"Datové připojení 2G nebo 3G bude po dosažení stanoveného limitu zakázáno."\n\n"Chcete-li se vyhnout zbytečným poplatkům, zkuste použít snížený limit, protože způsoby účtování zařízení a operátora se mohou lišit."</string>
+    <string name="data_usage_limit_dialog_4g" msgid="6134008906742403777">"Datové připojení 4G bude po dosažení stanoveného limitu zakázáno."\n\n"Chcete-li se vyhnout zbytečným poplatkům, zkuste použít snížený limit, protože způsoby účtování zařízení a operátora se mohou lišit."</string>
+    <string name="data_usage_disabled_dialog_3g_title" msgid="4221584306492812040">"Datové přenosy 2G a 3G jsou zakázány"</string>
+    <string name="data_usage_disabled_dialog_4g_title" msgid="715585612162185936">"Datové přenosy 4G jsou zakázány"</string>
+    <string name="data_usage_disabled_dialog_mobile_title" msgid="209516216265000221">"Mobilní data jsou zakázána"</string>
+    <string name="data_usage_disabled_dialog" msgid="2874031671067845964">"Dosáhli jste zadaného omezení datových přenosů."\n\n"Za další využívání dat vám operátor může naúčtovat poplatky."</string>
+    <string name="data_usage_disabled_dialog_enable" msgid="2441219164620753329">"Znovu povolit data"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="32">"<xliff:g id="NUMBER">%1$s</xliff:g>"</font>" "<font size="12">"<xliff:g id="UNIT">%2$s</xliff:g>"</font>\n<font size="12">"upozornění"</font></string>
+    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Tísňové volání"</string>
+    <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Zpět k hovoru"</string>
+    <string name="vpn_name" msgid="4689699885361002297">"Název"</string>
+    <string name="vpn_type" msgid="5435733139514388070">"Typ"</string>
+    <string name="vpn_server" msgid="2123096727287421913">"Adresa serveru"</string>
+    <string name="vpn_mppe" msgid="6639001940500288972">"Šifrování PPP (MPPE)"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"Tajný klíč L2TP"</string>
+    <string name="vpn_ipsec_identifier" msgid="4098175859460006296">"Identifikátor protokolu IPSec"</string>
+    <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Předsdílený klíč IPSec"</string>
+    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"Uživatelský certifikát IPSec"</string>
+    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"Certifikát CA protokolu IPSec"</string>
+    <!-- no translation found for vpn_search_domains (5391995501541199624) -->
+    <skip />
+    <!-- no translation found for vpn_routes (8556236801755260073) -->
+    <skip />
+    <string name="vpn_username" msgid="1863901629860867849">"Uživatelské jméno"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Heslo"</string>
+    <!-- no translation found for vpn_save_login (6350322456427484881) -->
+    <skip />
+    <!-- no translation found for vpn_not_used (9094191054524660891) -->
+    <skip />
+    <string name="vpn_no_ca_cert" msgid="7820884983947090538">"(neověřovat server)"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"Zrušit"</string>
+    <string name="vpn_save" msgid="4233484051644764510">"Uložit"</string>
+    <string name="vpn_connect" msgid="8469608541746132301">"Připojit"</string>
+    <string name="vpn_edit" msgid="1111459297288136079">"Upravit síť VPN"</string>
+    <string name="vpn_connect_to" msgid="7328758950427515753">"Připojit k síti <xliff:g id="NETWORK">%s</xliff:g>"</string>
+    <string name="vpn_title" msgid="7982620762043790565">"Nastavení sítě VPN"</string>
+    <string name="vpn_create" msgid="8966010925994175306">"Přidat síť VPN"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"Upravit síť"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"Smazat síť"</string>
+    <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Systém"</string>
+    <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Uživatel"</string>
+    <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Zakázat"</string>
+    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Povolit"</string>
+    <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Odebrat"</string>
+    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Povolit certifikát CA systému?"</string>
+    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Zakázat certifikát CA systému?"</string>
+    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Natrvalo odstranit uživatelský certifikát CA?"</string>
 </resources>
diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
index 7e162d5..b776cbe 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>
@@ -214,4 +240,36 @@
     <item msgid="3878793616631049349">"Brug kun HDCP-kontrol ved DRM-indhold"</item>
     <item msgid="45075631231212732">"Brug altid HDCP-kontrol"</item>
   </string-array>
+    <!-- no translation found for window_animation_scale_entries:0 (8134156599370824081) -->
+    <!-- no translation found for window_animation_scale_entries:1 (6624864048416710414) -->
+    <!-- no translation found for window_animation_scale_entries:2 (2219332261255416635) -->
+    <!-- no translation found for window_animation_scale_entries:3 (3544428804137048509) -->
+    <!-- no translation found for window_animation_scale_entries:4 (3110710404225974514) -->
+    <!-- no translation found for window_animation_scale_entries:5 (4402738611528318731) -->
+    <!-- no translation found for window_animation_scale_entries:6 (6189539267968330656) -->
+    <!-- no translation found for transition_animation_scale_entries:0 (8464255836173039442) -->
+    <!-- no translation found for transition_animation_scale_entries:1 (3375781541913316411) -->
+    <!-- no translation found for transition_animation_scale_entries:2 (1991041427801869945) -->
+    <!-- no translation found for transition_animation_scale_entries:3 (4012689927622382874) -->
+    <!-- no translation found for transition_animation_scale_entries:4 (3289156759925947169) -->
+    <!-- no translation found for transition_animation_scale_entries:5 (7705857441213621835) -->
+    <!-- no translation found for transition_animation_scale_entries:6 (6660750935954853365) -->
+    <!-- no translation found for app_process_limit_entries:0 (6799596560242275471) -->
+    <!-- no translation found for app_process_limit_entries:1 (2412794376818632575) -->
+    <!-- no translation found for app_process_limit_entries:2 (1578904888612645001) -->
+    <!-- no translation found for app_process_limit_entries:3 (8819235336299873577) -->
+  <string-array name="vpn_types_long">
+    <item msgid="2732002039459078847">"PPTP-VPN"</item>
+    <item msgid="3799752201662127867">"L2TP/IPsec VPN med forhåndsdelte nøgler"</item>
+    <item msgid="4725504331295252103">"L2TP/IPsec VPN med certifikater"</item>
+    <item msgid="7526551163264034377">"IPSec VPN med forhåndsdelte nøgler og Xauth- godkendelse"</item>
+    <item msgid="8064740940687465039">"IPSec VPN med certifikater og Xauth-godkendelse"</item>
+    <item msgid="4946199982372391490">"IPSec VPN med certifikater og hybridgodkendelse"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:0 (8621078286418985762) -->
+    <!-- no translation found for vpn_states:1 (6692305604213080515) -->
+    <!-- no translation found for vpn_states:2 (8001704909356800092) -->
+    <!-- no translation found for vpn_states:3 (4039737283841672166) -->
+    <!-- no translation found for vpn_states:4 (4042143101664725090) -->
+    <!-- no translation found for vpn_states:5 (2690164254699635531) -->
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 221dca8..2ca9d2b 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -19,6 +19,10 @@
     <string name="yes" msgid="4676390750360727396">"Ja"</string>
     <string name="no" msgid="6731231425810196216">"Nej"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Ukendte"</string>
+    <string name="header_category_wireless_networks" msgid="4944823405420438623">"TRÅDLØST OG NETVÆRK"</string>
+    <string name="header_category_device" msgid="5781174212691167553">"ENHED"</string>
+    <string name="header_category_personal" msgid="6225932173498802187">"PERSONLIG"</string>
+    <string name="header_category_system" msgid="2073558547468647128">"SYSTEM"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Slå radio til"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Slå radio fra"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Vis adressebog på SIM-kortet"</string>
@@ -111,7 +115,11 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Parrer ..."</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"Parret, men ikke forbundet"</string>
     <string name="bluetooth_device" msgid="6873461446424952003">"håndfri/headset"</string>
-    <string name="progress_scanning" msgid="3760897655335759141">"Søger"</string>
+    <!-- outdated translation 3760897655335759141 -->     <string name="progress_scanning" msgid="192587958424295789">"Søger"</string>
+    <!-- no translation found for progress_tap_to_pair (4192342336107106334) -->
+    <skip />
+    <!-- no translation found for bluetooth_no_devices_found (2412462335116297668) -->
+    <skip />
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Anmodning om Bluetooth-parring"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Anmodning om parring"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Vælg for at parre med <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
@@ -130,6 +138,9 @@
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"En applikation på din telefon anmoder om tilladelse til at aktivere Bluetooth, så din telefon er søgbar for andre enheder. Vil du gøre dette?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Aktiverer Bluetooth …"</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Opret automatisk forbindelse"</string>
+    <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Anmodning om Bluetooth-forbindelse"</string>
+    <string name="bluetooth_connection_notif_message" msgid="1833221950512058309">"Tryk for at oprette forbindelse til \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\""</string>
+    <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Ønsker du at oprette forbindelse til \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Indstillinger for dato og tid"</string>
     <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>
@@ -235,7 +246,7 @@
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Deaktiver alle trådløse forbindelser"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"Deaktiverer trådløse forbindelser ..."</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"Aktiverer trådløse forbindelser ..."</string>
-    <string name="radio_controls_title" msgid="5868688473587168882">"Trådløs og netværk"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Mere..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Trådløs og netværk"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"Administrer Wi-Fi, Bluetooth, flytilstand, mobilnetværk og VPN\'er"</string>
     <string name="roaming" msgid="3596055926335478572">"Dataroaming"</string>
@@ -271,10 +282,10 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Ejeroplysninger"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <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="location_settings_title" msgid="8935806698251432196">"Placeringstjenester"</string>
+    <string name="security_settings_title" msgid="7945465324818485460">"Sikkerhed"</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 +327,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>
@@ -375,8 +386,8 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Vis eller deaktiver enhedsadministratorer"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Slå Bluetooth til"</string>
-    <string name="bluetooth_settings" msgid="2725796451253089609">"Indstillinger for Bluetooth"</string>
-    <string name="bluetooth_settings_title" msgid="2824020086246268296">"Indstillinger for Bluetooth"</string>
+    <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
+    <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Administrer forbindelser, angiv enhedens navn og søgbarhed"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Anmodning om Bluetooth-parring"</string>
     <string name="bluetooth_enter_pin_msg" msgid="1499285355129256289">\n"Indtast pinkode for at parre med \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". (Prøv 0000 eller 1234). Du skal muligvis indtaste den samme pinkode på Bluetooth-enheden."</string>
@@ -394,7 +405,10 @@
     <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Parring afvist af <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"Der var problemer med at oprette forbindelse til <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Søg efter enheder"</string>
-    <string name="bluetooth_preference_find_nearby_title" msgid="5087410003465463318">"Find enheder i nærheden"</string>
+    <!-- no translation found for bluetooth_search_for_devices (5957007154213560390) -->
+    <skip />
+    <!-- no translation found for bluetooth_searching_for_devices (9203739709307871727) -->
+    <skip />
     <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"Enhedsindstillinger"</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Parrede enheder"</string>
     <string name="bluetooth_preference_found_devices" msgid="3133019331974936204">"Fundne enheder"</string>
@@ -404,6 +418,10 @@
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Ophæv parring"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Afbryd, og ophæv parring"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Indstillinger"</string>
+    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Avanceret"</string>
+    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Avanceret Bluetooth"</string>
+    <string name="bluetooth_advanced_settings_label" msgid="8659717781212434173">"Avanceret Bluetooth"</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="3631028334811113629">"Tænd for Bluetooth for at se de tilgængelige enheder"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Opret forbindelse til ..."</string>
     <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"Medier"</string>
     <string name="bluetooth_profile_headset" msgid="81844079120986198">"Håndfri"</string>
@@ -445,27 +463,31 @@
     <string name="nfc_toggle_error" msgid="2233172102497535522">"Der er opstået en fejl."</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Slå Wi-Fi til"</string>
-    <string name="wifi_settings" msgid="4746946030627213196">"Indstillinger for Wi-Fi"</string>
+    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="2810363951104753710">"Indstillinger for Wi-Fi"</string>
+    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Konfiguration og administration af trådløse adgangspunkter"</string>
-    <string name="wifi_starting" msgid="6710266609710860129">"Aktiverer..."</string>
-    <string name="wifi_stopping" msgid="5952909472548218348">"Deaktiverer..."</string>
+    <string name="wifi_starting" msgid="7732330327758522943">"Tænder for Wi-Fi..."</string>
+    <string name="wifi_stopping" msgid="244864762599017659">"Slukker Wi-Fi..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"Fejl"</string>
     <string name="wifi_in_airplane_mode" msgid="7618393787965366655">"I flytilstand"</string>
     <string name="wifi_fail_to_scan" msgid="6194542252808587669">"Der kunne ikke søges efter netværk"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Netværksmeddelelse"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Fortæl mig, når der er et tilgængeligt åbent netværk"</string>
+    <string name="wifi_enable_watchdog_service" msgid="4723544454066601706">"Kontrol af Wi-Fi-forbindelse"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="8687400936839455926">"Registrer og administrer potentielle problemer med netværksforbindelsen"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Politik for frakobling af Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Angiv, hvornår der skal skiftes fra Wi-Fi til mobile data"</string>
     <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" msgid="6234851776910938957">"Tilføj netværk"</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>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Opret forbindelse til netværk"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Glem netværk"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Rediger netværk"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="3682507011071029311">"Tænd Wi-Fi for se de tilgængelige netværk"</string>
     <string name="wifi_network_setup" msgid="7974851890019344870">"Netværkskonfiguration"</string>
     <string name="wifi_wps_pin" msgid="5471842298708321115">"Indtast pin via adgangspunkt"</string>
     <string name="wifi_wps_setup_title" msgid="150518971269252336">"Konfiguration af WPS"</string>
@@ -501,13 +523,13 @@
     <string name="wifi_save" msgid="3331121567988522826">"Gem"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Annuller"</string>
     <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"Der er registreret en anden WPS-session. Prøv igen om et par minutter."</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Avanceret"</string>
+    <!-- outdated translation 5419052271935350999 -->     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Avanceret"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi-frekvensbånd"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Angiv frekvensintervallet"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Problemer med indstillingen af frekvensbåndet."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC-adresse"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP-adresse"</string>
-    <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"IP-indstillinger"</string>
+    <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP-indstillinger"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Gem"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Annuller"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Indtast en gyldig IP-adresse."</string>
@@ -525,7 +547,7 @@
     <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> bærbart Wi-Fi-hotspot"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="sound_settings_title" msgid="8735891486683305886">"Lyd"</string>
-    <string name="display_settings_title" msgid="2378894265964357591">"Skærm"</string>
+    <string name="display_settings_title" msgid="1708697328627382561">"Visning"</string>
     <string name="sound_settings" msgid="5007659014828162881">"Indstillinger for lyd"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Lydløs"</string>
     <string name="silent_mode_summary" msgid="3309650676072917899">"Fjern alle lyde undtagen medier og alarmer"</string>
@@ -598,7 +620,18 @@
     <string name="brightness_summary" msgid="838917350127550703">"Juster skærmens lysstyrke"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Timeout"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Skærmen slukker automatisk efter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Baggrund"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android Dreams"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Pauseskærme og andre afledninger ved inaktivitet"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Valgt drøm"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Hvornår der skal aktiveres"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"Efter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inaktivitet"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Aldrig"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Prøv det!"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatisk lysstyrke"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Skrifttypestørrelse"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Samlede skrifttypestørrelser"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Vælg skrifttypestørrelse"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Indstillinger for lås af SIM-kort"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Konfigurer låsning af SIM-kort"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM-kortlås"</string>
@@ -643,8 +676,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>
@@ -696,6 +730,16 @@
     <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"SD-kort bliver demonteret."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Demontering"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Demontering i gang"</string>
+    <!-- no translation found for storage_menu_usb (1580545228584324704) -->
+    <skip />
+    <!-- no translation found for storage_title_usb (5775322159427546546) -->
+    <skip />
+    <!-- no translation found for usb_label_mtp (4157227401755543412) -->
+    <skip />
+    <!-- no translation found for usb_label_ptp (7417254019489575819) -->
+    <skip />
+    <!-- no translation found for usb_label_installer_cd (7438467574756086977) -->
+    <skip />
     <string name="battery_status_title" msgid="9159414319574976203">"Batteristatus"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Batteriniveau"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN\'er"</string>
@@ -806,6 +850,8 @@
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"Tethering kan ikke bruges til mere end <xliff:g id="MAXCONNECTION">%1$d</xliff:g> enheder"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Tethering til <xliff:g id="DEVICE_NAME">%1$s</xliff:g> vil blive afbrudt."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Hjælp"</string>
+    <string name="wireless_category_general" msgid="2973810407987118067">"Generelt"</string>
+    <string name="wireless_category_mobile_networks" msgid="1254629216798424288">"Mobilnetværk"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobilnetværk"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Angiv indstillinger for roaming, netværk, APN\'er"</string>
     <string name="location_title" msgid="1029961368397484576">"Min placering"</string>
@@ -883,7 +929,7 @@
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Sådan beskytter du din tabletcomputer"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Beskyt din telefon"</string>
     <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"Beskyt din tablet mod uautoriseret brug ved at oprette et personligt mønster til at låse skærmen op. Brug din finger til at forbinde punkterne vilkårligt på det næste skærmbillede. Du skal forbinde mindst fire punkter."\n\n"Klar til at starte? Tryk på \"Næste\"."</string>
-    <string name="lock_intro_message" product="default" msgid="9100785646737118042"><font size="17">"Beskyt din telefon mod uautoriseret brug ved at oprette et personligt mønster til at låse skærmen op. "\n<font height="17">\n</font><b>"1"</b>"  På næste skærm kan du se et eksempel på, hvordan mønsteret tegnes. "\n<font height="17">\n</font><b>"2"</b>"  Når du er klar, kan du tegne dit eget personlige mønster til at låse op. Eksperimenter med forskellige mønstre, men forbind mindst fire punkter. "\n<font height="17">\n</font><b>"3"</b>"  Tegn dit mønster igen for at bekræfte. "\n<font height="17">\n</font><b>"Er du klar? Tryk på \"Næste\""</b>". "\n<font height="3">\n</font>"Du kan lade din telefon være ubeskyttet ved at trykke på \"Annuller\"."</font></string>
+    <!-- outdated translation 3692151094288835065 -->     <string name="lock_intro_message" product="default" msgid="5796785892741212873">"Beskyt din tablet mod uautoriseret brug ved at oprette et personligt mønster til at låse skærmen op. Brug din finger til at forbinde punkterne vilkårligt på det næste skærmbillede. Du skal forbinde mindst fire punkter."\n\n"Klar til at starte? Tryk på \"Næste\"."</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Programadministration"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Administrer og fjern installerede applikationer"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Programmer"</string>
@@ -893,6 +939,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>
@@ -905,9 +953,10 @@
     <string name="force_stop" msgid="7435006169872876756">"Tving til at standse"</string>
     <string name="total_size_label" msgid="1048676419552557254">"I alt"</string>
     <string name="application_size_label" msgid="5055196275624686382">"Program"</string>
+    <string name="external_code_size_label" msgid="3459343140355961335">"App til USB-lagring"</string>
     <string name="data_size_label" msgid="8679376373625710107">"Data"</string>
-    <string name="external_size_label" product="nosdcard" msgid="4465530017830945766">"USB-lager"</string>
-    <string name="external_size_label" product="default" msgid="2107155737635944440">"SD-kort"</string>
+    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB-lagringsdata"</string>
+    <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD-kort"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Afinstaller"</string>
     <string name="disable_text" msgid="6544054052049395202">"Deaktiver"</string>
     <string name="enable_text" msgid="9217362512327828987">"Aktiver"</string>
@@ -1026,7 +1075,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 +1085,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>
@@ -1066,7 +1117,7 @@
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Indstillinger for skærmens tastatur"</string>
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Fysisk tastatur"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Indstillinger for fysisk tastatur"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Udvikling"</string>
+    <string name="development_settings_title" msgid="215179176067683667">"Indstillinger for udviklere"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"Angiv indstillinger for programudvikling"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB-fejlretning"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Fejlretningstilstand, når USB er tilsluttet"</string>
@@ -1091,14 +1142,14 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Tilgængelighed"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Indstillinger for tilgængelighed"</string>
     <string name="accessibility_settings_summary" msgid="8185181964847149507">"Administrer indstillinger for tilgængelighed"</string>
-    <string name="toggle_accessibility_title" msgid="650839277066574497">"Tilgængelighed"</string>
+    <string name="toggle_large_text_title" msgid="42259643359869436">"Stor tekst"</string>
     <string name="accessibility_services_category" msgid="8127851026323672607">"Tilgængelighedstjenester"</string>
+    <string name="toggle_accessibility_title" msgid="7338739354952553958">"Tillad tilgængelighedsttjenester"</string>
     <string name="no_accessibility_services_summary" msgid="694578333333808159">"Der er ikke installeret nogen tilgængelighedstjenester."</string>
     <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Denne tilgængelighedstjeneste vil muligvis være i stand til at indsamle al den tekst, du indtaster, inklusive personlige data, kreditkortoplysninger undtagen adgangskoder. Den kan også registrere dine interaktioner med brugergrænsefladen. Den kommer fra applikationen <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Vil du aktivere denne tilgængelighedstjeneste?"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Deaktiver tilgængelighed?"</string>
     <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"Der blev ikke fundet applikationer med relateret tilgængelighed"</string>
     <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"Du har ingen tilgængelighedsprogrammer."\n\n"Du kan downloade en skærmlæser på Android Marked."\n\n"Klik på OK for at installere skærmlæseren."</string>
-    <string name="accessibility_script_injection_category" msgid="8649951751131431904">"Tilgængelighedsscripts"</string>
     <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"Download tilgængelighedsscripts"</string>
     <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"Tillad, at applikationer henter tilgængelighedsscripts fra Google"</string>
     <string name="accessibility_script_injection_security_warning" product="tablet" msgid="1113600871264359828">"Nogle applikationer kan bede Google om at downloade scripts til din tablet, som gør deres indhold mere tilgængeligt. Vil du tillade, at Google installerer tilgængelighedsscripts på din tablet?"</string>
@@ -1106,10 +1157,11 @@
     <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>
-    <string name="power_usage_summary_title" msgid="5180282911164282324">"Batteriforbrug"</string>
+    <string name="power_usage_summary_title" msgid="7190304207330319919">"Batteri"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Hvad der har brugt batteriet"</string>
     <string name="power_usage_not_available" msgid="3583407442633768046">"Batteribrugsdata utilgængeligt"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Batteriforbrug siden afbrydelse"</string>
@@ -1218,6 +1270,8 @@
     <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>
+    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Engine-indstillinger"</string>
+    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Indstillinger for <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
     <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>
@@ -1228,114 +1282,33 @@
     <string name="gadget_title" msgid="7455548605888590466">"Strømkontrol"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Opdaterer indstillinger for Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Opdaterer Bluetooth-indstilling"</string>
-    <string name="vpn_settings_activity_title" msgid="7276864950701612579">"VPN-indstillinger"</string>
-    <string name="vpn_connect_to" msgid="2541409082892684362">"Opret forbindelse til <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpn_username_colon" msgid="7854930370861306247">"Brugernavn:"</string>
-    <string name="vpn_password_colon" msgid="5716278710848606626">"Adgangskode:"</string>
-    <string name="vpn_a_username" msgid="6664733641993968692">"et brugernavn"</string>
-    <string name="vpn_a_password" msgid="1537213632501483753">"en adgangskode"</string>
-    <string name="vpn_save_username" msgid="1408415289165970790">"Husk brugernavn"</string>
-    <string name="vpn_connect_button" msgid="1699007212602470655">"Forbind"</string>
-    <string name="vpn_yes_button" msgid="8034531001149843119">"Ja"</string>
-    <string name="vpn_no_button" msgid="7620339571187119107">"Nej"</string>
-    <string name="vpn_back_button" msgid="192036339792734970">"Tilbage"</string>
-    <string name="vpn_mistake_button" msgid="1683383660912491270">"Nej"</string>
-    <string name="vpn_menu_done" msgid="93528279226907926">"Gem"</string>
-    <string name="vpn_menu_cancel" msgid="7234451214611202868">"Annuller"</string>
-    <string name="vpn_menu_revert" msgid="4407762442281467659">"Annuller"</string>
-    <string name="vpn_menu_connect" msgid="1089399414463784218">"Opret forbindelse til netværk"</string>
-    <string name="vpn_menu_disconnect" msgid="8254492450022562235">"Afbryd forbindelsen til netværket"</string>
-    <string name="vpn_menu_edit" msgid="4526245173583195618">"Rediger netværk"</string>
-    <string name="vpn_menu_delete" msgid="3326527392609513129">"Slet netværk"</string>
-    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"Du skal indtaste <xliff:g id="CODE">%s</xliff:g>."</string>
-    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"Du skal vælge <xliff:g id="OPTION">%s</xliff:g>."</string>
-    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"VPN-navnet \'<xliff:g id="NAME">%s</xliff:g>\' eksisterer allerede. Find et andet navn."</string>
-    <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"Er du sikker på, at du ønsker at slette dette VPN?"</string>
-    <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"Er du sikker på, du ikke ønsker at oprette denne profil?"</string>
-    <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"Er du sikker på, at du ønsker at kassere de ændringer, der er foretaget til denne profil?"</string>
-    <string name="vpn_confirm_reconnect" msgid="5748535476278674296">"Der kunne ikke oprettes forbindelse til netværket. Ønsker du at prøve igen?"</string>
-    <string name="vpn_reconnect_from_lost" msgid="2442844155623372118">"Forbindelsen er mistet. Ønsker du at oprette forbindelse igen?"</string>
-    <string name="vpn_unknown_server_dialog_msg" msgid="3080742299823671319">"Servernavnet kan ikke løses. Ønsker du at kontrollere dine indstillinger for servernavn?"</string>
-    <string name="vpn_challenge_error_dialog_msg" msgid="6174901754230038601">"Udfordringsfejl. Ønsker du at kontrollere din hemmelige indstilling?"</string>
-    <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"Der mangler en eller flere hemmeligheder i denne VPN-konfiguration. Ønsker du at kontrollere din hemmelige indstilling?"</string>
-    <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"Det/den indtastede brugernavn eller adgangskode er forkert. Ønsker du at prøve igen?"</string>
-    <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"Serveren er optaget. Det indtastede brugernavn eller adgangskoden kan være forkert. Ønsker du at prøve igen?"</string>
-    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"Serveren afbrød. Du er muligvis bag en firewall, der forhindrer dig i at oprette forbindelse til serveren. Vil du prøve igen?"</string>
-    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"Serverkommunikationen mislykkedes. Serveren accepterer muligvis ikke dine krypteringsindstillinger. Vil du kontrollere dine krypteringsindstillinger?"</string>
-    <string name="vpn_type_title" msgid="6392933604218676224">"Tilføj VPN"</string>
-    <string name="vpn_add_new_vpn" msgid="5438260689052714550">"Tilføj VPN"</string>
-    <string name="vpn_details_title" msgid="418806440938510331">"Oplysninger om VPN"</string>
-    <string name="vpn_edit_title_add" msgid="2121313217989682890">"Tilføj <xliff:g id="NAME">%s</xliff:g> VPN"</string>
-    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"<xliff:g id="NAME">%s</xliff:g> detaljer"</string>
-    <string name="vpns" msgid="3148141862835492816">"VPN\'er"</string>
-    <string name="vpn_connecting" msgid="8039521381692090116">"Opretter forbindelse ..."</string>
-    <string name="vpn_disconnecting" msgid="7748050200708257066">"Afbryder ..."</string>
-    <string name="vpn_connected" msgid="7641723116362845781">"Tilsluttet"</string>
-    <string name="vpn_connect_hint" msgid="7442898962925875181">"Opret forbindelse til netværk"</string>
-    <string name="vpn_name" msgid="1550918148476193076">"VPN-navn"</string>
-    <string name="vpn_a_name" msgid="8445736942405283509">"et VPN-navn"</string>
-    <string name="vpn_profile_added" msgid="9061017910337129840">"\'<xliff:g id="NAME">%s</xliff:g>\' er tilføjet"</string>
-    <string name="vpn_profile_replaced" msgid="587435576816273815">"Der er foretaget ændringer af \'<xliff:g id="NAME">%s</xliff:g>\'"</string>
-    <string name="vpn_user_certificate_title" msgid="6812545893924071742">"Angiv brugercertifikat"</string>
-    <string name="vpn_user_certificate" msgid="949322691686938888">"Brugercertifikat"</string>
-    <string name="vpn_a_user_certificate" msgid="8943983437956898649">"et brugercertifikat"</string>
-    <string name="vpn_ca_certificate_title" msgid="7846466160795589985">"Angiv CA-certifikat"</string>
-    <string name="vpn_ca_certificate" msgid="465085144064264742">"Certifikat fra certifikatleverandør (CA)"</string>
-    <string name="vpn_a_ca_certificate" msgid="3374242520974884295">"et CA-certifikat"</string>
-    <string name="vpn_l2tp_secret_string_title" msgid="5039677186748940987">"Angiv L2TP-hemmelighed"</string>
-    <string name="vpn_l2tp_secret" msgid="529359749677142076">"L2TP-hemmelighed"</string>
-    <string name="vpn_a_l2tp_secret" msgid="6612042930810981845">"en L2TP-hemmelighed"</string>
-    <string name="vpn_pptp_encryption_title" msgid="2236795167467896499">"kryptering"</string>
-    <string name="vpn_pptp_encryption" msgid="2602329949737259686">"PPTP-kryptering"</string>
-    <string name="vpn_ipsec_presharedkey_title" msgid="2184060087690539175">"Angiv IPsec-forhåndsdelt nøglekodning"</string>
-    <string name="vpn_ipsec_presharedkey" msgid="5434316521616673741">"IPsec-forhåndsdelt nøglekodning"</string>
-    <string name="vpn_a_ipsec_presharedkey" msgid="1255301923217898418">"en IPsec-forhåndsdelt nøglekodning"</string>
-    <string name="vpn_vpn_server_title" msgid="8897005887420358913">"Angiv VPN-server"</string>
-    <string name="vpn_vpn_server" msgid="1141754908824209260">"VPN-server"</string>
-    <string name="vpn_a_vpn_server" msgid="5960906152125045853">"en VPN-server"</string>
-    <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"VPN-servernavn"</string>
-    <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"DNS-søgedomæner"</string>
-    <string name="vpn_dns_search_list" msgid="4230034234026605360">"DNS-søgedomæner"</string>
-    <string name="vpn_field_is_set" msgid="7137320847812992243">"<xliff:g id="VALUE">%s</xliff:g> er indstillet"</string>
-    <string name="vpn_field_not_set" msgid="2972519243515893804">"<xliff:g id="VALUE">%s</xliff:g> ikke indstillet"</string>
-    <string name="vpn_field_not_set_optional" msgid="8840557698252556791">"<xliff:g id="VALUE">%s</xliff:g> ikke indstillet (valgfrit)"</string>
-    <string name="vpn_enable_field" msgid="3700967675854517191">"Aktiver <xliff:g id="OPTION">%s</xliff:g>"</string>
-    <string name="vpn_disable_field" msgid="6905658811179634005">"Deaktiver<xliff:g id="OPTION">%s</xliff:g>"</string>
-    <string name="vpn_is_enabled" msgid="1266304230417098877">"<xliff:g id="OPTION">%s</xliff:g> er aktiveret"</string>
-    <string name="vpn_is_disabled" msgid="2013622485867806167">"<xliff:g id="OPTION">%s</xliff:g> er deaktiveret"</string>
     <string name="vpn_settings_title" msgid="7327468307909556719">"VPN-indstillinger"</string>
     <string name="vpn_settings_summary" msgid="8849924181594963972">"Konfigurer og administrer Virtuelle Private Netværk (VPN\'er)"</string>
-    <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="trusted_credentials" msgid="4266945289534242402">"Troværdige loginoplysninger"</string>
+    <string name="trusted_credentials_summary" msgid="6735221351155686632">"Vis troværdige CA-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>
-    <string name="privacy_settings_title" msgid="1987089301293213705">"Indstillinger for fortrolighed"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"Sikkerhedskopiering og nulstilling"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"Sikkerhedskopiering og nulstilling"</string>
     <string name="backup_section_title" msgid="8856083167469467588">"Sikkerhedskopiering og gendannelse"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Personlige oplysninger"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Sikkerhedskopier data"</string>
@@ -1439,4 +1412,107 @@
     <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>
+    <!-- no translation found for debug_ui_category (9023948280291055349) -->
+    <skip />
+    <!-- no translation found for strict_mode (1938795874357830695) -->
+    <skip />
+    <!-- no translation found for strict_mode_summary (142834318897332338) -->
+    <skip />
+    <!-- no translation found for pointer_location (6084434787496938001) -->
+    <skip />
+    <!-- no translation found for pointer_location_summary (840819275172753713) -->
+    <skip />
+    <!-- no translation found for show_screen_updates (8282711794220426931) -->
+    <skip />
+    <!-- no translation found for show_screen_updates_summary (1716122382094924596) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage (2389212910758076024) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage_summary (2113341923988958266) -->
+    <skip />
+    <!-- no translation found for window_animation_scale_title (6162587588166114700) -->
+    <skip />
+    <!-- no translation found for transition_animation_scale_title (387527540523595875) -->
+    <skip />
+    <!-- no translation found for debug_applications_category (6221644998451283813) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities (3622005081180597749) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities_summary (3592221124808773368) -->
+    <skip />
+    <!-- no translation found for app_process_limit_title (4121324758038197598) -->
+    <skip />
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Dataforbrug"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"Cyklus for dataforbrug"</string>
+    <string name="data_usage_menu_split_4g" msgid="7417435609285381968">"Vis 4G-forbrug separat"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Vis brug af Wi-Fi"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"Skift cyklus..."</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Dag i måneden, hvor cyklus for dataforbrug skal nulstilles"</string>
+    <string name="data_usage_disable_mobile_limit" msgid="289740911281022322">"Deaktiver mobildata ved grænsen"</string>
+    <string name="data_usage_disable_4g_limit" msgid="5808210773758699800">"Deaktiver 4G-data ved grænsen"</string>
+    <string name="data_usage_disable_3g_limit" msgid="3856971004328238231">"Deaktiver 2G-3G-data ved grænsen"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_mobile" msgid="454140350007299045">"Mobil"</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">"Mobildata"</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">"Vis applikationsindstillinger"</string>
+    <string name="data_usage_app_restrict_background" msgid="8856643905291165256">"Begræns brug af baggrundsdata"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="1503361245973512092">"Tillad kun baggrundsdata ved ubegrænset netværk"</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="8110736468987743260">"Begrænsning af baggrundsdata"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="100001698378554777">"Denne funktion kan have en negativ indflydelse på applikationer, der kræver brug af baggrundsdata."\n\n"Find mere passende kontrol af dataforbrug i applikationens indstillinger."</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Dato for nulstilling af forbrugsperiode"</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Dato i hver måned:"</string>
+    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Gem"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Grænse for dataforbrug"</string>
+    <string name="data_usage_limit_dialog_mobile" msgid="7931094451923591578">"Din mobildataforbindelse deaktiveres, når den angivne grænse er nået."\n\n"Hvis du vil undgå yderligere gebyrer, kan du evt. angive en lavere grænse, da de enkelte enheder og mobilselskaber har forskellige afregningsmetoder."</string>
+    <string name="data_usage_limit_dialog_3g" msgid="5478553071420316963">"Din 2G-3G-dataforbindelse deaktiveres, når den angivne grænse er nået."\n\n"Hvis du vil undgå yderligere gebyrer, kan du overveje at angive en lavere grænse, da de enkelte enheder og mobilselskaber har forskellige afregningsmetoder."</string>
+    <string name="data_usage_limit_dialog_4g" msgid="6134008906742403777">"Din 4G-dataforbindelse deaktiveres, når den angivne grænse er nået."\n\n"Hvis du vil undgå yderligere gebyrer, kan du overveje at angive en lavere grænse, da de enkelte enheder og mobilselskaber har forskellige afregningsmetoder."</string>
+    <string name="data_usage_disabled_dialog_3g_title" msgid="4221584306492812040">"2G-3G-data er deaktiveret"</string>
+    <string name="data_usage_disabled_dialog_4g_title" msgid="715585612162185936">"4G-data er deaktiveret"</string>
+    <string name="data_usage_disabled_dialog_mobile_title" msgid="209516216265000221">"Mobildata er deaktiveret"</string>
+    <string name="data_usage_disabled_dialog" msgid="2874031671067845964">"Den angivne grænse for dataforbrug er nået."\n\n"Yderligere dataforbrug kan koste ekstra hos mobilselskabet."</string>
+    <string name="data_usage_disabled_dialog_enable" msgid="2441219164620753329">"Genaktiver data"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="32">"<xliff:g id="NUMBER">%1$s</xliff:g>"</font>" "<font size="12">"<xliff:g id="UNIT">%2$s</xliff:g>"</font>\n<font size="12">"advarsel"</font></string>
+    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Nødopkald"</string>
+    <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Tilbage til opkald"</string>
+    <string name="vpn_name" msgid="4689699885361002297">"Navn"</string>
+    <string name="vpn_type" msgid="5435733139514388070">"Type"</string>
+    <string name="vpn_server" msgid="2123096727287421913">"Serveradresse"</string>
+    <string name="vpn_mppe" msgid="6639001940500288972">"PPP-kryptering (MPPE)"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"L2TP-hemmelighed"</string>
+    <string name="vpn_ipsec_identifier" msgid="4098175859460006296">"IPSec-identifikator"</string>
+    <string name="vpn_ipsec_secret" msgid="4526453255704888704">"IPsec-forhåndsdelt nøglekodning"</string>
+    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"IPSec-brugercertifikat"</string>
+    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec CA-certifikat"</string>
+    <!-- no translation found for vpn_search_domains (5391995501541199624) -->
+    <skip />
+    <!-- no translation found for vpn_routes (8556236801755260073) -->
+    <skip />
+    <string name="vpn_username" msgid="1863901629860867849">"Brugernavn"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Adgangskode"</string>
+    <!-- no translation found for vpn_save_login (6350322456427484881) -->
+    <skip />
+    <!-- no translation found for vpn_not_used (9094191054524660891) -->
+    <skip />
+    <string name="vpn_no_ca_cert" msgid="7820884983947090538">"(ingen bekræftelse af serveren)"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"Annuller"</string>
+    <string name="vpn_save" msgid="4233484051644764510">"Gem"</string>
+    <string name="vpn_connect" msgid="8469608541746132301">"Tilslut"</string>
+    <string name="vpn_edit" msgid="1111459297288136079">"Rediger VPN-netværk"</string>
+    <string name="vpn_connect_to" msgid="7328758950427515753">"Opret forbindelse til <xliff:g id="NETWORK">%s</xliff:g>"</string>
+    <string name="vpn_title" msgid="7982620762043790565">"VPN-indstillinger"</string>
+    <string name="vpn_create" msgid="8966010925994175306">"Tilføj VPN-netværk"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"Rediger netværk"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"Slet netværk"</string>
+    <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"System"</string>
+    <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Bruger"</string>
+    <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Deaktiver"</string>
+    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Aktiver"</string>
+    <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Fjern"</string>
+    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Vil du aktivere systemets CA-certifikat?"</string>
+    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Vil du deaktivere systemets CA-certifikat?"</string>
+    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Vil du fjerne bruger-CA-certifikatet?"</string>
 </resources>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index 1aeef8e..5ba8967 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>
@@ -214,4 +240,36 @@
     <item msgid="3878793616631049349">"HDCP-Prüfung nur für DRM-Inhalte verwenden"</item>
     <item msgid="45075631231212732">"HDCP-Prüfung immer verwenden"</item>
   </string-array>
+    <!-- no translation found for window_animation_scale_entries:0 (8134156599370824081) -->
+    <!-- no translation found for window_animation_scale_entries:1 (6624864048416710414) -->
+    <!-- no translation found for window_animation_scale_entries:2 (2219332261255416635) -->
+    <!-- no translation found for window_animation_scale_entries:3 (3544428804137048509) -->
+    <!-- no translation found for window_animation_scale_entries:4 (3110710404225974514) -->
+    <!-- no translation found for window_animation_scale_entries:5 (4402738611528318731) -->
+    <!-- no translation found for window_animation_scale_entries:6 (6189539267968330656) -->
+    <!-- no translation found for transition_animation_scale_entries:0 (8464255836173039442) -->
+    <!-- no translation found for transition_animation_scale_entries:1 (3375781541913316411) -->
+    <!-- no translation found for transition_animation_scale_entries:2 (1991041427801869945) -->
+    <!-- no translation found for transition_animation_scale_entries:3 (4012689927622382874) -->
+    <!-- no translation found for transition_animation_scale_entries:4 (3289156759925947169) -->
+    <!-- no translation found for transition_animation_scale_entries:5 (7705857441213621835) -->
+    <!-- no translation found for transition_animation_scale_entries:6 (6660750935954853365) -->
+    <!-- no translation found for app_process_limit_entries:0 (6799596560242275471) -->
+    <!-- no translation found for app_process_limit_entries:1 (2412794376818632575) -->
+    <!-- no translation found for app_process_limit_entries:2 (1578904888612645001) -->
+    <!-- no translation found for app_process_limit_entries:3 (8819235336299873577) -->
+  <string-array name="vpn_types_long">
+    <item msgid="2732002039459078847">"PPTP-VPN"</item>
+    <item msgid="3799752201662127867">"L2TP-/IPSec-VPN mit vorinstallierten Schlüsseln"</item>
+    <item msgid="4725504331295252103">"L2TP-/IPSec-VPN mit Zertifikaten"</item>
+    <item msgid="7526551163264034377">"IPSec-VPN mit vorinstallierten Schlüsseln und Xauth-Authentifizierung"</item>
+    <item msgid="8064740940687465039">"IPSec-VPN mit Zertifikaten und Xauth-Authentifizierung"</item>
+    <item msgid="4946199982372391490">"IPSec-VPN mit Zertifikaten und Hybrid-Authentifizierung"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:0 (8621078286418985762) -->
+    <!-- no translation found for vpn_states:1 (6692305604213080515) -->
+    <!-- no translation found for vpn_states:2 (8001704909356800092) -->
+    <!-- no translation found for vpn_states:3 (4039737283841672166) -->
+    <!-- no translation found for vpn_states:4 (4042143101664725090) -->
+    <!-- no translation found for vpn_states:5 (2690164254699635531) -->
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index b8ab60f..6a80f40 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -19,6 +19,10 @@
     <string name="yes" msgid="4676390750360727396">"Ja"</string>
     <string name="no" msgid="6731231425810196216">"Nein"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Unbekannt"</string>
+    <string name="header_category_wireless_networks" msgid="4944823405420438623">"Drahtlos &amp; Netzwerke"</string>
+    <string name="header_category_device" msgid="5781174212691167553">"Gerät"</string>
+    <string name="header_category_personal" msgid="6225932173498802187">"Privat"</string>
+    <string name="header_category_system" msgid="2073558547468647128">"SYSTEM"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Mobilfunkverbindung aktivieren"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Mobilfunkverbindung deaktivieren"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"SIM-Adressbuch anzeigen"</string>
@@ -111,7 +115,11 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Pairing…"</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"Pairing aktiv, aber nicht verbunden"</string>
     <string name="bluetooth_device" msgid="6873461446424952003">"Freisprechfunktion/Headset"</string>
-    <string name="progress_scanning" msgid="3760897655335759141">"Scannen..."</string>
+    <!-- outdated translation 3760897655335759141 -->     <string name="progress_scanning" msgid="192587958424295789">"Scannen..."</string>
+    <!-- no translation found for progress_tap_to_pair (4192342336107106334) -->
+    <skip />
+    <!-- no translation found for bluetooth_no_devices_found (2412462335116297668) -->
+    <skip />
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Bluetooth-Pairing-Anfrage"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Pairing-Anfrage"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Zum Pairing auswählen: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
@@ -130,6 +138,9 @@
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Eine Anwendung auf Ihrem Telefon beantragt die Berechtigung, Bluetooth zu aktivieren und Ihr Telefon für andere Telefone sichtbar zu machen. Möchten Sie dies tun?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Bluetooth wird aktiviert..."</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Automatische Verbindung"</string>
+    <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth-Verbindungsanfrage"</string>
+    <string name="bluetooth_connection_notif_message" msgid="1833221950512058309">"Zum Herstellen einer Verbindung mit \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" berühren"</string>
+    <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Möchten Sie eine Verbindung mit \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" herstellen?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Einstellungen für Datum &amp; Uhrzeit"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00"</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
@@ -235,7 +246,7 @@
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Alle drahtlosen Verbindungen deaktivieren"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"Drahtlosverbindungen werden deaktiviert..."</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"Drahtlosverbindungen werden aktiviert..."</string>
-    <string name="radio_controls_title" msgid="5868688473587168882">"Drahtlos &amp; Netzwerke"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Mehr..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Drahtlos &amp; Netzwerke"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"WLAN, Bluetooth, Flugmodus, Mobilfunknetze und VPNs verwalten"</string>
     <string name="roaming" msgid="3596055926335478572">"Daten-Roaming"</string>
@@ -271,8 +282,8 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Inhaberinformationen"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="2382525043173672857">"Text für Sperrdisplay eingeben"</string>
-    <string name="security_settings_title" msgid="5168491784222013179">"Standort &amp; Sicherheit"</string>
-    <string name="location_security_settings_title" msgid="4624434296446625554">"Einstellungen für Standort &amp; Sicherheit"</string>
+    <string name="location_settings_title" msgid="8935806698251432196">"Standortdienste"</string>
+    <string name="security_settings_title" msgid="7945465324818485460">"Sicherheit"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Meinen Standort, Display-Entsperrung, SIM-Kartensperre und Sperre für Anmeldeinformationsspeicher festlegen"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Meinen Standort, Display-Entsperrung, SIM-Kartensperrung und Sperrung des Anmeldeinformationsspeichers festlegen"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Passwörter"</string>
@@ -316,7 +327,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>
@@ -375,8 +386,8 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Geräteadministratoren anzeigen oder deaktivieren"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Bluetooth aktivieren"</string>
-    <string name="bluetooth_settings" msgid="2725796451253089609">"Bluetooth-Einstellungen"</string>
-    <string name="bluetooth_settings_title" msgid="2824020086246268296">"Bluetooth-Einstellungen"</string>
+    <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
+    <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Verbindungen, Gerätenamen und Erkennbarkeit verwalten"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Bluetooth-Pairing-Anfrage"</string>
     <string name="bluetooth_enter_pin_msg" msgid="1499285355129256289">\n"PIN zum Pairing mit \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" eingeben. Versuchen Sie es mit 0000 oder 1234. Möglicherweise müssen Sie dieselbe PIN auf dem Bluetooth-Gerät eingeben."</string>
@@ -394,7 +405,10 @@
     <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Verbindung wurde von <xliff:g id="DEVICE_NAME">%1$s</xliff:g> abgelehnt."</string>
     <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"Beim Verbindungsaufbau mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ist ein Problem aufgetreten."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Scan nach Geräten"</string>
-    <string name="bluetooth_preference_find_nearby_title" msgid="5087410003465463318">"Geräte in der Nähe suchen"</string>
+    <!-- no translation found for bluetooth_search_for_devices (5957007154213560390) -->
+    <skip />
+    <!-- no translation found for bluetooth_searching_for_devices (9203739709307871727) -->
+    <skip />
     <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"Geräteeinstellungen"</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Pairing-Geräte"</string>
     <string name="bluetooth_preference_found_devices" msgid="3133019331974936204">"Geräte gefunden"</string>
@@ -404,6 +418,10 @@
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Pairing aufheben"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Verbindung trennen und Pairing aufheben"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Optionen..."</string>
+    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Erweitert"</string>
+    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth - Erweitert"</string>
+    <string name="bluetooth_advanced_settings_label" msgid="8659717781212434173">"Bluetooth - Erweitert"</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="3631028334811113629">"Bluetooth aktivieren, um verf. Geräte anzuzeigen"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Verbinden mit..."</string>
     <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"Medien"</string>
     <string name="bluetooth_profile_headset" msgid="81844079120986198">"Freisprechfunktion"</string>
@@ -445,27 +463,31 @@
     <string name="nfc_toggle_error" msgid="2233172102497535522">"Ein Fehler ist aufgetreten."</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"WLAN"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"WLAN aktivieren"</string>
-    <string name="wifi_settings" msgid="4746946030627213196">"WLAN-Einstellungen"</string>
+    <string name="wifi_settings" msgid="1277428034634973011">"WLAN"</string>
     <string name="wifi_settings_category" msgid="2810363951104753710">"WLAN-Einstellungen"</string>
+    <string name="wifi_settings_title" msgid="4351120897298124250">"WLAN"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"WLAN-Zugangspunkte festlegen und verwalten"</string>
-    <string name="wifi_starting" msgid="6710266609710860129">"Aktivierung..."</string>
-    <string name="wifi_stopping" msgid="5952909472548218348">"Deaktivierung..."</string>
+    <string name="wifi_starting" msgid="7732330327758522943">"WLAN wird aktiviert..."</string>
+    <string name="wifi_stopping" msgid="244864762599017659">"WLAN wird deaktiviert..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"Fehler"</string>
     <string name="wifi_in_airplane_mode" msgid="7618393787965366655">"Im Flugmodus"</string>
     <string name="wifi_fail_to_scan" msgid="6194542252808587669">"Netzwerkscan nicht möglich"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Netzwerkhinweis"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Benachrichtigen, wenn ein offenes Netzwerk verfügbar ist"</string>
+    <string name="wifi_enable_watchdog_service" msgid="4723544454066601706">"WLAN-Verbindungsprüfungen"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="8687400936839455926">"Mögliche Probleme mit der Netzwerkverbindung erkennen und verwalten"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"WLAN-Standby-Richtlinie"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Festlegen, wann von WLAN auf mobile Daten umgeschaltet werden soll"</string>
     <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" msgid="6234851776910938957">"Netzwerk hinzufügen"</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>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Mit Netzwerk verbinden"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Netzwerk entfernen"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Netzwerk ändern"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="3682507011071029311">"WLAN zum Anzeigen verfügbarer Netzwerke aktivieren"</string>
     <string name="wifi_network_setup" msgid="7974851890019344870">"Netzwerkeinrichtung"</string>
     <string name="wifi_wps_pin" msgid="5471842298708321115">"PIN vom Zugriffspunkt eingeben"</string>
     <string name="wifi_wps_setup_title" msgid="150518971269252336">"WPS-Einrichtung"</string>
@@ -501,13 +523,13 @@
     <string name="wifi_save" msgid="3331121567988522826">"Speichern"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Abbrechen"</string>
     <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"Andere WPS-Sitzung gefunden, versuchen Sie es in einigen Minuten erneut."</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Erweitert"</string>
+    <!-- outdated translation 5419052271935350999 -->     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Erweitert"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"WLAN-Frequenzband"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Frequenzbereich für Betrieb festlegen"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Fehler beim Festlegen des Frequenzbands"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC-Adresse"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP-Adresse"</string>
-    <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"IP-Einstellungen"</string>
+    <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP-Einstellungen"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Speichern"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Abbrechen"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Geben Sie eine gültige IP-Adresse ein."</string>
@@ -525,7 +547,7 @@
     <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> mobiler WLAN-Hotspot"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="sound_settings_title" msgid="8735891486683305886">"Töne"</string>
-    <string name="display_settings_title" msgid="2378894265964357591">"Display"</string>
+    <string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
     <string name="sound_settings" msgid="5007659014828162881">"Toneinstellungen"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Lautlosmodus"</string>
     <string name="silent_mode_summary" msgid="3309650676072917899">"Alle Töne (außer für Wecker &amp; Medienwiedergabe) stummschalten"</string>
@@ -598,7 +620,18 @@
     <string name="brightness_summary" msgid="838917350127550703">"Helligkeit des Bildschirms anpassen"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Timeout"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Bildschirm wird nach <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> automatisch abgeschaltet."</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Hintergrund"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android-Träume"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Bildschirmschoner und andere Unterhaltung bei Nichtaktivität"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Ausgewählter Traum"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Zeitpunkt der Aktivierung"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"Nach <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ohne Aktivität"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Nie"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Probieren Sie es aus!"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatische Helligkeit"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Schriftgröße"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Allgemeine Schriftgröße"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Schriftgröße auswählen"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Einstellungen für SIM-Karten-Sperre"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"SIM-Sperre einrichten"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM-Kartensperre"</string>
@@ -643,8 +676,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>
@@ -696,6 +730,16 @@
     <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"SD-Karte wird getrennt."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Trennen..."</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Trennung..."</string>
+    <!-- no translation found for storage_menu_usb (1580545228584324704) -->
+    <skip />
+    <!-- no translation found for storage_title_usb (5775322159427546546) -->
+    <skip />
+    <!-- no translation found for usb_label_mtp (4157227401755543412) -->
+    <skip />
+    <!-- no translation found for usb_label_ptp (7417254019489575819) -->
+    <skip />
+    <!-- no translation found for usb_label_installer_cd (7438467574756086977) -->
+    <skip />
     <string name="battery_status_title" msgid="9159414319574976203">"Akkustatus"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Akkuladung"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNs"</string>
@@ -806,6 +850,8 @@
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"Tethering nur für maximal <xliff:g id="MAXCONNECTION">%1$d</xliff:g> Geräte möglich"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Tethering für <xliff:g id="DEVICE_NAME">%1$s</xliff:g> wird deaktiviert."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Hilfe"</string>
+    <string name="wireless_category_general" msgid="2973810407987118067">"Allgemein"</string>
+    <string name="wireless_category_mobile_networks" msgid="1254629216798424288">"Mobilfunknetze"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobilfunknetze"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Optionen für Roaming, Netzwerke, APNs festlegen"</string>
     <string name="location_title" msgid="1029961368397484576">"Mein Standort"</string>
@@ -883,7 +929,7 @@
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Sichern Ihres Tablets"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Sichern Ihres Telefons"</string>
     <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"Schützen Sie Ihr Tablet durch die Erstellung eines persönlichen Display-Entsperrungsmusters vor unbefugten Zugriffen. Verbinden Sie auf dem nächsten Display in beliebiger Reihenfolge die Punkte mit dem Finger. Sie müssen mindestens vier Punkte verbinden."\n\n"Bereit? Berühren Sie \"Weiter\"."</string>
-    <string name="lock_intro_message" product="default" msgid="9100785646737118042"><font size="17">"Schützen Sie Ihr Telefon vor unerlaubter Verwendung, indem Sie ein persönliches Entsperrungsmuster erstellen. "\n<font height="17">\n</font><b>"1"</b>"  Auf dem nächsten Bildschirm sehen Sie, wie ein Beispielmuster gezeichnet wird. "\n<font height="17">\n</font><b>"2"</b>"  Anschließend können Sie Ihr eigenes Entsperrungsmuster zeichnen. Sie können verschiedene Muster ausprobieren, müssen jedoch immer mindestens vier Punkte miteinander verbinden. "\n<font height="17">\n</font><b>"3"</b>"  Zeichnen Sie Ihr Muster zur Bestätigung erneut. "\n<font height="17">\n</font><b>"Bereit? Wählen Sie “Weiter”"</b>". "\n<font height="3">\n</font>"Wählen Sie “Abbrechen”, wenn Sie Ihr Telefon nicht schützen möchten."</font></string>
+    <!-- outdated translation 3692151094288835065 -->     <string name="lock_intro_message" product="default" msgid="5796785892741212873">"Schützen Sie Ihr Tablet durch die Erstellung eines persönlichen Display-Entsperrungsmusters vor unbefugten Zugriffen. Verbinden Sie auf dem nächsten Display in beliebiger Reihenfolge die Punkte mit dem Finger. Sie müssen mindestens vier Punkte verbinden."\n\n"Bereit? Berühren Sie \"Weiter\"."</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Anwendungen verwalten"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Installierte Anwendungen verwalten und entfernen"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Apps"</string>
@@ -893,6 +939,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>
@@ -905,9 +953,10 @@
     <string name="force_stop" msgid="7435006169872876756">"Stoppen erzwingen"</string>
     <string name="total_size_label" msgid="1048676419552557254">"Insgesamt"</string>
     <string name="application_size_label" msgid="5055196275624686382">"App"</string>
+    <string name="external_code_size_label" msgid="3459343140355961335">"USB-Speicher-App"</string>
     <string name="data_size_label" msgid="8679376373625710107">"Daten"</string>
-    <string name="external_size_label" product="nosdcard" msgid="4465530017830945766">"USB-Speicher"</string>
-    <string name="external_size_label" product="default" msgid="2107155737635944440">"SD-Karte"</string>
+    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB-Speicherdaten"</string>
+    <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD-Karte"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Deinstallieren"</string>
     <string name="disable_text" msgid="6544054052049395202">"Deaktivieren"</string>
     <string name="enable_text" msgid="9217362512327828987">"Aktivieren"</string>
@@ -1026,7 +1075,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 +1085,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>
@@ -1066,7 +1117,7 @@
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Einstellungen der Bildschirmtastatur"</string>
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Physische Tastatur"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Einstellungen für physische Tastatur"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Entwicklung"</string>
+    <string name="development_settings_title" msgid="215179176067683667">"Entwickleroptionen"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"Optionen zur Anwendungsentwicklung festlegen"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB-Debugging"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Debugmodus bei Anschluss über USB"</string>
@@ -1091,14 +1142,14 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Eingabehilfen"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Einstellungen für Eingabehilfen"</string>
     <string name="accessibility_settings_summary" msgid="8185181964847149507">"Optionen für Eingabehilfe verwalten"</string>
-    <string name="toggle_accessibility_title" msgid="650839277066574497">"Eingabehilfen"</string>
+    <string name="toggle_large_text_title" msgid="42259643359869436">"Großer Text"</string>
     <string name="accessibility_services_category" msgid="8127851026323672607">"Eingabehilfendienste"</string>
+    <string name="toggle_accessibility_title" msgid="7338739354952553958">"Eingabehilfendienste zulassen"</string>
     <string name="no_accessibility_services_summary" msgid="694578333333808159">"Keine Eingabehilfen installiert"</string>
     <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Diese Eingabehilfe kann den gesamten von Ihnen eingegebenen Text erfassen, einschließlich persönlicher Daten wie Kreditkartennummern, jedoch keine Passwörter. Sie kann auch Ihre Interaktionen auf der Benutzeroberfläche protokollieren. Sie ist Teil der Anwendung <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Soll diese Eingabehilfe aktiviert werden?"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Eingabehilfe deaktivieren?"</string>
     <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"Keine Eingabehilfen-Anwendungen gefunden"</string>
     <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"Es sind keine Eingabehilfen-Anwendungen installiert."\n\n"Sie können von Android Market einen Screenreader für Ihr Gerät herunterladen."\n\n"Klicken Sie auf \"OK\", um den Screenreader zu installieren."</string>
-    <string name="accessibility_script_injection_category" msgid="8649951751131431904">"Skripts für Eingabehilfen"</string>
     <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"Skripts für Eingabehilfen herunterladen"</string>
     <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"Anwendungen dürfen Eingabehilfenskripts von Google herunterladen."</string>
     <string name="accessibility_script_injection_security_warning" product="tablet" msgid="1113600871264359828">"Einige Anwendungen können Google auffordern, Skripts auf Ihr Tablet herunterzuladen, um den Zugriff auf deren Inhalte zu erleichtern. Sind Sie sicher, dass Sie Google erlauben möchten, Skripts für Eingabehilfen auf Ihrem Tablet zu installieren?"</string>
@@ -1106,10 +1157,11 @@
     <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>
-    <string name="power_usage_summary_title" msgid="5180282911164282324">"Akkuverbrauch"</string>
+    <string name="power_usage_summary_title" msgid="7190304207330319919">"Akku"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Was zum Akkuverbrauch beiträgt"</string>
     <string name="power_usage_not_available" msgid="3583407442633768046">"Keine Akku-Nutzungsdaten"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Akkuverbrauch seit dem Ausstecken"</string>
@@ -1218,6 +1270,8 @@
     <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>
+    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Moduleinstellungen"</string>
+    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Einstellungen für <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
     <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>
@@ -1228,114 +1282,33 @@
     <string name="gadget_title" msgid="7455548605888590466">"Energiesteuerung"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Aktualisieren der WLAN-Einstellung"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Aktualisieren der Bluetooth-Einstellung"</string>
-    <string name="vpn_settings_activity_title" msgid="7276864950701612579">"VPN-Einstellungen"</string>
-    <string name="vpn_connect_to" msgid="2541409082892684362">"Mit <xliff:g id="NAME">%s</xliff:g> verbinden"</string>
-    <string name="vpn_username_colon" msgid="7854930370861306247">"Name:"</string>
-    <string name="vpn_password_colon" msgid="5716278710848606626">"Passwort:"</string>
-    <string name="vpn_a_username" msgid="6664733641993968692">"ein Nutzername"</string>
-    <string name="vpn_a_password" msgid="1537213632501483753">"ein Passwort"</string>
-    <string name="vpn_save_username" msgid="1408415289165970790">"Name speichern"</string>
-    <string name="vpn_connect_button" msgid="1699007212602470655">"Verbinden"</string>
-    <string name="vpn_yes_button" msgid="8034531001149843119">"Ja"</string>
-    <string name="vpn_no_button" msgid="7620339571187119107">"Nein"</string>
-    <string name="vpn_back_button" msgid="192036339792734970">"Zurück"</string>
-    <string name="vpn_mistake_button" msgid="1683383660912491270">"Nein"</string>
-    <string name="vpn_menu_done" msgid="93528279226907926">"Speichern"</string>
-    <string name="vpn_menu_cancel" msgid="7234451214611202868">"Abbrechen"</string>
-    <string name="vpn_menu_revert" msgid="4407762442281467659">"Zurücksetzen"</string>
-    <string name="vpn_menu_connect" msgid="1089399414463784218">"Mit Netzwerk verbinden"</string>
-    <string name="vpn_menu_disconnect" msgid="8254492450022562235">"Netzwerkverbindung trennen"</string>
-    <string name="vpn_menu_edit" msgid="4526245173583195618">"Netzwerk bearbeiten"</string>
-    <string name="vpn_menu_delete" msgid="3326527392609513129">"Netzwerk löschen"</string>
-    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"Geben Sie <xliff:g id="CODE">%s</xliff:g> ein."</string>
-    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"Wählen Sie <xliff:g id="OPTION">%s</xliff:g> aus."</string>
-    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"Der VPN-Name \"<xliff:g id="NAME">%s</xliff:g>\" ist bereits vorhanden. Wählen Sie einen anderen Namen."</string>
-    <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"Möchten Sie dieses VPN wirklich nicht löschen?"</string>
-    <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"Möchten Sie dieses Profil wirklich nicht erstellen?"</string>
-    <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"Möchten Sie die Änderungen an diesem Profil wirklich verwerfen?"</string>
-    <string name="vpn_confirm_reconnect" msgid="5748535476278674296">"Netzwerkverbindung kann nicht hergestellt werden. Möchten Sie es erneut versuchen?"</string>
-    <string name="vpn_reconnect_from_lost" msgid="2442844155623372118">"Verbindung abgebrochen. Möchten Sie die Verbindung erneut herstellen?"</string>
-    <string name="vpn_unknown_server_dialog_msg" msgid="3080742299823671319">"Der Servername kann nicht aufgelöst werden. Möchten Sie die Einstellung Ihres Servernamens überprüfen?"</string>
-    <string name="vpn_challenge_error_dialog_msg" msgid="6174901754230038601">"Herausforderungsfehler. Möchten Sie Ihre geheimen Einstellungen jetzt prüfen?"</string>
-    <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"Eine oder mehrere geheime Informationen scheinen in dieser VPN-Konfiguration zu fehlen. Möchten Sie Ihre geheimen Einstellungen prüfen?"</string>
-    <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"Der eingegebene Nutzername oder das Passwort ist falsch. Möchten Sie es erneut versuchen?"</string>
-    <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"Der Server hat ein Problem. Möglicherweise sind der von Ihnen eingegebene Nutzername und das Passwort falsch. Möchten Sie es erneut versuchen?"</string>
-    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"Der Server reagiert nicht. Möglicherweise befinden Sie sich hinter einer Firewall, die eine Verbindung mit dem Server verhindert. Möchten Sie es erneut versuchen?"</string>
-    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"Bei der Serververhandlung ist ein Fehler aufgetreten. Der Server stimmt möglicherweise nicht mit Ihrer Verschlüsselungsoption überein. Möchten Sie die Einstellungen Ihrer Verschlüsselung überprüfen?"</string>
-    <string name="vpn_type_title" msgid="6392933604218676224">"VPN hinzufügen"</string>
-    <string name="vpn_add_new_vpn" msgid="5438260689052714550">"VPN hinzufügen"</string>
-    <string name="vpn_details_title" msgid="418806440938510331">"VPN-Details"</string>
-    <string name="vpn_edit_title_add" msgid="2121313217989682890">"<xliff:g id="NAME">%s</xliff:g>-VPN hinzufügen"</string>
-    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"Details zu <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpns" msgid="3148141862835492816">"VPNs"</string>
-    <string name="vpn_connecting" msgid="8039521381692090116">"Verbindung wird hergestellt..."</string>
-    <string name="vpn_disconnecting" msgid="7748050200708257066">"Verbindung wird getrennt..."</string>
-    <string name="vpn_connected" msgid="7641723116362845781">"Verbunden"</string>
-    <string name="vpn_connect_hint" msgid="7442898962925875181">"Mit Netzwerk verbinden"</string>
-    <string name="vpn_name" msgid="1550918148476193076">"VPN-Name"</string>
-    <string name="vpn_a_name" msgid="8445736942405283509">"ein VPN-Name"</string>
-    <string name="vpn_profile_added" msgid="9061017910337129840">"\"<xliff:g id="NAME">%s</xliff:g>\" wurde hinzugefügt."</string>
-    <string name="vpn_profile_replaced" msgid="587435576816273815">"Änderungen wurden an \"<xliff:g id="NAME">%s</xliff:g>\" vorgenommen."</string>
-    <string name="vpn_user_certificate_title" msgid="6812545893924071742">"Nutzerzertifikat festlegen"</string>
-    <string name="vpn_user_certificate" msgid="949322691686938888">"Nutzerzertifikat"</string>
-    <string name="vpn_a_user_certificate" msgid="8943983437956898649">"ein Nutzerzertifikat"</string>
-    <string name="vpn_ca_certificate_title" msgid="7846466160795589985">"CA-Zertifikat festlegen"</string>
-    <string name="vpn_ca_certificate" msgid="465085144064264742">"CA-Zertifikat (Certificate Authority)"</string>
-    <string name="vpn_a_ca_certificate" msgid="3374242520974884295">"ein CA-Zertifikat"</string>
-    <string name="vpn_l2tp_secret_string_title" msgid="5039677186748940987">"L2TP-Schlüssel festlegen"</string>
-    <string name="vpn_l2tp_secret" msgid="529359749677142076">"L2TP-Schlüssel"</string>
-    <string name="vpn_a_l2tp_secret" msgid="6612042930810981845">"ein L2TP-Schlüssel"</string>
-    <string name="vpn_pptp_encryption_title" msgid="2236795167467896499">"Verschlüsselung"</string>
-    <string name="vpn_pptp_encryption" msgid="2602329949737259686">"PPTP-Verschlüsselung"</string>
-    <string name="vpn_ipsec_presharedkey_title" msgid="2184060087690539175">"Vorinstallierten IPSec-Schlüssel festlegen"</string>
-    <string name="vpn_ipsec_presharedkey" msgid="5434316521616673741">"Vorinstallierter IPSec-Schlüssel"</string>
-    <string name="vpn_a_ipsec_presharedkey" msgid="1255301923217898418">"ein vorinstallierter IPSec-Schlüssel"</string>
-    <string name="vpn_vpn_server_title" msgid="8897005887420358913">"VPN-Server festlegen"</string>
-    <string name="vpn_vpn_server" msgid="1141754908824209260">"VPN-Server"</string>
-    <string name="vpn_a_vpn_server" msgid="5960906152125045853">"ein VPN-Server"</string>
-    <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"VPN-Servername"</string>
-    <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"DNS-Suchdomains"</string>
-    <string name="vpn_dns_search_list" msgid="4230034234026605360">"DNS-Suchdomains"</string>
-    <string name="vpn_field_is_set" msgid="7137320847812992243">"<xliff:g id="VALUE">%s</xliff:g> ist festgelegt."</string>
-    <string name="vpn_field_not_set" msgid="2972519243515893804">"<xliff:g id="VALUE">%s</xliff:g> nicht festgelegt"</string>
-    <string name="vpn_field_not_set_optional" msgid="8840557698252556791">"<xliff:g id="VALUE">%s</xliff:g> nicht festgelegt (optional)"</string>
-    <string name="vpn_enable_field" msgid="3700967675854517191">"<xliff:g id="OPTION">%s</xliff:g> aktivieren"</string>
-    <string name="vpn_disable_field" msgid="6905658811179634005">"<xliff:g id="OPTION">%s</xliff:g> deaktivieren"</string>
-    <string name="vpn_is_enabled" msgid="1266304230417098877">"<xliff:g id="OPTION">%s</xliff:g> ist aktiviert."</string>
-    <string name="vpn_is_disabled" msgid="2013622485867806167">"<xliff:g id="OPTION">%s</xliff:g> ist deaktiviert."</string>
     <string name="vpn_settings_title" msgid="7327468307909556719">"VPN-Einstellungen"</string>
     <string name="vpn_settings_summary" msgid="8849924181594963972">"Virtual Private Networks (VPNs) einrichten und verwalten"</string>
-    <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="trusted_credentials" msgid="4266945289534242402">"Vertrauensw. Anmeldedaten"</string>
+    <string name="trusted_credentials_summary" msgid="6735221351155686632">"Vertrauenswürdige CA-Zertifikate anzeigen"</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>
-    <string name="privacy_settings_title" msgid="1987089301293213705">"Datenschutzeinstellungen"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"Sichern und zurücksetzen"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"Sichern und zurücksetzen"</string>
     <string name="backup_section_title" msgid="8856083167469467588">"Sicherung und Wiederherstellung"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Persönliche Daten"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Meine Daten sichern"</string>
@@ -1439,4 +1412,107 @@
     <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>
+    <!-- no translation found for debug_ui_category (9023948280291055349) -->
+    <skip />
+    <!-- no translation found for strict_mode (1938795874357830695) -->
+    <skip />
+    <!-- no translation found for strict_mode_summary (142834318897332338) -->
+    <skip />
+    <!-- no translation found for pointer_location (6084434787496938001) -->
+    <skip />
+    <!-- no translation found for pointer_location_summary (840819275172753713) -->
+    <skip />
+    <!-- no translation found for show_screen_updates (8282711794220426931) -->
+    <skip />
+    <!-- no translation found for show_screen_updates_summary (1716122382094924596) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage (2389212910758076024) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage_summary (2113341923988958266) -->
+    <skip />
+    <!-- no translation found for window_animation_scale_title (6162587588166114700) -->
+    <skip />
+    <!-- no translation found for transition_animation_scale_title (387527540523595875) -->
+    <skip />
+    <!-- no translation found for debug_applications_category (6221644998451283813) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities (3622005081180597749) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities_summary (3592221124808773368) -->
+    <skip />
+    <!-- no translation found for app_process_limit_title (4121324758038197598) -->
+    <skip />
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Datennutzung"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"Datennutzungszyklus"</string>
+    <string name="data_usage_menu_split_4g" msgid="7417435609285381968">"4G-Nutzung getrennt anzeigen"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"WLAN-Nutzung anzeigen"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"Zyklus ändern..."</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Tag für Zurücksetzung des Datennutzungszyklus:"</string>
+    <string name="data_usage_disable_mobile_limit" msgid="289740911281022322">"Daten nach Verbrauch deaktivieren"</string>
+    <string name="data_usage_disable_4g_limit" msgid="5808210773758699800">"4G-Daten bei Limit deaktivieren"</string>
+    <string name="data_usage_disable_3g_limit" msgid="3856971004328238231">"2G/3G bei Limit deaktivieren"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"WLAN"</string>
+    <string name="data_usage_tab_mobile" msgid="454140350007299045">"Mobil"</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 Daten"</string>
+    <string name="data_usage_enable_3g" msgid="6304006671869578254">"2G-/3G-Daten"</string>
+    <string name="data_usage_enable_4g" msgid="3635854097335036738">"4G-Daten"</string>
+    <string name="data_usage_app_settings" msgid="3727561362090820369">"App-Einstellungen anzeigen"</string>
+    <string name="data_usage_app_restrict_background" msgid="8856643905291165256">"Datennutzung beschränken"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="1503361245973512092">"Hintergrunddaten nur bei unbegrenztem Netzwerk zulassen"</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="8110736468987743260">"Nutzungsbeschränkung für Hintergrunddaten"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="100001698378554777">"Diese Funktion kann sich negativ auf Apps auswirken, die auf eine Datennutzung im Hintergrund angewiesen sind."\n\n"Geeignetere Steuerelemente für die Datennutzung finden Sie in den Einstellungen der App."</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Datum für Zurücksetzung der Nutzungszyklen"</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Datum (monatlich):"</string>
+    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Übernehmen"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Begrenzung der Datennutzung"</string>
+    <string name="data_usage_limit_dialog_mobile" msgid="7931094451923591578">"Ihre mobile Datenverbindung wird deaktiviert, sobald das angegebene Limit erreicht wurde."\n\n"Um zusätzliche Kosten zu vermeiden, sollten Sie eine Herabsetzung des Limits in Betracht ziehen, da die Abrechnungsmethoden von Gerät und Mobilfunkanbieter variieren können."</string>
+    <string name="data_usage_limit_dialog_3g" msgid="5478553071420316963">"Ihre 2G-/3G-Datenverbindung wird deaktiviert, sobald das angegebene Limit erreicht wurde."\n\n"Um zusätzliche Kosten zu vermeiden, sollten Sie eine Herabsetzung des Limits in Betracht ziehen, da die Abrechnungsmethoden von Gerät und Mobilfunkanbieter variieren können."</string>
+    <string name="data_usage_limit_dialog_4g" msgid="6134008906742403777">"Ihre 4G-Datenverbindung wird deaktiviert, sobald das angegebene Limit erreicht wurde."\n\n"Um zusätzliche Kosten zu vermeiden, sollten Sie eine Herabsetzung des Limits in Betracht ziehen, da die Abrechnungsmethoden von Gerät und Mobilfunkanbieter variieren können."</string>
+    <string name="data_usage_disabled_dialog_3g_title" msgid="4221584306492812040">"2G-/3G-Daten deaktiviert"</string>
+    <string name="data_usage_disabled_dialog_4g_title" msgid="715585612162185936">"4G-Daten deaktiviert"</string>
+    <string name="data_usage_disabled_dialog_mobile_title" msgid="209516216265000221">"Mobile Daten deaktiviert"</string>
+    <string name="data_usage_disabled_dialog" msgid="2874031671067845964">"Das für die Datennutzung festgelegte Limit wurde erreicht."\n\n"Eine weitere Datennutzung kann mit zusätzlichen Kosten vonseiten des Mobilfunkanbieters verbunden sein."</string>
+    <string name="data_usage_disabled_dialog_enable" msgid="2441219164620753329">"Daten erneut aktivieren"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="32">"<xliff:g id="NUMBER">%1$s</xliff:g>"</font><font size="12">"<xliff:g id="UNIT">%2$s</xliff:g>"</font>\n<font size="12">"Warnung"</font></string>
+    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Notruf"</string>
+    <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Zurück zum Anruf"</string>
+    <string name="vpn_name" msgid="4689699885361002297">"Name"</string>
+    <string name="vpn_type" msgid="5435733139514388070">"Typ"</string>
+    <string name="vpn_server" msgid="2123096727287421913">"Serveradresse"</string>
+    <string name="vpn_mppe" msgid="6639001940500288972">"PPP-Verschlüsselung (MPPE)"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"L2TP-Schlüssel"</string>
+    <string name="vpn_ipsec_identifier" msgid="4098175859460006296">"IPSec-ID"</string>
+    <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Vorinstallierter IPSec-Schlüssel"</string>
+    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"IPSec-Nutzerzertifikat"</string>
+    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec-CA-Zertifikat"</string>
+    <!-- no translation found for vpn_search_domains (5391995501541199624) -->
+    <skip />
+    <!-- no translation found for vpn_routes (8556236801755260073) -->
+    <skip />
+    <string name="vpn_username" msgid="1863901629860867849">"Nutzername"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Passwort"</string>
+    <!-- no translation found for vpn_save_login (6350322456427484881) -->
+    <skip />
+    <!-- no translation found for vpn_not_used (9094191054524660891) -->
+    <skip />
+    <string name="vpn_no_ca_cert" msgid="7820884983947090538">"(Server nicht überprüfen)"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"Abbrechen"</string>
+    <string name="vpn_save" msgid="4233484051644764510">"Speichern"</string>
+    <string name="vpn_connect" msgid="8469608541746132301">"Verbinden"</string>
+    <string name="vpn_edit" msgid="1111459297288136079">"VPN bearbeiten"</string>
+    <string name="vpn_connect_to" msgid="7328758950427515753">"Mit <xliff:g id="NETWORK">%s</xliff:g> verbinden"</string>
+    <string name="vpn_title" msgid="7982620762043790565">"VPN-Einstellungen"</string>
+    <string name="vpn_create" msgid="8966010925994175306">"VPN hinzufügen"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"Netzwerk bearbeiten"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"Netzwerk löschen"</string>
+    <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"System"</string>
+    <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Nutzer"</string>
+    <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Deaktivieren"</string>
+    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Aktivieren"</string>
+    <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Entfernen"</string>
+    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"System-CA-Zertifikat aktivieren?"</string>
+    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"System-CA-Zertifikat deaktivieren?"</string>
+    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"CA-Zertifikat des Nutzers endgültig entfernen?"</string>
 </resources>
diff --git a/res/values-el/arrays.xml b/res/values-el/arrays.xml
index 910b9d9..758390e 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>
@@ -214,4 +240,36 @@
     <item msgid="3878793616631049349">"Χρήση ελέγχου HDCP μόνο για περιεχόμενο DRM"</item>
     <item msgid="45075631231212732">"Να χρησιμοποιείται πάντα έλεγχος HDCP"</item>
   </string-array>
+    <!-- no translation found for window_animation_scale_entries:0 (8134156599370824081) -->
+    <!-- no translation found for window_animation_scale_entries:1 (6624864048416710414) -->
+    <!-- no translation found for window_animation_scale_entries:2 (2219332261255416635) -->
+    <!-- no translation found for window_animation_scale_entries:3 (3544428804137048509) -->
+    <!-- no translation found for window_animation_scale_entries:4 (3110710404225974514) -->
+    <!-- no translation found for window_animation_scale_entries:5 (4402738611528318731) -->
+    <!-- no translation found for window_animation_scale_entries:6 (6189539267968330656) -->
+    <!-- no translation found for transition_animation_scale_entries:0 (8464255836173039442) -->
+    <!-- no translation found for transition_animation_scale_entries:1 (3375781541913316411) -->
+    <!-- no translation found for transition_animation_scale_entries:2 (1991041427801869945) -->
+    <!-- no translation found for transition_animation_scale_entries:3 (4012689927622382874) -->
+    <!-- no translation found for transition_animation_scale_entries:4 (3289156759925947169) -->
+    <!-- no translation found for transition_animation_scale_entries:5 (7705857441213621835) -->
+    <!-- no translation found for transition_animation_scale_entries:6 (6660750935954853365) -->
+    <!-- no translation found for app_process_limit_entries:0 (6799596560242275471) -->
+    <!-- no translation found for app_process_limit_entries:1 (2412794376818632575) -->
+    <!-- no translation found for app_process_limit_entries:2 (1578904888612645001) -->
+    <!-- no translation found for app_process_limit_entries:3 (8819235336299873577) -->
+  <string-array name="vpn_types_long">
+    <item msgid="2732002039459078847">"PPTP VPN"</item>
+    <item msgid="3799752201662127867">"L2TP/IPSec VPN με κλειδιά μοιρασμένα εκ των προτέρων"</item>
+    <item msgid="4725504331295252103">"L2TP/IPSec VPN με πιστοποιητικά"</item>
+    <item msgid="7526551163264034377">"IPSec VPN με ήδη κοινόχρηστα κλειδιά και έλεγχο ταυτότητας Xauth"</item>
+    <item msgid="8064740940687465039">"IPSec VPN με πιστοποιητικά και έλεγχο ταυτότητας Xauth"</item>
+    <item msgid="4946199982372391490">"IPSec VPN με πιστοποιητικά και υβριδικό έλεγχο ταυτότητας"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:0 (8621078286418985762) -->
+    <!-- no translation found for vpn_states:1 (6692305604213080515) -->
+    <!-- no translation found for vpn_states:2 (8001704909356800092) -->
+    <!-- no translation found for vpn_states:3 (4039737283841672166) -->
+    <!-- no translation found for vpn_states:4 (4042143101664725090) -->
+    <!-- no translation found for vpn_states:5 (2690164254699635531) -->
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 714da64..32b1888 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -19,6 +19,10 @@
     <string name="yes" msgid="4676390750360727396">"Ναι"</string>
     <string name="no" msgid="6731231425810196216">"Όχι"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Άγνωστο"</string>
+    <string name="header_category_wireless_networks" msgid="4944823405420438623">"ΑΣΥΡΜΑΤΟ και ΔΙΚΤΥΑ"</string>
+    <string name="header_category_device" msgid="5781174212691167553">"ΣΥΣΚΕΥΗ"</string>
+    <string name="header_category_personal" msgid="6225932173498802187">"ΠΡΟΣΩΠΙΚΟΣ"</string>
+    <string name="header_category_system" msgid="2073558547468647128">"ΣΥΣΤΗΜΑ"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Ενεργοποίηση πομπού"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Απενεργοποίηση πομπού"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Προβολή βιβλίου διευθύνσεων κάρτας SIM"</string>
@@ -111,7 +115,11 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Σύζευξη..."</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"Συζευγμένα αλλά όχι συνδεδεμένα"</string>
     <string name="bluetooth_device" msgid="6873461446424952003">"σετ ακουστικού-μικροφώνου"</string>
-    <string name="progress_scanning" msgid="3760897655335759141">"Σάρωση"</string>
+    <!-- outdated translation 3760897655335759141 -->     <string name="progress_scanning" msgid="192587958424295789">"Σάρωση"</string>
+    <!-- no translation found for progress_tap_to_pair (4192342336107106334) -->
+    <skip />
+    <!-- no translation found for bluetooth_no_devices_found (2412462335116297668) -->
+    <skip />
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Αίτημα σύζευξης Bluetooth"</string>
     <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>
@@ -130,6 +138,9 @@
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Μια εφαρμογή στο τηλέφωνό σας ζητά άδεια να ενεργοποιήσει το Bluetooth και να καταστήσει το τηλέφωνό σας ανιχνεύσιμο από άλλες συσκευές. Θέλετε να τη χορηγήσετε;"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Ενεργοποίηση Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Αυτόματη σύνδεση"</string>
+    <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Αίτημα σύνδεσης Bluetooth"</string>
+    <string name="bluetooth_connection_notif_message" msgid="1833221950512058309">"Αγγίξτε για να συνδεθείτε στο \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\""</string>
+    <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Θέλετε να συνδεθείτε στο \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\";"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Ρυθμίσεις ημερομηνίας &amp; ώρας"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00 μμ"</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
@@ -235,7 +246,7 @@
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Απενεργοποίηση όλων των ασύρματων συνδέσεων"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"Απενεργοποίηση ασύρματων συνδέσεων..."</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"Ενεργοποίηση ασύρματων συνδέσεων..."</string>
-    <string name="radio_controls_title" msgid="5868688473587168882">"Ασύρματο και δίκτυα"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Περισσότερα ..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Ασύρματο και δίκτυα"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"Διαχείριση Wi-Fi, Bluetooth, λειτουργίας πτήσης, δικτύων κινητής τηλεφωνίας και VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Περιαγωγή δεδομένων"</string>
@@ -271,8 +282,8 @@
     <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">"Τοποθεσία και ασφάλεια"</string>
-    <string name="location_security_settings_title" msgid="4624434296446625554">"Ρυθμίσεις τοποθεσίας και ασφάλειας"</string>
+    <string name="location_settings_title" msgid="8935806698251432196">"Υπηρεσίες τοποθεσίας"</string>
+    <string name="security_settings_title" msgid="7945465324818485460">"Ασφάλεια"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Ορισμός του \"Η τοποθεσία μου\", ξεκλειδώματος οθόνης, κλειδώματος κάρτας SIM, κλειδώματος αποθηκευτικού χώρου διαπιστευτηρίων"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Ορισμός του \"Η τοποθεσία μου\", του ξεκλειδώματος οθόνης και του κλειδώματος αποθηκευτικού χώρου διαπιστευτηρίων"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Κωδικοί πρόσβασης"</string>
@@ -316,7 +327,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>
@@ -375,8 +386,8 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Προβολή ή απενεργοποίηση των διαχειριστών συσκευής"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Ενεργοποίηση Bluetooth"</string>
-    <string name="bluetooth_settings" msgid="2725796451253089609">"Ρυθμίσεις Bluetooth"</string>
-    <string name="bluetooth_settings_title" msgid="2824020086246268296">"Ρυθμίσεις Bluetooth"</string>
+    <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
+    <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Διαχείριση συνδέσεων, ορισμός ονόματος συσκευής &amp; ανιχνευσιμότητα"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Αίτημα σύζευξης Bluetooth"</string>
     <string name="bluetooth_enter_pin_msg" msgid="1499285355129256289">\n"Εισαγάγετε το PIN για να πραγματοποιήσετε ζεύξη με τη συσκευή \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". (Δοκιμάστε 0000 ή 1234.) Ενδέχεται να χρειαστεί να εισαγάγετε το ίδιο PIN στη συσκευή Bluetooth."</string>
@@ -394,7 +405,10 @@
     <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>
+    <!-- no translation found for bluetooth_search_for_devices (5957007154213560390) -->
+    <skip />
+    <!-- no translation found for bluetooth_searching_for_devices (9203739709307871727) -->
+    <skip />
     <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>
@@ -404,6 +418,10 @@
     <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_menu_advanced" msgid="8572178316357220524">"Για προχωρημένους"</string>
+    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Προηγμένες ρυθμίσεις Bluetooth"</string>
+    <string name="bluetooth_advanced_settings_label" msgid="8659717781212434173">"Προηγμένες ρυθμίσεις Bluetooth"</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="3631028334811113629">"Ενεργοποιήστε το Bluetooth για να δείτε τις διαθέσιμες συσκευές"</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">"Handsfree"</string>
@@ -445,27 +463,31 @@
     <string name="nfc_toggle_error" msgid="2233172102497535522">"Παρουσιάστηκε σφάλμα."</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Ενεργοποίηση Wi-Fi"</string>
-    <string name="wifi_settings" msgid="4746946030627213196">"Ρυθμίσεις Wi-Fi"</string>
+    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="2810363951104753710">"Ρυθμίσεις Wi-Fi"</string>
+    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Ορισμός &amp; διαχείριση ασύρματων σημείων πρόσβασης"</string>
-    <string name="wifi_starting" msgid="6710266609710860129">"Ενεργοποίηση..."</string>
-    <string name="wifi_stopping" msgid="5952909472548218348">"Απενεργοποίηση..."</string>
+    <string name="wifi_starting" msgid="7732330327758522943">"Ενεργοποίηση Wi-Fi..."</string>
+    <string name="wifi_stopping" msgid="244864762599017659">"Απενεργοποίηση του Wi-Fi..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"Σφάλμα"</string>
     <string name="wifi_in_airplane_mode" msgid="7618393787965366655">"Στη λειτουργία πτήσης"</string>
     <string name="wifi_fail_to_scan" msgid="6194542252808587669">"Δεν είναι δυνατή η σάρωση για δίκτυα"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Ειδοποίηση δικτύου"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Να ειδοποιούμαι όταν υπάρχει διαθέσιμο ανοικτό δίκτυο"</string>
+    <string name="wifi_enable_watchdog_service" msgid="4723544454066601706">"Έλεγχοι συνδεσιμότητας Wi-Fi"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="8687400936839455926">"Εντοπισμός και διαχείριση πιθανών προβλημάτων στη συνδεσιμότητα του δικτύου"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Πολιτική αποσύνδεσης Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Ορισμός εναλλαγής από δεδομένα Wi-Fi σε δεδομένα κινητού"</string>
     <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" msgid="6234851776910938957">"Προσθήκη δικτύου"</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>
     <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_empty_list_wifi_off" msgid="3682507011071029311">"Ενεργοποιήστε το WiFi για να δείτε τα διαθέσιμα δίκτυα"</string>
     <string name="wifi_network_setup" msgid="7974851890019344870">"Ρύθμιση δικτύου"</string>
     <string name="wifi_wps_pin" msgid="5471842298708321115">"Εισαγωγή ορισμού από σημείο πρόσβασης"</string>
     <string name="wifi_wps_setup_title" msgid="150518971269252336">"Ρύθμιση WPS"</string>
@@ -501,13 +523,13 @@
     <string name="wifi_save" msgid="3331121567988522826">"Αποθήκευση"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Ακύρωση"</string>
     <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"Εντοπίστηκε άλλη περίοδος σύνδεσης WPS. Προσπαθήστε ξανά σε λίγα λεπτά"</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Σύνθετα"</string>
+    <!-- outdated translation 5419052271935350999 -->     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Σύνθετα"</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>
-    <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"Ρυθμίσεις IP"</string>
+    <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Ρυθμίσεις IP"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Αποθ/ση"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Ακύρωση"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Πληκτρολογήστε μια έγκυρη διεύθυνση IP."</string>
@@ -525,7 +547,7 @@
     <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">"AndroidHotspot"</string>
     <string name="sound_settings_title" msgid="8735891486683305886">"Ήχος"</string>
-    <string name="display_settings_title" msgid="2378894265964357591">"Οθόνη"</string>
+    <string name="display_settings_title" msgid="1708697328627382561">"Προβολή"</string>
     <string name="sound_settings" msgid="5007659014828162881">"Ρυθμίσεις ήχου"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Λειτουργία σίγασης"</string>
     <string name="silent_mode_summary" msgid="3309650676072917899">"Σίγαση όλων των ήχων εκτός από τα μέσα και τις ειδοποιήσεις"</string>
@@ -533,7 +555,7 @@
     <string name="ringtone_title" msgid="7037881886694206550">"Ήχος εισερχόμενης κλήσης"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="8741571721868253103">"Ένταση ήχου"</string>
-    <string name="ring_volume_title" msgid="7938706566797464165">"Ένταση ήχου κουδουνίσματος"</string>
+    <string name="ring_volume_title" msgid="7938706566797464165">"Ένταση ήχου ειδοποίησης"</string>
     <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>
@@ -598,7 +620,18 @@
     <string name="brightness_summary" msgid="838917350127550703">"Ρύθμιση της φωτεινότητας της οθόνης"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Λήξη ορίου χρόνου"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Η οθόνη απενεργοποιείται αυτόματα μετά από  <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Ταπετσαρία"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android Dreams"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Προφύλαξη οθόνης και άλλες μορφές διαφοροποίησης αδράνειας"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Selected dream"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Χρόνος ενεργοποίησης"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"Μετά από <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> σε αδράνεια"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Ποτέ"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Δοκιμάστε το!"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Αυτόματη φωτεινότητα"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Μέγεθος γραμματοσειράς"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Συνολικό μέγεθος γραμματοσειράς"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Επιλέξτε μέγεθος γραμματοσειράς"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Ρυθμίσεις κλειδώματος κάρτας SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Ορισμός κλειδώματος κάρτας SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Κλείδωμα κάρτας SIM"</string>
@@ -643,8 +676,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>
@@ -696,6 +730,16 @@
     <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 storage_menu_usb (1580545228584324704) -->
+    <skip />
+    <!-- no translation found for storage_title_usb (5775322159427546546) -->
+    <skip />
+    <!-- no translation found for usb_label_mtp (4157227401755543412) -->
+    <skip />
+    <!-- no translation found for usb_label_ptp (7417254019489575819) -->
+    <skip />
+    <!-- no translation found for usb_label_installer_cd (7438467574756086977) -->
+    <skip />
     <string name="battery_status_title" msgid="9159414319574976203">"Κατάσταση μπαταρίας"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Επίπεδο μπαταρίας"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -806,6 +850,8 @@
     <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>
+    <string name="wireless_category_general" msgid="2973810407987118067">"Γενικά"</string>
+    <string name="wireless_category_mobile_networks" msgid="1254629216798424288">"Δίκτυα κινητής τηλεφωνίας"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Δίκτυα κινητής τηλεφωνίας"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Ορισμός επιλογών για περιαγωγή, δίκτυα, APN"</string>
     <string name="location_title" msgid="1029961368397484576">"Η τοποθεσία μου"</string>
@@ -883,7 +929,7 @@
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Ασφάλεια του tablet σας"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Ασφάλιση του τηλεφώνου σας"</string>
     <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"Προστατέψτε  το tablet σας από μη εξουσιοδοτημένη χρήση, δημιουργώντας ένα προσωπικό μοτίβο ξεκλειδώματος οθόνης. Χρησιμοποιήστε το δάχτυλό σας για να συνδέσετε τις τελείες με οποιαδήποτε σειρά στην επόμενη οθόνη. Πρέπει να συνδέσετε τουλάχιστον τέσσερις τελείες. "\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>
+    <!-- outdated translation 3692151094288835065 -->     <string name="lock_intro_message" product="default" msgid="5796785892741212873">"Προστατέψτε  το tablet σας από μη εξουσιοδοτημένη χρήση, δημιουργώντας ένα προσωπικό μοτίβο ξεκλειδώματος οθόνης. Χρησιμοποιήστε το δάχτυλό σας για να συνδέσετε τις τελείες με οποιαδήποτε σειρά στην επόμενη οθόνη. Πρέπει να συνδέσετε τουλάχιστον τέσσερις τελείες. "\n\n"Είστε έτοιμοι να ξεκινήσετε; Πατήστε “Επόμενο”."</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Διαχείριση εφαρμογών"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Διαχείριση και κατάργηση εγκατεστημένων εφαρμογών"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Εφαρμογές"</string>
@@ -893,6 +939,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>
@@ -905,9 +953,10 @@
     <string name="force_stop" msgid="7435006169872876756">"Αναγκαστική διακοπή"</string>
     <string name="total_size_label" msgid="1048676419552557254">"Σύνολο"</string>
     <string name="application_size_label" msgid="5055196275624686382">"Εφαρμογή"</string>
+    <string name="external_code_size_label" msgid="3459343140355961335">"Εφαρμογή χώρου αποθήκευσης USB"</string>
     <string name="data_size_label" msgid="8679376373625710107">"Δεδομένα"</string>
-    <string name="external_size_label" product="nosdcard" msgid="4465530017830945766">"Αποθηκευτικού χώρου USB"</string>
-    <string name="external_size_label" product="default" msgid="2107155737635944440">"Κάρτα SD"</string>
+    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Εφαρμογή χώρου αποθήκευσης USB"</string>
+    <string name="external_data_size_label" product="default" msgid="626414192825329708">"Κάρτα SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Κατάργηση εγκατάστασης"</string>
     <string name="disable_text" msgid="6544054052049395202">"Απενεργοποίηση"</string>
     <string name="enable_text" msgid="9217362512327828987">"Ενεργοποίηση"</string>
@@ -1026,7 +1075,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 +1085,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>
@@ -1066,7 +1117,7 @@
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Ρυθμίσεις πληκτρολογίου οθόνης"</string>
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Φυσικό πληκτρολόγιο"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Ρυθμίσεις φυσικού πληκτρολογίου"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Ανάπτυξη"</string>
+    <string name="development_settings_title" msgid="215179176067683667">"Επιλογές για προγραμματιστές"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"Ορισμός επιλογών για ανάπτυξη εφαρμογής"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Εντοπισμός σφαλμάτων USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Λειτουργία εντοπισμού σφαλμάτων όταν το USB είναι συνδεδεμένο"</string>
@@ -1091,14 +1142,14 @@
     <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="toggle_large_text_title" msgid="42259643359869436">"Μεγάλο κείμενο"</string>
     <string name="accessibility_services_category" msgid="8127851026323672607">"Υπηρεσίες προσβασιμότητας"</string>
+    <string name="toggle_accessibility_title" msgid="7338739354952553958">"Να επιτρέπεται η χρήση υπηρ. πρόσβασης"</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"Κάντε κλικ στην επιλογή \"OK\" για να εγκαταστήσετε το πρόγραμμα ανάγνωσης οθόνης."</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 τη λήψη σεναρίων στο  tablet σας, τα οποία κάνουν το περιεχόμενό τους πιο προσβάσιμο. Είστε βέβαιοι ότι θέλετε να επιτρέψετε στην Google να εγκαθιστά σενάρια προσβασιμότητας στο tablet σας;"</string>
@@ -1106,10 +1157,11 @@
     <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>
-    <string name="power_usage_summary_title" msgid="5180282911164282324">"Χρήση μπαταρίας"</string>
+    <string name="power_usage_summary_title" msgid="7190304207330319919">"Μπαταρία"</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>
@@ -1218,6 +1270,8 @@
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Ρυθμίσεις <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"Η επιλογή <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> είναι ενεργοποιημένη"</string>
     <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"Η επιλογή <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> είναι απενεργοποιημένη"</string>
+    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Ρυθμίσεις μηχανής"</string>
+    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Ρυθμίσεις για τη μηχανή <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"Γλώσσες και φωνές"</string>
     <string name="pico_installed" msgid="2452546687858267414">"Εγκαταστάθηκε"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"Δεν έχει εγκατασταθεί"</string>
@@ -1228,114 +1282,33 @@
     <string name="gadget_title" msgid="7455548605888590466">"Έλεγχος ισχύος"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Ενημέρωση ρύθμισης Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Ενημέρωση ρύθμισης Bluetooth"</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">"Προσθήκη VPN <xliff:g id="NAME">%s</xliff:g>"</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">"Εγκατάσταση και διαχείριση Εικονικών Ιδιωτικών Δικτύων (VPN)"</string>
-    <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="trusted_credentials" msgid="4266945289534242402">"Αξιόπιστα διαπιστευτήρια"</string>
+    <string name="trusted_credentials_summary" msgid="6735221351155686632">"Προβολή αξιόπιστων πιστοποιητικών CA"</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>
-    <string name="privacy_settings_title" msgid="1987089301293213705">"Ρυθμίσεις απορρήτου"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"Αντίγραφα ασφαλείας και επαναφορά"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"Αντίγραφα ασφαλείας και επαναφορά"</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>
@@ -1446,4 +1419,107 @@
     <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>
+    <!-- no translation found for debug_ui_category (9023948280291055349) -->
+    <skip />
+    <!-- no translation found for strict_mode (1938795874357830695) -->
+    <skip />
+    <!-- no translation found for strict_mode_summary (142834318897332338) -->
+    <skip />
+    <!-- no translation found for pointer_location (6084434787496938001) -->
+    <skip />
+    <!-- no translation found for pointer_location_summary (840819275172753713) -->
+    <skip />
+    <!-- no translation found for show_screen_updates (8282711794220426931) -->
+    <skip />
+    <!-- no translation found for show_screen_updates_summary (1716122382094924596) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage (2389212910758076024) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage_summary (2113341923988958266) -->
+    <skip />
+    <!-- no translation found for window_animation_scale_title (6162587588166114700) -->
+    <skip />
+    <!-- no translation found for transition_animation_scale_title (387527540523595875) -->
+    <skip />
+    <!-- no translation found for debug_applications_category (6221644998451283813) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities (3622005081180597749) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities_summary (3592221124808773368) -->
+    <skip />
+    <!-- no translation found for app_process_limit_title (4121324758038197598) -->
+    <skip />
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Χρήση δεδομένων"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"Κύκλος δεδομένων χρήσης"</string>
+    <string name="data_usage_menu_split_4g" msgid="7417435609285381968">"Διαχωρισμός χρήσης 4G"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Εμφάνιση χρήσης Wi-Fi"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"Αλλαγή κύκλου..."</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Η ημέρα που θα γίνει η επαναφορά του κύκλου χρήσης δεδομένων:"</string>
+    <string name="data_usage_disable_mobile_limit" msgid="289740911281022322">"Απεν. δεδ. κιν. τηλεφ. στο όριο"</string>
+    <string name="data_usage_disable_4g_limit" msgid="5808210773758699800">"Απενεργοπ. δεδομένων 4G στο όριο"</string>
+    <string name="data_usage_disable_3g_limit" msgid="3856971004328238231">"Απενεργ. δεδομ. 2G-3G στο όριο"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_mobile" msgid="454140350007299045">"Κινητό"</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">"Δεδομένα κινητής τηλεφωνίας"</string>
+    <string name="data_usage_enable_3g" msgid="6304006671869578254">"Δεδομένα 2G-3G"</string>
+    <string name="data_usage_enable_4g" msgid="3635854097335036738">"Δεδομένα 4G"</string>
+    <string name="data_usage_app_settings" msgid="3727561362090820369">"Προβολή των ρυθμίσεων εφαρμογής"</string>
+    <string name="data_usage_app_restrict_background" msgid="8856643905291165256">"Περιορισμός χρήσης δεδ. παρασκ."</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="1503361245973512092">"Η χρήση δεδ. στο παρασκ. να επιτρέπεται μόνο σε απεριόριστο δικ."</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="8110736468987743260">"Περιορισμός δεδομένων παρασκηνίου"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="100001698378554777">"Αυτή η λειτουργία μπορεί να επηρεάσει αρνητικά τις εφαρμογές που εξαρτώνται από τη χρήση δεδομένων παρασκηνίου."\n\n"Περισσότερο κατάλληλα στοιχεία ελέγχου χρήσης δεδομένων ενδέχεται να βρείτε στις ρυθμίσεις της εφαρμογής."</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Ημερομηνία επαναφοράς κύκλου χρήσης"</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Ημερομηνία του κάθε μήνα:"</string>
+    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Ορισμός"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Περιορισμός χρήσης δεδομένων"</string>
+    <string name="data_usage_limit_dialog_mobile" msgid="7931094451923591578">"Η σύνδεση δεδομένων κινητής τηλεφωνίας θα απενεργοποιηθεί όταν συμπληρωθεί το καθορισμένο όριο."\n\n"Για την αποφυγή χρεώσεων, σκεφτείτε το ενδεχόμενο χρήσης μειωμένου ορίου, καθώς ο υπολογισμός των χρεώσεων από τη συσκευή και την εταιρεία κινητής τηλεφωνίας ενδέχεται να διαφέρει."</string>
+    <string name="data_usage_limit_dialog_3g" msgid="5478553071420316963">"Η σύνδεση δεδομένων 2G-3G θα απενεργοποιηθεί όταν συμπληρωθεί το καθορισμένο όριο."\n\n"Για την αποφυγή χρεώσεων, σκεφτείτε το ενδεχόμενο χρήσης μειωμένου ορίου, καθώς ο υπολογισμός των χρεώσεων από τη συσκευή και την εταιρεία κινητής τηλεφωνίας ενδέχεται να διαφέρει."</string>
+    <string name="data_usage_limit_dialog_4g" msgid="6134008906742403777">"Η σύνδεση δεδομένων 4G θα απενεργοποιηθεί όταν συμπληρωθεί το καθορισμένο όριο."\n\n"Για την αποφυγή χρεώσεων, σκεφτείτε το ενδεχόμενο χρήσης μειωμένου ορίου, καθώς ο υπολογισμός των χρεώσεων από τη συσκευή και την εταιρεία κινητής τηλεφωνίας ενδέχεται να διαφέρει."</string>
+    <string name="data_usage_disabled_dialog_3g_title" msgid="4221584306492812040">"Τα δεδομένα 2G-3G απενεργοποιήθηκαν"</string>
+    <string name="data_usage_disabled_dialog_4g_title" msgid="715585612162185936">"Τα δεδομένα 4G απενεργοποιήθηκαν"</string>
+    <string name="data_usage_disabled_dialog_mobile_title" msgid="209516216265000221">"Τα δεδομένα κινητής τηλεφωνίας απενεργοποιήθηκαν"</string>
+    <string name="data_usage_disabled_dialog" msgid="2874031671067845964">"Το καθορισμένο όριο χρήσης δεδομένων συμπληρώθηκε."\n\n"Πρόσθετη χρήση δεδομένων ενδέχεται να επιφέρει χρεώσεις από την εταιρεία κινητής τηλεφωνίας."</string>
+    <string name="data_usage_disabled_dialog_enable" msgid="2441219164620753329">"Εκ νέου ενεργοποίηση δεδομ."</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="32">" <xliff:g id="NUMBER">%1$s</xliff:g> "</font>" "<font size="12">" <xliff:g id="UNIT">%2$s</xliff:g> "</font>" "\n" "<font size="12">" προειδοποίηση "</font></string>
+    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Κλήση έκτακτης ανάγκης"</string>
+    <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Επιστροφή στην κλήση"</string>
+    <string name="vpn_name" msgid="4689699885361002297">"Όνομα"</string>
+    <string name="vpn_type" msgid="5435733139514388070">"Τύπος"</string>
+    <string name="vpn_server" msgid="2123096727287421913">"Διεύθυνση διακομιστή"</string>
+    <string name="vpn_mppe" msgid="6639001940500288972">"Κρυπτογράφηση PPP (MPPE)"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"Μυστικό L2TP"</string>
+    <string name="vpn_ipsec_identifier" msgid="4098175859460006296">"Αναγνωριστικό IPSec"</string>
+    <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Ήδη κοινόχρηστο κλειδί IPSec"</string>
+    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"Πιστοποιητικό χρήστη IPSec"</string>
+    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"Πιστοποιητικό CA IPSec"</string>
+    <!-- no translation found for vpn_search_domains (5391995501541199624) -->
+    <skip />
+    <!-- no translation found for vpn_routes (8556236801755260073) -->
+    <skip />
+    <string name="vpn_username" msgid="1863901629860867849">"Όνομα χρήστη"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Κωδικός πρόσβασης"</string>
+    <!-- no translation found for vpn_save_login (6350322456427484881) -->
+    <skip />
+    <!-- no translation found for vpn_not_used (9094191054524660891) -->
+    <skip />
+    <string name="vpn_no_ca_cert" msgid="7820884983947090538">"(να μην γίνεται επαλήθευση διακομιστή)"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"Ακύρωση"</string>
+    <string name="vpn_save" msgid="4233484051644764510">"Αποθήκευση"</string>
+    <string name="vpn_connect" msgid="8469608541746132301">"Σύνδεση"</string>
+    <string name="vpn_edit" msgid="1111459297288136079">"Επεξεργασία δικτύου VPN"</string>
+    <string name="vpn_connect_to" msgid="7328758950427515753">"Σύνδεση στο δίκτυο <xliff:g id="NETWORK">%s</xliff:g>"</string>
+    <string name="vpn_title" msgid="7982620762043790565">"Ρυθμίσεις VPN"</string>
+    <string name="vpn_create" msgid="8966010925994175306">"Προσθήκη δικτύου VPN"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"Επεξεργασία δικτύου"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"Διαγραφή δικτύου"</string>
+    <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Σύστημα"</string>
+    <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Χρήστης"</string>
+    <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Απενεργοποίηση"</string>
+    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Ενεργοποίηση"</string>
+    <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Κατάργηση"</string>
+    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Ενεργοποίηση πιστοποιητικού CA συστήματος;"</string>
+    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Απενεργοποίηση πιστοποιητικού CA συστήματος;"</string>
+    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Να καταργηθεί οριστικά το πιστοποιητικό CA χρήστη;"</string>
 </resources>
diff --git a/res/values-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml
index 96e9bc8..f89db9f 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>
@@ -214,4 +240,36 @@
     <item msgid="3878793616631049349">"Use HDCP checking for DRM content only"</item>
     <item msgid="45075631231212732">"Always use HDCP checking"</item>
   </string-array>
+    <!-- no translation found for window_animation_scale_entries:0 (8134156599370824081) -->
+    <!-- no translation found for window_animation_scale_entries:1 (6624864048416710414) -->
+    <!-- no translation found for window_animation_scale_entries:2 (2219332261255416635) -->
+    <!-- no translation found for window_animation_scale_entries:3 (3544428804137048509) -->
+    <!-- no translation found for window_animation_scale_entries:4 (3110710404225974514) -->
+    <!-- no translation found for window_animation_scale_entries:5 (4402738611528318731) -->
+    <!-- no translation found for window_animation_scale_entries:6 (6189539267968330656) -->
+    <!-- no translation found for transition_animation_scale_entries:0 (8464255836173039442) -->
+    <!-- no translation found for transition_animation_scale_entries:1 (3375781541913316411) -->
+    <!-- no translation found for transition_animation_scale_entries:2 (1991041427801869945) -->
+    <!-- no translation found for transition_animation_scale_entries:3 (4012689927622382874) -->
+    <!-- no translation found for transition_animation_scale_entries:4 (3289156759925947169) -->
+    <!-- no translation found for transition_animation_scale_entries:5 (7705857441213621835) -->
+    <!-- no translation found for transition_animation_scale_entries:6 (6660750935954853365) -->
+    <!-- no translation found for app_process_limit_entries:0 (6799596560242275471) -->
+    <!-- no translation found for app_process_limit_entries:1 (2412794376818632575) -->
+    <!-- no translation found for app_process_limit_entries:2 (1578904888612645001) -->
+    <!-- no translation found for app_process_limit_entries:3 (8819235336299873577) -->
+  <string-array name="vpn_types_long">
+    <item msgid="2732002039459078847">"PPTP VPN"</item>
+    <item msgid="3799752201662127867">"L2TP/IPSec VPN with preshared keys"</item>
+    <item msgid="4725504331295252103">"L2TP/IPSec VPN with certificates"</item>
+    <item msgid="7526551163264034377">"IPSec VPN with preshared keys and Xauth authentication"</item>
+    <item msgid="8064740940687465039">"IPSec VPN with certificates and Xauth authentication"</item>
+    <item msgid="4946199982372391490">"IPSec VPN with certificates and hybrid authentication"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:0 (8621078286418985762) -->
+    <!-- no translation found for vpn_states:1 (6692305604213080515) -->
+    <!-- no translation found for vpn_states:2 (8001704909356800092) -->
+    <!-- no translation found for vpn_states:3 (4039737283841672166) -->
+    <!-- no translation found for vpn_states:4 (4042143101664725090) -->
+    <!-- no translation found for vpn_states:5 (2690164254699635531) -->
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index f5bab30..2a01f09 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -19,6 +19,10 @@
     <string name="yes" msgid="4676390750360727396">"Yes"</string>
     <string name="no" msgid="6731231425810196216">"No"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Unknown"</string>
+    <string name="header_category_wireless_networks" msgid="4944823405420438623">"WIRELESS &amp; NETWORKS"</string>
+    <string name="header_category_device" msgid="5781174212691167553">"DEVICE"</string>
+    <string name="header_category_personal" msgid="6225932173498802187">"PERSONAL"</string>
+    <string name="header_category_system" msgid="2073558547468647128">"SYSTEM"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Turn on radio"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Turn off radio"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"View SIM address book"</string>
@@ -111,7 +115,11 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Pairing…"</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"Paired, but not connected"</string>
     <string name="bluetooth_device" msgid="6873461446424952003">"handsfree/headset"</string>
-    <string name="progress_scanning" msgid="3760897655335759141">"Scanning"</string>
+    <!-- outdated translation 3760897655335759141 -->     <string name="progress_scanning" msgid="192587958424295789">"Scanning"</string>
+    <!-- no translation found for progress_tap_to_pair (4192342336107106334) -->
+    <skip />
+    <!-- no translation found for bluetooth_no_devices_found (2412462335116297668) -->
+    <skip />
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Bluetooth pairing request"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Pairing request"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Select to pair with <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
@@ -130,6 +138,9 @@
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"An application on your phone is requesting permission to turn on Bluetooth and to make your phone discoverable by other devices. Do you want to do this?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Turning on Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Auto-connect"</string>
+    <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth connection request"</string>
+    <string name="bluetooth_connection_notif_message" msgid="1833221950512058309">"Touch to connect to \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\""</string>
+    <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Do you want to connect to \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Date &amp; time settings"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00 P.M."</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
@@ -235,7 +246,7 @@
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Disable all wireless connections"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"Disabling wireless connections…"</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"Enabling wireless connections…"</string>
-    <string name="radio_controls_title" msgid="5868688473587168882">"Wireless &amp; networks"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"More…"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Wireless &amp; networks"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"Manage Wi-Fi, Bluetooth, airplane mode, mobile networks &amp; VPNs"</string>
     <string name="roaming" msgid="3596055926335478572">"Data roaming"</string>
@@ -271,8 +282,8 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Owner info"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="2382525043173672857">"Enter text to display on the lock screen"</string>
-    <string name="security_settings_title" msgid="5168491784222013179">"Location &amp; security"</string>
-    <string name="location_security_settings_title" msgid="4624434296446625554">"Location &amp; security settings"</string>
+    <string name="location_settings_title" msgid="8935806698251432196">"Location services"</string>
+    <string name="security_settings_title" msgid="7945465324818485460">"Security"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Set My Location, screen unlock, SIM card lock, credential storage lock"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Set My Location, screen unlock, credential storage lock"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Passwords"</string>
@@ -316,7 +327,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>
@@ -375,8 +386,8 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"View or deactivate device administrators"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Turn on Bluetooth"</string>
-    <string name="bluetooth_settings" msgid="2725796451253089609">"Bluetooth settings"</string>
-    <string name="bluetooth_settings_title" msgid="2824020086246268296">"Bluetooth settings"</string>
+    <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
+    <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Manage connections, set device name &amp; discoverability"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Bluetooth pairing request"</string>
     <string name="bluetooth_enter_pin_msg" msgid="1499285355129256289">\n"Enter PIN to pair with \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". (Try 0000 or 1234.) You may need to enter the same PIN on the Bluetooth device."</string>
@@ -394,7 +405,10 @@
     <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Pairing rejected by <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"There was a problem connecting to <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Scan for devices"</string>
-    <string name="bluetooth_preference_find_nearby_title" msgid="5087410003465463318">"Find devices nearby"</string>
+    <!-- no translation found for bluetooth_search_for_devices (5957007154213560390) -->
+    <skip />
+    <!-- no translation found for bluetooth_searching_for_devices (9203739709307871727) -->
+    <skip />
     <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"Device settings"</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Paired devices"</string>
     <string name="bluetooth_preference_found_devices" msgid="3133019331974936204">"Found devices"</string>
@@ -404,6 +418,10 @@
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Unpair"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Disconnect &amp; unpair"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Options…"</string>
+    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Advanced"</string>
+    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Advanced Bluetooth"</string>
+    <string name="bluetooth_advanced_settings_label" msgid="8659717781212434173">"Advanced Bluetooth"</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="3631028334811113629">"Turn on Bluetooth to see devices available"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Connect to…"</string>
     <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"Media"</string>
     <string name="bluetooth_profile_headset" msgid="81844079120986198">"Hands-free"</string>
@@ -445,27 +463,31 @@
     <string name="nfc_toggle_error" msgid="2233172102497535522">"An error occurred."</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"WiFi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Turn on Wi-Fi"</string>
-    <string name="wifi_settings" msgid="4746946030627213196">"Wi-Fi settings"</string>
+    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="2810363951104753710">"Wi-Fi settings"</string>
+    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Set up &amp; manage wireless access points"</string>
-    <string name="wifi_starting" msgid="6710266609710860129">"Turning on…"</string>
-    <string name="wifi_stopping" msgid="5952909472548218348">"Turning off…"</string>
+    <string name="wifi_starting" msgid="7732330327758522943">"Turning on Wi-Fi..."</string>
+    <string name="wifi_stopping" msgid="244864762599017659">"Turning off Wi-Fi…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Error"</string>
     <string name="wifi_in_airplane_mode" msgid="7618393787965366655">"In airplane mode"</string>
     <string name="wifi_fail_to_scan" msgid="6194542252808587669">"Unable to scan for networks"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Network notification"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Notify me when an open network is available"</string>
+    <string name="wifi_enable_watchdog_service" msgid="4723544454066601706">"Wi-Fi Connectivity Checks"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="8687400936839455926">"Detect and manage potential network connectivity problems"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Wi-Fi disconnection policy"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Specify when to switch from Wi-Fi to mobile data"</string>
     <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" msgid="6234851776910938957">"Add 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>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Connect to network"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Forget network"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modify network"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="3682507011071029311">"Turn on Wi-Fi to see networks available"</string>
     <string name="wifi_network_setup" msgid="7974851890019344870">"Network Setup"</string>
     <string name="wifi_wps_pin" msgid="5471842298708321115">"Enter pin from access point"</string>
     <string name="wifi_wps_setup_title" msgid="150518971269252336">"WPS Setup"</string>
@@ -501,13 +523,13 @@
     <string name="wifi_save" msgid="3331121567988522826">"Save"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Cancel"</string>
     <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"Another WPS session detected. Please retry in a few minutes."</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Advanced"</string>
+    <!-- outdated translation 5419052271935350999 -->     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Advanced"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi frequency band"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Specify the frequency range of operation"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"There was a problem while setting the frequency band."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC address"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP address"</string>
-    <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"IP settings"</string>
+    <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP settings"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Save"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Cancel"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Please type a valid IP address."</string>
@@ -525,7 +547,7 @@
     <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> portable Wi-Fi hotspot"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Android Hotspot"</string>
     <string name="sound_settings_title" msgid="8735891486683305886">"Sound"</string>
-    <string name="display_settings_title" msgid="2378894265964357591">"Screen"</string>
+    <string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
     <string name="sound_settings" msgid="5007659014828162881">"Sound settings"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Silent mode"</string>
     <string name="silent_mode_summary" msgid="3309650676072917899">"All sounds except media &amp; alarms"</string>
@@ -598,7 +620,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 +676,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>
@@ -696,6 +730,16 @@
     <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"SD card will be unmounted."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Unmounting"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Unmount in progress"</string>
+    <!-- no translation found for storage_menu_usb (1580545228584324704) -->
+    <skip />
+    <!-- no translation found for storage_title_usb (5775322159427546546) -->
+    <skip />
+    <!-- no translation found for usb_label_mtp (4157227401755543412) -->
+    <skip />
+    <!-- no translation found for usb_label_ptp (7417254019489575819) -->
+    <skip />
+    <!-- no translation found for usb_label_installer_cd (7438467574756086977) -->
+    <skip />
     <string name="battery_status_title" msgid="9159414319574976203">"Battery status"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Battery level"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNs"</string>
@@ -806,6 +850,8 @@
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"Cannot tether to more than <xliff:g id="MAXCONNECTION">%1$d</xliff:g> devices"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be untethered."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Help"</string>
+    <string name="wireless_category_general" msgid="2973810407987118067">"General"</string>
+    <string name="wireless_category_mobile_networks" msgid="1254629216798424288">"Mobile networks"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobile networks"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Set options for roaming, networks, APNs"</string>
     <string name="location_title" msgid="1029961368397484576">"My Location"</string>
@@ -883,7 +929,7 @@
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Securing your tablet"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Securing your phone"</string>
     <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"Protect your tablet from unauthorised use by creating a personal screen-unlock pattern. Use your finger to connect the dots in any order on the next screen. You must connect at least four dots. "\n\n"Ready to start? Touch “Next”."</string>
-    <string name="lock_intro_message" product="default" msgid="9100785646737118042"><font size="17">"Protect your phone from unauthorised use by creating a personal screen unlock pattern. "\n<font height="17">\n</font><b>"1"</b>"  On the next screen, watch while an example pattern is drawn. "\n<font height="17">\n</font><b>"2"</b>"  When ready, draw your own personal unlock pattern. Experiment with different patterns but connect at least four dots. "\n<font height="17">\n</font><b>"3"</b>"  Redraw your pattern to confirm. "\n<font height="17">\n</font><b>"Ready to start? Select “Next”"</b>". "\n<font height="3">\n</font>"To leave your phone unprotected, select “Cancel”."</font></string>
+    <!-- outdated translation 3692151094288835065 -->     <string name="lock_intro_message" product="default" msgid="5796785892741212873">"Protect your tablet from unauthorised use by creating a personal screen-unlock pattern. Use your finger to connect the dots in any order on the next screen. You must connect at least four dots. "\n\n"Ready to start? Touch “Next”."</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Manage applications"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Manage and remove installed applications"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Applications"</string>
@@ -893,6 +939,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>
@@ -905,9 +953,10 @@
     <string name="force_stop" msgid="7435006169872876756">"Force stop"</string>
     <string name="total_size_label" msgid="1048676419552557254">"Total"</string>
     <string name="application_size_label" msgid="5055196275624686382">"Application"</string>
+    <string name="external_code_size_label" msgid="3459343140355961335">"USB storage app"</string>
     <string name="data_size_label" msgid="8679376373625710107">"Data"</string>
-    <string name="external_size_label" product="nosdcard" msgid="4465530017830945766">"USB storage"</string>
-    <string name="external_size_label" product="default" msgid="2107155737635944440">"SD card"</string>
+    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB storage data"</string>
+    <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD card"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Uninstall"</string>
     <string name="disable_text" msgid="6544054052049395202">"Disable"</string>
     <string name="enable_text" msgid="9217362512327828987">"Enable"</string>
@@ -1026,7 +1075,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 +1085,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>
@@ -1066,7 +1117,7 @@
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"On-screen keyboard settings"</string>
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Physical keyboard"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Physical keyboard settings"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Development"</string>
+    <string name="development_settings_title" msgid="215179176067683667">"Developer options"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"Set options for application development"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB debugging"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Debug mode when USB is connected"</string>
@@ -1091,14 +1142,14 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Accessibility"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Accessibility settings"</string>
     <string name="accessibility_settings_summary" msgid="8185181964847149507">"Manage accessibility options"</string>
-    <string name="toggle_accessibility_title" msgid="650839277066574497">"Accessibility"</string>
+    <string name="toggle_large_text_title" msgid="42259643359869436">"Large text"</string>
     <string name="accessibility_services_category" msgid="8127851026323672607">"Accessibility services"</string>
+    <string name="toggle_accessibility_title" msgid="7338739354952553958">"Allow accessibility services"</string>
     <string name="no_accessibility_services_summary" msgid="694578333333808159">"No installed accessibility services."</string>
     <string name="accessibility_service_security_warning" msgid="4066258132331302670">"This accessibility service may be able to collect all the text that you type, including personal data credit card numbers except passwords. It may also log your user interface interactions. It comes from the application <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Use this accessibility service?"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Disable accessibility?"</string>
     <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"No accessibility-related applications found"</string>
     <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"You do not have any accessibility-related applications installed."\n\n"You can download a screen reader for your device from Android Market."\n\n"Click OK to install the screen reader."</string>
-    <string name="accessibility_script_injection_category" msgid="8649951751131431904">"Accessibility scripts"</string>
     <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"Download accessibility scripts"</string>
     <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"Allow applications to download accessibility scripts from Google"</string>
     <string name="accessibility_script_injection_security_warning" product="tablet" msgid="1113600871264359828">"Some applications can ask Google to download scripts to your tablet that make their content more accessible. Are you sure that you want to allow Google to install accessibility scripts on your tablet?"</string>
@@ -1106,10 +1157,11 @@
     <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>
-    <string name="power_usage_summary_title" msgid="5180282911164282324">"Battery use"</string>
+    <string name="power_usage_summary_title" msgid="7190304207330319919">"Battery"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"What has been using the battery"</string>
     <string name="power_usage_not_available" msgid="3583407442633768046">"Battery usage data not available"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Battery use since unplugged"</string>
@@ -1218,6 +1270,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>
@@ -1228,114 +1282,33 @@
     <string name="gadget_title" msgid="7455548605888590466">"Power Control"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Updating WiFi setting"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Updating Bluetooth setting"</string>
-    <string name="vpn_settings_activity_title" msgid="7276864950701612579">"VPN settings"</string>
-    <string name="vpn_connect_to" msgid="2541409082892684362">"Connect to <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpn_username_colon" msgid="7854930370861306247">"Username:"</string>
-    <string name="vpn_password_colon" msgid="5716278710848606626">"Password:"</string>
-    <string name="vpn_a_username" msgid="6664733641993968692">"a username"</string>
-    <string name="vpn_a_password" msgid="1537213632501483753">"a password"</string>
-    <string name="vpn_save_username" msgid="1408415289165970790">"Remember username"</string>
-    <string name="vpn_connect_button" msgid="1699007212602470655">"Connect"</string>
-    <string name="vpn_yes_button" msgid="8034531001149843119">"Yes"</string>
-    <string name="vpn_no_button" msgid="7620339571187119107">"No"</string>
-    <string name="vpn_back_button" msgid="192036339792734970">"Back"</string>
-    <string name="vpn_mistake_button" msgid="1683383660912491270">"No"</string>
-    <string name="vpn_menu_done" msgid="93528279226907926">"Save"</string>
-    <string name="vpn_menu_cancel" msgid="7234451214611202868">"Cancel"</string>
-    <string name="vpn_menu_revert" msgid="4407762442281467659">"Revert"</string>
-    <string name="vpn_menu_connect" msgid="1089399414463784218">"Connect to network"</string>
-    <string name="vpn_menu_disconnect" msgid="8254492450022562235">"Disconnect from network"</string>
-    <string name="vpn_menu_edit" msgid="4526245173583195618">"Edit network"</string>
-    <string name="vpn_menu_delete" msgid="3326527392609513129">"Delete network"</string>
-    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"You must enter <xliff:g id="CODE">%s</xliff:g>."</string>
-    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"You must select <xliff:g id="OPTION">%s</xliff:g>."</string>
-    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"<xliff:g id="NAME">%s</xliff:g>the VPN  \'NAME\' already exists. Find another name."</string>
-    <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"Are you sure that you want to delete this VPN?"</string>
-    <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"Are you sure that you don\'t want to create this profile?"</string>
-    <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"Are you sure that you want to discard the changes made to this profile?"</string>
-    <string name="vpn_confirm_reconnect" msgid="5748535476278674296">"Unable to connect to the network. Do you want to try again?"</string>
-    <string name="vpn_reconnect_from_lost" msgid="2442844155623372118">"Connection lost. Do you want to connect again?"</string>
-    <string name="vpn_unknown_server_dialog_msg" msgid="3080742299823671319">"Server name cannot be resolved. Do you want to check your server name setting?"</string>
-    <string name="vpn_challenge_error_dialog_msg" msgid="6174901754230038601">"Challenge error. Do you want to check your secret setting?"</string>
-    <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"One or more secrets are missing in this VPN configuration. Do you want to check your secret setting?"</string>
-    <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"The username or password that you entered is incorrect. Do you want to try again?"</string>
-    <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"Server hung up. The username or password that you entered could be incorrect. Do you want to try again?"</string>
-    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"Server hung up. It is possible that you are behind a firewall that prevents you from connecting to the server. Do you want to try again?"</string>
-    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"Server negotiation failed. The server may not agree with your encryption option. Do you want to check your encryption setting?"</string>
-    <string name="vpn_type_title" msgid="6392933604218676224">"Add VPN"</string>
-    <string name="vpn_add_new_vpn" msgid="5438260689052714550">"Add VPN"</string>
-    <string name="vpn_details_title" msgid="418806440938510331">"VPN details"</string>
-    <string name="vpn_edit_title_add" msgid="2121313217989682890">"<xliff:g id="NAME">%s</xliff:g>Add VPN"</string>
-    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"<xliff:g id="NAME">%s</xliff:g> details"</string>
-    <string name="vpns" msgid="3148141862835492816">"VPNs"</string>
-    <string name="vpn_connecting" msgid="8039521381692090116">"Connecting..."</string>
-    <string name="vpn_disconnecting" msgid="7748050200708257066">"Disconnecting..."</string>
-    <string name="vpn_connected" msgid="7641723116362845781">"Connected"</string>
-    <string name="vpn_connect_hint" msgid="7442898962925875181">"Connect to network"</string>
-    <string name="vpn_name" msgid="1550918148476193076">"VPN name"</string>
-    <string name="vpn_a_name" msgid="8445736942405283509">"a VPN name"</string>
-    <string name="vpn_profile_added" msgid="9061017910337129840">"\'<xliff:g id="NAME">%s</xliff:g>\' is added"</string>
-    <string name="vpn_profile_replaced" msgid="587435576816273815">"Changes are made to \'<xliff:g id="NAME">%s</xliff:g>\'"</string>
-    <string name="vpn_user_certificate_title" msgid="6812545893924071742">"Set user certificate"</string>
-    <string name="vpn_user_certificate" msgid="949322691686938888">"User certificate"</string>
-    <string name="vpn_a_user_certificate" msgid="8943983437956898649">"a user certificate"</string>
-    <string name="vpn_ca_certificate_title" msgid="7846466160795589985">"Set CA certificate"</string>
-    <string name="vpn_ca_certificate" msgid="465085144064264742">"Certificate authority (CA) certificate"</string>
-    <string name="vpn_a_ca_certificate" msgid="3374242520974884295">"a CA certificate"</string>
-    <string name="vpn_l2tp_secret_string_title" msgid="5039677186748940987">"Set L2TP secret"</string>
-    <string name="vpn_l2tp_secret" msgid="529359749677142076">"L2TP secret"</string>
-    <string name="vpn_a_l2tp_secret" msgid="6612042930810981845">"an L2TP secret"</string>
-    <string name="vpn_pptp_encryption_title" msgid="2236795167467896499">"encryption"</string>
-    <string name="vpn_pptp_encryption" msgid="2602329949737259686">"PPTP encryption"</string>
-    <string name="vpn_ipsec_presharedkey_title" msgid="2184060087690539175">"Set IPSec preshared key"</string>
-    <string name="vpn_ipsec_presharedkey" msgid="5434316521616673741">"IPSec preshared key"</string>
-    <string name="vpn_a_ipsec_presharedkey" msgid="1255301923217898418">"an IPSec preshared key"</string>
-    <string name="vpn_vpn_server_title" msgid="8897005887420358913">"Set VPN server"</string>
-    <string name="vpn_vpn_server" msgid="1141754908824209260">"VPN server"</string>
-    <string name="vpn_a_vpn_server" msgid="5960906152125045853">"a VPN server"</string>
-    <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"VPN server name"</string>
-    <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"DNS search domains"</string>
-    <string name="vpn_dns_search_list" msgid="4230034234026605360">"DNS search domains"</string>
-    <string name="vpn_field_is_set" msgid="7137320847812992243">"<xliff:g id="VALUE">%s</xliff:g> is set"</string>
-    <string name="vpn_field_not_set" msgid="2972519243515893804">"<xliff:g id="VALUE">%s</xliff:g> not set"</string>
-    <string name="vpn_field_not_set_optional" msgid="8840557698252556791">"<xliff:g id="VALUE">%s</xliff:g> not set (optional)"</string>
-    <string name="vpn_enable_field" msgid="3700967675854517191">"Enable <xliff:g id="OPTION">%s</xliff:g>"</string>
-    <string name="vpn_disable_field" msgid="6905658811179634005">"Disable <xliff:g id="OPTION">%s</xliff:g>"</string>
-    <string name="vpn_is_enabled" msgid="1266304230417098877">"<xliff:g id="OPTION">%s</xliff:g> is enabled"</string>
-    <string name="vpn_is_disabled" msgid="2013622485867806167">"<xliff:g id="OPTION">%s</xliff:g> is disabled"</string>
     <string name="vpn_settings_title" msgid="7327468307909556719">"VPN settings"</string>
     <string name="vpn_settings_summary" msgid="8849924181594963972">"Set up &amp; manage Virtual Private Networks (VPNs)"</string>
-    <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="trusted_credentials" msgid="4266945289534242402">"Trusted credentials"</string>
+    <string name="trusted_credentials_summary" msgid="6735221351155686632">"Display trusted CA 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>
-    <string name="privacy_settings_title" msgid="1987089301293213705">"Privacy settings"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"Backup &amp; reset"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"Backup &amp; reset"</string>
     <string name="backup_section_title" msgid="8856083167469467588">"Back up and restore"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"personal data"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Back up my data"</string>
@@ -1439,4 +1412,107 @@
     <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>
+    <!-- no translation found for debug_ui_category (9023948280291055349) -->
+    <skip />
+    <!-- no translation found for strict_mode (1938795874357830695) -->
+    <skip />
+    <!-- no translation found for strict_mode_summary (142834318897332338) -->
+    <skip />
+    <!-- no translation found for pointer_location (6084434787496938001) -->
+    <skip />
+    <!-- no translation found for pointer_location_summary (840819275172753713) -->
+    <skip />
+    <!-- no translation found for show_screen_updates (8282711794220426931) -->
+    <skip />
+    <!-- no translation found for show_screen_updates_summary (1716122382094924596) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage (2389212910758076024) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage_summary (2113341923988958266) -->
+    <skip />
+    <!-- no translation found for window_animation_scale_title (6162587588166114700) -->
+    <skip />
+    <!-- no translation found for transition_animation_scale_title (387527540523595875) -->
+    <skip />
+    <!-- no translation found for debug_applications_category (6221644998451283813) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities (3622005081180597749) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities_summary (3592221124808773368) -->
+    <skip />
+    <!-- no translation found for app_process_limit_title (4121324758038197598) -->
+    <skip />
+    <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="8821760330497941117">"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="2441219164620753329">"Reenable data"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="32">"<xliff:g id="NUMBER">%1$s</xliff:g>"</font>" "<font size="12">"<xliff:g id="UNIT">%2$s</xliff:g>"</font>\n<font size="12">"warning"</font></string>
+    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Emergency call"</string>
+    <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Return to call"</string>
+    <string name="vpn_name" msgid="4689699885361002297">"Name"</string>
+    <string name="vpn_type" msgid="5435733139514388070">"Type"</string>
+    <string name="vpn_server" msgid="2123096727287421913">"Server address"</string>
+    <string name="vpn_mppe" msgid="6639001940500288972">"PPP encryption (MPPE)"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"L2TP secret"</string>
+    <string name="vpn_ipsec_identifier" msgid="4098175859460006296">"IPSec identifier"</string>
+    <string name="vpn_ipsec_secret" msgid="4526453255704888704">"IPSec preshared key"</string>
+    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"IPSec user certificate"</string>
+    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec CA certificate"</string>
+    <!-- no translation found for vpn_search_domains (5391995501541199624) -->
+    <skip />
+    <!-- no translation found for vpn_routes (8556236801755260073) -->
+    <skip />
+    <string name="vpn_username" msgid="1863901629860867849">"Username"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Password"</string>
+    <!-- no translation found for vpn_save_login (6350322456427484881) -->
+    <skip />
+    <!-- no translation found for vpn_not_used (9094191054524660891) -->
+    <skip />
+    <string name="vpn_no_ca_cert" msgid="7820884983947090538">"(do not verify server)"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"Cancel"</string>
+    <string name="vpn_save" msgid="4233484051644764510">"Save"</string>
+    <string name="vpn_connect" msgid="8469608541746132301">"Connect"</string>
+    <string name="vpn_edit" msgid="1111459297288136079">"Edit VPN network"</string>
+    <string name="vpn_connect_to" msgid="7328758950427515753">"Connect to <xliff:g id="NETWORK">%s</xliff:g>"</string>
+    <string name="vpn_title" msgid="7982620762043790565">"VPN settings"</string>
+    <string name="vpn_create" msgid="8966010925994175306">"Add VPN network"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"Edit network"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"Delete network"</string>
+    <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"System"</string>
+    <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"User"</string>
+    <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Disable"</string>
+    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Enable"</string>
+    <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Remove"</string>
+    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Enable the system CA certificate?"</string>
+    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Disable the system CA certificate?"</string>
+    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Permanently remove the user CA certificate?"</string>
 </resources>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index 3a662b0..ed6ed5e 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>
@@ -214,4 +240,36 @@
     <item msgid="3878793616631049349">"Usar comprobación HDCP para contenido DRM solamente"</item>
     <item msgid="45075631231212732">"Siempre utilizar comprobación HDCP"</item>
   </string-array>
+    <!-- no translation found for window_animation_scale_entries:0 (8134156599370824081) -->
+    <!-- no translation found for window_animation_scale_entries:1 (6624864048416710414) -->
+    <!-- no translation found for window_animation_scale_entries:2 (2219332261255416635) -->
+    <!-- no translation found for window_animation_scale_entries:3 (3544428804137048509) -->
+    <!-- no translation found for window_animation_scale_entries:4 (3110710404225974514) -->
+    <!-- no translation found for window_animation_scale_entries:5 (4402738611528318731) -->
+    <!-- no translation found for window_animation_scale_entries:6 (6189539267968330656) -->
+    <!-- no translation found for transition_animation_scale_entries:0 (8464255836173039442) -->
+    <!-- no translation found for transition_animation_scale_entries:1 (3375781541913316411) -->
+    <!-- no translation found for transition_animation_scale_entries:2 (1991041427801869945) -->
+    <!-- no translation found for transition_animation_scale_entries:3 (4012689927622382874) -->
+    <!-- no translation found for transition_animation_scale_entries:4 (3289156759925947169) -->
+    <!-- no translation found for transition_animation_scale_entries:5 (7705857441213621835) -->
+    <!-- no translation found for transition_animation_scale_entries:6 (6660750935954853365) -->
+    <!-- no translation found for app_process_limit_entries:0 (6799596560242275471) -->
+    <!-- no translation found for app_process_limit_entries:1 (2412794376818632575) -->
+    <!-- no translation found for app_process_limit_entries:2 (1578904888612645001) -->
+    <!-- no translation found for app_process_limit_entries:3 (8819235336299873577) -->
+  <string-array name="vpn_types_long">
+    <item msgid="2732002039459078847">"VPN PPTP"</item>
+    <item msgid="3799752201662127867">"Claves precompartidas de VPN L2TP/IPSec"</item>
+    <item msgid="4725504331295252103">"VPN L2TP/IPSec con certificados"</item>
+    <item msgid="7526551163264034377">"VPN IPSec con claves precompartidas y autenticación Xauth"</item>
+    <item msgid="8064740940687465039">"VPN IPSec con certificados y autenticación Xauth"</item>
+    <item msgid="4946199982372391490">"VPN IPSec con certificados y autenticación híbrida"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:0 (8621078286418985762) -->
+    <!-- no translation found for vpn_states:1 (6692305604213080515) -->
+    <!-- no translation found for vpn_states:2 (8001704909356800092) -->
+    <!-- no translation found for vpn_states:3 (4039737283841672166) -->
+    <!-- no translation found for vpn_states:4 (4042143101664725090) -->
+    <!-- no translation found for vpn_states:5 (2690164254699635531) -->
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index ddfe78d..30cdce8 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -19,6 +19,10 @@
     <string name="yes" msgid="4676390750360727396">"Sí"</string>
     <string name="no" msgid="6731231425810196216">"No"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Desconocido"</string>
+    <string name="header_category_wireless_networks" msgid="4944823405420438623">"CONEXIONES INALÁMBRICAS Y REDES"</string>
+    <string name="header_category_device" msgid="5781174212691167553">"DISPOSITIVO"</string>
+    <string name="header_category_personal" msgid="6225932173498802187">"PERSONAL"</string>
+    <string name="header_category_system" msgid="2073558547468647128">"SISTEMA"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Encender la radio"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Apagar la radio"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Ver libreta de direcciones de SIM"</string>
@@ -111,7 +115,11 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Vinculando..."</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"Vinculado pero no conectado"</string>
     <string name="bluetooth_device" msgid="6873461446424952003">"manos libres/auriculares"</string>
-    <string name="progress_scanning" msgid="3760897655335759141">"Explorando"</string>
+    <!-- outdated translation 3760897655335759141 -->     <string name="progress_scanning" msgid="192587958424295789">"Explorando"</string>
+    <!-- no translation found for progress_tap_to_pair (4192342336107106334) -->
+    <skip />
+    <!-- no translation found for bluetooth_no_devices_found (2412462335116297668) -->
+    <skip />
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Solicitud de vinculación de Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Vinculando solicitud"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Seleccionar para vincularse con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
@@ -130,6 +138,9 @@
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Una aplicación de tu teléfono solicita permiso para activar Bluetooth y hacer que tu teléfono pueda ser detectable por otros dispositivos. ¿Deseas hacer esto?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Activando Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Conectar automáticamente"</string>
+    <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Solicitud para establecer conexión de Bluetooth"</string>
+    <string name="bluetooth_connection_notif_message" msgid="1833221950512058309">"Toca para conectarte a \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
+    <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"¿Deseas conectarte a “<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Configuración de fecha y hora"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00 p. m."</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
@@ -235,7 +246,7 @@
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Desactivar todas las conexiones inalámbricas"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"Desactivando conexiones inalámbricas…"</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"Activando conexiones inalámbricas…"</string>
-    <string name="radio_controls_title" msgid="5868688473587168882">"Conexiones inalámbricas y redes"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Más..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Redes inalámbricas y redes"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"Administrar Wi-Fi, Bluetooth, modo de avión, redes, móviles, &amp; VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming de datos"</string>
@@ -271,8 +282,8 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Datos propietario"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="2382525043173672857">"Ingresa el texto para la pantalla de bloqueo."</string>
-    <string name="security_settings_title" msgid="5168491784222013179">"Ubicación y seguridad"</string>
-    <string name="location_security_settings_title" msgid="4624434296446625554">"Configuración de ubicación y seguridad"</string>
+    <string name="location_settings_title" msgid="8935806698251432196">"Servicios de ubicación"</string>
+    <string name="security_settings_title" msgid="7945465324818485460">"Seguridad"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Establecer Mi ubicación, desbloqueo de pantalla, bloqueo de la tarjeta SIM, bloqueo de almacenamiento de la credencial"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Establecer Mi ubicación, desbloqueo de pantalla, bloqueo de almacenamiento de credencial"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Contraseñas"</string>
@@ -316,7 +327,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>
@@ -375,8 +386,8 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Ver o desactivar los administradores de dispositivo"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Activar Bluetooth"</string>
-    <string name="bluetooth_settings" msgid="2725796451253089609">"Config. de Bluetooth"</string>
-    <string name="bluetooth_settings_title" msgid="2824020086246268296">"Config. de Bluetooth"</string>
+    <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
+    <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Administrar conexiones, establecer nombre y detección del dispositivo"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Solicitud de vinculación de Bluetooth"</string>
     <string name="bluetooth_enter_pin_msg" msgid="1499285355129256289">\n"Ingresa el PIN para vincularlo con \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". (Intenta con 0000 ó 1234). Es posible que debas ingresar el mismo PIN en el dispositivo Bluetooth."</string>
@@ -394,7 +405,10 @@
     <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Vínculo rechazado por <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"Se ha producido un problema al conectarse con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Buscar dispositivos"</string>
-    <string name="bluetooth_preference_find_nearby_title" msgid="5087410003465463318">"Buscar dispositivos cercanos"</string>
+    <!-- no translation found for bluetooth_search_for_devices (5957007154213560390) -->
+    <skip />
+    <!-- no translation found for bluetooth_searching_for_devices (9203739709307871727) -->
+    <skip />
     <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"Configuración de dispositivos"</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Dispositivos vinculados"</string>
     <string name="bluetooth_preference_found_devices" msgid="3133019331974936204">"Dispositivos encontrados"</string>
@@ -404,6 +418,10 @@
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Desvincular"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Desconectar y desvincular"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Opciones…"</string>
+    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Avanzado"</string>
+    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth avanzado"</string>
+    <string name="bluetooth_advanced_settings_label" msgid="8659717781212434173">"Bluetooth avanzado"</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="3631028334811113629">"Activar Bluetooth para ver los dispositivos disponibles"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Conectar a..."</string>
     <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"Medios"</string>
     <string name="bluetooth_profile_headset" msgid="81844079120986198">"Manos libres"</string>
@@ -445,27 +463,31 @@
     <string name="nfc_toggle_error" msgid="2233172102497535522">"Se produjo un error."</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Activar Wi-Fi"</string>
-    <string name="wifi_settings" msgid="4746946030627213196">"Configuración Wi-Fi"</string>
+    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="2810363951104753710">"Configuración Wi-Fi"</string>
+    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Configurar y administrar los puntos de acceso de teléfonos inalámbricos"</string>
-    <string name="wifi_starting" msgid="6710266609710860129">"Activando..."</string>
-    <string name="wifi_stopping" msgid="5952909472548218348">"Desactivando..."</string>
+    <string name="wifi_starting" msgid="7732330327758522943">"Encendiendo Wi-Fi..."</string>
+    <string name="wifi_stopping" msgid="244864762599017659">"Apagando Wi-Fi..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"Error"</string>
     <string name="wifi_in_airplane_mode" msgid="7618393787965366655">"En modo de avión"</string>
     <string name="wifi_fail_to_scan" msgid="6194542252808587669">"No se han podido buscar redes"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Notificación de red"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Notificarme cuando se encuentre disponible una red abierta"</string>
+    <string name="wifi_enable_watchdog_service" msgid="4723544454066601706">"Comprobaciones de conectividad Wi-Fi"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="8687400936839455926">"Detectar y tratar los posibles problemas de conectividad de red"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Política de desconexión de Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Especificar cuándo se debe cambiar de Wi-Fi a datos de celular"</string>
     <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" msgid="6234851776910938957">"Agregar red"</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>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Conectar a la red"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Olvidar red"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modificar la red"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="3682507011071029311">"Encender Wi-Fi para ver las redes disponibles"</string>
     <string name="wifi_network_setup" msgid="7974851890019344870">"Configuración de red"</string>
     <string name="wifi_wps_pin" msgid="5471842298708321115">"Ingresar pin de punto de acceso"</string>
     <string name="wifi_wps_setup_title" msgid="150518971269252336">"Configuración de WPS"</string>
@@ -501,13 +523,13 @@
     <string name="wifi_save" msgid="3331121567988522826">"Guardar"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Cancelar"</string>
     <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"Se detectó otra sesión WPS, vuelve a intentarlo en unos minutos"</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Avanzado"</string>
+    <!-- outdated translation 5419052271935350999 -->     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Avanzado"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Banda de frecuencia Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Especificar el rango de frecuencia de la operación"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Problema al configurar la banda de frecuencias."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Dirección MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Dirección IP"</string>
-    <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"Configuración de IP"</string>
+    <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Configuración de IP"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Guardar"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Cancelar"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Escribe una dirección IP válida."</string>
@@ -525,7 +547,7 @@
     <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">" Zona activa Wi-Fi portátil <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Android Hotspot"</string>
     <string name="sound_settings_title" msgid="8735891486683305886">"Sonido"</string>
-    <string name="display_settings_title" msgid="2378894265964357591">"Pantalla"</string>
+    <string name="display_settings_title" msgid="1708697328627382561">"Pantalla"</string>
     <string name="sound_settings" msgid="5007659014828162881">"Configuración de sonido"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Modo silencioso"</string>
     <string name="silent_mode_summary" msgid="3309650676072917899">"Silenciar todos los sonidos excepto los medios y las alarmas."</string>
@@ -598,7 +620,18 @@
     <string name="brightness_summary" msgid="838917350127550703">"Ajustar el brillo de la pantalla"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Tiempo de espera"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"La pantalla se apaga automáticamente después de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Fondo de pantalla"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Sueños Android"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Protectores de pantalla y otras diversiones en estado inactivo"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Sueño seleccionado"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Cuándo activar"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"Después de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> en estado inactivo"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Nunca"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Prueba esta opción."</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brillo automático"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Tamaño de fuente"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Tamaño total de la fuente"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Seleccionar tamaño de fuente"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Configuración de bloqueo de la tarjeta SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Conf. bloqueo de tarj. SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Bloqueo de la tarjeta SIM"</string>
@@ -643,8 +676,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>
@@ -696,6 +730,16 @@
     <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"Se desactivará la tarjeta SD."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Desmontando"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Desmontaje en progreso"</string>
+    <!-- no translation found for storage_menu_usb (1580545228584324704) -->
+    <skip />
+    <!-- no translation found for storage_title_usb (5775322159427546546) -->
+    <skip />
+    <!-- no translation found for usb_label_mtp (4157227401755543412) -->
+    <skip />
+    <!-- no translation found for usb_label_ptp (7417254019489575819) -->
+    <skip />
+    <!-- no translation found for usb_label_installer_cd (7438467574756086977) -->
+    <skip />
     <string name="battery_status_title" msgid="9159414319574976203">"Estado de batería"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Nivel de la batería"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -735,8 +779,8 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Restabl. datos de fábrica"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Borra todos los datos del tablet"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Borra todos los datos del teléfono"</string>
-    <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"Esto borrará todos los datos del "<b>"almacenamiento interno"</b>" de tu tablet, incluidos "\n\n<li>"Tu cuenta de Google"</li>\n<li>"Datos del sistema y aplicaciones y configuración"</li>\n<li>"Aplicaciones descargadas"</li></string>
-    <string name="master_clear_desc" product="default" msgid="3251400937758241249">"Esto borrará todos los datos del "<b>"almacenamiento interno"</b>" del teléfono, incluidos "\n\n<li>"Tu cuenta de Google"</li>\n<li>"Datos del sistema y aplicaciones y configuración"</li>\n<li>"Aplicaciones descargadas"</li></string>
+    <string name="master_clear_desc" product="tablet" msgid="590799767511283567">"Esto borrará todos los datos del "<b>"almacenamiento interno"</b>" de tu tablet, incluidos "\n\n<li>"Tu Cuenta de Google"</li>\n<li>"Datos del sistema y aplicaciones y configuración"</li>\n<li>"Aplicaciones descargadas"</li></string>
+    <string name="master_clear_desc" product="default" msgid="3251400937758241249">"Esto borrará todos los datos del "<b>"almacenamiento interno"</b>" del teléfono, incluidos "\n\n<li>"Tu Cuenta de Google"</li>\n<li>"Datos del sistema y aplicaciones y configuración"</li>\n<li>"Aplicaciones descargadas"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Actualmente has accedido a las siguientes cuentas:"\n</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Música"</li>\n<li>"Fotos"</li>\n<li>"Otros datos de usuario"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="4740866328425123395">\n\n"Para borrar la música, las imágenes y otros datos del usuario, debes borrar el "<b>"almacenamiento USB"</b>"."</string>
@@ -806,6 +850,8 @@
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"No se puede realizar el anclaje a red con más de <xliff:g id="MAXCONNECTION">%1$d</xliff:g> dispositivos"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ya no se anclará a red."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ayuda"</string>
+    <string name="wireless_category_general" msgid="2973810407987118067">"General"</string>
+    <string name="wireless_category_mobile_networks" msgid="1254629216798424288">"Redes para celulares"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Redes de celulares"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Establecer opciones para roaming, redes, APN"</string>
     <string name="location_title" msgid="1029961368397484576">"Mi ubicación"</string>
@@ -883,7 +929,7 @@
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Protección de tu tablet"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Protección de tu teléfono"</string>
     <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"Protege tu tableta del uso no autorizado creando un gráfico de desbloqueo de pantalla personal. Usa el dedo para unir los puntos en cualquier orden en la pantalla. Debes unir al menos cuatro puntos."\n\n"¿Listo para comenzar? Toca “Siguiente”."</string>
-    <string name="lock_intro_message" product="default" msgid="9100785646737118042"><font size="17">"Protege a tu teléfono de usos no autorizados al crear un patrón de desbloqueo en la pantalla personal. "\n<font height="17">\n</font><b>"1"</b>"  En la pantalla siguiente, observa cómo se extrae un patrón de ejemplo. "\n<font height="17">\n</font><b>"2"</b>"  Cuando estés listo, extrae tu propio patrón de desbloqueo personal. Experimenta con diferentes patrones pero conecta al menos cuatro puntos. "\n<font height="17">\n</font><b>"3"</b>"  Revisa tu patrón para confirmar. "\n<font height="17">\n</font><b>"¿Estás listo para comenzar? Toca \"Siguiente\""</b>". "\n<font height="3">\n</font>"Si deseas dejar sin protección a tu teléfono, toca \"Cancelar\"."</font></string>
+    <!-- outdated translation 3692151094288835065 -->     <string name="lock_intro_message" product="default" msgid="5796785892741212873">"Protege tu tableta del uso no autorizado creando un gráfico de desbloqueo de pantalla personal. Usa el dedo para unir los puntos en cualquier orden en la pantalla. Debes unir al menos cuatro puntos."\n\n"¿Listo para comenzar? Toca “Siguiente”."</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Administrar aplicaciones"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Administrar y eliminar aplicaciones instaladas"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Aplicaciones"</string>
@@ -893,6 +939,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>
@@ -905,9 +953,10 @@
     <string name="force_stop" msgid="7435006169872876756">"Forzar la detención"</string>
     <string name="total_size_label" msgid="1048676419552557254">"Total"</string>
     <string name="application_size_label" msgid="5055196275624686382">"Aplicación"</string>
+    <string name="external_code_size_label" msgid="3459343140355961335">"Aplicación en el almacenamiento USB"</string>
     <string name="data_size_label" msgid="8679376373625710107">"Datos"</string>
-    <string name="external_size_label" product="nosdcard" msgid="4465530017830945766">"Almacenamiento USB"</string>
-    <string name="external_size_label" product="default" msgid="2107155737635944440">"Tarjeta SD"</string>
+    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Datos en el almacenamiento USB"</string>
+    <string name="external_data_size_label" product="default" msgid="626414192825329708">"Tarjeta SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Desinstalar..."</string>
     <string name="disable_text" msgid="6544054052049395202">"Inhabilitar"</string>
     <string name="enable_text" msgid="9217362512327828987">"Habilitar"</string>
@@ -1026,7 +1075,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 +1085,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>
@@ -1066,7 +1117,7 @@
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Configuración del teclado en pantalla"</string>
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Teclado físico"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Configuración de teclado físico"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Desarrollo"</string>
+    <string name="development_settings_title" msgid="215179176067683667">"Opciones del desarrollador"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"Establecer opciones para desarrollar aplicaciones"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Depuración de USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Modo de depuración cuando se conecta el USB"</string>
@@ -1091,14 +1142,14 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Accesibilidad"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Configuración de accesibilidad"</string>
     <string name="accessibility_settings_summary" msgid="8185181964847149507">"Administrar opciones de accesibilidad"</string>
-    <string name="toggle_accessibility_title" msgid="650839277066574497">"Accesibilidad"</string>
+    <string name="toggle_large_text_title" msgid="42259643359869436">"Texto grande"</string>
     <string name="accessibility_services_category" msgid="8127851026323672607">"Servicios de accesibilidad"</string>
+    <string name="toggle_accessibility_title" msgid="7338739354952553958">"Permitir servicios de accesibilidad"</string>
     <string name="no_accessibility_services_summary" msgid="694578333333808159">"No se han instalado servicios de accesibilidad"</string>
     <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Este servicio de accesibilidad podrá recopilar todo el texto que escribas, incluido los números de tarjeta de crédito de tus datos personales, excepto las contraseñas. También podrá registrar las interacciones de tu interfaz de usuario. Proviene de la aplicación <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. ¿Deseas utilizar este servicio de accesibilidad?"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"¿Deseas desactivar la accesibilidad?"</string>
     <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"No se encontraron aplicaciones relacionadas a la accesibilidad."</string>
     <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"No has instalado ninguna aplicación relacionada a la accesibilidad."\n\n"Puedes descargar un lector de pantalla para tu dispositivo desde la tienda Android."\n\n"Haz clic en Aceptar para instalar el lector de pantalla."</string>
-    <string name="accessibility_script_injection_category" msgid="8649951751131431904">"Scripts de accesibilidad"</string>
     <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"Descarga los scripts de accesibilidad"</string>
     <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"Permite que las aplicaciones descarguen scripts de accesibilidad desde Google."</string>
     <string name="accessibility_script_injection_security_warning" product="tablet" msgid="1113600871264359828">"Algunas aplicaciones pueden solicitar que Google descargue scripts a tu tablet para hacer más accesible su contenido. ¿Estás seguro de que quieres permitir que Google instale scripts de accesibilidad en tu tablet?"</string>
@@ -1106,10 +1157,11 @@
     <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>
-    <string name="power_usage_summary_title" msgid="5180282911164282324">"Uso de la batería"</string>
+    <string name="power_usage_summary_title" msgid="7190304207330319919">"Batería"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Lo que ha utilizado la batería"</string>
     <string name="power_usage_not_available" msgid="3583407442633768046">"No hay datos disponibles del uso de la batería"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Uso de la batería desde que se desconectó"</string>
@@ -1218,6 +1270,8 @@
     <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>
+    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Configuración del motor"</string>
+    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Configuración de <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
     <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>
@@ -1228,114 +1282,33 @@
     <string name="gadget_title" msgid="7455548605888590466">"Control de energía"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Actualizando configuración de Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Actualización de la configuración de Bluetooth"</string>
-    <string name="vpn_settings_activity_title" msgid="7276864950701612579">"Configuración de VPN"</string>
-    <string name="vpn_connect_to" msgid="2541409082892684362">"Conectar a <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpn_username_colon" msgid="7854930370861306247">"Nombre de usuario:"</string>
-    <string name="vpn_password_colon" msgid="5716278710848606626">"Contraseña:"</string>
-    <string name="vpn_a_username" msgid="6664733641993968692">"un nombre de usuario"</string>
-    <string name="vpn_a_password" msgid="1537213632501483753">"una contraseña"</string>
-    <string name="vpn_save_username" msgid="1408415289165970790">"Recordar nombre de usuario"</string>
-    <string name="vpn_connect_button" msgid="1699007212602470655">"Conectar"</string>
-    <string name="vpn_yes_button" msgid="8034531001149843119">"Sí"</string>
-    <string name="vpn_no_button" msgid="7620339571187119107">"No"</string>
-    <string name="vpn_back_button" msgid="192036339792734970">"Atrás"</string>
-    <string name="vpn_mistake_button" msgid="1683383660912491270">"No"</string>
-    <string name="vpn_menu_done" msgid="93528279226907926">"Guardar"</string>
-    <string name="vpn_menu_cancel" msgid="7234451214611202868">"Cancelar"</string>
-    <string name="vpn_menu_revert" msgid="4407762442281467659">"Revertir"</string>
-    <string name="vpn_menu_connect" msgid="1089399414463784218">"Conectar a la red"</string>
-    <string name="vpn_menu_disconnect" msgid="8254492450022562235">"Desconectar de la red"</string>
-    <string name="vpn_menu_edit" msgid="4526245173583195618">"Editar red"</string>
-    <string name="vpn_menu_delete" msgid="3326527392609513129">"Eliminar red"</string>
-    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"Debes ingresar <xliff:g id="CODE">%s</xliff:g>."</string>
-    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"Debes seleccionar <xliff:g id="OPTION">%s</xliff:g>."</string>
-    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"El nombre de la VPN \"<xliff:g id="NAME">%s</xliff:g>\" ya existe. Busca otro nombre."</string>
-    <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"¿Estás seguro de que deseas eliminar esta VPN?"</string>
-    <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"¿Estás seguro de que no deseas crear este perfil?"</string>
-    <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"¿Estás seguro de que deseas descartar los cambios realizados a este perfil?"</string>
-    <string name="vpn_confirm_reconnect" msgid="5748535476278674296">"No se puede conectar a la red. ¿Deseas volver a intentarlo?"</string>
-    <string name="vpn_reconnect_from_lost" msgid="2442844155623372118">"Conexión perdida. ¿Deseas volver a establecer la conexión?"</string>
-    <string name="vpn_unknown_server_dialog_msg" msgid="3080742299823671319">"El nombre del servidor no se ha podido resolver. ¿Deseas verificar la configuración del nombre el servidor?"</string>
-    <string name="vpn_challenge_error_dialog_msg" msgid="6174901754230038601">"Error de desafío. ¿Deseas verificar tu configuración de secretos?"</string>
-    <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"Faltan uno o más secretos en esta configuración de VPN. ¿Deseas verificar tu configuración de secretos?"</string>
-    <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"El nombre de usuario o la contraseña que has ingresado es incorrecto. ¿Deseas volver a intentarlo?"</string>
-    <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"Servidor en suspenso. El nombre de usuario o la contraseña que has ingresado pueden ser incorrectos. ¿Deseas volver a intentarlo?"</string>
-    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"Servidor en suspenso. Es posible que te encuentres detrás de un cortafuegos que te impide conectarte con el servidor. ¿Deseas volver a intentarlo?"</string>
-    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"Hubo un error en la negociación del servidor. Es posible que el servidor no acuerde con tu opción de encriptación. ¿Deseas revisar tu configuración de encriptación?"</string>
-    <string name="vpn_type_title" msgid="6392933604218676224">"Agregar VPN"</string>
-    <string name="vpn_add_new_vpn" msgid="5438260689052714550">"Agregar VPN"</string>
-    <string name="vpn_details_title" msgid="418806440938510331">"Detalles de VPN"</string>
-    <string name="vpn_edit_title_add" msgid="2121313217989682890">"Agregar <xliff:g id="NAME">%s</xliff:g> VPN"</string>
-    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"Detalles de <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpns" msgid="3148141862835492816">"VPN"</string>
-    <string name="vpn_connecting" msgid="8039521381692090116">"Conectando..."</string>
-    <string name="vpn_disconnecting" msgid="7748050200708257066">"Desconectando..."</string>
-    <string name="vpn_connected" msgid="7641723116362845781">"Conectado"</string>
-    <string name="vpn_connect_hint" msgid="7442898962925875181">"Conectar a la red"</string>
-    <string name="vpn_name" msgid="1550918148476193076">"Nombre de VPN"</string>
-    <string name="vpn_a_name" msgid="8445736942405283509">"un nombre de VPN"</string>
-    <string name="vpn_profile_added" msgid="9061017910337129840">"\"<xliff:g id="NAME">%s</xliff:g>\" se ha agregado"</string>
-    <string name="vpn_profile_replaced" msgid="587435576816273815">"Se han realizado cambios a \'<xliff:g id="NAME">%s</xliff:g>\'"</string>
-    <string name="vpn_user_certificate_title" msgid="6812545893924071742">"Establecer certificado de usuario"</string>
-    <string name="vpn_user_certificate" msgid="949322691686938888">"Certificado del usuario"</string>
-    <string name="vpn_a_user_certificate" msgid="8943983437956898649">"un certificado de usuario"</string>
-    <string name="vpn_ca_certificate_title" msgid="7846466160795589985">"Establecer certificado de CA"</string>
-    <string name="vpn_ca_certificate" msgid="465085144064264742">"Certificado de entidad emisora de certificados (CA)"</string>
-    <string name="vpn_a_ca_certificate" msgid="3374242520974884295">"un certificado de CA"</string>
-    <string name="vpn_l2tp_secret_string_title" msgid="5039677186748940987">"Establecer secreto de L2TP"</string>
-    <string name="vpn_l2tp_secret" msgid="529359749677142076">"Secreto de L2TP"</string>
-    <string name="vpn_a_l2tp_secret" msgid="6612042930810981845">"un secreto de L2TP"</string>
-    <string name="vpn_pptp_encryption_title" msgid="2236795167467896499">"encriptación"</string>
-    <string name="vpn_pptp_encryption" msgid="2602329949737259686">"Encriptación de PPTP"</string>
-    <string name="vpn_ipsec_presharedkey_title" msgid="2184060087690539175">"Establecer clave precompartida de IPSec"</string>
-    <string name="vpn_ipsec_presharedkey" msgid="5434316521616673741">"Clave precompartida de IPSec"</string>
-    <string name="vpn_a_ipsec_presharedkey" msgid="1255301923217898418">"una clave precompartida de IPSec"</string>
-    <string name="vpn_vpn_server_title" msgid="8897005887420358913">"Establ. servidor de VPN"</string>
-    <string name="vpn_vpn_server" msgid="1141754908824209260">"Servidor de VPN"</string>
-    <string name="vpn_a_vpn_server" msgid="5960906152125045853">"un servidor de VPN"</string>
-    <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"Nombre del servidor de VPN"</string>
-    <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"Dom. de búsqueda de DNS"</string>
-    <string name="vpn_dns_search_list" msgid="4230034234026605360">"Dominios de búsqueda de DNS"</string>
-    <string name="vpn_field_is_set" msgid="7137320847812992243">"<xliff:g id="VALUE">%s</xliff:g> se ha establecido"</string>
-    <string name="vpn_field_not_set" msgid="2972519243515893804">"<xliff:g id="VALUE">%s</xliff:g> no establecido"</string>
-    <string name="vpn_field_not_set_optional" msgid="8840557698252556791">"<xliff:g id="VALUE">%s</xliff:g> no establecido (opcional)"</string>
-    <string name="vpn_enable_field" msgid="3700967675854517191">"Activar<xliff:g id="OPTION">%s</xliff:g>"</string>
-    <string name="vpn_disable_field" msgid="6905658811179634005">"Desactivar <xliff:g id="OPTION">%s</xliff:g>"</string>
-    <string name="vpn_is_enabled" msgid="1266304230417098877">"<xliff:g id="OPTION">%s</xliff:g> está habilitado"</string>
-    <string name="vpn_is_disabled" msgid="2013622485867806167">"<xliff:g id="OPTION">%s</xliff:g> está inhabilitada"</string>
     <string name="vpn_settings_title" msgid="7327468307909556719">"Configuración de VPN"</string>
     <string name="vpn_settings_summary" msgid="8849924181594963972">"Establecer y administrar Redes privadas virtuales (VPN)"</string>
-    <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="trusted_credentials" msgid="4266945289534242402">"Credenciales de confianza"</string>
+    <string name="trusted_credentials_summary" msgid="6735221351155686632">"Mostrar certificados de CA de confianza"</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>
-    <string name="privacy_settings_title" msgid="1987089301293213705">"Configuración de privacidad"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"Hacer copia de seguridad &amp; restablecer"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"Hacer copia de seguridad &amp; restablecer"</string>
     <string name="backup_section_title" msgid="8856083167469467588">"Hacer una copia de seguridad y restaurar"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Datos personales"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Hacer una copia de seguridad de mis datos"</string>
@@ -1423,8 +1396,8 @@
     <string name="really_remove_account_title" msgid="6574643117748564960">"Eliminar cuenta"</string>
     <string name="really_remove_account_message" product="tablet" msgid="4448645571715719563">"¿Deseas eliminar realmente esta cuenta? Si la eliminas, se eliminarán también todos los mensajes, los contactos y otros datos de la tableta. "\n"¿Quieres continuar?"</string>
     <string name="really_remove_account_message" product="default" msgid="1005751790899989319">"¿Deseas eliminar realmente esta cuenta? Si la eliminas, se eliminarán también todos los mensajes, los contactos y otros datos del teléfono. "\n"¿Quieres continuar?"</string>
-    <string name="remove_account_failed" product="tablet" msgid="1093911989149396624">"Algunas aplicaciones requieren esta cuenta. Solo puedes suprimirla si restableces la configuración predeterminada de fábrica en la tableta (esta acción suprime todos tus datos personales). Puedes hacerlo en la aplicación Configuración, dentro de Privacidad."</string>
-    <string name="remove_account_failed" product="default" msgid="9174390193652391412">"Algunas aplicaciones requieren esta cuenta. Solo puedes suprimirla si restableces la configuración predeterminada de fábrica en el teléfono (la cual suprime todos tus datos personales). Puedes hacerlo en la aplicación Configuración, dentro de Privacidad."</string>
+    <string name="remove_account_failed" product="tablet" msgid="1093911989149396624">"Algunas aplicaciones requieren esta cuenta. Solo puedes suprimirla si restableces la configuración predeterminada de fábrica en la tableta (esta acción elimina todos tus datos personales). Puedes hacerlo en la aplicación Configuración, dentro de Privacidad."</string>
+    <string name="remove_account_failed" product="default" msgid="9174390193652391412">"Algunas aplicaciones requieren esta cuenta. Solo puedes suprimirla si restableces la configuración predeterminada de fábrica en el teléfono (la cual elimina todos tus datos personales). Puedes hacerlo en la aplicación Configuración, dentro de Privacidad."</string>
     <string name="provider_label" msgid="7724593781904508866">"Suscripciones de inserción"</string>
     <string name="sync_item_title" msgid="1931551540462877488">"Sincronización<xliff:g id="AUTHORITY">%s</xliff:g>"</string>
     <string name="cant_sync_dialog_title" msgid="7185199796123573317">"No se puede realizar la sincronización manual"</string>
@@ -1439,4 +1412,107 @@
     <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>
+    <!-- no translation found for debug_ui_category (9023948280291055349) -->
+    <skip />
+    <!-- no translation found for strict_mode (1938795874357830695) -->
+    <skip />
+    <!-- no translation found for strict_mode_summary (142834318897332338) -->
+    <skip />
+    <!-- no translation found for pointer_location (6084434787496938001) -->
+    <skip />
+    <!-- no translation found for pointer_location_summary (840819275172753713) -->
+    <skip />
+    <!-- no translation found for show_screen_updates (8282711794220426931) -->
+    <skip />
+    <!-- no translation found for show_screen_updates_summary (1716122382094924596) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage (2389212910758076024) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage_summary (2113341923988958266) -->
+    <skip />
+    <!-- no translation found for window_animation_scale_title (6162587588166114700) -->
+    <skip />
+    <!-- no translation found for transition_animation_scale_title (387527540523595875) -->
+    <skip />
+    <!-- no translation found for debug_applications_category (6221644998451283813) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities (3622005081180597749) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities_summary (3592221124808773368) -->
+    <skip />
+    <!-- no translation found for app_process_limit_title (4121324758038197598) -->
+    <skip />
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Uso de datos"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"Ciclo de uso de datos"</string>
+    <string name="data_usage_menu_split_4g" msgid="7417435609285381968">"Dividir el uso de 4 GB"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Mostrar el uso de Wi-Fi"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"Cambiar el ciclo..."</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Día del mes para restablecer el ciclo de uso de datos:"</string>
+    <string name="data_usage_disable_mobile_limit" msgid="289740911281022322">"Desactivar datos móviles en el límite"</string>
+    <string name="data_usage_disable_4g_limit" msgid="5808210773758699800">"Desactivar datos de 4 GB en el límite"</string>
+    <string name="data_usage_disable_3g_limit" msgid="3856971004328238231">"Desactivar datos de 2 GB - 3 GB en límite"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_mobile" msgid="454140350007299045">"Móvil"</string>
+    <string name="data_usage_tab_4g" msgid="1301978716067512235">"4 GB"</string>
+    <string name="data_usage_tab_3g" msgid="6092169523081538718">"2 GB - 3 GB"</string>
+    <string name="data_usage_enable_mobile" msgid="986782622560157977">"Datos móviles"</string>
+    <string name="data_usage_enable_3g" msgid="6304006671869578254">"Datos de 2 GB - 3 GB"</string>
+    <string name="data_usage_enable_4g" msgid="3635854097335036738">"Datos de 4 GB"</string>
+    <string name="data_usage_app_settings" msgid="3727561362090820369">"Ver configuración de la aplicación"</string>
+    <string name="data_usage_app_restrict_background" msgid="8856643905291165256">"Restringir uso de datos de referencia"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="1503361245973512092">"Solo permite datos de referencia de las aplicaciones cuando utilizas una red ilimitada"</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="8110736468987743260">"Restricción de datos de referencia"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="100001698378554777">"Esta característica puede afectar negativamente las aplicaciones que dependen del uso de datos de referencia."\n" "\n"Pueden encontrarse controles de uso de datos más apropiados dentro de la configuración de esta aplicación."</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Fecha de restablecimiento del ciclo de uso"</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Fecha de cada mes:"</string>
+    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Configurar"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Limitar el uso de datos"</string>
+    <string name="data_usage_limit_dialog_mobile" msgid="7931094451923591578">"Cuando se alcance el límite especificado, se desactivará tu conexión de datos móviles."\n\n"Para evitar cargos excedentes, considera utilizar un límite reducido, ya que los métodos de contabilidad del dispositivo y del operador pueden variar."</string>
+    <string name="data_usage_limit_dialog_3g" msgid="5478553071420316963">"Cuando se alcance el límite especificado, se desactivará tu conexión de datos de 2 GB - 3 GB."\n\n"Para evitar cargos excedentes, considera utilizar un límite reducido, ya que los métodos de contabilidad del dispositivo y del operador pueden variar."</string>
+    <string name="data_usage_limit_dialog_4g" msgid="6134008906742403777">"Cuando se alcance el límite especificado, se desactivará tu conexión de datos de 4 GB."\n\n"Para evitar cargos excedentes, considera utilizar un límite reducido, ya que los métodos de contabilidad del dispositivo y del operador pueden variar."</string>
+    <string name="data_usage_disabled_dialog_3g_title" msgid="4221584306492812040">"Datos de 2 GB - 3 GB desactivados"</string>
+    <string name="data_usage_disabled_dialog_4g_title" msgid="715585612162185936">"Datos de 4 GB desactivados"</string>
+    <string name="data_usage_disabled_dialog_mobile_title" msgid="209516216265000221">"Datos móviles desactivados"</string>
+    <string name="data_usage_disabled_dialog" msgid="2874031671067845964">"Se ha alcanzado el límite de uso de datos especificado."\n\n"El uso de datos adicionales pueden conllevar cargos para el operador."</string>
+    <string name="data_usage_disabled_dialog_enable" msgid="2441219164620753329">"Volver a habilitar datos"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="32">"<xliff:g id="NUMBER">%1$s</xliff:g>"</font><font size="12">"<xliff:g id="UNIT">%2$s</xliff:g>"</font>\n<font size="12">"advertencia"</font></string>
+    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Llamada de emergencia"</string>
+    <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Regresar a llamada"</string>
+    <string name="vpn_name" msgid="4689699885361002297">"Nombre"</string>
+    <string name="vpn_type" msgid="5435733139514388070">"Tipo"</string>
+    <string name="vpn_server" msgid="2123096727287421913">"Dirección del servidor"</string>
+    <string name="vpn_mppe" msgid="6639001940500288972">"Encriptación de PPTP (MPPE)"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"Secreto de L2TP"</string>
+    <string name="vpn_ipsec_identifier" msgid="4098175859460006296">"Identificador IPSec"</string>
+    <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Clave precompartida de IPSec"</string>
+    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"Certificado de usuario IPSec"</string>
+    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"Certificado de CA de IPSec"</string>
+    <!-- no translation found for vpn_search_domains (5391995501541199624) -->
+    <skip />
+    <!-- no translation found for vpn_routes (8556236801755260073) -->
+    <skip />
+    <string name="vpn_username" msgid="1863901629860867849">"Nombre de usuario"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Contraseña"</string>
+    <!-- no translation found for vpn_save_login (6350322456427484881) -->
+    <skip />
+    <!-- no translation found for vpn_not_used (9094191054524660891) -->
+    <skip />
+    <string name="vpn_no_ca_cert" msgid="7820884983947090538">"(no verificar el servidor)"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"Cancelar"</string>
+    <string name="vpn_save" msgid="4233484051644764510">"Guardar"</string>
+    <string name="vpn_connect" msgid="8469608541746132301">"Conectar"</string>
+    <string name="vpn_edit" msgid="1111459297288136079">"Editar red de VPN"</string>
+    <string name="vpn_connect_to" msgid="7328758950427515753">"Conectar a <xliff:g id="NETWORK">%s</xliff:g>"</string>
+    <string name="vpn_title" msgid="7982620762043790565">"Configuración de VPN"</string>
+    <string name="vpn_create" msgid="8966010925994175306">"Agregar red de VPN"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"Editar red"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"Eliminar red"</string>
+    <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Sistema"</string>
+    <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Usuario"</string>
+    <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Inhabilitar"</string>
+    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Habilitar"</string>
+    <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Eliminar"</string>
+    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"¿Deseas habilitar el certificado de CA del sistema?"</string>
+    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"¿Deseas inhabilitar el certificado de CA del sistema?"</string>
+    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"¿Deseas eliminar de forma permanente el certificado de CA del usuario?"</string>
 </resources>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index 0fc04fe..9fdfd5d 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>
@@ -214,4 +240,36 @@
     <item msgid="3878793616631049349">"Utilizar comprobación de HDCP solo para contenido DRM"</item>
     <item msgid="45075631231212732">"Utilizar siempre comprobación de HDCP"</item>
   </string-array>
+    <!-- no translation found for window_animation_scale_entries:0 (8134156599370824081) -->
+    <!-- no translation found for window_animation_scale_entries:1 (6624864048416710414) -->
+    <!-- no translation found for window_animation_scale_entries:2 (2219332261255416635) -->
+    <!-- no translation found for window_animation_scale_entries:3 (3544428804137048509) -->
+    <!-- no translation found for window_animation_scale_entries:4 (3110710404225974514) -->
+    <!-- no translation found for window_animation_scale_entries:5 (4402738611528318731) -->
+    <!-- no translation found for window_animation_scale_entries:6 (6189539267968330656) -->
+    <!-- no translation found for transition_animation_scale_entries:0 (8464255836173039442) -->
+    <!-- no translation found for transition_animation_scale_entries:1 (3375781541913316411) -->
+    <!-- no translation found for transition_animation_scale_entries:2 (1991041427801869945) -->
+    <!-- no translation found for transition_animation_scale_entries:3 (4012689927622382874) -->
+    <!-- no translation found for transition_animation_scale_entries:4 (3289156759925947169) -->
+    <!-- no translation found for transition_animation_scale_entries:5 (7705857441213621835) -->
+    <!-- no translation found for transition_animation_scale_entries:6 (6660750935954853365) -->
+    <!-- no translation found for app_process_limit_entries:0 (6799596560242275471) -->
+    <!-- no translation found for app_process_limit_entries:1 (2412794376818632575) -->
+    <!-- no translation found for app_process_limit_entries:2 (1578904888612645001) -->
+    <!-- no translation found for app_process_limit_entries:3 (8819235336299873577) -->
+  <string-array name="vpn_types_long">
+    <item msgid="2732002039459078847">"Red privada virtual PPTP"</item>
+    <item msgid="3799752201662127867">"Red privada virtual L2TP/IPSec con claves precompartidas"</item>
+    <item msgid="4725504331295252103">"Red privada virtual L2TP/IPSec con certificados"</item>
+    <item msgid="7526551163264034377">"Red privada virtual IPSec con claves precompartidas y autenticación XAuth"</item>
+    <item msgid="8064740940687465039">"Red privada virtual IPSec con certificados y autenticación XAuth"</item>
+    <item msgid="4946199982372391490">"Red privada virtual IPSec con certificados y autenticación híbrida"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:0 (8621078286418985762) -->
+    <!-- no translation found for vpn_states:1 (6692305604213080515) -->
+    <!-- no translation found for vpn_states:2 (8001704909356800092) -->
+    <!-- no translation found for vpn_states:3 (4039737283841672166) -->
+    <!-- no translation found for vpn_states:4 (4042143101664725090) -->
+    <!-- no translation found for vpn_states:5 (2690164254699635531) -->
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 94000a3..729a7f0 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -19,6 +19,10 @@
     <string name="yes" msgid="4676390750360727396">"Sí"</string>
     <string name="no" msgid="6731231425810196216">"No"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Desconocido"</string>
+    <string name="header_category_wireless_networks" msgid="4944823405420438623">"CONEXIONES INALÁMBRICAS Y REDES"</string>
+    <string name="header_category_device" msgid="5781174212691167553">"DISPOSITIVO"</string>
+    <string name="header_category_personal" msgid="6225932173498802187">"PERSONAL"</string>
+    <string name="header_category_system" msgid="2073558547468647128">"SISTEMA"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Activar señal móvil"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Desactivar señal móvil"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Ver libreta de direcciones de tarjeta SIM"</string>
@@ -111,7 +115,11 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Sincronizando..."</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"Sincronizado, pero sin conexión"</string>
     <string name="bluetooth_device" msgid="6873461446424952003">"manos libres/auriculares"</string>
-    <string name="progress_scanning" msgid="3760897655335759141">"Buscando..."</string>
+    <!-- outdated translation 3760897655335759141 -->     <string name="progress_scanning" msgid="192587958424295789">"Buscando..."</string>
+    <!-- no translation found for progress_tap_to_pair (4192342336107106334) -->
+    <skip />
+    <!-- no translation found for bluetooth_no_devices_found (2412462335116297668) -->
+    <skip />
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Solicitud de sincronización de Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Solicitud de sincronización"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Seleccionar <xliff:g id="DEVICE_NAME">%1$s</xliff:g> para realizar la sincronización"</string>
@@ -130,6 +138,9 @@
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Una aplicación del teléfono está solicitando permiso para activar la función Bluetooth y hacer visible el teléfono para otros dispositivos. ¿Aceptas?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Activando Bluetooth..."</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Conexión automática"</string>
+    <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Solicitud para establecer conexión de Bluetooth"</string>
+    <string name="bluetooth_connection_notif_message" msgid="1833221950512058309">"Toca para conectarte a <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"¿Quieres conectarte a <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Ajustes de fecha y hora"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00 p.m."</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
@@ -235,7 +246,7 @@
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Inhabilitar todas las conexiones inalámbricas"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"Inhabilitando conexiones inalámbricas..."</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"Habilitando conexiones inalámbricas..."</string>
-    <string name="radio_controls_title" msgid="5868688473587168882">"Conexiones inalámbricas y redes"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Más…"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Conexiones inalámbricas y redes"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"Administrar Wi-Fi, Bluetooth, modo avión, redes móviles y VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Itinerancia de datos"</string>
@@ -271,8 +282,8 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Info propietario"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="2382525043173672857">"Introduce el texto para la pantalla de bloqueo."</string>
-    <string name="security_settings_title" msgid="5168491784222013179">"Ubicación y seguridad"</string>
-    <string name="location_security_settings_title" msgid="4624434296446625554">"Ajustes de seguridad y de ubicación"</string>
+    <string name="location_settings_title" msgid="8935806698251432196">"Servicios de ubicación"</string>
+    <string name="security_settings_title" msgid="7945465324818485460">"Seguridad"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Establecer Mi ubicación, bloqueo de pantalla, bloqueo de tarjeta SIM y bloqueo de almacenamiento de credenciales"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Establecer ubicación, bloqueo de pantalla y bloqueo de almacenamiento de credenciales"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Contraseñas"</string>
@@ -316,7 +327,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>
@@ -375,8 +386,8 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Ver o desactivar administradores de dispositivo"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Ajustes de Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Activar Bluetooth"</string>
-    <string name="bluetooth_settings" msgid="2725796451253089609">"Ajustes de Bluetooth"</string>
-    <string name="bluetooth_settings_title" msgid="2824020086246268296">"Ajustes de Bluetooth"</string>
+    <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
+    <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Administrar conexiones, establecer el nombre del dispositivo y la visibilidad"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Solicitud de sincronización de Bluetooth"</string>
     <string name="bluetooth_enter_pin_msg" msgid="1499285355129256289">\n"Introduce el PIN para realizar la sincronización con \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". (Prueba 0000 o 1234). Puede que tengas que introducir el mismo PIN en el dispositivo Bluetooth."</string>
@@ -394,7 +405,10 @@
     <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Sincronización rechazada por <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"Se ha producido un problema al establecer conexión con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Buscar dispositivos"</string>
-    <string name="bluetooth_preference_find_nearby_title" msgid="5087410003465463318">"Buscar dispositivos cercanos"</string>
+    <!-- no translation found for bluetooth_search_for_devices (5957007154213560390) -->
+    <skip />
+    <!-- no translation found for bluetooth_searching_for_devices (9203739709307871727) -->
+    <skip />
     <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"Ajustes del dispositivo"</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Dispositivos sincronizados"</string>
     <string name="bluetooth_preference_found_devices" msgid="3133019331974936204">"Dispositivos encontrados"</string>
@@ -404,6 +418,10 @@
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Desincronizar"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Desconectar y desincronizar"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Opciones…"</string>
+    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Ajustes avanzados"</string>
+    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Ajustes avanzados de Bluetooth"</string>
+    <string name="bluetooth_advanced_settings_label" msgid="8659717781212434173">"Bluetooth avanzado"</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="3631028334811113629">"Activar Bluetooth para detectar dispositivos"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Establecer conexión con…"</string>
     <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"Multimedia"</string>
     <string name="bluetooth_profile_headset" msgid="81844079120986198">"Manos libres"</string>
@@ -445,27 +463,31 @@
     <string name="nfc_toggle_error" msgid="2233172102497535522">"Se ha producido un error."</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Activar Wi-Fi"</string>
-    <string name="wifi_settings" msgid="4746946030627213196">"Ajustes de Wi-Fi"</string>
+    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="2810363951104753710">"Ajustes de Wi-Fi"</string>
+    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Configurar y administrar puntos de acceso inalámbricos"</string>
-    <string name="wifi_starting" msgid="6710266609710860129">"Activando..."</string>
-    <string name="wifi_stopping" msgid="5952909472548218348">"Desactivando..."</string>
+    <string name="wifi_starting" msgid="7732330327758522943">"Activando Wi-Fi…"</string>
+    <string name="wifi_stopping" msgid="244864762599017659">"Desactivando Wi-Fi…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Error"</string>
     <string name="wifi_in_airplane_mode" msgid="7618393787965366655">"Modo avión"</string>
     <string name="wifi_fail_to_scan" msgid="6194542252808587669">"No se han podido buscar redes."</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Notificación de red"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Informarme cuando haya una red abierta disponible"</string>
+    <string name="wifi_enable_watchdog_service" msgid="4723544454066601706">"Comprobaciones de conectividad Wi-Fi"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="8687400936839455926">"Detectar y administrar los posibles errores relacionados con la conectividad de red"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Política de desconexión de Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Especificar cuándo cambiar de Wi-Fi a datos móviles"</string>
     <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" msgid="6234851776910938957">"Añadir red"</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>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Establecer conexión con red"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Borrar red"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modificar red"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="3682507011071029311">"Activar Wi-Fi para detectar redes disponibles"</string>
     <string name="wifi_network_setup" msgid="7974851890019344870">"Configuración de red"</string>
     <string name="wifi_wps_pin" msgid="5471842298708321115">"Introducir PIN de punto de acceso"</string>
     <string name="wifi_wps_setup_title" msgid="150518971269252336">"Configuración WPS"</string>
@@ -501,13 +523,13 @@
     <string name="wifi_save" msgid="3331121567988522826">"Guardar"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Cancelar"</string>
     <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"Se ha detectado otra configuración WPS. Inténtalo de nuevo en unos minutos."</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Avanzado"</string>
+    <!-- outdated translation 5419052271935350999 -->     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Avanzado"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Banda de frecuencia WiFi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Especificar intervalo frecuencia de funcionamiento"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Error al establecer la banda de frecuencia"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Dirección MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Dirección IP"</string>
-    <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"Ajustes de IP"</string>
+    <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Ajustes de IP"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Guardar"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Cancelar"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Introduce una dirección IP válida."</string>
@@ -525,7 +547,7 @@
     <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"Zona Wi-Fi portátil de <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> de <xliff:g id="NETWORK_SSID">%1$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="sound_settings_title" msgid="8735891486683305886">"Sonido"</string>
-    <string name="display_settings_title" msgid="2378894265964357591">"Pantalla"</string>
+    <string name="display_settings_title" msgid="1708697328627382561">"Pantalla"</string>
     <string name="sound_settings" msgid="5007659014828162881">"Ajustes de sonido"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Modo silencio"</string>
     <string name="silent_mode_summary" msgid="3309650676072917899">"Silenciar todos los sonidos, excepto el contenido multimedia y las alarmas"</string>
@@ -598,7 +620,18 @@
     <string name="brightness_summary" msgid="838917350127550703">"Ajustar el brillo de la pantalla"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Tiempo de espera"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"La pantalla se apaga automáticamente después de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>."</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Fondo de pantalla"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android Dreams"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Salvapantallas y otros elementos divertidos en estado inactivo"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Módulo dream seleccionado"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Cuándo activar"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"Después de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactividad"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Nunca"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Probar"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brillo automático"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Tamaño de fuente"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Tamaño de fuente general"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Seleccionar tamaño de fuente"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Ajustes de bloqueo de tarjeta SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Bloqueo de tarjeta SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Bloqueo de tarjeta SIM"</string>
@@ -643,8 +676,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>
@@ -696,6 +730,16 @@
     <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"Se desactivará la tarjeta SD."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Desactivando"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"La tarjeta SD se está desactivando."</string>
+    <!-- no translation found for storage_menu_usb (1580545228584324704) -->
+    <skip />
+    <!-- no translation found for storage_title_usb (5775322159427546546) -->
+    <skip />
+    <!-- no translation found for usb_label_mtp (4157227401755543412) -->
+    <skip />
+    <!-- no translation found for usb_label_ptp (7417254019489575819) -->
+    <skip />
+    <!-- no translation found for usb_label_installer_cd (7438467574756086977) -->
+    <skip />
     <string name="battery_status_title" msgid="9159414319574976203">"Estado de la batería"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Nivel de batería"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -806,6 +850,8 @@
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"No se puede anclar a más de <xliff:g id="MAXCONNECTION">%1$d</xliff:g> dispositivos"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Se desactivará el anclaje a red de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ayuda"</string>
+    <string name="wireless_category_general" msgid="2973810407987118067">"General"</string>
+    <string name="wireless_category_mobile_networks" msgid="1254629216798424288">"Redes móviles"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Redes móviles"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Establecer opciones para itinerancia, redes, APN"</string>
     <string name="location_title" msgid="1029961368397484576">"Mi ubicación"</string>
@@ -883,7 +929,7 @@
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Protección del tablet"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Protección del teléfono"</string>
     <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"Protege el tablet contra usos no autorizados creando un patrón de desbloqueo de pantalla personal. Utiliza el dedo para unir los puntos en cualquier orden en la siguiente pantalla. Debes conectar al menos cuatro puntos."\n\n"Si estás preparado para comenzar, toca Siguiente."</string>
-    <string name="lock_intro_message" product="default" msgid="9100785646737118042"><font size="17">"Protege el teléfono de usos no autorizados mediante la creación de un patrón de desbloqueo de pantalla personal. "\n<font height="17">\n</font><b>"1"</b>"  En la siguiente pantalla, puedes observar cómo se crea un patrón de ejemplo. "\n<font height="17">\n</font><b>"2"</b>"  Cuando estés preparado, crea tu propio patrón de desbloqueo personal. Puedes experimentar con distintos patrones, pero recuerda que debes conectar al menos cuatro puntos. "\n<font height="17">\n</font><b>"3"</b>"  Vuelve a dibujar el patrón para confirmarlo. "\n<font height="17">\n</font><b>"Si estás preparado para comenzar, toca en \"Siguiente\""</b>". "\n<font height="3">\n</font>"Si deseas dejar tu teléfono sin protección, toca \"Cancelar\"."</font></string>
+    <!-- outdated translation 3692151094288835065 -->     <string name="lock_intro_message" product="default" msgid="5796785892741212873">"Protege el tablet contra usos no autorizados creando un patrón de desbloqueo de pantalla personal. Utiliza el dedo para unir los puntos en cualquier orden en la siguiente pantalla. Debes conectar al menos cuatro puntos."\n\n"Si estás preparado para comenzar, toca Siguiente."</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Administrar aplicaciones"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Administrar y eliminar aplicaciones instaladas"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Aplicaciones"</string>
@@ -893,6 +939,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>
@@ -905,9 +953,10 @@
     <string name="force_stop" msgid="7435006169872876756">"Forzar detención"</string>
     <string name="total_size_label" msgid="1048676419552557254">"Total"</string>
     <string name="application_size_label" msgid="5055196275624686382">"Aplicación"</string>
+    <string name="external_code_size_label" msgid="3459343140355961335">"Aplicación de almacenamiento USB"</string>
     <string name="data_size_label" msgid="8679376373625710107">"Datos"</string>
-    <string name="external_size_label" product="nosdcard" msgid="4465530017830945766">"Almacenamiento USB"</string>
-    <string name="external_size_label" product="default" msgid="2107155737635944440">"Tarjeta SD"</string>
+    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Datos de almacenamiento USB"</string>
+    <string name="external_data_size_label" product="default" msgid="626414192825329708">"Tarjeta SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Desinstalar"</string>
     <string name="disable_text" msgid="6544054052049395202">"Inhabilitar"</string>
     <string name="enable_text" msgid="9217362512327828987">"Habilitar"</string>
@@ -1026,7 +1075,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 +1085,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>
@@ -1066,7 +1117,7 @@
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Ajustes de teclado en pantalla"</string>
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Teclado físico"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Ajustes del teclado físico"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Desarrollo"</string>
+    <string name="development_settings_title" msgid="215179176067683667">"Opciones para desarrolladores"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"Establecer opciones de desarrollo de aplicaciones"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Depuración USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Modo de depuración cuando está conectado el dispositivo USB"</string>
@@ -1091,14 +1142,14 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Accesibilidad"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Ajustes de accesibilidad"</string>
     <string name="accessibility_settings_summary" msgid="8185181964847149507">"Administrar opciones de accesibilidad"</string>
-    <string name="toggle_accessibility_title" msgid="650839277066574497">"Accesibilidad"</string>
+    <string name="toggle_large_text_title" msgid="42259643359869436">"Texto grande"</string>
     <string name="accessibility_services_category" msgid="8127851026323672607">"Servicios de accesibilidad"</string>
+    <string name="toggle_accessibility_title" msgid="7338739354952553958">"Permitir servicios de accesibilidad"</string>
     <string name="no_accessibility_services_summary" msgid="694578333333808159">"No hay instalado ningún servicio de accesibilidad."</string>
     <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Este servicio de accesibilidad puede recopilar todo lo que escribas, desde datos personales hasta números de tarjetas de crédito, a excepción de las contraseñas. También puede registrar las interacciones con la interfaz de usuario. Procede de la aplicación <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. ¿Quieres utilizar este servicio de accesibilidad?"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"¿Quieres inhabilitar la accesibilidad?"</string>
     <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"No se han encontrado aplicaciones relacionadas con la accesibilidad."</string>
     <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"No tienes instaladas aplicaciones relacionadas con la accesibilidad."\n\n"Puedes descargar un lector de pantalla para tu dispositivo en Android Market."\n\n"Haz clic en \"Aceptar\" para instalar el lector de pantalla."</string>
-    <string name="accessibility_script_injection_category" msgid="8649951751131431904">"Scripts de accesibilidad"</string>
     <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"Descargar scripts de accesibilidad"</string>
     <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"Permitir a aplicaciones descargar scripts accesibilidad de Google"</string>
     <string name="accessibility_script_injection_security_warning" product="tablet" msgid="1113600871264359828">"Algunas aplicaciones pueden solicitar a Google que descargue scripts en tu tablet para poder acceder a su contenido más fácilmente. ¿Seguro que quieres permitir que Google instale scripts de accesibilidad en tu tablet?"</string>
@@ -1106,10 +1157,11 @@
     <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>
-    <string name="power_usage_summary_title" msgid="5180282911164282324">"Uso de la batería"</string>
+    <string name="power_usage_summary_title" msgid="7190304207330319919">"Batería"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Consumo de la batería"</string>
     <string name="power_usage_not_available" msgid="3583407442633768046">"Datos uso batería no disponibles"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Uso de la batería desde que se cargó"</string>
@@ -1218,6 +1270,8 @@
     <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>
+    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Configuración del motor"</string>
+    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Ajustes de <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
     <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>
@@ -1228,114 +1282,33 @@
     <string name="gadget_title" msgid="7455548605888590466">"Control de energía"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Actualización de la configuración de la conexión Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Actualización de la configuración de la conexión Bluetooth"</string>
-    <string name="vpn_settings_activity_title" msgid="7276864950701612579">"Ajustes de red VPN"</string>
-    <string name="vpn_connect_to" msgid="2541409082892684362">"Establecer conexión con <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpn_username_colon" msgid="7854930370861306247">"Nombre de usuario:"</string>
-    <string name="vpn_password_colon" msgid="5716278710848606626">"Contraseña:"</string>
-    <string name="vpn_a_username" msgid="6664733641993968692">"un nombre de usuario"</string>
-    <string name="vpn_a_password" msgid="1537213632501483753">"una contraseña"</string>
-    <string name="vpn_save_username" msgid="1408415289165970790">"Recordar nombre de usuario"</string>
-    <string name="vpn_connect_button" msgid="1699007212602470655">"Establecer conexión"</string>
-    <string name="vpn_yes_button" msgid="8034531001149843119">"Sí"</string>
-    <string name="vpn_no_button" msgid="7620339571187119107">"No"</string>
-    <string name="vpn_back_button" msgid="192036339792734970">"Atrás"</string>
-    <string name="vpn_mistake_button" msgid="1683383660912491270">"No"</string>
-    <string name="vpn_menu_done" msgid="93528279226907926">"Guardar"</string>
-    <string name="vpn_menu_cancel" msgid="7234451214611202868">"Cancelar"</string>
-    <string name="vpn_menu_revert" msgid="4407762442281467659">"Revertir"</string>
-    <string name="vpn_menu_connect" msgid="1089399414463784218">"Establecer conexión con red"</string>
-    <string name="vpn_menu_disconnect" msgid="8254492450022562235">"Desconectar de la red"</string>
-    <string name="vpn_menu_edit" msgid="4526245173583195618">"Editar red"</string>
-    <string name="vpn_menu_delete" msgid="3326527392609513129">"Eliminar red"</string>
-    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"Debes introducir <xliff:g id="CODE">%s</xliff:g>."</string>
-    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"Debes seleccionar <xliff:g id="OPTION">%s</xliff:g>."</string>
-    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"El nombre de red VPN \"<xliff:g id="NAME">%s</xliff:g>\" ya existe. Utiliza otro."</string>
-    <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"¿Estás seguro de que quieres eliminar esta red VPN?"</string>
-    <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"¿Estás seguro de que no quieres crear este perfil?"</string>
-    <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"¿Estás seguro de que quieres descartar los cambios realizados en este perfil?"</string>
-    <string name="vpn_confirm_reconnect" msgid="5748535476278674296">"No se ha podido establecer conexión con la red. ¿Quieres intentarlo de nuevo?"</string>
-    <string name="vpn_reconnect_from_lost" msgid="2442844155623372118">"Se ha perdido la conexión. ¿Deseas volver a establecer conexión?"</string>
-    <string name="vpn_unknown_server_dialog_msg" msgid="3080742299823671319">"No se puede resolver el nombre de servidor. ¿Quieres comprobar la configuración de nombre de tu servidor?"</string>
-    <string name="vpn_challenge_error_dialog_msg" msgid="6174901754230038601">"Error de pregunta de seguridad. ¿Deseas comprobar tu configuración secreta?"</string>
-    <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"Faltan uno o varios secretos en la configuración de esta VPN. ¿Deseas comprobar tu configuración secreta?"</string>
-    <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"El nombre de usuario o la contraseña introducidos no son correctos. ¿Quieres intentarlo de nuevo?"</string>
-    <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"El servidor se ha bloqueado. Es posible que la contraseña o el nombre de usuario introducidos sean incorrectos. ¿Deseas volver a intentarlo?"</string>
-    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"El servidor se ha bloqueado. Es posible que tengas activado un cortafuegos que impide la conexión con el servidor. ¿Quieres volver a intentarlo?"</string>
-    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"Error de negociación con el servidor. Es posible que el servidor no acepte tu opción de encriptación. ¿Quieres comprobar tus valores de configuración de la encriptación?"</string>
-    <string name="vpn_type_title" msgid="6392933604218676224">"Añadir VPN"</string>
-    <string name="vpn_add_new_vpn" msgid="5438260689052714550">"Añadir VPN"</string>
-    <string name="vpn_details_title" msgid="418806440938510331">"Detalles de red VPN"</string>
-    <string name="vpn_edit_title_add" msgid="2121313217989682890">"Añadir red VPN \"<xliff:g id="NAME">%s</xliff:g>\""</string>
-    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"Detalles de <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpns" msgid="3148141862835492816">"Redes VPN"</string>
-    <string name="vpn_connecting" msgid="8039521381692090116">"Estableciendo conexión..."</string>
-    <string name="vpn_disconnecting" msgid="7748050200708257066">"Desconectando..."</string>
-    <string name="vpn_connected" msgid="7641723116362845781">"Conectada"</string>
-    <string name="vpn_connect_hint" msgid="7442898962925875181">"Establecer conexión con red"</string>
-    <string name="vpn_name" msgid="1550918148476193076">"Nombre de VPN"</string>
-    <string name="vpn_a_name" msgid="8445736942405283509">"un nombre de VPN"</string>
-    <string name="vpn_profile_added" msgid="9061017910337129840">"Se ha añadido \"<xliff:g id="NAME">%s</xliff:g>\"."</string>
-    <string name="vpn_profile_replaced" msgid="587435576816273815">"Los cambios se han aplicado a \"<xliff:g id="NAME">%s</xliff:g>\"."</string>
-    <string name="vpn_user_certificate_title" msgid="6812545893924071742">"Establecer certificado de usuario"</string>
-    <string name="vpn_user_certificate" msgid="949322691686938888">"Certificado de usuario"</string>
-    <string name="vpn_a_user_certificate" msgid="8943983437956898649">"un certificado de usuario"</string>
-    <string name="vpn_ca_certificate_title" msgid="7846466160795589985">"Establecer certificado de CA"</string>
-    <string name="vpn_ca_certificate" msgid="465085144064264742">"Certificado de entidad emisora de certificados (CA)"</string>
-    <string name="vpn_a_ca_certificate" msgid="3374242520974884295">"un certificado de CA"</string>
-    <string name="vpn_l2tp_secret_string_title" msgid="5039677186748940987">"Establecer L2TP secreto"</string>
-    <string name="vpn_l2tp_secret" msgid="529359749677142076">"L2TP secreto"</string>
-    <string name="vpn_a_l2tp_secret" msgid="6612042930810981845">"un L2TP secreto"</string>
-    <string name="vpn_pptp_encryption_title" msgid="2236795167467896499">"encriptación"</string>
-    <string name="vpn_pptp_encryption" msgid="2602329949737259686">"Encriptación de PPTP"</string>
-    <string name="vpn_ipsec_presharedkey_title" msgid="2184060087690539175">"Establecer clave precompartida de IPSec"</string>
-    <string name="vpn_ipsec_presharedkey" msgid="5434316521616673741">"Clave precompartida de IPSec"</string>
-    <string name="vpn_a_ipsec_presharedkey" msgid="1255301923217898418">"una clave precompartida de IPSec"</string>
-    <string name="vpn_vpn_server_title" msgid="8897005887420358913">"Establecer servidor VPN"</string>
-    <string name="vpn_vpn_server" msgid="1141754908824209260">"Servidor VPN"</string>
-    <string name="vpn_a_vpn_server" msgid="5960906152125045853">"un servidor VPN"</string>
-    <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"Nombre de servidor VPN"</string>
-    <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"Dominios de búsqueda DNS"</string>
-    <string name="vpn_dns_search_list" msgid="4230034234026605360">"Dominios de búsqueda de DNS"</string>
-    <string name="vpn_field_is_set" msgid="7137320847812992243">"Se ha establecido el valor \"<xliff:g id="VALUE">%s</xliff:g>\"."</string>
-    <string name="vpn_field_not_set" msgid="2972519243515893804">"No se ha establecido el valor \"<xliff:g id="VALUE">%s</xliff:g>\"."</string>
-    <string name="vpn_field_not_set_optional" msgid="8840557698252556791">"No se ha establecido el valor \"<xliff:g id="VALUE">%s</xliff:g>\" (opcional)."</string>
-    <string name="vpn_enable_field" msgid="3700967675854517191">"Habilitar <xliff:g id="OPTION">%s</xliff:g>"</string>
-    <string name="vpn_disable_field" msgid="6905658811179634005">"Inhabilitar <xliff:g id="OPTION">%s</xliff:g>"</string>
-    <string name="vpn_is_enabled" msgid="1266304230417098877">"Se ha habilitado <xliff:g id="OPTION">%s</xliff:g>."</string>
-    <string name="vpn_is_disabled" msgid="2013622485867806167">"Se ha inhabilitado <xliff:g id="OPTION">%s</xliff:g>."</string>
     <string name="vpn_settings_title" msgid="7327468307909556719">"Ajustes de red VPN"</string>
     <string name="vpn_settings_summary" msgid="8849924181594963972">"Configurar y administrar redes privadas virtuales (VPN)"</string>
-    <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="trusted_credentials" msgid="4266945289534242402">"Credenciales de confianza"</string>
+    <string name="trusted_credentials_summary" msgid="6735221351155686632">"Mostrar certificados de CA de confianza"</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>
-    <string name="privacy_settings_title" msgid="1987089301293213705">"Ajustes de privacidad"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"Copia de seguridad y restauración"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"Copia de seguridad y restauración"</string>
     <string name="backup_section_title" msgid="8856083167469467588">"Copia de seguridad y restauración"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Datos personales"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Copia de seguridad de datos"</string>
@@ -1439,4 +1412,107 @@
     <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>
+    <!-- no translation found for debug_ui_category (9023948280291055349) -->
+    <skip />
+    <!-- no translation found for strict_mode (1938795874357830695) -->
+    <skip />
+    <!-- no translation found for strict_mode_summary (142834318897332338) -->
+    <skip />
+    <!-- no translation found for pointer_location (6084434787496938001) -->
+    <skip />
+    <!-- no translation found for pointer_location_summary (840819275172753713) -->
+    <skip />
+    <!-- no translation found for show_screen_updates (8282711794220426931) -->
+    <skip />
+    <!-- no translation found for show_screen_updates_summary (1716122382094924596) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage (2389212910758076024) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage_summary (2113341923988958266) -->
+    <skip />
+    <!-- no translation found for window_animation_scale_title (6162587588166114700) -->
+    <skip />
+    <!-- no translation found for transition_animation_scale_title (387527540523595875) -->
+    <skip />
+    <!-- no translation found for debug_applications_category (6221644998451283813) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities (3622005081180597749) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities_summary (3592221124808773368) -->
+    <skip />
+    <!-- no translation found for app_process_limit_title (4121324758038197598) -->
+    <skip />
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Uso de datos"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"Ciclo de uso de datos"</string>
+    <string name="data_usage_menu_split_4g" msgid="7417435609285381968">"Dividir uso de datos 4G"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Mostrar uso de Wi-Fi"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"Cambiar ciclo…"</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Día del mes para restablecer ciclo de uso de datos:"</string>
+    <string name="data_usage_disable_mobile_limit" msgid="289740911281022322">"Inhabilitar datos móv en límite"</string>
+    <string name="data_usage_disable_4g_limit" msgid="5808210773758699800">"Inhabilitar datos 4G en límite"</string>
+    <string name="data_usage_disable_3g_limit" msgid="3856971004328238231">"Inhabilitar datos 2G-3G en límite"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_mobile" msgid="454140350007299045">"Móvil"</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">"Datos móviles"</string>
+    <string name="data_usage_enable_3g" msgid="6304006671869578254">"Datos 2G-3G"</string>
+    <string name="data_usage_enable_4g" msgid="3635854097335036738">"Datos 4G"</string>
+    <string name="data_usage_app_settings" msgid="3727561362090820369">"Ver ajustes de aplicación"</string>
+    <string name="data_usage_app_restrict_background" msgid="8856643905291165256">"Restringir uso datos referencia"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="1503361245973512092">"Permitir datos de referencia de aplicaciones solo al utilizar redes ilimitadas"</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="8110736468987743260">"Restringir datos de referencia"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="100001698378554777">"Esta función puede afectar de forma negativa a las aplicaciones que dependen del uso de datos de referencia."\n\n"Es posible que aparezcan controles de uso de datos más adecuados en la configuración de la aplicación."</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Fecha de restablecimiento de ciclo de uso"</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Fecha de cada mes:"</string>
+    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Establecer"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Limitar uso de datos"</string>
+    <string name="data_usage_limit_dialog_mobile" msgid="7931094451923591578">"Cuando se alcance el límite especificado, se inhabilitará la conexión de datos móviles."\n\n"Para evitar cargos adicionales, considera la posibilidad de utilizar un límite reducido, ya que los métodos de contabilidad del dispositivo y del operador pueden variar."</string>
+    <string name="data_usage_limit_dialog_3g" msgid="5478553071420316963">"Cuando se alcance el límite especificado, se inhabilitará la conexión de datos 2G-3G."\n\n"Para evitar cargos adicionales, considera la posibilidad de utilizar un límite reducido, ya que los métodos de contabilidad del dispositivo y del operador pueden variar."</string>
+    <string name="data_usage_limit_dialog_4g" msgid="6134008906742403777">"Cuando se alcance el límite especificado, se inhabilitará la conexión de datos 4G."\n\n"Para evitar cargos adicionales, considera la posibilidad de utilizar un límite reducido, ya que los métodos de contabilidad del dispositivo y del operador pueden variar."</string>
+    <string name="data_usage_disabled_dialog_3g_title" msgid="4221584306492812040">"Inhabilitar 2G-3G inhabilitados"</string>
+    <string name="data_usage_disabled_dialog_4g_title" msgid="715585612162185936">"Datos 4G inhabilitados"</string>
+    <string name="data_usage_disabled_dialog_mobile_title" msgid="209516216265000221">"Datos móviles inhabilitados"</string>
+    <string name="data_usage_disabled_dialog" msgid="2874031671067845964">"Se ha alcanzado el límite de uso de datos especificado."\n\n"Se pueden aplicar cargos adicionales si utilizas más datos."</string>
+    <string name="data_usage_disabled_dialog_enable" msgid="2441219164620753329">"Volver a habilitar los datos"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="32">"<xliff:g id="NUMBER">%1$s</xliff:g>"</font>" "<font size="12">"<xliff:g id="UNIT">%2$s</xliff:g>"</font>\n<font size="12">"aviso"</font></string>
+    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Llamada de emergencia"</string>
+    <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Volver a llamada"</string>
+    <string name="vpn_name" msgid="4689699885361002297">"Nombre"</string>
+    <string name="vpn_type" msgid="5435733139514388070">"Tipo"</string>
+    <string name="vpn_server" msgid="2123096727287421913">"Dirección del servidor"</string>
+    <string name="vpn_mppe" msgid="6639001940500288972">"Encriptación de PPP (MPPE)"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"L2TP secreto"</string>
+    <string name="vpn_ipsec_identifier" msgid="4098175859460006296">"Identificador de IPSec"</string>
+    <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Clave precompartida de IPSec"</string>
+    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"Certificado de usuario de IPSec"</string>
+    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"Certificado de CA de IPSec"</string>
+    <!-- no translation found for vpn_search_domains (5391995501541199624) -->
+    <skip />
+    <!-- no translation found for vpn_routes (8556236801755260073) -->
+    <skip />
+    <string name="vpn_username" msgid="1863901629860867849">"Nombre de usuario"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Contraseña"</string>
+    <!-- no translation found for vpn_save_login (6350322456427484881) -->
+    <skip />
+    <!-- no translation found for vpn_not_used (9094191054524660891) -->
+    <skip />
+    <string name="vpn_no_ca_cert" msgid="7820884983947090538">"(no verificar servidor)"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"Cancelar"</string>
+    <string name="vpn_save" msgid="4233484051644764510">"Guardar"</string>
+    <string name="vpn_connect" msgid="8469608541746132301">"Conectar"</string>
+    <string name="vpn_edit" msgid="1111459297288136079">"Editar red VPN"</string>
+    <string name="vpn_connect_to" msgid="7328758950427515753">"Establecer conexión con <xliff:g id="NETWORK">%s</xliff:g>"</string>
+    <string name="vpn_title" msgid="7982620762043790565">"Ajustes de red VPN"</string>
+    <string name="vpn_create" msgid="8966010925994175306">"Añadir red VPN"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"Editar red"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"Eliminar red"</string>
+    <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Sistema"</string>
+    <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Usuario"</string>
+    <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Inhabilitar"</string>
+    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Habilitar"</string>
+    <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Eliminar"</string>
+    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"¿Quieres habilitar el certificado de CA del sistema?"</string>
+    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"¿Quieres inhabilitar el certificado de CA del sistema?"</string>
+    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"¿Quieres eliminar el certificado de CA de usuario de forma permanente?"</string>
 </resources>
diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
index bbd7880..f0f9089 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>
@@ -214,4 +240,36 @@
     <item msgid="3878793616631049349">"استفاده از بررسی HDCP فقط برای محتوای DRM"</item>
     <item msgid="45075631231212732">"همیشه از بررسی HDCP استفاده شود"</item>
   </string-array>
+    <!-- no translation found for window_animation_scale_entries:0 (8134156599370824081) -->
+    <!-- no translation found for window_animation_scale_entries:1 (6624864048416710414) -->
+    <!-- no translation found for window_animation_scale_entries:2 (2219332261255416635) -->
+    <!-- no translation found for window_animation_scale_entries:3 (3544428804137048509) -->
+    <!-- no translation found for window_animation_scale_entries:4 (3110710404225974514) -->
+    <!-- no translation found for window_animation_scale_entries:5 (4402738611528318731) -->
+    <!-- no translation found for window_animation_scale_entries:6 (6189539267968330656) -->
+    <!-- no translation found for transition_animation_scale_entries:0 (8464255836173039442) -->
+    <!-- no translation found for transition_animation_scale_entries:1 (3375781541913316411) -->
+    <!-- no translation found for transition_animation_scale_entries:2 (1991041427801869945) -->
+    <!-- no translation found for transition_animation_scale_entries:3 (4012689927622382874) -->
+    <!-- no translation found for transition_animation_scale_entries:4 (3289156759925947169) -->
+    <!-- no translation found for transition_animation_scale_entries:5 (7705857441213621835) -->
+    <!-- no translation found for transition_animation_scale_entries:6 (6660750935954853365) -->
+    <!-- no translation found for app_process_limit_entries:0 (6799596560242275471) -->
+    <!-- no translation found for app_process_limit_entries:1 (2412794376818632575) -->
+    <!-- no translation found for app_process_limit_entries:2 (1578904888612645001) -->
+    <!-- no translation found for app_process_limit_entries:3 (8819235336299873577) -->
+  <string-array name="vpn_types_long">
+    <item msgid="2732002039459078847">"PPTP VPN"</item>
+    <item msgid="3799752201662127867">"L2TP/IPSec VPN با کلیدهای از قبل به اشتراک گذاشته شده"</item>
+    <item msgid="4725504331295252103">"L2TP/IPSec VPN با گواهی"</item>
+    <item msgid="7526551163264034377">"IPSec VPN با کلیدهای از قبل به اشتراک گذاشته شده و تأیید اعتبار Xauth"</item>
+    <item msgid="8064740940687465039">"IPSec VPN با گواهی و تأیید اعتبار Xauth"</item>
+    <item msgid="4946199982372391490">"IPSec VPN دارای گواهی و تأیید اعتبار دوگانه"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:0 (8621078286418985762) -->
+    <!-- no translation found for vpn_states:1 (6692305604213080515) -->
+    <!-- no translation found for vpn_states:2 (8001704909356800092) -->
+    <!-- no translation found for vpn_states:3 (4039737283841672166) -->
+    <!-- no translation found for vpn_states:4 (4042143101664725090) -->
+    <!-- no translation found for vpn_states:5 (2690164254699635531) -->
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index c7d7220..40977ae 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -19,6 +19,10 @@
     <string name="yes" msgid="4676390750360727396">"بله"</string>
     <string name="no" msgid="6731231425810196216">"خیر"</string>
     <string name="device_info_default" msgid="7847265875578739287">"ناشناس"</string>
+    <string name="header_category_wireless_networks" msgid="4944823405420438623">"بی سیم و شبکه ها"</string>
+    <string name="header_category_device" msgid="5781174212691167553">"دستگاه"</string>
+    <string name="header_category_personal" msgid="6225932173498802187">"شخصی"</string>
+    <string name="header_category_system" msgid="2073558547468647128">"سیستم"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"روشن کردن رادیو"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"خاموش کردن رادیو"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"مشاهده دفترچه آدرس سیم کارت"</string>
@@ -111,7 +115,11 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"در حال جفت سازی..."</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"جفت شده اما وصل نیست"</string>
     <string name="bluetooth_device" msgid="6873461446424952003">"هندزفری/گوشی"</string>
-    <string name="progress_scanning" msgid="3760897655335759141">"اسکن کردن"</string>
+    <!-- outdated translation 3760897655335759141 -->     <string name="progress_scanning" msgid="192587958424295789">"اسکن کردن"</string>
+    <!-- no translation found for progress_tap_to_pair (4192342336107106334) -->
+    <skip />
+    <!-- no translation found for bluetooth_no_devices_found (2412462335116297668) -->
+    <skip />
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"درخواست جفت سازی"</string>
     <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>
@@ -130,6 +138,9 @@
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"یک برنامه کاربردی در تلفن شما درخواست اجازه کرده است که بلوتوث را روشن کرده و تلفن شما را برای سایر دستگاه ها قابل شناسایی کند. می خواهید این کار را انجام دهید؟"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"خاموش کردن بلوتوث..."</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"اتصال خودکار"</string>
+    <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"درخواست اتصال بلوتوث"</string>
+    <string name="bluetooth_connection_notif_message" msgid="1833221950512058309">"برای اتصال به \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" لمس کنید"</string>
+    <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"آیا می خواهید به \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" وصل شوید؟"</string>
     <string name="date_and_time" msgid="4114084177056654663">"تنظیمات تاریخ و ساعت"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00 بعدازظهر"</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
@@ -235,7 +246,7 @@
     <string name="airplane_mode_summary" msgid="3154817401368780988">"تمام اتصال های بی سیم غیرفعال شود"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"در حال غیرفعال کردن اتصال های بی سیم..."</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"فعالسازی اتصال های بی سیم..."</string>
-    <string name="radio_controls_title" msgid="5868688473587168882">"شبکه و بی سیم"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"بیشتر..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"بی سیم و شبکه ها"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"مدیریت Wi-Fi، بلوتوث، حالت هواپیما، شبکه های تلفن همراه و VPN ها"</string>
     <string name="roaming" msgid="3596055926335478572">"رومینگ داده"</string>
@@ -271,8 +282,8 @@
     <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">"مکان و امنیت"</string>
-    <string name="location_security_settings_title" msgid="4624434296446625554">"تنظیمات مکان و امنیت"</string>
+    <string name="location_settings_title" msgid="8935806698251432196">"سرویس های مکان"</string>
+    <string name="security_settings_title" msgid="7945465324818485460">"امنیت"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"تنظیم مکان من، قفل صفحه، قفل سیم کارت، قفل محل ذخیره اطلاعات کاربری"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"تنظیم مکان من، بازگشایی قفل صفحه، قفل محل ذخیره اطلاعات کاربری"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"رمزهای ورود"</string>
@@ -316,7 +327,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>
@@ -375,8 +386,8 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"مشاهده یا غیر فعال کردن سرپرست های دستگاه"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"بلوتوث"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"روشن کردن بلوتوث"</string>
-    <string name="bluetooth_settings" msgid="2725796451253089609">"تنظیمات بلوتوث"</string>
-    <string name="bluetooth_settings_title" msgid="2824020086246268296">"تنظیمات بلوتوث"</string>
+    <string name="bluetooth_settings" msgid="1810521656168174329">"بلوتوث"</string>
+    <string name="bluetooth_settings_title" msgid="1908745291161353016">"بلوتوث"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"مدیریت اتصال ها، تنظیم نام دستگاه و قابلیت شناسایی"</string>
     <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>\" وارد کنید. (0000 یا 1234 را امتحان کنید.) ممکن است لازم باشد همین کد پین را در دستگاه بلوتوث نیز وارد کنید."</string>
@@ -394,7 +405,10 @@
     <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>
+    <!-- no translation found for bluetooth_search_for_devices (5957007154213560390) -->
+    <skip />
+    <!-- no translation found for bluetooth_searching_for_devices (9203739709307871727) -->
+    <skip />
     <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>
@@ -404,6 +418,10 @@
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"لغو جفت سازی"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"قطع اتصال و لغو جفت سازی"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"گزینه ها…"</string>
+    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"پیشرفته"</string>
+    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"بلوتوث پیشرفته"</string>
+    <string name="bluetooth_advanced_settings_label" msgid="8659717781212434173">"بلوتوث پیشرفته"</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="3631028334811113629">"روشن کردن بلوتوث برای دیدن دستگاه های موجود"</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>
@@ -445,27 +463,31 @@
     <string name="nfc_toggle_error" msgid="2233172102497535522">"خطایی روی داد."</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"روشن کردن Wi-Fi"</string>
-    <string name="wifi_settings" msgid="4746946030627213196">"تنظیمات WiFi"</string>
+    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="2810363951104753710">"تنظیمات Wi-Fi"</string>
+    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"تنظیم و مدیریت نقاط دسترسی بی سیم"</string>
-    <string name="wifi_starting" msgid="6710266609710860129">"روشن کردن..."</string>
-    <string name="wifi_stopping" msgid="5952909472548218348">"در حال خاموش کردن..."</string>
+    <string name="wifi_starting" msgid="7732330327758522943">"روشن کردن Wi-Fi..."</string>
+    <string name="wifi_stopping" msgid="244864762599017659">"خاموش کردن Wi-Fi..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"خطا"</string>
     <string name="wifi_in_airplane_mode" msgid="7618393787965366655">"در حالت هواپیما"</string>
     <string name="wifi_fail_to_scan" msgid="6194542252808587669">"اسکن کردن شبکه ها امکان پذیر نیست"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"اعلان شبکه"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"هنگام در دسترس بودن یک شبکه باز، به من اعلام شود"</string>
+    <string name="wifi_enable_watchdog_service" msgid="4723544454066601706">"بررسی قابلیت اتصال Wi-Fi"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="8687400936839455926">"شناسایی و مدیریت مشکلات اتصال شبکه"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"خط مشی قطع اتصال Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"زمان جابجایی Wi-Fi به داده تلفن همراه را مشخص کنید"</string>
     <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" msgid="6234851776910938957">"افزودن شبکه"</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>
     <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_empty_list_wifi_off" msgid="3682507011071029311">"روشن کردن Wifi برای دیدن شبکه های موجود"</string>
     <string name="wifi_network_setup" msgid="7974851890019344870">"تنظیم شبکه"</string>
     <string name="wifi_wps_pin" msgid="5471842298708321115">"پین را از نقطه دستیابی وارد کنید"</string>
     <string name="wifi_wps_setup_title" msgid="150518971269252336">"راه اندازی WPS"</string>
@@ -501,13 +523,13 @@
     <string name="wifi_save" msgid="3331121567988522826">"ذخیره"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"لغو"</string>
     <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"جلسه WPS دیگری شناسایی شد، لطفاً چند دقیقه دیگر دوباره امتحان کنید"</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"پیشرفته"</string>
+    <!-- outdated translation 5419052271935350999 -->     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"پیشرفته"</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>
-    <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"تنظیمات IP"</string>
+    <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"تنظیمات IP"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"ذخیره"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"لغو"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"لطفاً یک آدرس IP معتبر بنویسید."</string>
@@ -525,7 +547,7 @@
     <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">"AndroidHotspot"</string>
     <string name="sound_settings_title" msgid="8735891486683305886">"صدا"</string>
-    <string name="display_settings_title" msgid="2378894265964357591">"صفحه نمایش"</string>
+    <string name="display_settings_title" msgid="1708697328627382561">"نمایش"</string>
     <string name="sound_settings" msgid="5007659014828162881">"تنظیمات صوتی"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"حالت ساکت"</string>
     <string name="silent_mode_summary" msgid="3309650676072917899">"ساکت کردن تمام صداها بجز رسانه و هشدارها"</string>
@@ -598,7 +620,18 @@
     <string name="brightness_summary" msgid="838917350127550703">"تنظیم روشنایی صفحه"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"وقفه زمانی"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"صفحه بعد از <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> به صورت خودکار خاموش می شود"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"تصویر زمینه"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android Dreams"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"محافظ های صفحه و سایر حالت های عدم استفاده"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"رویای انتخابی"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"چه وقت باید فعال شود"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"پس از <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> عدم استفاده"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"هیچوقت"</string>
+    <string name="dream_test" msgid="5968002644622194481">"امتحان کنید!"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"روشنایی خودکار"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"اندازه قلم"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"اندازه کلی قلم ها"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"انتخاب اندازه قلم"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"تنظیمات قفل سیم کارت"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"تنظیم قفل سیم کارت"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"قفل سیم کارت"</string>
@@ -643,8 +676,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>
@@ -696,6 +730,16 @@
     <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 storage_menu_usb (1580545228584324704) -->
+    <skip />
+    <!-- no translation found for storage_title_usb (5775322159427546546) -->
+    <skip />
+    <!-- no translation found for usb_label_mtp (4157227401755543412) -->
+    <skip />
+    <!-- no translation found for usb_label_ptp (7417254019489575819) -->
+    <skip />
+    <!-- no translation found for usb_label_installer_cd (7438467574756086977) -->
+    <skip />
     <string name="battery_status_title" msgid="9159414319574976203">"وضعیت باتری"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"سطح باتری"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNها"</string>
@@ -806,6 +850,8 @@
     <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>
+    <string name="wireless_category_general" msgid="2973810407987118067">"کلی"</string>
+    <string name="wireless_category_mobile_networks" msgid="1254629216798424288">"شبکه های تلفن همراه"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"شبکه های تلفن همراه"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"تنظیم گزینه ها برای رومینگ، شبکه ها، APNها"</string>
     <string name="location_title" msgid="1029961368397484576">"موقعیت مکانی من"</string>
@@ -883,7 +929,7 @@
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"محافظت از رایانه لوحی خود"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"حفظ امنیت تلفن شما"</string>
     <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"با ایجاد یک الگوی باز کردن قفل صفحه شخصی، از رایانه لوحی خود در برابر استفاده غیر مجاز محافظت کنید. با استفاده از انگشت خود، در صفحه بعدی نقاط را با ترتیب دلخواه متصل کنید. حداقل باید چهار نقطه را به هم متصل کنید."\n" "\n"آماده هستید؟ \"بعدی\" را لمس کنید."</string>
-    <string name="lock_intro_message" product="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>
+    <!-- outdated translation 3692151094288835065 -->     <string name="lock_intro_message" product="default" msgid="5796785892741212873">"با ایجاد یک الگوی باز کردن قفل صفحه شخصی، از رایانه لوحی خود در برابر استفاده غیر مجاز محافظت کنید. با استفاده از انگشت خود، در صفحه بعدی نقاط را با ترتیب دلخواه متصل کنید. حداقل باید چهار نقطه را به هم متصل کنید."\n" "\n"آماده هستید؟ \"بعدی\" را لمس کنید."</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"مدیریت برنامه های کاربردی"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"مدیریت وحذف برنامه های حذف شده"</string>
     <string name="applications_settings" msgid="3736173521008476946">"برنامه های کاربردی"</string>
@@ -893,6 +939,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>
@@ -905,9 +953,10 @@
     <string name="force_stop" msgid="7435006169872876756">"توقف اجباری"</string>
     <string name="total_size_label" msgid="1048676419552557254">"مجموع"</string>
     <string name="application_size_label" msgid="5055196275624686382">"برنامه کاربردی"</string>
+    <string name="external_code_size_label" msgid="3459343140355961335">"برنامه ذخیره سازی USB"</string>
     <string name="data_size_label" msgid="8679376373625710107">"داده"</string>
-    <string name="external_size_label" product="nosdcard" msgid="4465530017830945766">"حافظه USB"</string>
-    <string name="external_size_label" product="default" msgid="2107155737635944440">"کارت SD"</string>
+    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"داده های ذخیره سازی USB"</string>
+    <string name="external_data_size_label" product="default" msgid="626414192825329708">"کارت SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"حذف نصب"</string>
     <string name="disable_text" msgid="6544054052049395202">"غیرفعال کردن"</string>
     <string name="enable_text" msgid="9217362512327828987">"فعال کردن"</string>
@@ -1026,7 +1075,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 +1085,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>
@@ -1066,7 +1117,7 @@
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"تنظیمات صفحه کلید روی صفحه"</string>
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"صفحه کلید فیزیکی"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"تنظیمات صفحه کلید فیزیکی"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"توسعه"</string>
+    <string name="development_settings_title" msgid="215179176067683667">"گزینه های برنامه نویس"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"تنظیم گزینه های مربوط به توسعه برنامه"</string>
     <string name="enable_adb" msgid="7982306934419797485">"رفع عیب USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"با اتصال USB حالت رفع عیب فعال شود"</string>
@@ -1091,14 +1142,14 @@
     <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="toggle_large_text_title" msgid="42259643359869436">"متن بزرگ"</string>
     <string name="accessibility_services_category" msgid="8127851026323672607">"سرویس های قابلیت دسترسی"</string>
+    <string name="toggle_accessibility_title" msgid="7338739354952553958">"اجازه به سرویس های قابلیت دسترسی"</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>
@@ -1106,10 +1157,11 @@
     <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>
-    <string name="power_usage_summary_title" msgid="5180282911164282324">"استفاده از باتری"</string>
+    <string name="power_usage_summary_title" msgid="7190304207330319919">"باتری"</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>
@@ -1218,6 +1270,8 @@
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> تنظیمات"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> فعال است"</string>
     <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> غیرفعال است"</string>
+    <string name="tts_engine_settings_section" msgid="2346105138448751893">"تنظیمات موتور"</string>
+    <string name="tts_engine_settings_title" msgid="3499112142425680334">"تنظیمات برای <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"زبان ها و صداها"</string>
     <string name="pico_installed" msgid="2452546687858267414">"نصب شده"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"نصب نشد"</string>
@@ -1228,114 +1282,33 @@
     <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">"نام \"<xliff:g id="NAME">%s</xliff:g>\" برای VPN از قبل وجود دارد. یک نام دیگر بیابید."</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">"رمزگذاری PPP"</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">"تنظیم و مدیریت شبکه های خصوصی مجازی (VPN)"</string>
-    <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="trusted_credentials" msgid="4266945289534242402">"اطلاعات کاربری قابل اطمینان"</string>
+    <string name="trusted_credentials_summary" msgid="6735221351155686632">"نمایش گواهی های CA قابل اطمینان"</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>
-    <string name="privacy_settings_title" msgid="1987089301293213705">"تنظیمات رازداری"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"تهیه نسخه پشتیبان و بازیابی"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"تهیه نسخه پشتیبان و بازیابی"</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>
@@ -1440,4 +1413,107 @@
     <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>
+    <!-- no translation found for debug_ui_category (9023948280291055349) -->
+    <skip />
+    <!-- no translation found for strict_mode (1938795874357830695) -->
+    <skip />
+    <!-- no translation found for strict_mode_summary (142834318897332338) -->
+    <skip />
+    <!-- no translation found for pointer_location (6084434787496938001) -->
+    <skip />
+    <!-- no translation found for pointer_location_summary (840819275172753713) -->
+    <skip />
+    <!-- no translation found for show_screen_updates (8282711794220426931) -->
+    <skip />
+    <!-- no translation found for show_screen_updates_summary (1716122382094924596) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage (2389212910758076024) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage_summary (2113341923988958266) -->
+    <skip />
+    <!-- no translation found for window_animation_scale_title (6162587588166114700) -->
+    <skip />
+    <!-- no translation found for transition_animation_scale_title (387527540523595875) -->
+    <skip />
+    <!-- no translation found for debug_applications_category (6221644998451283813) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities (3622005081180597749) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities_summary (3592221124808773368) -->
+    <skip />
+    <!-- no translation found for app_process_limit_title (4121324758038197598) -->
+    <skip />
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"مصرف داده"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"چرخه استفاده از داده"</string>
+    <string name="data_usage_menu_split_4g" msgid="7417435609285381968">"تقسیم استفاده 4G"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"نمایش استفاده Wi-Fi"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"تغییر چرخه..."</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"روز از ماه برای بازیابی چرخه استفاده از داده:"</string>
+    <string name="data_usage_disable_mobile_limit" msgid="289740911281022322">"غیرفعال کردن داده تلفن همراه با رسیدن به محدودیت تنظیم شده"</string>
+    <string name="data_usage_disable_4g_limit" msgid="5808210773758699800">"غیر فعال کردن داده 4G با رسیدن به محدوده مشخص شده"</string>
+    <string name="data_usage_disable_3g_limit" msgid="3856971004328238231">"غیر فعال کردن داده 2G-3G با رسیدن به محدودیت مشخص شده"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_mobile" msgid="454140350007299045">"تلفن همراه"</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">"داده های تلفن همراه"</string>
+    <string name="data_usage_enable_3g" msgid="6304006671869578254">"داده 2G-3G"</string>
+    <string name="data_usage_enable_4g" msgid="3635854097335036738">"داده 4G"</string>
+    <string name="data_usage_app_settings" msgid="3727561362090820369">"مشاهده تنظیمات برنامه"</string>
+    <string name="data_usage_app_restrict_background" msgid="8856643905291165256">"محدود کردن استفاده از داده پس زمینه"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="1503361245973512092">"هنگام استفاده از شبکه نامحدود، فقط داده های پس زمینه برنامه مجاز هستند"</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="8110736468987743260">"محدود کردن داده های پس زمینه"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="100001698378554777">"این ویژگی ممکن است بر برنامه ای که به استفاده از داده پس زمینه نیاز دارد تأثیر منفی بگذارد."\n\n"کنترل های مصرف داده مناسب تری را می توانید در قسمت تنظیمات این برنامه پیدا کنید."</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"تاریخ تنظیم مجدد چرخه استفاده"</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"تاریخ هر ماه:"</string>
+    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"تنظیم"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"محدود کردن استفاده از داده"</string>
+    <string name="data_usage_limit_dialog_mobile" msgid="7931094451923591578">"با رسیدن به محدودیت مشخص شده، اتصال داده تلفن همراه شما غیرفعال می شود."\n\n"برای جلوگیری از زیاد شدن بیش از حد هزینه ها، از یک محدوده کاهش یافته استفاده کنید، زیرا ممکن است دستگاه و روش های محاسبه حامل تغییر کنند."</string>
+    <string name="data_usage_limit_dialog_3g" msgid="5478553071420316963">"با رسیدن به محدودیت مشخص شده، اتصال داده 2G-3G غیرفعال می شود."\n\n"برای جلوگیری از زیاد شدن بیش از حد هزینه ها، از یک محدوده کاهش یافته استفاده کنید، زیرا ممکن است دستگاه و روش های محاسبه شرکت مخابراتی تغییر کنند."</string>
+    <string name="data_usage_limit_dialog_4g" msgid="6134008906742403777">"با رسیدن به محدودیت مشخص شده، اتصال داده 4G غیرفعال می شود."\n\n"برای جلوگیری از زیاد شدن بیش از حد هزینه ها، از یک محدوده کاهش یافته استفاده کنید زیرا ممکن است دستگاه و روش های محاسبه شرکت مخابراتی تغییر کنند."</string>
+    <string name="data_usage_disabled_dialog_3g_title" msgid="4221584306492812040">"داده 2G-3G غیرفعال شد"</string>
+    <string name="data_usage_disabled_dialog_4g_title" msgid="715585612162185936">"داده 4G غیر فعال شد"</string>
+    <string name="data_usage_disabled_dialog_mobile_title" msgid="209516216265000221">"داده های تلفن همراه غیرفعال است"</string>
+    <string name="data_usage_disabled_dialog" msgid="2874031671067845964">"به حداکثر محدودیت استفاده از داده رسیده اید."\n\n"استفاده از داده بیشتر سبب افزایش هزینه های شرکت مخابراتی می شود."</string>
+    <string name="data_usage_disabled_dialog_enable" msgid="2441219164620753329">"فعال کردن مجدد داده"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="32">"<xliff:g id="NUMBER">%1$s</xliff:g>"</font><font size="12">"<xliff:g id="UNIT">%2$s</xliff:g>"</font>\n<font size="12">"هشدار"</font></string>
+    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"تماس اضطراری"</string>
+    <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"بازگشت به تماس"</string>
+    <string name="vpn_name" msgid="4689699885361002297">"نام"</string>
+    <string name="vpn_type" msgid="5435733139514388070">"نوع"</string>
+    <string name="vpn_server" msgid="2123096727287421913">"آدرس سرور"</string>
+    <string name="vpn_mppe" msgid="6639001940500288972">"رمزگذاری PPP (MPPE)"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"مورد محرمانه L2TP"</string>
+    <string name="vpn_ipsec_identifier" msgid="4098175859460006296">"شناسه IPSec"</string>
+    <string name="vpn_ipsec_secret" msgid="4526453255704888704">"کلید IPSec از پیش مشترک شده"</string>
+    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"گواهی کاربر IPSec"</string>
+    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"گواهی IPSec CA"</string>
+    <!-- no translation found for vpn_search_domains (5391995501541199624) -->
+    <skip />
+    <!-- no translation found for vpn_routes (8556236801755260073) -->
+    <skip />
+    <string name="vpn_username" msgid="1863901629860867849">"نام کاربری"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"رمز ورود"</string>
+    <!-- no translation found for vpn_save_login (6350322456427484881) -->
+    <skip />
+    <!-- no translation found for vpn_not_used (9094191054524660891) -->
+    <skip />
+    <string name="vpn_no_ca_cert" msgid="7820884983947090538">"(سرور تأیید نشود)"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"لغو"</string>
+    <string name="vpn_save" msgid="4233484051644764510">"ذخیره"</string>
+    <string name="vpn_connect" msgid="8469608541746132301">"اتصال"</string>
+    <string name="vpn_edit" msgid="1111459297288136079">"ویرایش شبکه VPN"</string>
+    <string name="vpn_connect_to" msgid="7328758950427515753">"اتصال به <xliff:g id="NETWORK">%s</xliff:g>"</string>
+    <string name="vpn_title" msgid="7982620762043790565">"تنظیمات VPN"</string>
+    <string name="vpn_create" msgid="8966010925994175306">"افزودن شبکه VPN"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"ویرایش شبکه"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"حذف شبکه"</string>
+    <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"سیستم"</string>
+    <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"کاربر"</string>
+    <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"غیرفعال کردن"</string>
+    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"فعال کردن"</string>
+    <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"حذف کردن"</string>
+    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"گواهی CA سیستم فعال شود؟"</string>
+    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"گواهی CA سیستم غیرفعال شود؟"</string>
+    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"گواهی CA کاربر به صورت دائمی حذف شود؟"</string>
 </resources>
diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml
index c6177f8..36bc017 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>
@@ -214,4 +240,36 @@
     <item msgid="3878793616631049349">"Käytä HDCP-tarkistusta vain DRM-suojatulle sisällölle"</item>
     <item msgid="45075631231212732">"Käytä aina HDCP-tarkistusta"</item>
   </string-array>
+    <!-- no translation found for window_animation_scale_entries:0 (8134156599370824081) -->
+    <!-- no translation found for window_animation_scale_entries:1 (6624864048416710414) -->
+    <!-- no translation found for window_animation_scale_entries:2 (2219332261255416635) -->
+    <!-- no translation found for window_animation_scale_entries:3 (3544428804137048509) -->
+    <!-- no translation found for window_animation_scale_entries:4 (3110710404225974514) -->
+    <!-- no translation found for window_animation_scale_entries:5 (4402738611528318731) -->
+    <!-- no translation found for window_animation_scale_entries:6 (6189539267968330656) -->
+    <!-- no translation found for transition_animation_scale_entries:0 (8464255836173039442) -->
+    <!-- no translation found for transition_animation_scale_entries:1 (3375781541913316411) -->
+    <!-- no translation found for transition_animation_scale_entries:2 (1991041427801869945) -->
+    <!-- no translation found for transition_animation_scale_entries:3 (4012689927622382874) -->
+    <!-- no translation found for transition_animation_scale_entries:4 (3289156759925947169) -->
+    <!-- no translation found for transition_animation_scale_entries:5 (7705857441213621835) -->
+    <!-- no translation found for transition_animation_scale_entries:6 (6660750935954853365) -->
+    <!-- no translation found for app_process_limit_entries:0 (6799596560242275471) -->
+    <!-- no translation found for app_process_limit_entries:1 (2412794376818632575) -->
+    <!-- no translation found for app_process_limit_entries:2 (1578904888612645001) -->
+    <!-- no translation found for app_process_limit_entries:3 (8819235336299873577) -->
+  <string-array name="vpn_types_long">
+    <item msgid="2732002039459078847">"PPTP VPN"</item>
+    <item msgid="3799752201662127867">"Esijaettuun avaimeen perustuva L2TP-/IPSec-VPN-verkko"</item>
+    <item msgid="4725504331295252103">"L2TP/IPSec-suojattu VPN-verkko varmenteilla"</item>
+    <item msgid="7526551163264034377">"Esijaettuun avaimeen perustuva IPSec-suojattu VPN-verkko Xauth-todennuksella"</item>
+    <item msgid="8064740940687465039">"IPSec-suojattu VPN-verkko varmenteilla ja Xauth-todennuksella"</item>
+    <item msgid="4946199982372391490">"IPSec-suojattu VPN-verkko varmenteilla ja hybriditodennuksella"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:0 (8621078286418985762) -->
+    <!-- no translation found for vpn_states:1 (6692305604213080515) -->
+    <!-- no translation found for vpn_states:2 (8001704909356800092) -->
+    <!-- no translation found for vpn_states:3 (4039737283841672166) -->
+    <!-- no translation found for vpn_states:4 (4042143101664725090) -->
+    <!-- no translation found for vpn_states:5 (2690164254699635531) -->
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 6f4da62..5520df4 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -19,6 +19,10 @@
     <string name="yes" msgid="4676390750360727396">"Kyllä"</string>
     <string name="no" msgid="6731231425810196216">"Ei"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Tuntematon"</string>
+    <string name="header_category_wireless_networks" msgid="4944823405420438623">"LANGATTOMAT YHTEYDET JA VERKOT"</string>
+    <string name="header_category_device" msgid="5781174212691167553">"LAITE"</string>
+    <string name="header_category_personal" msgid="6225932173498802187">"HENKILÖKOHTAINEN"</string>
+    <string name="header_category_system" msgid="2073558547468647128">"JÄRJESTELMÄ"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Käynnistä radio"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Sammuta radio"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Näytä SIM-kortin osoitekirja"</string>
@@ -111,7 +115,11 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Laiteparia muodostetaan..."</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"Laitepari muodostettu mutta yhteyttä ei"</string>
     <string name="bluetooth_device" msgid="6873461446424952003">"kuulokemikrofoni"</string>
-    <string name="progress_scanning" msgid="3760897655335759141">"Etsitään"</string>
+    <!-- outdated translation 3760897655335759141 -->     <string name="progress_scanning" msgid="192587958424295789">"Etsitään"</string>
+    <!-- no translation found for progress_tap_to_pair (4192342336107106334) -->
+    <skip />
+    <!-- no translation found for bluetooth_no_devices_found (2412462335116297668) -->
+    <skip />
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Bluetooth-laiteparipyyntö"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Laiteparinmuodostuspyyntö"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Muodostetaan laitepari laitteeseen <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
@@ -130,6 +138,9 @@
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Puhelimesi sovellus pyytää lupaa ottaa Bluetooth-yhteyden käyttöön ja asettaa puhelimesi muiden Bluetooth-laitteiden tunnistettavaksi. Haluatko myöntää luvan?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Otetaan Bluetooth-yhteys käyttöön…"</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Yhdistä automaattisesti"</string>
+    <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth-yhteyspyyntö"</string>
+    <string name="bluetooth_connection_notif_message" msgid="1833221950512058309">"Yhdistä laitteeseen <xliff:g id="DEVICE_NAME">%1$s</xliff:g> koskettamalla"</string>
+    <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Haluatko yhdistää laitteeseen <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Päivämäärä- ja aika-asetukset"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1.00 ip"</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13.00"</string>
@@ -235,7 +246,7 @@
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Poista kaikki langattomat yhteydet käytöstä"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"Poistetaan langattomia yhteyksiä käytöstä..."</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"Otetaan langattomia yhteyksiä käyttöön..."</string>
-    <string name="radio_controls_title" msgid="5868688473587168882">"Langaton verkko ja verkot"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Lisää..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Langaton verkko ja verkot"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"Hallinnoi wifi- ja Bluetooth-yhteyksiä, lentokonetilaa ja mobiili- ja VPN-verkkoja"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming-tiedonsiirto"</string>
@@ -271,8 +282,8 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Omistajan tiedot"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="2382525043173672857">"Kirjoita tekstiä näytettäväksi lukitusruudulla"</string>
-    <string name="security_settings_title" msgid="5168491784222013179">"Sijainti ja suojaus"</string>
-    <string name="location_security_settings_title" msgid="4624434296446625554">"Sijainti- ja suojausasetukset"</string>
+    <string name="location_settings_title" msgid="8935806698251432196">"Sijaintipalvelut"</string>
+    <string name="security_settings_title" msgid="7945465324818485460">"Suojaus"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Aseta Oma sijainti, näytön lukituksen poisto, SIM-kortin lukitus, käyttöoikeustietojen tallennustilan lukitus"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Aseta Oma sijainti, näytön lukituksen poisto, käyttöoikeustietojen tallennustilan lukitus"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Salasanat"</string>
@@ -316,7 +327,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>
@@ -375,8 +386,8 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Näytä tai poista käytöstä laitteen ylläpitäjiä"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Ota Bluetooth-yhteys käyttöön"</string>
-    <string name="bluetooth_settings" msgid="2725796451253089609">"Bluetooth-asetukset"</string>
-    <string name="bluetooth_settings_title" msgid="2824020086246268296">"Bluetooth-asetukset"</string>
+    <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
+    <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Hallinnoi yhteyksiä, aseta laitteen nimi ja tunnistettavuus"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Bluetooth-laiteparipyyntö"</string>
     <string name="bluetooth_enter_pin_msg" msgid="1499285355129256289">\n"Anna PIN-koodi muodostaaksesi parin laitteen <xliff:g id="DEVICE_NAME">%1$s</xliff:g> kanssa. (Kokeile koodeja 0000 tai 1234.) Saatat joutua antamaan saman PIN-koodin Bluetooth-laitteeseen."</string>
@@ -394,7 +405,10 @@
     <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Laite <xliff:g id="DEVICE_NAME">%1$s</xliff:g> torjui laitepariyhteyden."</string>
     <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"Ongelma yhteyden muodostamisessa laitteeseen <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Etsi laitteita"</string>
-    <string name="bluetooth_preference_find_nearby_title" msgid="5087410003465463318">"Etsi läheisiä laitteita"</string>
+    <!-- no translation found for bluetooth_search_for_devices (5957007154213560390) -->
+    <skip />
+    <!-- no translation found for bluetooth_searching_for_devices (9203739709307871727) -->
+    <skip />
     <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"Laiteasetukset"</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Laiteparit"</string>
     <string name="bluetooth_preference_found_devices" msgid="3133019331974936204">"Löydetyt laitteet"</string>
@@ -404,6 +418,10 @@
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Poista laitepariyhteys"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Katkaise yhteys ja poista laitepariyhteys"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Asetukset…"</string>
+    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Lisäasetukset"</string>
+    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth-lisäasetukset"</string>
+    <string name="bluetooth_advanced_settings_label" msgid="8659717781212434173">"Bluetooth-lisäaset."</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="3631028334811113629">"Ota bluetooth käyttöön"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Yhdistä profiiliin..."</string>
     <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"Media"</string>
     <string name="bluetooth_profile_headset" msgid="81844079120986198">"Handsfree"</string>
@@ -445,27 +463,31 @@
     <string name="nfc_toggle_error" msgid="2233172102497535522">"Tapahtui virhe."</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wifi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Ota wifi-yhteys käyttöön"</string>
-    <string name="wifi_settings" msgid="4746946030627213196">"Wifi-asetukset"</string>
+    <string name="wifi_settings" msgid="1277428034634973011">"Wifi"</string>
     <string name="wifi_settings_category" msgid="2810363951104753710">"Wifi-asetukset"</string>
+    <string name="wifi_settings_title" msgid="4351120897298124250">"Wifi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Ota käyttöön ja hallinnoi langattoman yhteyden tukiasemia"</string>
-    <string name="wifi_starting" msgid="6710266609710860129">"Otetaan käyttöön..."</string>
-    <string name="wifi_stopping" msgid="5952909472548218348">"Poistetaan käytöstä..."</string>
+    <string name="wifi_starting" msgid="7732330327758522943">"Käynnistetään wifi-yhteyttä…"</string>
+    <string name="wifi_stopping" msgid="244864762599017659">"Sammutetaan wifi-yhteyttä…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Virhe"</string>
     <string name="wifi_in_airplane_mode" msgid="7618393787965366655">"Lentokonetilassa"</string>
     <string name="wifi_fail_to_scan" msgid="6194542252808587669">"Verkkojen etsintä epäonnistui"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Verkkoilmoitus"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Ilmoita, kun avoin verkko on käytettävissä"</string>
+    <string name="wifi_enable_watchdog_service" msgid="4723544454066601706">"Wifi-yhteyden tarkistus"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="8687400936839455926">"Tunnista verkon mahdolliset yhteysongelmat ja hallinnoi niitä."</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Wifi-yhteyden katkaisukäytäntö"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Määritä, milloin vaihdetaan wifi-yhteydestä mobiiliverkkoyhteyteen"</string>
     <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" msgid="6234851776910938957">"Lisää verkko"</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>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Yhdistä verkkoon"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Unohda verkko"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Muokkaa verkkoa"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="3682507011071029311">"Ota wifi käyttöön"</string>
     <string name="wifi_network_setup" msgid="7974851890019344870">"Verkon asetukset"</string>
     <string name="wifi_wps_pin" msgid="5471842298708321115">"Anna pin-koodi tukiasemasta"</string>
     <string name="wifi_wps_setup_title" msgid="150518971269252336">"WPS-asetukset"</string>
@@ -501,13 +523,13 @@
     <string name="wifi_save" msgid="3331121567988522826">"Tallenna"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Peruuta"</string>
     <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"Toinen WPS-käyttökerta havaittu, yritä uudelleen muutaman minuutin kuluttua"</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Lisäasetukset"</string>
+    <!-- outdated translation 5419052271935350999 -->     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Lisäasetukset"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wifi-taajuusalue"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Määritä toiminnan taajuusalue"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Ongelma taajuusalueen asettamisessa."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC-osoite"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP-osoite"</string>
-    <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"IP-asetukset"</string>
+    <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP-asetukset"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Tallenna"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Peruuta"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Anna kelvollinen IP-osoite"</string>
@@ -525,7 +547,7 @@
     <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> kannettava wifi-yhteyspiste"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="sound_settings_title" msgid="8735891486683305886">"Ääni"</string>
-    <string name="display_settings_title" msgid="2378894265964357591">"Ruutu"</string>
+    <string name="display_settings_title" msgid="1708697328627382561">"Näyttö"</string>
     <string name="sound_settings" msgid="5007659014828162881">"Ääniasetukset"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Äänetön tila"</string>
     <string name="silent_mode_summary" msgid="3309650676072917899">"Hiljennä kaikki äänet paitsi media ja hälytykset"</string>
@@ -598,7 +620,18 @@
     <string name="brightness_summary" msgid="838917350127550703">"Säädä näytön kirkkautta"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Aikaraja"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Ruutu sammuu automaattisesti <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> kuluttua"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Taustakuva"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android Dreams"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Näytönsäästäjät ja muut käyttämättömyysasetukset"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Valittu unelma"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Käyttöönottoaika"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"Kun laite ollut käyttämättä <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Ei koskaan"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Kokeile"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automaattinen kirkkaus"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Kirjasimen koko"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Kirjasimen koko"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Valitse kirjasimen koko"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM-kortin lukitusasetukset"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Ota SIM-kortin lukitus käyttöön"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM-kortin lukitus"</string>
@@ -643,8 +676,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>
@@ -696,6 +730,16 @@
     <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"SD-kortti poistetaan käytöstä."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Poistetaan käytöstä"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Poistetaan käytöstä"</string>
+    <!-- no translation found for storage_menu_usb (1580545228584324704) -->
+    <skip />
+    <!-- no translation found for storage_title_usb (5775322159427546546) -->
+    <skip />
+    <!-- no translation found for usb_label_mtp (4157227401755543412) -->
+    <skip />
+    <!-- no translation found for usb_label_ptp (7417254019489575819) -->
+    <skip />
+    <!-- no translation found for usb_label_installer_cd (7438467574756086977) -->
+    <skip />
     <string name="battery_status_title" msgid="9159414319574976203">"Akun tila"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Akun taso"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN:t"</string>
@@ -806,6 +850,8 @@
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"Voidaan yhdistää korkeintaan <xliff:g id="MAXCONNECTION">%1$d</xliff:g> laitteeseen"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Jaettu internetyhteys katkaistaan laitteesta <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ohje"</string>
+    <string name="wireless_category_general" msgid="2973810407987118067">"Yleiset"</string>
+    <string name="wireless_category_mobile_networks" msgid="1254629216798424288">"Mobiiliverkot"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobiiliverkot"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Aseta roaming-, verkko- ja APN-asetukset"</string>
     <string name="location_title" msgid="1029961368397484576">"Oma sijainti"</string>
@@ -883,7 +929,7 @@
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Tablet-laitteen suojaaminen"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Puhelimen suojaaminen"</string>
     <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"Suojaa tablet-laitetta luvattomalta käytöltä luomalla henkilökohtainen ruudun lukituksenpoistokuvio. Yhdistä seuraavassa ruudussa olevat pisteet sormellasi haluamassasi järjestyksessä. Yhdistä vähintään 4 pistettä."\n\n"Valmis? Kosketa Seuraava."</string>
-    <string name="lock_intro_message" product="default" msgid="9100785646737118042"><font size="17">"Suojaa puhelintasi luvattomalta käytöltä luomalla henkilökohtainen näytön lukituksenpoistokuvio. "\n<font height="17">\n</font><b>"1"</b>"  Katso seuraavalla sivulla, kun piirrämme esimerkkikuvion. "\n<font height="17">\n</font><b>"2"</b>"  Kun olet valmis, voit piirtää oman lukituksenpoistokuviosi. Kokeile eri kuvioita mutta yhdistä vähintään neljä pistettä. "\n<font height="17">\n</font><b>"3"</b>"  Vahvista kuvio piirtämällä se uudelleen. "\n<font height="17">\n</font><b>"Oletko valmis? Kosketa Seuraava"</b>". "\n<font height="3">\n</font>"Jos haluat jättää puhelimesi suojaamatta, kosketa Peruuta."</font></string>
+    <!-- outdated translation 3692151094288835065 -->     <string name="lock_intro_message" product="default" msgid="5796785892741212873">"Suojaa tablet-laitetta luvattomalta käytöltä luomalla henkilökohtainen ruudun lukituksenpoistokuvio. Yhdistä seuraavassa ruudussa olevat pisteet sormellasi haluamassasi järjestyksessä. Yhdistä vähintään 4 pistettä."\n\n"Valmis? Kosketa Seuraava."</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Hallinnoi sovelluksia"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Hallinnoi ja poista asennettuja sovelluksia"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Sovellukset"</string>
@@ -893,6 +939,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>
@@ -905,9 +953,10 @@
     <string name="force_stop" msgid="7435006169872876756">"Pakota lopetus"</string>
     <string name="total_size_label" msgid="1048676419552557254">"Yhteensä"</string>
     <string name="application_size_label" msgid="5055196275624686382">"Sovellus"</string>
+    <string name="external_code_size_label" msgid="3459343140355961335">"Sovelluksen käyttämä USB-tallennustila"</string>
     <string name="data_size_label" msgid="8679376373625710107">"Tiedot"</string>
-    <string name="external_size_label" product="nosdcard" msgid="4465530017830945766">"USB-tallennustila"</string>
-    <string name="external_size_label" product="default" msgid="2107155737635944440">"SD-kortti"</string>
+    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB-tallennustilan tiedot"</string>
+    <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD-kortti"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Poista"</string>
     <string name="disable_text" msgid="6544054052049395202">"Poista käytöstä"</string>
     <string name="enable_text" msgid="9217362512327828987">"Ota käyttöön"</string>
@@ -1026,7 +1075,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 +1085,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>
@@ -1066,7 +1117,7 @@
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Näyttönäppäimistön asetukset"</string>
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Fyysinen näppäimistö"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Fyysisen näppäimistön asetukset"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Kehittäminen"</string>
+    <string name="development_settings_title" msgid="215179176067683667">"Kehittäjävaihtoehdot"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"Valitse sovelluksen kehittämisasetukset"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB-vianetsintä"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Vianetsintätila USB-liitännän ollessa käytössä"</string>
@@ -1091,14 +1142,14 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Esteettömyys"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Esteettömyysasetukset"</string>
     <string name="accessibility_settings_summary" msgid="8185181964847149507">"Hallinnoi esteettömyysasetuksia"</string>
-    <string name="toggle_accessibility_title" msgid="650839277066574497">"Käyttöoikeus"</string>
+    <string name="toggle_large_text_title" msgid="42259643359869436">"Suuri teksti"</string>
     <string name="accessibility_services_category" msgid="8127851026323672607">"Esteettömyyspalvelut"</string>
+    <string name="toggle_accessibility_title" msgid="7338739354952553958">"Salli esteettömyyspalvelut"</string>
     <string name="no_accessibility_services_summary" msgid="694578333333808159">"Ei asennettuja esteettömyyspalveluita."</string>
     <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Tämä esteettömyyspalvelu saattaa kerätä kaiken kirjoittamasi tekstin, mukaan lukien henkilökohtaiset tiedot ja luottokorttinumerosi, mutta ei salasanoja. Se saattaa myös tallentaa käyttöliittymätoimintojasi. Se on lähtöisin sovelluksesta <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Käytetäänkö tätä esteettömyyspalvelua?"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Poistetaanko esteettömyys?"</string>
     <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"Esteettömyyteen liittyviä sovelluksia ei löydy"</string>
     <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"Et ole asentanut esteettömyyssovelluksia."\n\n"Voit ladata ruudunlukijan laitteellesi Android Marketista."\n\n"Asenna ruudunlukija napsauttamalla OK."</string>
-    <string name="accessibility_script_injection_category" msgid="8649951751131431904">"Esteettömyyskoodi"</string>
     <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"Lataa esteettömyyskoodi"</string>
     <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"Anna sovelluksien ladata esteettömyyskoodia Googlelta"</string>
     <string name="accessibility_script_injection_security_warning" product="tablet" msgid="1113600871264359828">"Jotkut sovellukset voivat pyytää Googlea lataamaan tablet-laitteellesi koodia, jonka avulla sovellusten sisältö on paremmin käytettävissä. Haluatko antaa Googlelle luvan asentaa tablet-laitteellesi esteettömyyskoodia?"</string>
@@ -1106,10 +1157,11 @@
     <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>
-    <string name="power_usage_summary_title" msgid="5180282911164282324">"Akun käyttö"</string>
+    <string name="power_usage_summary_title" msgid="7190304207330319919">"Akku"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Mikä on käyttänyt akkua"</string>
     <string name="power_usage_not_available" msgid="3583407442633768046">"Akun käyttötietoja ei saatavilla"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Akun käyttö laturin irrottamisen jälkeen"</string>
@@ -1218,6 +1270,8 @@
     <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>
+    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Koneen asetukset"</string>
+    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Asetukset: <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
     <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>
@@ -1228,114 +1282,33 @@
     <string name="gadget_title" msgid="7455548605888590466">"Virranhallinta"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Päivitetään wifi-asetuksia"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Päivitetään Bluetooth-asetuksia"</string>
-    <string name="vpn_settings_activity_title" msgid="7276864950701612579">"VPN-asetukset"</string>
-    <string name="vpn_connect_to" msgid="2541409082892684362">"Yhdistä verkkoon <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpn_username_colon" msgid="7854930370861306247">"Käyttäjänimi:"</string>
-    <string name="vpn_password_colon" msgid="5716278710848606626">"Salasana:"</string>
-    <string name="vpn_a_username" msgid="6664733641993968692">"käyttäjänimi"</string>
-    <string name="vpn_a_password" msgid="1537213632501483753">"salasana"</string>
-    <string name="vpn_save_username" msgid="1408415289165970790">"Muista käyttäjänimi"</string>
-    <string name="vpn_connect_button" msgid="1699007212602470655">"Yhdistä"</string>
-    <string name="vpn_yes_button" msgid="8034531001149843119">"Kyllä"</string>
-    <string name="vpn_no_button" msgid="7620339571187119107">"Ei"</string>
-    <string name="vpn_back_button" msgid="192036339792734970">"Takaisin"</string>
-    <string name="vpn_mistake_button" msgid="1683383660912491270">"Ei"</string>
-    <string name="vpn_menu_done" msgid="93528279226907926">"Tallenna"</string>
-    <string name="vpn_menu_cancel" msgid="7234451214611202868">"Peruuta"</string>
-    <string name="vpn_menu_revert" msgid="4407762442281467659">"Palauta"</string>
-    <string name="vpn_menu_connect" msgid="1089399414463784218">"Yhdistä verkkoon"</string>
-    <string name="vpn_menu_disconnect" msgid="8254492450022562235">"Katkaise yhteys verkosta"</string>
-    <string name="vpn_menu_edit" msgid="4526245173583195618">"Muokkaa verkkoa"</string>
-    <string name="vpn_menu_delete" msgid="3326527392609513129">"Poista verkko"</string>
-    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"Kirjoita <xliff:g id="CODE">%s</xliff:g>."</string>
-    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"Valitse <xliff:g id="OPTION">%s</xliff:g>."</string>
-    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"VPN-nimi <xliff:g id="NAME">%s</xliff:g> on jo olemassa. Valitse toinen nimi."</string>
-    <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"Haluatko varmasti poistaa tämän VPN-verkon?"</string>
-    <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"Oletko varma, ettet halua luoda tätä profiilia?"</string>
-    <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"Haluatko varmasti hylätä tähän profiiliin tehdyt muutokset?"</string>
-    <string name="vpn_confirm_reconnect" msgid="5748535476278674296">"Verkkoyhteyden muodostaminen epäonnistui. Haluatko yrittää uudelleen?"</string>
-    <string name="vpn_reconnect_from_lost" msgid="2442844155623372118">"Yhteys katkesi. Haluatko yhdistää uudelleen?"</string>
-    <string name="vpn_unknown_server_dialog_msg" msgid="3080742299823671319">"Palvelimen nimeä ei voi selvittää. Haluatko tarkistaa palvelimen nimiasetukset?"</string>
-    <string name="vpn_challenge_error_dialog_msg" msgid="6174901754230038601">"Haastevirhe. Haluatko tarkistaa salaisuusasetuksesi?"</string>
-    <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"VPN-asetuksista puuttuu vähintään yksi salaisuus. Haluatko tarkistaa salaisuusasetuksesi?"</string>
-    <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"Antamasi käyttäjänimi tai salasana on virheellinen. Haluatko yrittää uudelleen?"</string>
-    <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"Palvelimeen ei saada yhteyttä. Antamasi käyttäjänimi tai salasana saattaa olla virheellinen. Haluatko yrittää uudelleen?"</string>
-    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"Ei yhteyttä palvelimeen. Saatat käyttää palomuuria, joka estää sinua yhdistämästä palvelimeen. Haluatko yrittää uudelleen?"</string>
-    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"Palvelinyhteyttä ei muodostettu. Palvelin ei välttämättä hyväksy salausvalintaasi. Haluatko tarkistaa salausasetuksesi?"</string>
-    <string name="vpn_type_title" msgid="6392933604218676224">"Lisää VPN"</string>
-    <string name="vpn_add_new_vpn" msgid="5438260689052714550">"Lisää VPN"</string>
-    <string name="vpn_details_title" msgid="418806440938510331">"VPN-tiedot"</string>
-    <string name="vpn_edit_title_add" msgid="2121313217989682890">"Lisää <xliff:g id="NAME">%s</xliff:g>-VPN"</string>
-    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"<xliff:g id="NAME">%s</xliff:g>-tiedot"</string>
-    <string name="vpns" msgid="3148141862835492816">"VPN-yhteydet"</string>
-    <string name="vpn_connecting" msgid="8039521381692090116">"Yhdistetään..."</string>
-    <string name="vpn_disconnecting" msgid="7748050200708257066">"Katkaistaan yhteyttä..."</string>
-    <string name="vpn_connected" msgid="7641723116362845781">"Yhdistetty"</string>
-    <string name="vpn_connect_hint" msgid="7442898962925875181">"Yhdistä verkkoon"</string>
-    <string name="vpn_name" msgid="1550918148476193076">"VPN-nimi"</string>
-    <string name="vpn_a_name" msgid="8445736942405283509">"VPN-nimi"</string>
-    <string name="vpn_profile_added" msgid="9061017910337129840">"<xliff:g id="NAME">%s</xliff:g> lisättiin"</string>
-    <string name="vpn_profile_replaced" msgid="587435576816273815">"Profiilia <xliff:g id="NAME">%s</xliff:g> muutettiin"</string>
-    <string name="vpn_user_certificate_title" msgid="6812545893924071742">"Aseta käyttäjävarmenne"</string>
-    <string name="vpn_user_certificate" msgid="949322691686938888">"Käyttäjävarmenne"</string>
-    <string name="vpn_a_user_certificate" msgid="8943983437956898649">"käyttäjävarmenne"</string>
-    <string name="vpn_ca_certificate_title" msgid="7846466160795589985">"Aseta CA-varmenne"</string>
-    <string name="vpn_ca_certificate" msgid="465085144064264742">"Certificate authority (CA) -varmenne"</string>
-    <string name="vpn_a_ca_certificate" msgid="3374242520974884295">"CA-varmenne"</string>
-    <string name="vpn_l2tp_secret_string_title" msgid="5039677186748940987">"Aseta L2TP-salaisuus"</string>
-    <string name="vpn_l2tp_secret" msgid="529359749677142076">"L2TP-salaisuus"</string>
-    <string name="vpn_a_l2tp_secret" msgid="6612042930810981845">"L2TP-salaisuus"</string>
-    <string name="vpn_pptp_encryption_title" msgid="2236795167467896499">"salaus"</string>
-    <string name="vpn_pptp_encryption" msgid="2602329949737259686">"PPTP-salaus"</string>
-    <string name="vpn_ipsec_presharedkey_title" msgid="2184060087690539175">"Aseta esijaettu IPSec-avain"</string>
-    <string name="vpn_ipsec_presharedkey" msgid="5434316521616673741">"esijaettu IPSec-avain"</string>
-    <string name="vpn_a_ipsec_presharedkey" msgid="1255301923217898418">"esijaettu IPSec-avain"</string>
-    <string name="vpn_vpn_server_title" msgid="8897005887420358913">"Aseta VPN-palvelin"</string>
-    <string name="vpn_vpn_server" msgid="1141754908824209260">"VPN-palvelin"</string>
-    <string name="vpn_a_vpn_server" msgid="5960906152125045853">"VPN-palvelin"</string>
-    <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"VPN-palvelimen nimi"</string>
-    <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"Nimipalveluhaun verkkotunnukset"</string>
-    <string name="vpn_dns_search_list" msgid="4230034234026605360">"Nimipalveluhaun verkkotunnukset"</string>
-    <string name="vpn_field_is_set" msgid="7137320847812992243">"<xliff:g id="VALUE">%s</xliff:g> on asetettu"</string>
-    <string name="vpn_field_not_set" msgid="2972519243515893804">"<xliff:g id="VALUE">%s</xliff:g> ei asetettu"</string>
-    <string name="vpn_field_not_set_optional" msgid="8840557698252556791">"<xliff:g id="VALUE">%s</xliff:g> ei asetettu (valinnainen)"</string>
-    <string name="vpn_enable_field" msgid="3700967675854517191">"Ota käyttöön <xliff:g id="OPTION">%s</xliff:g>"</string>
-    <string name="vpn_disable_field" msgid="6905658811179634005">"Poista <xliff:g id="OPTION">%s</xliff:g> käytöstä"</string>
-    <string name="vpn_is_enabled" msgid="1266304230417098877">"<xliff:g id="OPTION">%s</xliff:g> on käytössä"</string>
-    <string name="vpn_is_disabled" msgid="2013622485867806167">"<xliff:g id="OPTION">%s</xliff:g> on poistettu käytöstä"</string>
     <string name="vpn_settings_title" msgid="7327468307909556719">"VPN-asetukset"</string>
     <string name="vpn_settings_summary" msgid="8849924181594963972">"Ota käyttöön ja hallinnoi virtuaalisia yksityisverkkoja (VPN)."</string>
-    <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="trusted_credentials" msgid="4266945289534242402">"Luotetut todennustiedot"</string>
+    <string name="trusted_credentials_summary" msgid="6735221351155686632">"Näytä luotetut CA-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>
-    <string name="privacy_settings_title" msgid="1987089301293213705">"Tietosuoja-asetukset"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"Varmuuskopioi ja palauta"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"Varmuuskopioi ja palauta"</string>
     <string name="backup_section_title" msgid="8856083167469467588">"Varmuuskopioi ja palauta"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Henkilötiedot"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Varmuuskopioi tiedot"</string>
@@ -1439,4 +1412,107 @@
     <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>
+    <!-- no translation found for debug_ui_category (9023948280291055349) -->
+    <skip />
+    <!-- no translation found for strict_mode (1938795874357830695) -->
+    <skip />
+    <!-- no translation found for strict_mode_summary (142834318897332338) -->
+    <skip />
+    <!-- no translation found for pointer_location (6084434787496938001) -->
+    <skip />
+    <!-- no translation found for pointer_location_summary (840819275172753713) -->
+    <skip />
+    <!-- no translation found for show_screen_updates (8282711794220426931) -->
+    <skip />
+    <!-- no translation found for show_screen_updates_summary (1716122382094924596) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage (2389212910758076024) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage_summary (2113341923988958266) -->
+    <skip />
+    <!-- no translation found for window_animation_scale_title (6162587588166114700) -->
+    <skip />
+    <!-- no translation found for transition_animation_scale_title (387527540523595875) -->
+    <skip />
+    <!-- no translation found for debug_applications_category (6221644998451283813) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities (3622005081180597749) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities_summary (3592221124808773368) -->
+    <skip />
+    <!-- no translation found for app_process_limit_title (4121324758038197598) -->
+    <skip />
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Tietojen käyttö"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"Tiedonsiirtojakso"</string>
+    <string name="data_usage_menu_split_4g" msgid="7417435609285381968">"Erittele 4G-tiedonsiirto"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Näytä wifi-tiedonsiirto"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"Muuta jaksoa…"</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Tiedonsiirtojakson nollauspäivä (kk):"</string>
+    <string name="data_usage_disable_mobile_limit" msgid="289740911281022322">"Aseta mob.tiedonsiirtokiintiö"</string>
+    <string name="data_usage_disable_4g_limit" msgid="5808210773758699800">"Aseta 4G-tiedonsiirtokiintiö"</string>
+    <string name="data_usage_disable_3g_limit" msgid="3856971004328238231">"Aseta 2G-3G-tiedonsiirtokiintiö"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wifi"</string>
+    <string name="data_usage_tab_mobile" msgid="454140350007299045">"Mobiili"</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">"Mobiilitiedonsiirto"</string>
+    <string name="data_usage_enable_3g" msgid="6304006671869578254">"2G-3G-tiedonsiirto"</string>
+    <string name="data_usage_enable_4g" msgid="3635854097335036738">"4G-tiedonsiirto"</string>
+    <string name="data_usage_app_settings" msgid="3727561362090820369">"Näytä sovellusasetukset"</string>
+    <string name="data_usage_app_restrict_background" msgid="8856643905291165256">"Rajoita taustatiedonsiirtoa"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="1503361245973512092">"Salli sovellusten taustatiedonsiirto vain rajoittamattomassa verkossa"</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="8110736468987743260">"Taustatiedonsiirron rajoittaminen"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="100001698378554777">"Tämä voi vaikuttaa negatiivisesti sovelluksiin, jotka ovat riippuvaisia taustatiedonsiirrosta."\n\n"Saatat löytää sopivampia tiedonsiirtoasetuksia sovellusasetuksista."</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Käyttöjakson nollauspäivä"</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Kuukauden päivä:"</string>
+    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Aseta"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Tiedonsiirron rajoittaminen"</string>
+    <string name="data_usage_limit_dialog_mobile" msgid="7931094451923591578">"Mobiilitiedonsiirto poistetaan käytöstä, kun siirtoraja on täynnä."\n\n"Voit välttää mahdolliset lisätiedonsiirrosta aiheutuvat kulut käyttämällä hieman matalampaa rajaa, sillä laite voi laskea tiedonsiirron eri tavalla kuin operaattori."</string>
+    <string name="data_usage_limit_dialog_3g" msgid="5478553071420316963">"2G-3G-tiedonsiirto poistetaan käytöstä, kun siirtoraja on täynnä."\n\n"Voit välttää mahdolliset lisätiedonsiirrosta aiheutuvat kulut käyttämällä hieman matalampaa rajaa, sillä laite voi laskea tiedonsiirron eri tavalla kuin operaattori."</string>
+    <string name="data_usage_limit_dialog_4g" msgid="6134008906742403777">"4G-tiedonsiirto poistetaan käytöstä, kun siirtoraja on täynnä."\n\n"Voit välttää mahdolliset lisätiedonsiirrosta aiheutuvat kulut käyttämällä hieman matalampaa rajaa, sillä laite voi laskea tiedonsiirron eri tavalla kuin operaattori."</string>
+    <string name="data_usage_disabled_dialog_3g_title" msgid="4221584306492812040">"2G-3G-tiedonsiirto pois käytöstä"</string>
+    <string name="data_usage_disabled_dialog_4g_title" msgid="715585612162185936">"4G-tiedonsiirto pois käytöstä"</string>
+    <string name="data_usage_disabled_dialog_mobile_title" msgid="209516216265000221">"Mobiilitiedonsiirto pois käytöstä"</string>
+    <string name="data_usage_disabled_dialog" msgid="2874031671067845964">"Määritetty tiedonsiirtoraja on täynnä."\n\n"Operaattori voi veloittaa lisätiedonsiirrosta."</string>
+    <string name="data_usage_disabled_dialog_enable" msgid="2441219164620753329">"Ota tiedonsiirto käyttöön"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="32">"<xliff:g id="NUMBER">%1$s</xliff:g>"</font>" "<font size="12">"<xliff:g id="UNIT">%2$s</xliff:g>"</font>\n<font size="12">"varoitus"</font></string>
+    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Hätäpuhelu"</string>
+    <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Palaa puheluun"</string>
+    <string name="vpn_name" msgid="4689699885361002297">"Nimi"</string>
+    <string name="vpn_type" msgid="5435733139514388070">"Tyyppi"</string>
+    <string name="vpn_server" msgid="2123096727287421913">"Palvelimen osoite"</string>
+    <string name="vpn_mppe" msgid="6639001940500288972">"PPP-salaus (MPPE)"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"L2TP-salaisuus"</string>
+    <string name="vpn_ipsec_identifier" msgid="4098175859460006296">"IPSec-tunnus"</string>
+    <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Esijaettu IPSec-avain"</string>
+    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"IPSec-käyttäjävarmenne"</string>
+    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec-CA-varmenne"</string>
+    <!-- no translation found for vpn_search_domains (5391995501541199624) -->
+    <skip />
+    <!-- no translation found for vpn_routes (8556236801755260073) -->
+    <skip />
+    <string name="vpn_username" msgid="1863901629860867849">"Käyttäjänimi"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Salasana"</string>
+    <!-- no translation found for vpn_save_login (6350322456427484881) -->
+    <skip />
+    <!-- no translation found for vpn_not_used (9094191054524660891) -->
+    <skip />
+    <string name="vpn_no_ca_cert" msgid="7820884983947090538">"(älä vahvista palvelinta)"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"Peruuta"</string>
+    <string name="vpn_save" msgid="4233484051644764510">"Tallenna"</string>
+    <string name="vpn_connect" msgid="8469608541746132301">"Yhdistä"</string>
+    <string name="vpn_edit" msgid="1111459297288136079">"Muokkaa VPN-verkkoa"</string>
+    <string name="vpn_connect_to" msgid="7328758950427515753">"Yhdistä verkkoon <xliff:g id="NETWORK">%s</xliff:g>"</string>
+    <string name="vpn_title" msgid="7982620762043790565">"VPN-asetukset"</string>
+    <string name="vpn_create" msgid="8966010925994175306">"Lisää VPN-verkko"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"Muokkaa verkkoa"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"Poista verkko"</string>
+    <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Järjestelmä"</string>
+    <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Käyttäjä"</string>
+    <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Poista käytöstä"</string>
+    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Ota käyttöön"</string>
+    <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Poista"</string>
+    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Otetaanko järjestelmän CA-varmenne käyttöön?"</string>
+    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Poistetaanko järjestelmän CA-varmenne käytöstä?"</string>
+    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Poistetaanko käyttäjän CA-varmenne pysyvästi?"</string>
 </resources>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index 2a94715..33f3530 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>
@@ -214,4 +240,36 @@
     <item msgid="3878793616631049349">"Utiliser la vérification HDCP uniquement pour le contenu GDN"</item>
     <item msgid="45075631231212732">"Toujours utiliser la vérification HDCP"</item>
   </string-array>
+    <!-- no translation found for window_animation_scale_entries:0 (8134156599370824081) -->
+    <!-- no translation found for window_animation_scale_entries:1 (6624864048416710414) -->
+    <!-- no translation found for window_animation_scale_entries:2 (2219332261255416635) -->
+    <!-- no translation found for window_animation_scale_entries:3 (3544428804137048509) -->
+    <!-- no translation found for window_animation_scale_entries:4 (3110710404225974514) -->
+    <!-- no translation found for window_animation_scale_entries:5 (4402738611528318731) -->
+    <!-- no translation found for window_animation_scale_entries:6 (6189539267968330656) -->
+    <!-- no translation found for transition_animation_scale_entries:0 (8464255836173039442) -->
+    <!-- no translation found for transition_animation_scale_entries:1 (3375781541913316411) -->
+    <!-- no translation found for transition_animation_scale_entries:2 (1991041427801869945) -->
+    <!-- no translation found for transition_animation_scale_entries:3 (4012689927622382874) -->
+    <!-- no translation found for transition_animation_scale_entries:4 (3289156759925947169) -->
+    <!-- no translation found for transition_animation_scale_entries:5 (7705857441213621835) -->
+    <!-- no translation found for transition_animation_scale_entries:6 (6660750935954853365) -->
+    <!-- no translation found for app_process_limit_entries:0 (6799596560242275471) -->
+    <!-- no translation found for app_process_limit_entries:1 (2412794376818632575) -->
+    <!-- no translation found for app_process_limit_entries:2 (1578904888612645001) -->
+    <!-- no translation found for app_process_limit_entries:3 (8819235336299873577) -->
+  <string-array name="vpn_types_long">
+    <item msgid="2732002039459078847">"VPN PPTP"</item>
+    <item msgid="3799752201662127867">"VPN L2TP/IPSec avec clés pré-partagées"</item>
+    <item msgid="4725504331295252103">"VPN L2TP/IPSec avec certificats"</item>
+    <item msgid="7526551163264034377">"VPN IPSec avec clés pré-partagées et authentification Xauth"</item>
+    <item msgid="8064740940687465039">"VPN IPSec avec certificats et authentification Xauth"</item>
+    <item msgid="4946199982372391490">"VPN IPSec avec certificats et authentification hybride"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:0 (8621078286418985762) -->
+    <!-- no translation found for vpn_states:1 (6692305604213080515) -->
+    <!-- no translation found for vpn_states:2 (8001704909356800092) -->
+    <!-- no translation found for vpn_states:3 (4039737283841672166) -->
+    <!-- no translation found for vpn_states:4 (4042143101664725090) -->
+    <!-- no translation found for vpn_states:5 (2690164254699635531) -->
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 8536302..d6b0d5e 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -19,6 +19,10 @@
     <string name="yes" msgid="4676390750360727396">"Oui"</string>
     <string name="no" msgid="6731231425810196216">"Non"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Inconnu"</string>
+    <string name="header_category_wireless_networks" msgid="4944823405420438623">"SANS FIL ET RÉSEAUX"</string>
+    <string name="header_category_device" msgid="5781174212691167553">"APPAREIL"</string>
+    <string name="header_category_personal" msgid="6225932173498802187">"PERSONNEL"</string>
+    <string name="header_category_system" msgid="2073558547468647128">"SYSTÈME"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Allumer le signal radio"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Éteindre le signal radio"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Afficher le carnet d\'adresses de la carte SIM"</string>
@@ -111,7 +115,11 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Association…"</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"Relié, mais pas connecté"</string>
     <string name="bluetooth_device" msgid="6873461446424952003">"mains libres/casque"</string>
-    <string name="progress_scanning" msgid="3760897655335759141">"Recherche"</string>
+    <!-- outdated translation 3760897655335759141 -->     <string name="progress_scanning" msgid="192587958424295789">"Recherche"</string>
+    <!-- no translation found for progress_tap_to_pair (4192342336107106334) -->
+    <skip />
+    <!-- no translation found for bluetooth_no_devices_found (2412462335116297668) -->
+    <skip />
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Demande d\'association Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Demande d\'association"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Sélectionner pour associer à <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
@@ -130,6 +138,9 @@
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Une application de votre téléphone demande l\'autorisation d\'activer Bluetooth et de permettre à d\'autres appareils d\'identifier votre téléphone. Voulez-vous activer cette fonction ?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Activation du Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Connexion automatique"</string>
+    <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Demande de connexion Bluetooth"</string>
+    <string name="bluetooth_connection_notif_message" msgid="1833221950512058309">"Appuyez ici pour vous connecter à \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
+    <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Voulez-vous vous connecter à \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" ?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Paramètres d\'heure et de date"</string>
     <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>
@@ -235,7 +246,7 @@
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Désactiver toutes les connexions sans fil"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"Désactivation des connexions sans fil…"</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"Activation des connexions sans fil…"</string>
-    <string name="radio_controls_title" msgid="5868688473587168882">"Sans fil et réseaux"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Plus..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Sans fil et réseaux"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"Configurer le Wi-Fi, le mode Bluetooth, le mode Avion, les réseaux mobiles et le VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Itinérance des données"</string>
@@ -271,8 +282,8 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Infos propriétaire"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="2382525043173672857">"Saisissez texte à afficher sur écran verrouillé"</string>
-    <string name="security_settings_title" msgid="5168491784222013179">"Localisation et sécurité"</string>
-    <string name="location_security_settings_title" msgid="4624434296446625554">"Paramètres de sécurité et localisation"</string>
+    <string name="location_settings_title" msgid="8935806698251432196">"Services de localisation"</string>
+    <string name="security_settings_title" msgid="7945465324818485460">"Sécurité"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Définir les paramètres de l\'option Ma position et de verrouillage"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Définir les paramètres de la fonction Ma position, de déverrouillage de l\'écran et de verrouillage du stockage des identifiants"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Mots de passe"</string>
@@ -316,7 +327,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>
@@ -375,8 +386,8 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Afficher ou désactiver les administrateurs de l\'appareil"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Activer le Bluetooth"</string>
-    <string name="bluetooth_settings" msgid="2725796451253089609">"Paramètres Bluetooth"</string>
-    <string name="bluetooth_settings_title" msgid="2824020086246268296">"Paramètres Bluetooth"</string>
+    <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
+    <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Gérer les connexions, configurer le nom et l\'identification de l\'appareil"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Demande d\'association Bluetooth"</string>
     <string name="bluetooth_enter_pin_msg" msgid="1499285355129256289">\n"Saisissez un code PIN pour effectuer l\'association avec \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". (Essayez 0000 ou 1234.) Il est possible que vous deviez saisir le même code PIN sur le périphérique Bluetooth."</string>
@@ -394,7 +405,10 @@
     <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Association refusée par <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"Un problème est survenu lors de la connexion à <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Rechercher des appareils"</string>
-    <string name="bluetooth_preference_find_nearby_title" msgid="5087410003465463318">"Trouver des appareils à proximité"</string>
+    <!-- no translation found for bluetooth_search_for_devices (5957007154213560390) -->
+    <skip />
+    <!-- no translation found for bluetooth_searching_for_devices (9203739709307871727) -->
+    <skip />
     <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"Paramètres de l\'appareil"</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Périphériques associés"</string>
     <string name="bluetooth_preference_found_devices" msgid="3133019331974936204">"Périphériques trouvés"</string>
@@ -404,6 +418,10 @@
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Dissocier"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Déconnecter et dissocier"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Options…"</string>
+    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Paramètres avancés"</string>
+    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Paramètres Bluetooth avancés"</string>
+    <string name="bluetooth_advanced_settings_label" msgid="8659717781212434173">"Paramètres Bluetooth avancés"</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="3631028334811113629">"Activer Bluetooth pour voir appareils disponibles"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Se connecter à…"</string>
     <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"Multimédia"</string>
     <string name="bluetooth_profile_headset" msgid="81844079120986198">"Mains libres"</string>
@@ -445,27 +463,31 @@
     <string name="nfc_toggle_error" msgid="2233172102497535522">"Une erreur s\'est produite."</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Activer le Wi-Fi"</string>
-    <string name="wifi_settings" msgid="4746946030627213196">"Paramètres Wi-Fi"</string>
+    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="2810363951104753710">"Paramètres Wi-Fi"</string>
+    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Configurer et gérer les points d\'accès sans fil"</string>
-    <string name="wifi_starting" msgid="6710266609710860129">"Activation…"</string>
-    <string name="wifi_stopping" msgid="5952909472548218348">"Désactivation…"</string>
+    <string name="wifi_starting" msgid="7732330327758522943">"Activation du Wi-Fi..."</string>
+    <string name="wifi_stopping" msgid="244864762599017659">"Désactivation du Wi-Fi..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"Erreur"</string>
     <string name="wifi_in_airplane_mode" msgid="7618393787965366655">"En mode avion"</string>
     <string name="wifi_fail_to_scan" msgid="6194542252808587669">"Impossible de rechercher des réseaux."</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Notification de réseau"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Me notifier lorsqu\'un réseau ouvert est disponible"</string>
+    <string name="wifi_enable_watchdog_service" msgid="4723544454066601706">"Contrôles de la connectivité Wi-Fi"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="8687400936839455926">"Détecter et gérer les éventuels problèmes de connectivité réseau"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Règles de déconnexion du Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Indiquer quand basculer du Wi-Fi sur le réseau de données mobile"</string>
     <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" msgid="6234851776910938957">"Ajouter un réseau"</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>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Se connecter au réseau"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Retirer le réseau"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modifier le réseau"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="3682507011071029311">"Activer le Wi-Fi pour voir les réseaux disponibles"</string>
     <string name="wifi_network_setup" msgid="7974851890019344870">"Configuration du réseau"</string>
     <string name="wifi_wps_pin" msgid="5471842298708321115">"Tapez un code d\'accès depuis un point d\'accès"</string>
     <string name="wifi_wps_setup_title" msgid="150518971269252336">"Configuration WPS"</string>
@@ -501,13 +523,13 @@
     <string name="wifi_save" msgid="3331121567988522826">"Enregistrer"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Annuler"</string>
     <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"Une autre session WPS a été détectée. Veuillez réessayer dans quelques minutes."</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Options avancées"</string>
+    <!-- outdated translation 5419052271935350999 -->     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Options avancées"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Plage de fréquences Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Définir la plage de fréquences"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Erreur de paramétrage de la plage de fréquences"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Adresse MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Adresse IP"</string>
-    <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"Paramètres IP"</string>
+    <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Paramètres IP"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Enregistrer"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Annuler"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Saisissez une adresse IP valide."</string>
@@ -525,7 +547,7 @@
     <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"Point d\'accès Wi-Fi mobile <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="sound_settings_title" msgid="8735891486683305886">"Son"</string>
-    <string name="display_settings_title" msgid="2378894265964357591">"Écran"</string>
+    <string name="display_settings_title" msgid="1708697328627382561">"Affichage"</string>
     <string name="sound_settings" msgid="5007659014828162881">"Paramètres sonores"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Mode silencieux"</string>
     <string name="silent_mode_summary" msgid="3309650676072917899">"Aucun son, sauf pour le multimédia et le réveil"</string>
@@ -598,7 +620,18 @@
     <string name="brightness_summary" msgid="838917350127550703">"Régler la luminosité de l\'écran"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Délai"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"L\'écran s\'éteint automatiquement au bout de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>."</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Fond d\'écran"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Rêves Android"</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 +676,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>
@@ -696,6 +730,16 @@
     <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"La carte SD va être désinstallée."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Désinstallation en cours"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Désinstallation en cours"</string>
+    <!-- no translation found for storage_menu_usb (1580545228584324704) -->
+    <skip />
+    <!-- no translation found for storage_title_usb (5775322159427546546) -->
+    <skip />
+    <!-- no translation found for usb_label_mtp (4157227401755543412) -->
+    <skip />
+    <!-- no translation found for usb_label_ptp (7417254019489575819) -->
+    <skip />
+    <!-- no translation found for usb_label_installer_cd (7438467574756086977) -->
+    <skip />
     <string name="battery_status_title" msgid="9159414319574976203">"État de la batterie"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Niveau de la batterie"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -806,6 +850,8 @@
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"Partage connexion impossible au-delà de <xliff:g id="MAXCONNECTION">%1$d</xliff:g> mobiles"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Le partage connexion avec <xliff:g id="DEVICE_NAME">%1$s</xliff:g> va être annulé."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Aide"</string>
+    <string name="wireless_category_general" msgid="2973810407987118067">"Général"</string>
+    <string name="wireless_category_mobile_networks" msgid="1254629216798424288">"Réseaux mobiles"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Réseaux mobiles"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Définir les options d\'itinérance, réseaux, noms de points d\'accès"</string>
     <string name="location_title" msgid="1029961368397484576">"Ma position"</string>
@@ -883,7 +929,7 @@
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Sécurisation de votre tablette"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Sécurisation de votre téléphone"</string>
     <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"Protégez votre tablette contre toute utilisation non autorisée en créant un schéma personnel de déverrouillage de l\'écran. À l\'aide de votre doigt, reliez les points dans l\'ordre de votre choix sur l\'écran suivant. Vous devez relier au moins quatre points. "\n\n"Vous êtes prêt ? Appuyez sur \"Suivant\"."</string>
-    <string name="lock_intro_message" product="default" msgid="9100785646737118042"><font size="17">"Protégez votre téléphone contre toute utilisation non autorisée en créant un schéma personnel de déverrouillage de l\'écran. "\n<font height="17">\n</font><b>"1"</b>"  L\'écran suivant vous présente un exemple de schéma. "\n<font height="17">\n</font><b>"2"</b>"  Lorsque vous êtes prêt, dessinez votre propre schéma de déverrouillage. Essayez-en plusieurs, mais veillez à relier au moins quatre points. "\n<font height="17">\n</font><b>"3"</b>"  Reproduisez votre schéma pour confirmer votre choix. "\n<font height="17">\n</font><b>"Pour commencer, appuyez sur \"Suivant\""</b>". "\n<font height="3">\n</font>"Si vous ne souhaitez pas activer la protection, appuyez sur \"Annuler\"."</font></string>
+    <!-- outdated translation 3692151094288835065 -->     <string name="lock_intro_message" product="default" msgid="5796785892741212873">"Protégez votre tablette contre toute utilisation non autorisée en créant un schéma personnel de déverrouillage de l\'écran. À l\'aide de votre doigt, reliez les points dans l\'ordre de votre choix sur l\'écran suivant. Vous devez relier au moins quatre points. "\n\n"Vous êtes prêt ? Appuyez sur \"Suivant\"."</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Gérer applications"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Gérer et supprimer les applications installées"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Applications"</string>
@@ -893,6 +939,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>
@@ -905,9 +953,10 @@
     <string name="force_stop" msgid="7435006169872876756">"Forcer l\'arrêt"</string>
     <string name="total_size_label" msgid="1048676419552557254">"Total"</string>
     <string name="application_size_label" msgid="5055196275624686382">"Application"</string>
+    <string name="external_code_size_label" msgid="3459343140355961335">"Mémoire USB utilisée par l\'application"</string>
     <string name="data_size_label" msgid="8679376373625710107">"Données"</string>
-    <string name="external_size_label" product="nosdcard" msgid="4465530017830945766">"Mémoire de stockage USB"</string>
-    <string name="external_size_label" product="default" msgid="2107155737635944440">"Carte SD"</string>
+    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Mémoire USB utilisée par les données"</string>
+    <string name="external_data_size_label" product="default" msgid="626414192825329708">"Carte SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Désinstaller"</string>
     <string name="disable_text" msgid="6544054052049395202">"Désactiver"</string>
     <string name="enable_text" msgid="9217362512327828987">"Activer"</string>
@@ -1026,7 +1075,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 +1085,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>
@@ -1066,7 +1117,7 @@
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Paramètres du clavier virtuel"</string>
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Clavier physique"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Paramètres du clavier physique"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Développement"</string>
+    <string name="development_settings_title" msgid="215179176067683667">"Options pour les développeurs"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"Définir les options pour le développement de l\'application"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Débogage USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Mode débogage lorsqu\'un câble USB est connecté"</string>
@@ -1091,14 +1142,14 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Accessibilité"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Paramètres d\'accessibilité"</string>
     <string name="accessibility_settings_summary" msgid="8185181964847149507">"Gérer les options d\'accessibilité"</string>
-    <string name="toggle_accessibility_title" msgid="650839277066574497">"Accessibilité"</string>
+    <string name="toggle_large_text_title" msgid="42259643359869436">"Grands caractères"</string>
     <string name="accessibility_services_category" msgid="8127851026323672607">"Services d\'accessibilité"</string>
+    <string name="toggle_accessibility_title" msgid="7338739354952553958">"Activer les services d\'accessibilité"</string>
     <string name="no_accessibility_services_summary" msgid="694578333333808159">"Aucun service d\'accessibilité installé"</string>
     <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Ce service d\'accessibilité est susceptible de recueillir tout le texte que vous saisissez, y compris les données personnelles et les numéros de cartes de crédit, mais pas les mots de passe. Il est également possible qu\'il enregistre vos interactions avec l\'interface utilisateur. Il provient de l\'application <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Utiliser ce service d\'accessibilité ?"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Désactiver les services d\'accessibilité ?"</string>
     <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"Aucune application d\'accessibilité n\'a été trouvée."</string>
     <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"Aucune application d\'accessibilité n\'est installée."\n\n"Vous pouvez télécharger un lecteur d\'écran pour votre mobile depuis Android Market."\n\n"Cliquez sur OK pour installer le lecteur d\'écran."</string>
-    <string name="accessibility_script_injection_category" msgid="8649951751131431904">"Scripts d\'accessibilité"</string>
     <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"Télécharger les scripts d\'accessibilité"</string>
     <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"Autoriser les applications à télécharger des scripts d\'accessibilité à partir de Google"</string>
     <string name="accessibility_script_injection_security_warning" product="tablet" msgid="1113600871264359828">"Pour accéder au contenu de certaines applications, vous devrez éventuellement télécharger des scripts sur votre tablette. Voulez-vous vraiment autoriser Google à installer des scripts d\'accessibilité sur votre tablette ?"</string>
@@ -1106,10 +1157,11 @@
     <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>
-    <string name="power_usage_summary_title" msgid="5180282911164282324">"Utilisation de la batterie"</string>
+    <string name="power_usage_summary_title" msgid="7190304207330319919">"Batterie"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Répartition de l\'utilisation de la batterie"</string>
     <string name="power_usage_not_available" msgid="3583407442633768046">"Données batterie non disponibles"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Utilisation de la batterie depuis le débranchement"</string>
@@ -1218,6 +1270,8 @@
     <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>
+    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Paramètres du moteur"</string>
+    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Paramètres de <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
     <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>
@@ -1228,114 +1282,33 @@
     <string name="gadget_title" msgid="7455548605888590466">"Contrôle de l\'alimentation"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Mise à jour des paramètres Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Mise à jour des paramètres Bluetooth"</string>
-    <string name="vpn_settings_activity_title" msgid="7276864950701612579">"Paramètres de VPN"</string>
-    <string name="vpn_connect_to" msgid="2541409082892684362">"Connexion à \"<xliff:g id="NAME">%s</xliff:g>\""</string>
-    <string name="vpn_username_colon" msgid="7854930370861306247">"Nom d\'utilisateur :"</string>
-    <string name="vpn_password_colon" msgid="5716278710848606626">"Mot de passe :"</string>
-    <string name="vpn_a_username" msgid="6664733641993968692">"un nom d\'utilisateur"</string>
-    <string name="vpn_a_password" msgid="1537213632501483753">"un mot de passe"</string>
-    <string name="vpn_save_username" msgid="1408415289165970790">"Mémoriser le nom d\'utilisateur"</string>
-    <string name="vpn_connect_button" msgid="1699007212602470655">"Se connecter"</string>
-    <string name="vpn_yes_button" msgid="8034531001149843119">"Oui"</string>
-    <string name="vpn_no_button" msgid="7620339571187119107">"Non"</string>
-    <string name="vpn_back_button" msgid="192036339792734970">"Retour"</string>
-    <string name="vpn_mistake_button" msgid="1683383660912491270">"Non"</string>
-    <string name="vpn_menu_done" msgid="93528279226907926">"Enregistrer"</string>
-    <string name="vpn_menu_cancel" msgid="7234451214611202868">"Annuler"</string>
-    <string name="vpn_menu_revert" msgid="4407762442281467659">"Annuler"</string>
-    <string name="vpn_menu_connect" msgid="1089399414463784218">"Se connecter au réseau"</string>
-    <string name="vpn_menu_disconnect" msgid="8254492450022562235">"Se déconnecter du réseau"</string>
-    <string name="vpn_menu_edit" msgid="4526245173583195618">"Modifier le réseau"</string>
-    <string name="vpn_menu_delete" msgid="3326527392609513129">"Supprimer un réseau"</string>
-    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"Vous devez entrer \"<xliff:g id="CODE">%s</xliff:g>\"."</string>
-    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"Vous devez sélectionner \"<xliff:g id="OPTION">%s</xliff:g>\"."</string>
-    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"Le nom de VPN \"<xliff:g id="NAME">%s</xliff:g>\" existe déjà. Veuillez choisir un autre nom."</string>
-    <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"Voulez-vous vraiment supprimer ce VPN ?"</string>
-    <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"Êtes-vous sûr de ne pas vouloir créer ce profil ?"</string>
-    <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"Voulez-vous vraiment annuler les modifications apportées à ce profil ?"</string>
-    <string name="vpn_confirm_reconnect" msgid="5748535476278674296">"Connexion au réseau impossible. Voulez-vous réessayer ?"</string>
-    <string name="vpn_reconnect_from_lost" msgid="2442844155623372118">"Connexion perdue. Voulez-vous essayer de vous reconnecter ?"</string>
-    <string name="vpn_unknown_server_dialog_msg" msgid="3080742299823671319">"Résolution du nom du serveur impossible. Voulez-vous vérifier le paramètre de nom de serveur ?"</string>
-    <string name="vpn_challenge_error_dialog_msg" msgid="6174901754230038601">"Erreur de demande d\'accès. Voulez-vous vérifier le secret défini ?"</string>
-    <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"Un ou plusieurs secrets sont manquants dans cette configuration VPN. Voulez-vous contrôler les paramètres de vos secrets ?"</string>
-    <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"Le nom d\'utilisateur ou le mot de passe entré est incorrect. Voulez-vous réessayer ?"</string>
-    <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"Le serveur a raccroché. Le nom d\'utilisateur et le mot de passe que vous avez saisis sont peut-être incorrects. Voulez-vous réessayer ?"</string>
-    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"Le serveur a raccroché. Il est possible que vous soyez protégé par un pare-feu qui empêche toute connexion au serveur. Souhaitez-vous réessayer ?"</string>
-    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"Échec de la négociation avec le serveur. Le serveur n\'est peut-être pas conforme au paramètre de chiffrement. Voulez-vous vérifier le paramètre de chiffrement ?"</string>
-    <string name="vpn_type_title" msgid="6392933604218676224">"Ajouter un VPN"</string>
-    <string name="vpn_add_new_vpn" msgid="5438260689052714550">"Ajouter un VPN"</string>
-    <string name="vpn_details_title" msgid="418806440938510331">"Informations sur le VPN"</string>
-    <string name="vpn_edit_title_add" msgid="2121313217989682890">"Ajouter le VPN \"<xliff:g id="NAME">%s</xliff:g>\""</string>
-    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"Détails du profil \"<xliff:g id="NAME">%s</xliff:g>\""</string>
-    <string name="vpns" msgid="3148141862835492816">"VPN"</string>
-    <string name="vpn_connecting" msgid="8039521381692090116">"Connexion en cours…"</string>
-    <string name="vpn_disconnecting" msgid="7748050200708257066">"Déconnexion en cours…"</string>
-    <string name="vpn_connected" msgid="7641723116362845781">"Connecté"</string>
-    <string name="vpn_connect_hint" msgid="7442898962925875181">"Se connecter au réseau"</string>
-    <string name="vpn_name" msgid="1550918148476193076">"Nom du VPN"</string>
-    <string name="vpn_a_name" msgid="8445736942405283509">"un nom de VPN"</string>
-    <string name="vpn_profile_added" msgid="9061017910337129840">"\"<xliff:g id="NAME">%s</xliff:g>\" a été ajouté."</string>
-    <string name="vpn_profile_replaced" msgid="587435576816273815">"Modifications appliquées à \"<xliff:g id="NAME">%s</xliff:g>\""</string>
-    <string name="vpn_user_certificate_title" msgid="6812545893924071742">"Définir le certificat utilisateur"</string>
-    <string name="vpn_user_certificate" msgid="949322691686938888">"Certificat utilisateur"</string>
-    <string name="vpn_a_user_certificate" msgid="8943983437956898649">"un certificat utilisateur"</string>
-    <string name="vpn_ca_certificate_title" msgid="7846466160795589985">"Définir le certificat CA"</string>
-    <string name="vpn_ca_certificate" msgid="465085144064264742">"Certificat de l\'autorité de certification (CA)"</string>
-    <string name="vpn_a_ca_certificate" msgid="3374242520974884295">"un certificat CA"</string>
-    <string name="vpn_l2tp_secret_string_title" msgid="5039677186748940987">"Définir le secret L2TP"</string>
-    <string name="vpn_l2tp_secret" msgid="529359749677142076">"Secret L2TP"</string>
-    <string name="vpn_a_l2tp_secret" msgid="6612042930810981845">"un secret L2TP"</string>
-    <string name="vpn_pptp_encryption_title" msgid="2236795167467896499">"chiffrement"</string>
-    <string name="vpn_pptp_encryption" msgid="2602329949737259686">"Chiffrement PPTP"</string>
-    <string name="vpn_ipsec_presharedkey_title" msgid="2184060087690539175">"Définir la clé pré-partagée IPSec"</string>
-    <string name="vpn_ipsec_presharedkey" msgid="5434316521616673741">"Clé pré-partagée IPSec"</string>
-    <string name="vpn_a_ipsec_presharedkey" msgid="1255301923217898418">"une clé pré-partagée IPSec"</string>
-    <string name="vpn_vpn_server_title" msgid="8897005887420358913">"Définir le serveur VPN"</string>
-    <string name="vpn_vpn_server" msgid="1141754908824209260">"Serveur VPN"</string>
-    <string name="vpn_a_vpn_server" msgid="5960906152125045853">"un serveur VPN"</string>
-    <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"Nom du serveur VPN"</string>
-    <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"Domaines de recherche DNS"</string>
-    <string name="vpn_dns_search_list" msgid="4230034234026605360">"Domaines de recherche DNS"</string>
-    <string name="vpn_field_is_set" msgid="7137320847812992243">"Valeur \"<xliff:g id="VALUE">%s</xliff:g>\" définie"</string>
-    <string name="vpn_field_not_set" msgid="2972519243515893804">"Valeur \"<xliff:g id="VALUE">%s</xliff:g>\" non définie"</string>
-    <string name="vpn_field_not_set_optional" msgid="8840557698252556791">"Valeur \"<xliff:g id="VALUE">%s</xliff:g>\" non définie (facultatif)"</string>
-    <string name="vpn_enable_field" msgid="3700967675854517191">"Activer \"<xliff:g id="OPTION">%s</xliff:g>\""</string>
-    <string name="vpn_disable_field" msgid="6905658811179634005">"Désactiver \"<xliff:g id="OPTION">%s</xliff:g>\""</string>
-    <string name="vpn_is_enabled" msgid="1266304230417098877">"L\'option \"<xliff:g id="OPTION">%s</xliff:g>\" est activée."</string>
-    <string name="vpn_is_disabled" msgid="2013622485867806167">"L\'option \"<xliff:g id="OPTION">%s</xliff:g>\" est désactivée."</string>
     <string name="vpn_settings_title" msgid="7327468307909556719">"Paramètres de VPN"</string>
     <string name="vpn_settings_summary" msgid="8849924181594963972">"Configurer et gérer les réseaux privés virtuels (VPN)"</string>
-    <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="trusted_credentials" msgid="4266945289534242402">"Références de confiance"</string>
+    <string name="trusted_credentials_summary" msgid="6735221351155686632">"Afficher les certificats d\'autorité de confiance"</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 d’effacer identifiants stockés."</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>
-    <string name="privacy_settings_title" msgid="1987089301293213705">"Paramètres de confidentialité"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"Sauvegarder et réinitialiser"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"Sauvegarder et réinitialiser"</string>
     <string name="backup_section_title" msgid="8856083167469467588">"Sauvegarder et restaurer"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Données personnelles"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Sauvegarder mes données"</string>
@@ -1439,4 +1412,107 @@
     <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>
+    <!-- no translation found for debug_ui_category (9023948280291055349) -->
+    <skip />
+    <!-- no translation found for strict_mode (1938795874357830695) -->
+    <skip />
+    <!-- no translation found for strict_mode_summary (142834318897332338) -->
+    <skip />
+    <!-- no translation found for pointer_location (6084434787496938001) -->
+    <skip />
+    <!-- no translation found for pointer_location_summary (840819275172753713) -->
+    <skip />
+    <!-- no translation found for show_screen_updates (8282711794220426931) -->
+    <skip />
+    <!-- no translation found for show_screen_updates_summary (1716122382094924596) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage (2389212910758076024) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage_summary (2113341923988958266) -->
+    <skip />
+    <!-- no translation found for window_animation_scale_title (6162587588166114700) -->
+    <skip />
+    <!-- no translation found for transition_animation_scale_title (387527540523595875) -->
+    <skip />
+    <!-- no translation found for debug_applications_category (6221644998451283813) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities (3622005081180597749) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities_summary (3592221124808773368) -->
+    <skip />
+    <!-- no translation found for app_process_limit_title (4121324758038197598) -->
+    <skip />
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Utilisation des données"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"Cycle utilisation données"</string>
+    <string name="data_usage_menu_split_4g" msgid="7417435609285381968">"Séparer utilisation données 4G"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Afficher utilisation données Wi-Fi"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"Changer le cycle..."</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Jour du mois de réinitialisation du cycle utilisation données :"</string>
+    <string name="data_usage_disable_mobile_limit" msgid="289740911281022322">"Désact. données selon limite"</string>
+    <string name="data_usage_disable_4g_limit" msgid="5808210773758699800">"Désact. 4G selon limite"</string>
+    <string name="data_usage_disable_3g_limit" msgid="3856971004328238231">"Désact. 2G-3G selon limite"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_mobile" msgid="454140350007299045">"Internet"</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">"Données mobiles"</string>
+    <string name="data_usage_enable_3g" msgid="6304006671869578254">"Données 2G-3G"</string>
+    <string name="data_usage_enable_4g" msgid="3635854097335036738">"Données 4G"</string>
+    <string name="data_usage_app_settings" msgid="3727561362090820369">"Afficher paramètres d\'application"</string>
+    <string name="data_usage_app_restrict_background" msgid="8856643905291165256">"Limiter util. données arrière-plan"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="1503361245973512092">"Autoriser données en arrière-plan uniq. quand connecté à réseau illimité"</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="8110736468987743260">"Limitation des données en arrière-plan"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="100001698378554777">"Cette fonctionnalité peut nuire à des applications qui dépendent de l\'utilisation des données en arrière-plan."\n\n"Des options plus appropriées de contrôle d\'utilisation des services de données sont disponibles dans les paramètres de cette application."</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Date de réinitialisation du cycle d\'utilisation"</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Date réinitialisation mensuelle :"</string>
+    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Défini"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Limitation de l\'utilisation des données mobiles"</string>
+    <string name="data_usage_limit_dialog_mobile" msgid="7931094451923591578">"Votre connexion de données sera désactivée lorsque vous atteindrez la limite spécifiée."\n\n"Pour éviter des frais supplémentaires, pensez à définir une limite réduite, puisque les méthodes comptables de l\'appareil et de l\'opérateur peuvent varier."</string>
+    <string name="data_usage_limit_dialog_3g" msgid="5478553071420316963">"Votre connexion 2G-3G sera désactivée lorsque vous atteindrez la limite spécifiée."\n\n"Pour éviter des frais supplémentaires, pensez à définir une limite réduite, puisque les méthodes comptables de l\'appareil et de l\'opérateur peuvent varier."</string>
+    <string name="data_usage_limit_dialog_4g" msgid="6134008906742403777">"Votre connexion 4G sera désactivée lorsque vous atteindrez la limite spécifiée."\n\n"Pour éviter des frais supplémentaires, pensez à définir une limite réduite, puisque les méthodes comptables de l\'appareil et de l\'opérateur peuvent varier."</string>
+    <string name="data_usage_disabled_dialog_3g_title" msgid="4221584306492812040">"Données 2G-3G  désactivées"</string>
+    <string name="data_usage_disabled_dialog_4g_title" msgid="715585612162185936">"Données 4G désactivées"</string>
+    <string name="data_usage_disabled_dialog_mobile_title" msgid="209516216265000221">"Données mobiles désactivées"</string>
+    <string name="data_usage_disabled_dialog" msgid="2874031671067845964">"Vous avez atteint la limite d\'utilisation de données spécifiée."\n\n"L\'utilisation supplémentaire de données peut entraîner la facturation de frais par votre opérateur."</string>
+    <string name="data_usage_disabled_dialog_enable" msgid="2441219164620753329">"Réactiver connexion Internet"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="32">"<xliff:g id="NUMBER">%1$s</xliff:g>"</font><font size="12">"<xliff:g id="UNIT">%2$s</xliff:g>"</font>\n<font size="12">"avertissement"</font></string>
+    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Appel d\'urgence"</string>
+    <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Retour à l\'appel"</string>
+    <string name="vpn_name" msgid="4689699885361002297">"Nom"</string>
+    <string name="vpn_type" msgid="5435733139514388070">"Type"</string>
+    <string name="vpn_server" msgid="2123096727287421913">"Adresse du serveur"</string>
+    <string name="vpn_mppe" msgid="6639001940500288972">"Chiffrement PPP (MPPE)"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"Secret L2TP"</string>
+    <string name="vpn_ipsec_identifier" msgid="4098175859460006296">"Identifiant IPSec"</string>
+    <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Clé pré-partagée IPSec"</string>
+    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"Certificat utilisateur IPSec"</string>
+    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"Certificat d\'autorité IPSec"</string>
+    <!-- no translation found for vpn_search_domains (5391995501541199624) -->
+    <skip />
+    <!-- no translation found for vpn_routes (8556236801755260073) -->
+    <skip />
+    <string name="vpn_username" msgid="1863901629860867849">"Nom d\'utilisateur"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Mot de passe"</string>
+    <!-- no translation found for vpn_save_login (6350322456427484881) -->
+    <skip />
+    <!-- no translation found for vpn_not_used (9094191054524660891) -->
+    <skip />
+    <string name="vpn_no_ca_cert" msgid="7820884983947090538">"(Ne pas valider le serveur)"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"Annuler"</string>
+    <string name="vpn_save" msgid="4233484051644764510">"Enregistrer"</string>
+    <string name="vpn_connect" msgid="8469608541746132301">"Se connecter"</string>
+    <string name="vpn_edit" msgid="1111459297288136079">"Modifier le réseau VPN"</string>
+    <string name="vpn_connect_to" msgid="7328758950427515753">"Connexion au réseau <xliff:g id="NETWORK">%s</xliff:g>"</string>
+    <string name="vpn_title" msgid="7982620762043790565">"Paramètres de VPN"</string>
+    <string name="vpn_create" msgid="8966010925994175306">"Ajouter un réseau VPN"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"Modifier le réseau"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"Supprimer un réseau"</string>
+    <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Système"</string>
+    <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Utilisateur"</string>
+    <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Désactiver"</string>
+    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Activer"</string>
+    <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Supprimer"</string>
+    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Activer le certificat d\'autorité du système ?"</string>
+    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Désactiver le certificat d\'autorité du système ?"</string>
+    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Supprimer définitivement le certificat d\'autorité utilisateur ?"</string>
 </resources>
diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml
index ef68942..01315ad 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>
@@ -214,4 +240,36 @@
     <item msgid="3878793616631049349">"Upotrebljavaj HDCP provjeru samo za DRM sadržaj"</item>
     <item msgid="45075631231212732">"Uvijek upotrebljavaj HDCP provjeru"</item>
   </string-array>
+    <!-- no translation found for window_animation_scale_entries:0 (8134156599370824081) -->
+    <!-- no translation found for window_animation_scale_entries:1 (6624864048416710414) -->
+    <!-- no translation found for window_animation_scale_entries:2 (2219332261255416635) -->
+    <!-- no translation found for window_animation_scale_entries:3 (3544428804137048509) -->
+    <!-- no translation found for window_animation_scale_entries:4 (3110710404225974514) -->
+    <!-- no translation found for window_animation_scale_entries:5 (4402738611528318731) -->
+    <!-- no translation found for window_animation_scale_entries:6 (6189539267968330656) -->
+    <!-- no translation found for transition_animation_scale_entries:0 (8464255836173039442) -->
+    <!-- no translation found for transition_animation_scale_entries:1 (3375781541913316411) -->
+    <!-- no translation found for transition_animation_scale_entries:2 (1991041427801869945) -->
+    <!-- no translation found for transition_animation_scale_entries:3 (4012689927622382874) -->
+    <!-- no translation found for transition_animation_scale_entries:4 (3289156759925947169) -->
+    <!-- no translation found for transition_animation_scale_entries:5 (7705857441213621835) -->
+    <!-- no translation found for transition_animation_scale_entries:6 (6660750935954853365) -->
+    <!-- no translation found for app_process_limit_entries:0 (6799596560242275471) -->
+    <!-- no translation found for app_process_limit_entries:1 (2412794376818632575) -->
+    <!-- no translation found for app_process_limit_entries:2 (1578904888612645001) -->
+    <!-- no translation found for app_process_limit_entries:3 (8819235336299873577) -->
+  <string-array name="vpn_types_long">
+    <item msgid="2732002039459078847">"PPTP VPN"</item>
+    <item msgid="3799752201662127867">"L2TP/IPSec VPN s unaprijed dijeljenim ključevima"</item>
+    <item msgid="4725504331295252103">"L2TP/IPSec VPN s certifikatima"</item>
+    <item msgid="7526551163264034377">"IPSec VPN s unaprijed dijeljenim ključevima i Xauth autentifikacijom"</item>
+    <item msgid="8064740940687465039">"IPSec VPN s certifikatima i Xauth autentifikacijom"</item>
+    <item msgid="4946199982372391490">"IPSec VPN s certifikatima i hibridnom autentifikacijom"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:0 (8621078286418985762) -->
+    <!-- no translation found for vpn_states:1 (6692305604213080515) -->
+    <!-- no translation found for vpn_states:2 (8001704909356800092) -->
+    <!-- no translation found for vpn_states:3 (4039737283841672166) -->
+    <!-- no translation found for vpn_states:4 (4042143101664725090) -->
+    <!-- no translation found for vpn_states:5 (2690164254699635531) -->
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 98fd7f9..94d5b41 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -19,6 +19,10 @@
     <string name="yes" msgid="4676390750360727396">"Da"</string>
     <string name="no" msgid="6731231425810196216">"Ne"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Nepoznato"</string>
+    <string name="header_category_wireless_networks" msgid="4944823405420438623">"BEŽIČNO POVEZIVANJE i MREŽE"</string>
+    <string name="header_category_device" msgid="5781174212691167553">"UREĐAJ"</string>
+    <string name="header_category_personal" msgid="6225932173498802187">"OSOBNO"</string>
+    <string name="header_category_system" msgid="2073558547468647128">"SUSTAV"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Uključi radio"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Isključi radio"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Prikaži SIM imenik"</string>
@@ -111,7 +115,11 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Uparivanje…"</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"Upareno, ali nije povezano"</string>
     <string name="bluetooth_device" msgid="6873461446424952003">"bez upotrebe ruku/slušalica"</string>
-    <string name="progress_scanning" msgid="3760897655335759141">"Skeniranje"</string>
+    <!-- outdated translation 3760897655335759141 -->     <string name="progress_scanning" msgid="192587958424295789">"Skeniranje"</string>
+    <!-- no translation found for progress_tap_to_pair (4192342336107106334) -->
+    <skip />
+    <!-- no translation found for bluetooth_no_devices_found (2412462335116297668) -->
+    <skip />
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Zahtjev za Bluetooth uparivanje"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Zahtjev za uparivanje"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Odaberi uparivanje s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
@@ -130,6 +138,9 @@
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Aplikacija na vašem telefonu traži dopuštenje da uključi Bluetooth i vaš telefon učini vidljivim drugim Bluetooth uređajima. Želite li to dopustiti?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Uključivanje Bluetootha…"</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Automatsko povezivanje"</string>
+    <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Zatražena je Bluetooth veza"</string>
+    <string name="bluetooth_connection_notif_message" msgid="1833221950512058309">"Dodirnite za povezivanje s uređajem \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\""</string>
+    <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Želite li se povezati s uređajem \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Postavke datuma i vremena"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"13 h"</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13 h"</string>
@@ -235,7 +246,7 @@
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Onemogući sve bežične veze"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"Onemogućavanje bežičnih veza…"</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"Omogućavanje bežičnih veza…"</string>
-    <string name="radio_controls_title" msgid="5868688473587168882">"Bežično povezivanje i mreže"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Više..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Bežično povezivanje i mreže"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"Upravljanje značajkama Wi-Fi, Bluetooth, način rada u zrakoplovu, mobilne mreže i VPN-ovi"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming podataka"</string>
@@ -271,8 +282,8 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Info o vlasniku"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="2382525043173672857">"Unesite tekst za prikaz na zaključanom zaslonu"</string>
-    <string name="security_settings_title" msgid="5168491784222013179">"Lokacija i sigurnost"</string>
-    <string name="location_security_settings_title" msgid="4624434296446625554">"Postavke lokacije i sigurnosti"</string>
+    <string name="location_settings_title" msgid="8935806698251432196">"Usluge lokacije"</string>
+    <string name="security_settings_title" msgid="7945465324818485460">"Sigurnost"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Postavi Moju lokaciju, otključavanje zaslona, zaključavanje SIM kartice, zaključavanje spremnika za vjerodajnice"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Postavi Moju lokaciju, otključavanje zaslona, zaključavanje pohranjivanja vjerodajnica"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Zaporke"</string>
@@ -316,7 +327,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>
@@ -375,8 +386,8 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Administratori za prikaz ili deaktivaciju uređaja"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Uključi Bluetooth"</string>
-    <string name="bluetooth_settings" msgid="2725796451253089609">"Bluetooth postavke"</string>
-    <string name="bluetooth_settings_title" msgid="2824020086246268296">"Bluetooth postavke"</string>
+    <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
+    <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Upravljajte vezama, postavite uređaj i mogućnost otkrivanja"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Zahtjev za Bluetooth uparivanje"</string>
     <string name="bluetooth_enter_pin_msg" msgid="1499285355129256289">\n"Unesite PIN za uparivanje s uređajem \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". (Pokušajte unijeti 0000 ili 1234.) Možda ćete morati unijeti isti taj PIN na Bluetooth uređaj."</string>
@@ -394,7 +405,10 @@
     <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Uparivanje odbio uređaj <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"Došlo je do problema s povezivanjem s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Skeniranjem traži uređaje"</string>
-    <string name="bluetooth_preference_find_nearby_title" msgid="5087410003465463318">"Pronađi uređaje u blizini"</string>
+    <!-- no translation found for bluetooth_search_for_devices (5957007154213560390) -->
+    <skip />
+    <!-- no translation found for bluetooth_searching_for_devices (9203739709307871727) -->
+    <skip />
     <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"Postavke uređaja"</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Spareni uređaji"</string>
     <string name="bluetooth_preference_found_devices" msgid="3133019331974936204">"Pronađeni uređaji"</string>
@@ -404,6 +418,10 @@
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Razdvoji par"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Isključi i razdvoji par"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Opcije…"</string>
+    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Napredno"</string>
+    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Napredni Bluetooth"</string>
+    <string name="bluetooth_advanced_settings_label" msgid="8659717781212434173">"Napredni Bluetooth"</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="3631028334811113629">"Uključite Bluetooth za prikaz dostupnih uređaja"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Poveži se na..."</string>
     <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"Mediji"</string>
     <string name="bluetooth_profile_headset" msgid="81844079120986198">"Handsfree"</string>
@@ -445,27 +463,31 @@
     <string name="nfc_toggle_error" msgid="2233172102497535522">"Došlo je do pogreške."</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Uključi Wi-Fi"</string>
-    <string name="wifi_settings" msgid="4746946030627213196">"Wi-Fi postavke"</string>
+    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="2810363951104753710">"Wi-Fi postavke"</string>
+    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Postavljanje i upravljanje bežičnim pristupnim točkama"</string>
-    <string name="wifi_starting" msgid="6710266609710860129">"Uključivanje..."</string>
-    <string name="wifi_stopping" msgid="5952909472548218348">"Isključivanje..."</string>
+    <string name="wifi_starting" msgid="7732330327758522943">"Uključivanje Wi-Fi mreže"</string>
+    <string name="wifi_stopping" msgid="244864762599017659">"Isključivanje Wi-Fi mreže..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"Pogreška"</string>
     <string name="wifi_in_airplane_mode" msgid="7618393787965366655">"U načinu rada u zrakoplovu"</string>
     <string name="wifi_fail_to_scan" msgid="6194542252808587669">"Skeniranjem nije moguće pretraživanje mreža"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Mrežna obavijest"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Obavijesti me ako postoji otvorena mreža"</string>
+    <string name="wifi_enable_watchdog_service" msgid="4723544454066601706">"Provjere Wi-Fi povezivosti"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="8687400936839455926">"Otkrivanje i upravljanje potencijalnim problemima mrežnog povezivanja"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Pravila isključivanja za Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Navedite trenutak za prebacivanje sa značajke Wi-Fi na mobilne podatke"</string>
     <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" msgid="6234851776910938957">"Dodaj mrežu"</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>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Poveži s mrežom"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Zaboravi mrežu"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Izmijeni mrežu"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="3682507011071029311">"Uključite WiFi za prikaz dostupnih mreža"</string>
     <string name="wifi_network_setup" msgid="7974851890019344870">"Postavljanje mreže"</string>
     <string name="wifi_wps_pin" msgid="5471842298708321115">"Unesi pin s lokacije pristupa"</string>
     <string name="wifi_wps_setup_title" msgid="150518971269252336">"Postavljanje WPS-a"</string>
@@ -501,13 +523,13 @@
     <string name="wifi_save" msgid="3331121567988522826">"Spremi"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Odustani"</string>
     <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"Otkrivena je još jedna WPS sesija, pokušajte ponovno za nekoliko minuta"</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Napredno"</string>
+    <!-- outdated translation 5419052271935350999 -->     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Napredno"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi pojas frekvencije"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Odredi raspon frekvencije rada"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Problem pri postavljanju pojasa frekvencije."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC adresa"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP adresa"</string>
-    <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"IP postavke"</string>
+    <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP postavke"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Spremi"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Odustani"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Upišite važeću IP adresu."</string>
@@ -525,7 +547,7 @@
     <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> prijenosni Wi-Fi hotspot"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="sound_settings_title" msgid="8735891486683305886">"Zvuk"</string>
-    <string name="display_settings_title" msgid="2378894265964357591">"Zaslon"</string>
+    <string name="display_settings_title" msgid="1708697328627382561">"Prikaz"</string>
     <string name="sound_settings" msgid="5007659014828162881">"Postavke zvuka"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Bešumni način"</string>
     <string name="silent_mode_summary" msgid="3309650676072917899">"Utišaj sve zvukove osim medija i alarma"</string>
@@ -598,7 +620,18 @@
     <string name="brightness_summary" msgid="838917350127550703">"Podesite svjetlinu zaslona"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Privremeni prekid"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Zaslon se isključuje automatski nakon <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Pozadinska slika"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android Dreams"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Čuvari zaslona i ostala ometanja mirovanja"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Odabrani san"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Kada aktivirati"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"Nakon <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> mirovanja"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Nikada"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Isprobajte!"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatska svjetlina"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Veličina fonta"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Opća veličina fonta"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Odabir veličine fonta"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Postavke zaključavanja SIM kartice"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Postavite zaključavanje SIM kartice"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM kartica je zaključana"</string>
@@ -643,8 +676,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>
@@ -696,6 +730,16 @@
     <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"Kartica SD bit će isključena."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Isključivanje"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Isključivanje u tijeku"</string>
+    <!-- no translation found for storage_menu_usb (1580545228584324704) -->
+    <skip />
+    <!-- no translation found for storage_title_usb (5775322159427546546) -->
+    <skip />
+    <!-- no translation found for usb_label_mtp (4157227401755543412) -->
+    <skip />
+    <!-- no translation found for usb_label_ptp (7417254019489575819) -->
+    <skip />
+    <!-- no translation found for usb_label_installer_cd (7438467574756086977) -->
+    <skip />
     <string name="battery_status_title" msgid="9159414319574976203">"Status baterije"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Razina baterije"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN-ovi"</string>
@@ -806,6 +850,8 @@
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"Ne može se dijeliti veza za više od <xliff:g id="MAXCONNECTION">%1$d</xliff:g> uređaja"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> će biti oslobođen."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Pomoć"</string>
+    <string name="wireless_category_general" msgid="2973810407987118067">"Općenito"</string>
+    <string name="wireless_category_mobile_networks" msgid="1254629216798424288">"Mobilne mreže"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobilne mreže"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Postavi opcije za roaming, mreže, APN-ove"</string>
     <string name="location_title" msgid="1029961368397484576">"Moja lokacija"</string>
@@ -883,7 +929,7 @@
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Osiguravanje tabletnog uređaja"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Osiguravanje telefona"</string>
     <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"Zaštitite svoje tabletno računalo od neovlaštene upotrebe stvaranjem osobnog uzorka za otključavanje zaslona. Prstom na zaslonu povežite točkice bilo kojim redoslijedom. Morate povezati barem četiri točkice. "\n\n"Jeste li spremni? Dodirnite Dalje."</string>
-    <string name="lock_intro_message" product="default" msgid="9100785646737118042"><font size="17">"Zaštitite svoj telefon od neovlaštene upotrebe stvaranjem osobnog uzorka za zaključavanje zaslona. "\n<font height="17">\n</font><b>"1"</b>"  Na sljedećem zaslonu pratite stvaranje uzorka. "\n<font height="17">\n</font><b>"2"</b>"  Ako ste spremni iscrtajte vlastiti uzorak. Eksperimentirajte s različitim uzorcima, ali povežite barem četiri točke. "\n<font height="17">\n</font><b>"3"</b>"  Za potvrdu ponovno iscrtajte uzorak. "\n<font height="17">\n</font><b>"Jeste li spremni? Dotaknite “Dalje”"</b>". "\n<font height="3">\n</font>"Da biste telefon ostavili nezaštićen, dotaknite “Odustani”."</font></string>
+    <!-- outdated translation 3692151094288835065 -->     <string name="lock_intro_message" product="default" msgid="5796785892741212873">"Zaštitite svoje tabletno računalo od neovlaštene upotrebe stvaranjem osobnog uzorka za otključavanje zaslona. Prstom na zaslonu povežite točkice bilo kojim redoslijedom. Morate povezati barem četiri točkice. "\n\n"Jeste li spremni? Dodirnite Dalje."</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Upravljanje aplikacijama"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Upravljanje i uklanjanje instaliranih aplikacija"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Aplikacije"</string>
@@ -893,6 +939,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>
@@ -905,9 +953,10 @@
     <string name="force_stop" msgid="7435006169872876756">"Prisilno zaustavi"</string>
     <string name="total_size_label" msgid="1048676419552557254">"Ukupno"</string>
     <string name="application_size_label" msgid="5055196275624686382">"Aplikacija"</string>
+    <string name="external_code_size_label" msgid="3459343140355961335">"USB aplikacija za pohranjivanje"</string>
     <string name="data_size_label" msgid="8679376373625710107">"Podaci"</string>
-    <string name="external_size_label" product="nosdcard" msgid="4465530017830945766">"Memorija USB"</string>
-    <string name="external_size_label" product="default" msgid="2107155737635944440">"SD kartica"</string>
+    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB uređaj za pohranu podataka"</string>
+    <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD kartica"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Deinstaliraj"</string>
     <string name="disable_text" msgid="6544054052049395202">"Onemogući"</string>
     <string name="enable_text" msgid="9217362512327828987">"Omogući"</string>
@@ -1026,7 +1075,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 +1085,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>
@@ -1066,7 +1117,7 @@
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Postavke zaslonske tipkovnice"</string>
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Fizička tipkovnica"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Postavke fizičke tipkovnice"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Razvoj"</string>
+    <string name="development_settings_title" msgid="215179176067683667">"Opcije za razvojne programere"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"Postavite opcije za razvoj aplikacije"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Uklanjanje pogreške USB-a"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Uklanjanje pogrešaka s priključenim USB-om"</string>
@@ -1091,14 +1142,14 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Dostupnost"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Postavke dostupnosti"</string>
     <string name="accessibility_settings_summary" msgid="8185181964847149507">"Upravljaj opcijama dostupnosti"</string>
-    <string name="toggle_accessibility_title" msgid="650839277066574497">"Dostupnost"</string>
+    <string name="toggle_large_text_title" msgid="42259643359869436">"Veliki tekst"</string>
     <string name="accessibility_services_category" msgid="8127851026323672607">"Usluge dostupnosti"</string>
+    <string name="toggle_accessibility_title" msgid="7338739354952553958">"Dopusti usluge dostupnosti"</string>
     <string name="no_accessibility_services_summary" msgid="694578333333808159">"Nema instaliranih usluga dostupnosti."</string>
     <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Ova usluga dostupnosti možda će prikupljati tekst koji unosite, uključujući osobne podatke i brojeve kreditne kartice, ali ne i zaporke. Također može bilježiti vaše interakcije na korisničkom sučelju. To omogućuje aplikacija <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Želite li koristiti ovu uslugu dostupnosti?"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Onemogućiti dostupnost?"</string>
     <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"Nisu pronađene aplikacije koje se odnose na dostupnost"</string>
     <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"Nemate instaliranih aplikacija za dostupnost."\n\n"Možete preuzeti čitač zaslona za svoj uređaj s Android Marketa."\n\n"Kliknite U redu da biste instalirali čitač zaslona."</string>
-    <string name="accessibility_script_injection_category" msgid="8649951751131431904">"Skripte za dostupnost"</string>
     <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"Preuzmi skripte za dostupnost"</string>
     <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"Omogući aplikacijama preuzimanje skripti dostupnosti od Googlea"</string>
     <string name="accessibility_script_injection_security_warning" product="tablet" msgid="1113600871264359828">"Neke aplikacije mogu tražiti Google da na vaš tabletni uređaj preuzme skripte koje će njihov sadržaj učiniti dostupnijim. Jeste li sigurni da želite Googleu dopustiti instaliranje skripti za pristup vašem tabletnom uređaju?"</string>
@@ -1106,10 +1157,11 @@
     <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>
-    <string name="power_usage_summary_title" msgid="5180282911164282324">"Iskorištenost baterije"</string>
+    <string name="power_usage_summary_title" msgid="7190304207330319919">"Baterija"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Što troši bateriju"</string>
     <string name="power_usage_not_available" msgid="3583407442633768046">"Pod. o potroš. bat. nedostupni"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Upotreba baterije nakon isključivanja"</string>
@@ -1218,6 +1270,8 @@
     <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>
+    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Postavke tražilice"</string>
+    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Postavke za <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
     <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>
@@ -1228,114 +1282,33 @@
     <string name="gadget_title" msgid="7455548605888590466">"Nadzor nad napajanjem"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Ažuriranje Wi-Fi postavki"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Ažuriranje postavke Bluetootha"</string>
-    <string name="vpn_settings_activity_title" msgid="7276864950701612579">"VPN postavke"</string>
-    <string name="vpn_connect_to" msgid="2541409082892684362">"Poveži se na <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpn_username_colon" msgid="7854930370861306247">"Korisničko ime:"</string>
-    <string name="vpn_password_colon" msgid="5716278710848606626">"Zaporka:"</string>
-    <string name="vpn_a_username" msgid="6664733641993968692">"korisničko ime"</string>
-    <string name="vpn_a_password" msgid="1537213632501483753">"zaporka"</string>
-    <string name="vpn_save_username" msgid="1408415289165970790">"Zapamti korisničko ime"</string>
-    <string name="vpn_connect_button" msgid="1699007212602470655">"Poveži"</string>
-    <string name="vpn_yes_button" msgid="8034531001149843119">"Da"</string>
-    <string name="vpn_no_button" msgid="7620339571187119107">"Ne"</string>
-    <string name="vpn_back_button" msgid="192036339792734970">"Natrag"</string>
-    <string name="vpn_mistake_button" msgid="1683383660912491270">"Ne"</string>
-    <string name="vpn_menu_done" msgid="93528279226907926">"Spremi"</string>
-    <string name="vpn_menu_cancel" msgid="7234451214611202868">"Odustani"</string>
-    <string name="vpn_menu_revert" msgid="4407762442281467659">"Poništi"</string>
-    <string name="vpn_menu_connect" msgid="1089399414463784218">"Poveži s mrežom"</string>
-    <string name="vpn_menu_disconnect" msgid="8254492450022562235">"Isključi s mreže"</string>
-    <string name="vpn_menu_edit" msgid="4526245173583195618">"Uredi mrežu"</string>
-    <string name="vpn_menu_delete" msgid="3326527392609513129">"Izbriši mrežu"</string>
-    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"Morate unijeti <xliff:g id="CODE">%s</xliff:g>."</string>
-    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"Morate odabrati <xliff:g id="OPTION">%s</xliff:g>."</string>
-    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"Naziv VPN-a \'<xliff:g id="NAME">%s</xliff:g>\' već postoji. Pronađite drugi naziv."</string>
-    <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"Jeste li sigurni da želite izbrisati ovaj VPN?"</string>
-    <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"Jeste li sigurni da ne želite stvoriti taj profil?"</string>
-    <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"Doista želite odbaciti promjene profila?"</string>
-    <string name="vpn_confirm_reconnect" msgid="5748535476278674296">"Nije moguće povezivanje s mrežom. Želite li pokušati ponovo?"</string>
-    <string name="vpn_reconnect_from_lost" msgid="2442844155623372118">"Veza je prekinuta. Želite li se ponovno povezati?"</string>
-    <string name="vpn_unknown_server_dialog_msg" msgid="3080742299823671319">"Naziv poslužitelja nije moguće otkriti. Želite li provjeriti postavku naziva poslužitelja?"</string>
-    <string name="vpn_challenge_error_dialog_msg" msgid="6174901754230038601">"Pogreška upita. Želite li provjeriti postavku tajne?"</string>
-    <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"Nedostaje jedna tajna ili više njih iz ove VPN konfiguracije. Želite li provjeriti postavke tajne?"</string>
-    <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"Uneseno je netočno korisničko ime ili zaporka. Želite li pokušati ponovo?"</string>
-    <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"Poslužitelj je prekinuo vezu. Korisničko ime koje ste unijeli možda nije točno. Želite li pokušati ponovo?"</string>
-    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"Poslužitelj je prekinuo vezu. Možda ste zaštićeni vatrozidom koji sprečava da se spojite s poslužiteljem. Želite li pokušati ponovo?"</string>
-    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"Poslužiteljski pregovori nisu uspjeli. Poslužitelj se možda ne slaže s vašom opcijom enkripcije. Želite li provjeriti svoju postavku enkripcije?"</string>
-    <string name="vpn_type_title" msgid="6392933604218676224">"Dodaj VPN"</string>
-    <string name="vpn_add_new_vpn" msgid="5438260689052714550">"Dodaj VPN"</string>
-    <string name="vpn_details_title" msgid="418806440938510331">"VPN detalji"</string>
-    <string name="vpn_edit_title_add" msgid="2121313217989682890">"Dodaj <xliff:g id="NAME">%s</xliff:g> VPN"</string>
-    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"<xliff:g id="NAME">%s</xliff:g> pojedinosti"</string>
-    <string name="vpns" msgid="3148141862835492816">"VPN-ovi"</string>
-    <string name="vpn_connecting" msgid="8039521381692090116">"Povezivanje..."</string>
-    <string name="vpn_disconnecting" msgid="7748050200708257066">"Isključivanje…"</string>
-    <string name="vpn_connected" msgid="7641723116362845781">"Povezan"</string>
-    <string name="vpn_connect_hint" msgid="7442898962925875181">"Poveži s mrežom"</string>
-    <string name="vpn_name" msgid="1550918148476193076">"VPN naziv"</string>
-    <string name="vpn_a_name" msgid="8445736942405283509">"Naziv VPN-a"</string>
-    <string name="vpn_profile_added" msgid="9061017910337129840">"Profil \'<xliff:g id="NAME">%s</xliff:g>\' je dodan"</string>
-    <string name="vpn_profile_replaced" msgid="587435576816273815">"Promjene su izvršene na stavci \'<xliff:g id="NAME">%s</xliff:g>\'"</string>
-    <string name="vpn_user_certificate_title" msgid="6812545893924071742">"Postavi korisnički certifikat"</string>
-    <string name="vpn_user_certificate" msgid="949322691686938888">"Korisnički certifikat"</string>
-    <string name="vpn_a_user_certificate" msgid="8943983437956898649">"korisnički certifikat"</string>
-    <string name="vpn_ca_certificate_title" msgid="7846466160795589985">"Postavi CA certifikat"</string>
-    <string name="vpn_ca_certificate" msgid="465085144064264742">"Certifikat institucije za izdavanje certifikata (CA)"</string>
-    <string name="vpn_a_ca_certificate" msgid="3374242520974884295">"CA certifikat"</string>
-    <string name="vpn_l2tp_secret_string_title" msgid="5039677186748940987">"Postavi tajnu L2TP"</string>
-    <string name="vpn_l2tp_secret" msgid="529359749677142076">"tajna L2TP"</string>
-    <string name="vpn_a_l2tp_secret" msgid="6612042930810981845">"tajna L2TP"</string>
-    <string name="vpn_pptp_encryption_title" msgid="2236795167467896499">"enkripcija"</string>
-    <string name="vpn_pptp_encryption" msgid="2602329949737259686">"PPTP enkripcija"</string>
-    <string name="vpn_ipsec_presharedkey_title" msgid="2184060087690539175">"Postavi IPSec tipku za dijeljenje unaprijed"</string>
-    <string name="vpn_ipsec_presharedkey" msgid="5434316521616673741">"IPSec tipka za dijeljenje unaprijed"</string>
-    <string name="vpn_a_ipsec_presharedkey" msgid="1255301923217898418">"IPSec tipka za dijeljenje unaprijed"</string>
-    <string name="vpn_vpn_server_title" msgid="8897005887420358913">"Postavi VPN poslužitelj"</string>
-    <string name="vpn_vpn_server" msgid="1141754908824209260">"VPN poslužitelj"</string>
-    <string name="vpn_a_vpn_server" msgid="5960906152125045853">"VPN poslužitelj"</string>
-    <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"Naziv VPN poslužitelja"</string>
-    <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"Domene DNS pretraživanja"</string>
-    <string name="vpn_dns_search_list" msgid="4230034234026605360">"Domene DNS pretraživanja"</string>
-    <string name="vpn_field_is_set" msgid="7137320847812992243">"Značajka <xliff:g id="VALUE">%s</xliff:g> je postavljena"</string>
-    <string name="vpn_field_not_set" msgid="2972519243515893804">"Vrijednost <xliff:g id="VALUE">%s</xliff:g> nije postavljena"</string>
-    <string name="vpn_field_not_set_optional" msgid="8840557698252556791">"<xliff:g id="VALUE">%s</xliff:g> nije postavljeno (neobavezno)"</string>
-    <string name="vpn_enable_field" msgid="3700967675854517191">"Omogući <xliff:g id="OPTION">%s</xliff:g>"</string>
-    <string name="vpn_disable_field" msgid="6905658811179634005">"Onemogući <xliff:g id="OPTION">%s</xliff:g>"</string>
-    <string name="vpn_is_enabled" msgid="1266304230417098877">"Stavka <xliff:g id="OPTION">%s</xliff:g> je onemogućena"</string>
-    <string name="vpn_is_disabled" msgid="2013622485867806167">"Stavka <xliff:g id="OPTION">%s</xliff:g> je onemogućena"</string>
     <string name="vpn_settings_title" msgid="7327468307909556719">"VPN postavke"</string>
     <string name="vpn_settings_summary" msgid="8849924181594963972">"Postavite i upravljajte virtualnim privatnim mrežama (VPN-ovima)"</string>
-    <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="trusted_credentials" msgid="4266945289534242402">"Pouzdane vjerodajnice"</string>
+    <string name="trusted_credentials_summary" msgid="6735221351155686632">"Prikaz pouzdanih CA 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>
-    <string name="privacy_settings_title" msgid="1987089301293213705">"Postavke privatnosti"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"Stvori sigurnosnu kopiju i poništi"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"Stvori sigurnosnu kopiju i poništi"</string>
     <string name="backup_section_title" msgid="8856083167469467588">"Sigurnosna kopija i pohranjivanje"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Osobni podaci"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Stvori sigurnosnu kopiju mojih podataka"</string>
@@ -1440,4 +1413,107 @@
     <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>
+    <!-- no translation found for debug_ui_category (9023948280291055349) -->
+    <skip />
+    <!-- no translation found for strict_mode (1938795874357830695) -->
+    <skip />
+    <!-- no translation found for strict_mode_summary (142834318897332338) -->
+    <skip />
+    <!-- no translation found for pointer_location (6084434787496938001) -->
+    <skip />
+    <!-- no translation found for pointer_location_summary (840819275172753713) -->
+    <skip />
+    <!-- no translation found for show_screen_updates (8282711794220426931) -->
+    <skip />
+    <!-- no translation found for show_screen_updates_summary (1716122382094924596) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage (2389212910758076024) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage_summary (2113341923988958266) -->
+    <skip />
+    <!-- no translation found for window_animation_scale_title (6162587588166114700) -->
+    <skip />
+    <!-- no translation found for transition_animation_scale_title (387527540523595875) -->
+    <skip />
+    <!-- no translation found for debug_applications_category (6221644998451283813) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities (3622005081180597749) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities_summary (3592221124808773368) -->
+    <skip />
+    <!-- no translation found for app_process_limit_title (4121324758038197598) -->
+    <skip />
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Potrošnja podataka"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"Ciklus upotrebe podataka"</string>
+    <string name="data_usage_menu_split_4g" msgid="7417435609285381968">"Podjela 4G upotrebe"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Prikaz upotrebe Wi-Fi mreže"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"Promjena ciklusa..."</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Dan u mjesecu za poništavanje ciklusa upotrebe podataka:"</string>
+    <string name="data_usage_disable_mobile_limit" msgid="289740911281022322">"Onemog. mob. pod. na ograničenju"</string>
+    <string name="data_usage_disable_4g_limit" msgid="5808210773758699800">"Onemog. 4G podat. na ogranič."</string>
+    <string name="data_usage_disable_3g_limit" msgid="3856971004328238231">"Onemog. 2G-3G podat. na ogranič."</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_mobile" msgid="454140350007299045">"Mobilno"</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">"Mobilni podaci"</string>
+    <string name="data_usage_enable_3g" msgid="6304006671869578254">"2G-3G podaci"</string>
+    <string name="data_usage_enable_4g" msgid="3635854097335036738">"4G podaci"</string>
+    <string name="data_usage_app_settings" msgid="3727561362090820369">"Prikaz postavki aplikacije"</string>
+    <string name="data_usage_app_restrict_background" msgid="8856643905291165256">"Ograniči upotrebu pozadinskih podataka"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="1503361245973512092">"Dopusti pozadinske podatke aplikacije samo kad se upotrebljava neograničena mreža"</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="8110736468987743260">"Ograničenje pozadinskih podataka"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="100001698378554777">"Ova značajka može negativno utjecati na aplikacije koje ovise o upotrebi pozadinskih podataka."\n\n"Prikladnije kontrole za upotrebu podataka mogu se pronaći u postavkama ove aplikacije."</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Datum poništavanja ciklusa upotrebe"</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Datum svakog mjeseca."</string>
+    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Postavi"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Ograničavanje upotrebe podataka"</string>
+    <string name="data_usage_limit_dialog_mobile" msgid="7931094451923591578">"Podatkovna veza bit će onemogućena kad se dosegne navedeno ograničenje."\n\n"Da biste izbjegli dodatne troškove, postavite manje ograničenje jer se načini uređaja i obračunavanja troškova operatera mogu razlikovati."</string>
+    <string name="data_usage_limit_dialog_3g" msgid="5478553071420316963">"2G-3G podatkovna veza bit će onemogućena kad se dosegne navedeno ograničenje."\n\n"Da biste izbjegli dodatne troškove, postavite manje ograničenje, budući da se načini uređaja i obračunavanja troškova operatera mogu razlikovati."</string>
+    <string name="data_usage_limit_dialog_4g" msgid="6134008906742403777">"4G podatkovna veza bit će onemogućena kad se dosegne navedeno ograničenje."\n\n"Da biste izbjegli dodatne troškove, postavite manje ograničenje, budući da se načini uređaja i obračunavanja troškova operatera mogu razlikovati."</string>
+    <string name="data_usage_disabled_dialog_3g_title" msgid="4221584306492812040">"2G-3G podaci su onemogućeni"</string>
+    <string name="data_usage_disabled_dialog_4g_title" msgid="715585612162185936">"4G podaci su onemogućeni"</string>
+    <string name="data_usage_disabled_dialog_mobile_title" msgid="209516216265000221">"Mobilni podaci su onemogućeni"</string>
+    <string name="data_usage_disabled_dialog" msgid="2874031671067845964">"Dosegnuto je navedeno ograničenje upotrebe podataka."\n\n"Dodatna upotreba podataka može podlijegati naplati."</string>
+    <string name="data_usage_disabled_dialog_enable" msgid="2441219164620753329">"Ponovo omogući podatke"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="32">"Upozorenja: <xliff:g id="NUMBER">%1$s</xliff:g>"</font>" "<font size="12">"<xliff:g id="UNIT">%2$s</xliff:g>"</font>\n<font size="12"></font></string>
+    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Hitan poziv"</string>
+    <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Vrati se na poziv"</string>
+    <string name="vpn_name" msgid="4689699885361002297">"Naziv"</string>
+    <string name="vpn_type" msgid="5435733139514388070">"Vrsta"</string>
+    <string name="vpn_server" msgid="2123096727287421913">"Adresa poslužitelja"</string>
+    <string name="vpn_mppe" msgid="6639001940500288972">"PPP enkripcija (MPPE)"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"tajna L2TP"</string>
+    <string name="vpn_ipsec_identifier" msgid="4098175859460006296">"IPSec identifikator"</string>
+    <string name="vpn_ipsec_secret" msgid="4526453255704888704">"IPSec unaprijed dijeljeni ključ"</string>
+    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"IPSec korisnički certifikat"</string>
+    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec CA certifikat"</string>
+    <!-- no translation found for vpn_search_domains (5391995501541199624) -->
+    <skip />
+    <!-- no translation found for vpn_routes (8556236801755260073) -->
+    <skip />
+    <string name="vpn_username" msgid="1863901629860867849">"Korisničko ime"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Zaporka"</string>
+    <!-- no translation found for vpn_save_login (6350322456427484881) -->
+    <skip />
+    <!-- no translation found for vpn_not_used (9094191054524660891) -->
+    <skip />
+    <string name="vpn_no_ca_cert" msgid="7820884983947090538">"(ne potvrđuj poslužitelja)"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"Odustani"</string>
+    <string name="vpn_save" msgid="4233484051644764510">"Spremi"</string>
+    <string name="vpn_connect" msgid="8469608541746132301">"Poveži"</string>
+    <string name="vpn_edit" msgid="1111459297288136079">"Uređivanje VPN mreže"</string>
+    <string name="vpn_connect_to" msgid="7328758950427515753">"Poveži s mrežom <xliff:g id="NETWORK">%s</xliff:g>"</string>
+    <string name="vpn_title" msgid="7982620762043790565">"VPN postavke"</string>
+    <string name="vpn_create" msgid="8966010925994175306">"Dodavanje VPN mreže"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"Uredi mrežu"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"Izbriši mrežu"</string>
+    <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Sustav"</string>
+    <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Korisnik"</string>
+    <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Onemogući"</string>
+    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Omogući"</string>
+    <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Ukloni"</string>
+    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Omogućiti sistemski CA certifikat?"</string>
+    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Onemogućiti sistemski CA certifikat?"</string>
+    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Trajno ukloniti korisnički CA certifikat?"</string>
 </resources>
diff --git a/res/values-hu/arrays.xml b/res/values-hu/arrays.xml
index a00d7e7..97a2fb7 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>
@@ -214,4 +240,36 @@
     <item msgid="3878793616631049349">"Csak DRM-tartalomhoz használjon HDCP ellenőrzést"</item>
     <item msgid="45075631231212732">"Mindig használjon HDCP ellenőrzést"</item>
   </string-array>
+    <!-- no translation found for window_animation_scale_entries:0 (8134156599370824081) -->
+    <!-- no translation found for window_animation_scale_entries:1 (6624864048416710414) -->
+    <!-- no translation found for window_animation_scale_entries:2 (2219332261255416635) -->
+    <!-- no translation found for window_animation_scale_entries:3 (3544428804137048509) -->
+    <!-- no translation found for window_animation_scale_entries:4 (3110710404225974514) -->
+    <!-- no translation found for window_animation_scale_entries:5 (4402738611528318731) -->
+    <!-- no translation found for window_animation_scale_entries:6 (6189539267968330656) -->
+    <!-- no translation found for transition_animation_scale_entries:0 (8464255836173039442) -->
+    <!-- no translation found for transition_animation_scale_entries:1 (3375781541913316411) -->
+    <!-- no translation found for transition_animation_scale_entries:2 (1991041427801869945) -->
+    <!-- no translation found for transition_animation_scale_entries:3 (4012689927622382874) -->
+    <!-- no translation found for transition_animation_scale_entries:4 (3289156759925947169) -->
+    <!-- no translation found for transition_animation_scale_entries:5 (7705857441213621835) -->
+    <!-- no translation found for transition_animation_scale_entries:6 (6660750935954853365) -->
+    <!-- no translation found for app_process_limit_entries:0 (6799596560242275471) -->
+    <!-- no translation found for app_process_limit_entries:1 (2412794376818632575) -->
+    <!-- no translation found for app_process_limit_entries:2 (1578904888612645001) -->
+    <!-- no translation found for app_process_limit_entries:3 (8819235336299873577) -->
+  <string-array name="vpn_types_long">
+    <item msgid="2732002039459078847">"PPTP VPN"</item>
+    <item msgid="3799752201662127867">"L2TP/IPSec VPN megosztott kulcsokkal"</item>
+    <item msgid="4725504331295252103">"L2TP/IPSec VPN-tanúsítványokkal"</item>
+    <item msgid="7526551163264034377">"IPSec VPN előre megosztott kulcsokkal és Xauth azonosítás"</item>
+    <item msgid="8064740940687465039">"IPSec VPN-tanúsítványokkal és Xauth azonosítás"</item>
+    <item msgid="4946199982372391490">"IPSec VPN-tanúsítványokkal és hibrid azonosítás"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:0 (8621078286418985762) -->
+    <!-- no translation found for vpn_states:1 (6692305604213080515) -->
+    <!-- no translation found for vpn_states:2 (8001704909356800092) -->
+    <!-- no translation found for vpn_states:3 (4039737283841672166) -->
+    <!-- no translation found for vpn_states:4 (4042143101664725090) -->
+    <!-- no translation found for vpn_states:5 (2690164254699635531) -->
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 1f5c90e..4b4ef97 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -19,6 +19,10 @@
     <string name="yes" msgid="4676390750360727396">"Igen"</string>
     <string name="no" msgid="6731231425810196216">"Nem"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Ismeretlen"</string>
+    <string name="header_category_wireless_networks" msgid="4944823405420438623">"VEZETÉK NÉLKÜLI és EGYÉB HÁLÓZATOK"</string>
+    <string name="header_category_device" msgid="5781174212691167553">"ESZKÖZ"</string>
+    <string name="header_category_personal" msgid="6225932173498802187">"SZEMÉLYES"</string>
+    <string name="header_category_system" msgid="2073558547468647128">"RENDSZER"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Rádió bekapcsolása"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Rádió kikapcsolása"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"SIM-kártya telefonkönyvének megtekintése"</string>
@@ -111,7 +115,11 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Párosítás..."</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"Párosítva van, de nincs csatlakoztatva"</string>
     <string name="bluetooth_device" msgid="6873461446424952003">"kihangosító/headset"</string>
-    <string name="progress_scanning" msgid="3760897655335759141">"Keresés"</string>
+    <!-- outdated translation 3760897655335759141 -->     <string name="progress_scanning" msgid="192587958424295789">"Keresés"</string>
+    <!-- no translation found for progress_tap_to_pair (4192342336107106334) -->
+    <skip />
+    <!-- no translation found for bluetooth_no_devices_found (2412462335116297668) -->
+    <skip />
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Bluetooth párosítási kérelem"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Párosítási kérelem"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Válassza ki a párosításhoz a következő eszközzel: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
@@ -130,6 +138,9 @@
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Egy alkalmazás engedélyt kér arra, hogy bekapcsolja a Bluetooth-t, és telefonját felfedezhetővé tegye más eszközök számára. Engedélyezi ezt?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"A Bluetooth bekapcsolása..."</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Automatikus csatlakozás"</string>
+    <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth-kapcsolat kérése"</string>
+    <string name="bluetooth_connection_notif_message" msgid="1833221950512058309">"Érintse meg ehhez az eszközhöz történő csatlakozáshoz: \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\""</string>
+    <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Szeretne csatlakozni a következő eszközhöz: \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Dátum és idő beállításai"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"du. 1:00"</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
@@ -235,7 +246,7 @@
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Minden vezeték nélküli kapcsolat letiltása"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"Vezeték nélküli kapcsolatok letiltása..."</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"Vezeték nélküli kapcsolat engedélyezése..."</string>
-    <string name="radio_controls_title" msgid="5868688473587168882">"Vezeték nélküli és hálózatok"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Továbbiak..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Vezeték nélküli és egyéb hálózatok"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"A Wi-Fi, a Bluetooth, a repülőgép mód, a mobilhálózatok és a VPN-ek kezelése"</string>
     <string name="roaming" msgid="3596055926335478572">"Adatbarangolás"</string>
@@ -271,8 +282,8 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Tulajdonosi adatok"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="2382525043173672857">"Írja be a lezárt képernyőn megjelenítendő szöveget"</string>
-    <string name="security_settings_title" msgid="5168491784222013179">"Hely és biztonság"</string>
-    <string name="location_security_settings_title" msgid="4624434296446625554">"Hely és biztonság beállításai"</string>
+    <string name="location_settings_title" msgid="8935806698251432196">"Helyszolgáltatások"</string>
+    <string name="security_settings_title" msgid="7945465324818485460">"Biztonság"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Saját pozíció beállítása, képernyőzár feloldása, SIM-kártya zárolása, hitelesítési adatok tárolójának zárolása"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Saját pozíció beállítása, képernyőzár feloldása, hitelesítési adatok tárolójának zárolása"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Jelszavak"</string>
@@ -316,7 +327,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>
@@ -375,8 +386,8 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Az eszköz rendszergazdáinak megtekintése vagy deaktiválása"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Bluetooth bekapcsolása"</string>
-    <string name="bluetooth_settings" msgid="2725796451253089609">"Bluetooth-beállítások"</string>
-    <string name="bluetooth_settings_title" msgid="2824020086246268296">"Bluetooth beállítások"</string>
+    <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
+    <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Kapcsolatok kezelése, eszközök nevének és felderíthetőségének beállítása"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Bluetooth párosítási kérelem"</string>
     <string name="bluetooth_enter_pin_msg" msgid="1499285355129256289">\n"Írja be a PIN kódot \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" eszköz párosításához. (Próbálkozzon a 0000 vagy az 1234 kombinációval.) Lehet, hogy ugyanezt a PIN kódot meg kell adnia a Bluetooth eszközön is."</string>
@@ -394,7 +405,10 @@
     <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"A(z) <xliff:g id="DEVICE_NAME">%1$s</xliff:g> eszköz elutasította a párosítást."</string>
     <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"Hiba történt <xliff:g id="DEVICE_NAME">%1$s</xliff:g> eszköz csatlakoztatásakor."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Eszközök keresése"</string>
-    <string name="bluetooth_preference_find_nearby_title" msgid="5087410003465463318">"Közeli eszközök keresése"</string>
+    <!-- no translation found for bluetooth_search_for_devices (5957007154213560390) -->
+    <skip />
+    <!-- no translation found for bluetooth_searching_for_devices (9203739709307871727) -->
+    <skip />
     <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"Eszközbeállítások"</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Párosított eszközök"</string>
     <string name="bluetooth_preference_found_devices" msgid="3133019331974936204">"Talált eszközök"</string>
@@ -404,6 +418,10 @@
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Párosítás törlése"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Szétkapcsolás és a párosítás törlése"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Beállítások…"</string>
+    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Speciális"</string>
+    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Speciális Bluetooth"</string>
+    <string name="bluetooth_advanced_settings_label" msgid="8659717781212434173">"Speciális Bluetooth"</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="3631028334811113629">"Bluetooth bekapcs. az elérhető eszközök listájához"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Csatlakozás a következőhöz..."</string>
     <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"Média"</string>
     <string name="bluetooth_profile_headset" msgid="81844079120986198">"Kihangosító"</string>
@@ -445,27 +463,31 @@
     <string name="nfc_toggle_error" msgid="2233172102497535522">"Hiba történt."</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Wi-Fi bekapcsolása"</string>
-    <string name="wifi_settings" msgid="4746946030627213196">"Wi-Fi beállítások"</string>
+    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="2810363951104753710">"Wi-Fi beállítások"</string>
+    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Vezeték nélküli hozzáférési pontok beállítása és kezelése"</string>
-    <string name="wifi_starting" msgid="6710266609710860129">"Bekapcsolás..."</string>
-    <string name="wifi_stopping" msgid="5952909472548218348">"Kikapcsolás..."</string>
+    <string name="wifi_starting" msgid="7732330327758522943">"Wi-Fi bekapcsolása..."</string>
+    <string name="wifi_stopping" msgid="244864762599017659">"Wi-Fi kikapcsolása..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"Hiba"</string>
     <string name="wifi_in_airplane_mode" msgid="7618393787965366655">"Repülőgép üzemmódban"</string>
     <string name="wifi_fail_to_scan" msgid="6194542252808587669">"Nem lehet hálózatokat keresni"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Hálózati értesítés"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Értesítést kérek az elérhető nyitott hálózatokról"</string>
+    <string name="wifi_enable_watchdog_service" msgid="4723544454066601706">"Wi-Fi kapcsolatellenőrzések"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="8687400936839455926">"Potenciális hálózati problémák észlelése és kezelése"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Wi-Fi leválasztási irányelv"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Adja meg, mikor legyen váltás Wi-Fi-ről mobil adatokra"</string>
     <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" msgid="6234851776910938957">"Hálózat hozzáadá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>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Csatlakozás hálózathoz"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Hálózat elfelejtése"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Hálózat módosítása"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="3682507011071029311">"Wi-Fi bekapcs. az elérhető hálózatok listájához"</string>
     <string name="wifi_network_setup" msgid="7974851890019344870">"Hálózat beállítása"</string>
     <string name="wifi_wps_pin" msgid="5471842298708321115">"Írja be a hozzáférési pont PIN kódját"</string>
     <string name="wifi_wps_setup_title" msgid="150518971269252336">"WPS beállítása"</string>
@@ -501,13 +523,13 @@
     <string name="wifi_save" msgid="3331121567988522826">"Mentés"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Mégse"</string>
     <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"Másik WPS programfolyamat észlelve; kérjük, próbálja újra pár perc múlva"</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Speciális"</string>
+    <!-- outdated translation 5419052271935350999 -->     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Speciális"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi frekvenciasáv"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Adja meg a működési frekvenciatartományt"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Hiba történt a frekvenciasáv beállítása során."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC-cím"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP-cím"</string>
-    <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"IP-beállítások"</string>
+    <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP-beállítások"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Mentés"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Mégse"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Adjon meg érvényes IP-címet."</string>
@@ -525,7 +547,7 @@
     <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> hordozható Wi-Fi hotspot"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="sound_settings_title" msgid="8735891486683305886">"Hang"</string>
-    <string name="display_settings_title" msgid="2378894265964357591">"Képernyő"</string>
+    <string name="display_settings_title" msgid="1708697328627382561">"Megjelenítés"</string>
     <string name="sound_settings" msgid="5007659014828162881">"Hangbeállítások"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Néma üzemmód"</string>
     <string name="silent_mode_summary" msgid="3309650676072917899">"Minden hang elnémítása a médiafájloké és az ébresztéseké kivételével"</string>
@@ -598,7 +620,18 @@
     <string name="brightness_summary" msgid="838917350127550703">"A képernyő fényerejének beállítása"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Időtúllépés"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"A képernyő <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> után automatikusan kikapcsol"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Háttérkép"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android Álmok"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Képernyővédők és más tétlenségi időtöltések"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Kiválasztott álom"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Mikor kell aktiválni"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> tétlenség után"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Soha"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Próbálja ki!"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatikus fényerő"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Betűméret"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Betűtípusok általános mérete"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Betűméret kiválasztása"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM-kártya lezárási beállításai"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"SIM-kártya zárolásának beállítása"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM-kártya zárolása"</string>
@@ -643,8 +676,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>
@@ -696,6 +730,16 @@
     <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"Az SD-kártya leválasztásra kerül."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Leválasztás"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Leválasztás folyamatban"</string>
+    <!-- no translation found for storage_menu_usb (1580545228584324704) -->
+    <skip />
+    <!-- no translation found for storage_title_usb (5775322159427546546) -->
+    <skip />
+    <!-- no translation found for usb_label_mtp (4157227401755543412) -->
+    <skip />
+    <!-- no translation found for usb_label_ptp (7417254019489575819) -->
+    <skip />
+    <!-- no translation found for usb_label_installer_cd (7438467574756086977) -->
+    <skip />
     <string name="battery_status_title" msgid="9159414319574976203">"Akkumulátor állapota"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Akkumulátorszint"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN-ek"</string>
@@ -806,6 +850,8 @@
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"Nem osztható meg több mint <xliff:g id="MAXCONNECTION">%1$d</xliff:g> eszköznek"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> megosztása meg lesz szüntetve."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Súgó"</string>
+    <string name="wireless_category_general" msgid="2973810407987118067">"Általános"</string>
+    <string name="wireless_category_mobile_networks" msgid="1254629216798424288">"Mobilhálózatok"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobilhálózatok"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Barangolás, hálózatok, APN-ek beállítása"</string>
     <string name="location_title" msgid="1029961368397484576">"Saját pozíció"</string>
@@ -883,7 +929,7 @@
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"A táblagép védelme"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"A telefon védelme"</string>
     <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"Védje meg táblagépét a jogosulatlan használattól egy személyes képernyőfeloldási minta létrehozásával. Ujjával tetszőleges sorrendben kösse össze a pontokat a következő képernyőn. Legalább négy pontot össze kell kötnie. "\n\n" Készen áll? Érintse meg a \"Tovább\" gombot."</string>
-    <string name="lock_intro_message" product="default" msgid="9100785646737118042"><font size="17">"Védje meg telefonját a jogosulatlan használattól egy személyes képernyőzár-feloldási minta létrehozásával. "\n<font height="17">\n</font><b>"1"</b>"  A következő képernyőn nézze meg a példaként felrajzolt mintát. "\n<font height="17">\n</font><b>"2"</b>"  Amikor készen áll, rajzolja meg a saját feloldási mintáját. Nyugodtan kísérletezzen a különböző mintákkal, ám mindig kapcsoljon össze legalább négy pontot. "\n<font height="17">\n</font><b>"3"</b>"  Rajzolja újra a mintát a megerősítéshez. "\n<font height="17">\n</font><b>"Készen áll? Érintse meg a “Tovább” gombot"</b>". "\n<font height="3">\n</font>"Amennyiben védtelenül kívánja hagyni telefonját, nyomja meg a \"Mégse\" gombot."</font></string>
+    <!-- outdated translation 3692151094288835065 -->     <string name="lock_intro_message" product="default" msgid="5796785892741212873">"Védje meg táblagépét a jogosulatlan használattól egy személyes képernyőfeloldási minta létrehozásával. Ujjával tetszőleges sorrendben kösse össze a pontokat a következő képernyőn. Legalább négy pontot össze kell kötnie. "\n\n" Készen áll? Érintse meg a \"Tovább\" gombot."</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Alkalmazások kezelése"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"A telepített alkalmazások kezelése és eltávolítása"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Alkalmazások"</string>
@@ -893,6 +939,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>
@@ -905,9 +953,10 @@
     <string name="force_stop" msgid="7435006169872876756">"Kényszerített leállítás"</string>
     <string name="total_size_label" msgid="1048676419552557254">"Összesen"</string>
     <string name="application_size_label" msgid="5055196275624686382">"Alkalmazás"</string>
+    <string name="external_code_size_label" msgid="3459343140355961335">"USB-alkalmazás"</string>
     <string name="data_size_label" msgid="8679376373625710107">"Adatok"</string>
-    <string name="external_size_label" product="nosdcard" msgid="4465530017830945766">"USB-tár"</string>
-    <string name="external_size_label" product="default" msgid="2107155737635944440">"SD-kártya"</string>
+    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB-adatok"</string>
+    <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD-kártya"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Eltávolítás"</string>
     <string name="disable_text" msgid="6544054052049395202">"Letiltás"</string>
     <string name="enable_text" msgid="9217362512327828987">"Engedélyezés"</string>
@@ -1026,7 +1075,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 +1085,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>
@@ -1066,7 +1117,7 @@
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Képernyőbillentyűzet beállításai"</string>
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Fizikai billentyűzet"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Fizikai billentyűzet beállításai"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Alkalmazásfejlesztés"</string>
+    <string name="development_settings_title" msgid="215179176067683667">"Fejlesztői lehetőségek"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"Alkalmazásfejlesztési lehetőségek beállítása"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB hibakeresés"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Hibakeresés mód USB csatlakoztatásakor"</string>
@@ -1091,14 +1142,14 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Kisegítő lehetőségek"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Kisegítő lehetőségek beállításai"</string>
     <string name="accessibility_settings_summary" msgid="8185181964847149507">"Kisegítő lehetőségek beállításainak kezelése"</string>
-    <string name="toggle_accessibility_title" msgid="650839277066574497">"Kisegítő lehetőségek"</string>
+    <string name="toggle_large_text_title" msgid="42259643359869436">"Nagy szöveg"</string>
     <string name="accessibility_services_category" msgid="8127851026323672607">"Kisegítő szolgáltatások"</string>
+    <string name="toggle_accessibility_title" msgid="7338739354952553958">"Kisegítő lehetőségek engedélyezése"</string>
     <string name="no_accessibility_services_summary" msgid="694578333333808159">"Nincsen telepítve kisegítő lehetőségeket nyújtó szolgáltatás."</string>
     <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Ez a beviteli módszer alkalmas lehet a beírt szövegek -- köztük a jelszavak kivételével az olyan személyes adatok, mint a hitelkártyaszámok -- összegyűjtésére. A(z) <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> alkalmazás kapcsolta be. Használja ezt a kisegítő szolgáltatást?"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Kikapcsolja a kisegítő lehetőségeket?"</string>
     <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"Nem található a kisegítő lehetőségekkel kapcsolatos alkalmazás"</string>
     <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"Nincsen kiegészítő lehetőségekhez kapcsolódó alkalmazás telepítve."\n\n"Az Android Marketről letölthet egy képernyőolvasót az eszközére."\n\n"A képernyőolvasó telepítéséhez kattintson az OK gombra."</string>
-    <string name="accessibility_script_injection_category" msgid="8649951751131431904">"Kisegítő lehetőségek"</string>
     <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"Kisegítő lehetőségek szkriptek letöltése"</string>
     <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"Lehetővé teszi az alkalmazások számára, hogy kisegítő lehetőségeket biztosító szkripteket töltsenek le a Google-tól"</string>
     <string name="accessibility_script_injection_security_warning" product="tablet" msgid="1113600871264359828">"Egyes alkalmazások megkérhetik a Google-t, hogy töltsön le szkripteket a táblagépére, hogy a tartalmuk még könnyebben hozzáférő legyen. Biztosan engedélyezi a Google-nak, hogy kiegészítő lehetőségeket biztosító szkripteket telepítsen a táblagépére?"</string>
@@ -1106,10 +1157,11 @@
     <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>
-    <string name="power_usage_summary_title" msgid="5180282911164282324">"Akkumulátorhasználat"</string>
+    <string name="power_usage_summary_title" msgid="7190304207330319919">"Akkumulátor"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Mi használta az akkumulátort"</string>
     <string name="power_usage_not_available" msgid="3583407442633768046">"Nincs elérhető akkuhaszn. adat"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Akkumulátorhasználat a legutolsó töltés óta"</string>
@@ -1218,6 +1270,8 @@
     <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>
+    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Motor beállításai"</string>
+    <string name="tts_engine_settings_title" msgid="3499112142425680334">"A(z) <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g> beállításai"</string>
     <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>
@@ -1228,114 +1282,33 @@
     <string name="gadget_title" msgid="7455548605888590466">"Energiagazdálkodás"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Wi-Fi beállítás frissítése"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetooth beállítások frissítése"</string>
-    <string name="vpn_settings_activity_title" msgid="7276864950701612579">"VPN-beállítások"</string>
-    <string name="vpn_connect_to" msgid="2541409082892684362">"Csatlakozás a(z) <xliff:g id="NAME">%s</xliff:g> hálózathoz"</string>
-    <string name="vpn_username_colon" msgid="7854930370861306247">"Felhasználónév:"</string>
-    <string name="vpn_password_colon" msgid="5716278710848606626">"Jelszó:"</string>
-    <string name="vpn_a_username" msgid="6664733641993968692">"egy felhasználónév"</string>
-    <string name="vpn_a_password" msgid="1537213632501483753">"egy jelszó"</string>
-    <string name="vpn_save_username" msgid="1408415289165970790">"Felhasználónév megjegyzése"</string>
-    <string name="vpn_connect_button" msgid="1699007212602470655">"Kapcsolódás"</string>
-    <string name="vpn_yes_button" msgid="8034531001149843119">"Igen"</string>
-    <string name="vpn_no_button" msgid="7620339571187119107">"Nem"</string>
-    <string name="vpn_back_button" msgid="192036339792734970">"Vissza"</string>
-    <string name="vpn_mistake_button" msgid="1683383660912491270">"Nem"</string>
-    <string name="vpn_menu_done" msgid="93528279226907926">"Mentés"</string>
-    <string name="vpn_menu_cancel" msgid="7234451214611202868">"Mégse"</string>
-    <string name="vpn_menu_revert" msgid="4407762442281467659">"Visszavonás"</string>
-    <string name="vpn_menu_connect" msgid="1089399414463784218">"Csatlakozás hálózathoz"</string>
-    <string name="vpn_menu_disconnect" msgid="8254492450022562235">"Hálózati kapcsolat bontása"</string>
-    <string name="vpn_menu_edit" msgid="4526245173583195618">"Hálózat szerkesztése"</string>
-    <string name="vpn_menu_delete" msgid="3326527392609513129">"Hálózat törlése"</string>
-    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"A következőt kell beírnia: <xliff:g id="CODE">%s</xliff:g>."</string>
-    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"A következőt kell választania: <xliff:g id="OPTION">%s</xliff:g>."</string>
-    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"A(z) \"<xliff:g id="NAME">%s</xliff:g>\" virtuális hálózat már létezik. Találjon ki másik nevet."</string>
-    <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"Biztosan törli ezt a virtuális magánhálózatot?"</string>
-    <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"Biztosan nem hozza létre ezt a profilt?"</string>
-    <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"Biztosan elveti a profilon végrehajtott módosításokat?"</string>
-    <string name="vpn_confirm_reconnect" msgid="5748535476278674296">"Nem lehet kapcsolódni a hálózathoz. Megpróbálja újra?"</string>
-    <string name="vpn_reconnect_from_lost" msgid="2442844155623372118">"A kapcsolat megszakadt. Újracsatlakozik?"</string>
-    <string name="vpn_unknown_server_dialog_msg" msgid="3080742299823671319">"A szerver neve nem oldható fel. Ellenőrzi a beállításokat?"</string>
-    <string name="vpn_challenge_error_dialog_msg" msgid="6174901754230038601">"Kihíváshiba. Ellenőrzi a titkos beállításait?"</string>
-    <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"Egy vagy több titok hiányzik ebből a VPN konfigurációból. Ellenőrzi a titkos beállításokat?"</string>
-    <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"A megadott felhasználónév vagy jelszó helytelen. Megpróbálja újra?"</string>
-    <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"A szerver megszakította a kapcsolatot. Valószínűleg helytelen a megadott felhasználónév vagy jelszó. Megpróbálja újra?"</string>
-    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"A szerver megszakította a kapcsolatot. Lehetséges, hogy Ön egy olyan tűzfal mögött van, amely megakadályozza a kapcsolódást a szerverhez. Újrapróbálja?"</string>
-    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"Sikertelen egyeztetés a szerverrel. Lehet, hogy az nem fogadja el a titkosítási beállításait. Ellenőrzi a beállításokat?"</string>
-    <string name="vpn_type_title" msgid="6392933604218676224">"VPN hozzáadása"</string>
-    <string name="vpn_add_new_vpn" msgid="5438260689052714550">"VPN hozzáadása"</string>
-    <string name="vpn_details_title" msgid="418806440938510331">"VPN részletei"</string>
-    <string name="vpn_edit_title_add" msgid="2121313217989682890">"<xliff:g id="NAME">%s</xliff:g> hálózat hozzáadása"</string>
-    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"<xliff:g id="NAME">%s</xliff:g> részletei"</string>
-    <string name="vpns" msgid="3148141862835492816">"VPN-ek"</string>
-    <string name="vpn_connecting" msgid="8039521381692090116">"Kapcsolódás..."</string>
-    <string name="vpn_disconnecting" msgid="7748050200708257066">"Kapcsolat bontása..."</string>
-    <string name="vpn_connected" msgid="7641723116362845781">"Csatlakozva"</string>
-    <string name="vpn_connect_hint" msgid="7442898962925875181">"Csatlakozás a hálózathoz"</string>
-    <string name="vpn_name" msgid="1550918148476193076">"VPN neve"</string>
-    <string name="vpn_a_name" msgid="8445736942405283509">"egy VPN neve"</string>
-    <string name="vpn_profile_added" msgid="9061017910337129840">"\"<xliff:g id="NAME">%s</xliff:g>\" hozzáadva"</string>
-    <string name="vpn_profile_replaced" msgid="587435576816273815">"\"<xliff:g id="NAME">%s</xliff:g>\" módosítva lett"</string>
-    <string name="vpn_user_certificate_title" msgid="6812545893924071742">"Felhasználói tanúsítvány beállítása"</string>
-    <string name="vpn_user_certificate" msgid="949322691686938888">"Felhasználói tanúsítvány"</string>
-    <string name="vpn_a_user_certificate" msgid="8943983437956898649">"egy felhasználói tanúsítvány"</string>
-    <string name="vpn_ca_certificate_title" msgid="7846466160795589985">"CA tanúsítvány beállítása"</string>
-    <string name="vpn_ca_certificate" msgid="465085144064264742">"Tanúsítványkibocsátói (CA) tanúsítvány"</string>
-    <string name="vpn_a_ca_certificate" msgid="3374242520974884295">"egy CA tanúsítvány"</string>
-    <string name="vpn_l2tp_secret_string_title" msgid="5039677186748940987">"L2TP titok beállítása"</string>
-    <string name="vpn_l2tp_secret" msgid="529359749677142076">"L2TP titok"</string>
-    <string name="vpn_a_l2tp_secret" msgid="6612042930810981845">"egy L2TP titok"</string>
-    <string name="vpn_pptp_encryption_title" msgid="2236795167467896499">"titkosítás"</string>
-    <string name="vpn_pptp_encryption" msgid="2602329949737259686">"PPTP titkosítás"</string>
-    <string name="vpn_ipsec_presharedkey_title" msgid="2184060087690539175">"Megosztott IPSec-kulcs beállítása"</string>
-    <string name="vpn_ipsec_presharedkey" msgid="5434316521616673741">"Megosztott IPSec-kulcs"</string>
-    <string name="vpn_a_ipsec_presharedkey" msgid="1255301923217898418">"egy megosztott IPSec-kulcs"</string>
-    <string name="vpn_vpn_server_title" msgid="8897005887420358913">"VPN-szerver beállítása"</string>
-    <string name="vpn_vpn_server" msgid="1141754908824209260">"VPN szerver"</string>
-    <string name="vpn_a_vpn_server" msgid="5960906152125045853">"egy VPN-szerver"</string>
-    <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"VPN szerver neve"</string>
-    <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"DNS keresési domainek"</string>
-    <string name="vpn_dns_search_list" msgid="4230034234026605360">"DNS keresési domainek"</string>
-    <string name="vpn_field_is_set" msgid="7137320847812992243">"<xliff:g id="VALUE">%s</xliff:g> lett beállítva"</string>
-    <string name="vpn_field_not_set" msgid="2972519243515893804">"<xliff:g id="VALUE">%s</xliff:g> nincs beállítva"</string>
-    <string name="vpn_field_not_set_optional" msgid="8840557698252556791">"<xliff:g id="VALUE">%s</xliff:g> nincs beállítva (nem kötelező)"</string>
-    <string name="vpn_enable_field" msgid="3700967675854517191">"<xliff:g id="OPTION">%s</xliff:g> engedélyezése"</string>
-    <string name="vpn_disable_field" msgid="6905658811179634005">"A(z) <xliff:g id="OPTION">%s</xliff:g> letiltása"</string>
-    <string name="vpn_is_enabled" msgid="1266304230417098877">"A(z) <xliff:g id="OPTION">%s</xliff:g> engedélyezve van"</string>
-    <string name="vpn_is_disabled" msgid="2013622485867806167">"A(z) <xliff:g id="OPTION">%s</xliff:g> le van tiltva"</string>
     <string name="vpn_settings_title" msgid="7327468307909556719">"VPN beállítások"</string>
     <string name="vpn_settings_summary" msgid="8849924181594963972">"Virtuális magánhálózatok (VPN) beállítása és kezelése"</string>
-    <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="trusted_credentials" msgid="4266945289534242402">"Megbízható hitelesítő adatok"</string>
+    <string name="trusted_credentials_summary" msgid="6735221351155686632">"Megbízható CA tanúsítványok megjelenítése"</string>
     <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>
-    <string name="privacy_settings_title" msgid="1987089301293213705">"Adatvédelmi beállítások"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"Biztonsági mentés és visszaállítás"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"Biztonsági mentés és visszaállítás"</string>
     <string name="backup_section_title" msgid="8856083167469467588">"Biztonsági mentés és helyreállítás"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Személyes adatok"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Adatok biztonsági mentése"</string>
@@ -1439,4 +1412,107 @@
     <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>
+    <!-- no translation found for debug_ui_category (9023948280291055349) -->
+    <skip />
+    <!-- no translation found for strict_mode (1938795874357830695) -->
+    <skip />
+    <!-- no translation found for strict_mode_summary (142834318897332338) -->
+    <skip />
+    <!-- no translation found for pointer_location (6084434787496938001) -->
+    <skip />
+    <!-- no translation found for pointer_location_summary (840819275172753713) -->
+    <skip />
+    <!-- no translation found for show_screen_updates (8282711794220426931) -->
+    <skip />
+    <!-- no translation found for show_screen_updates_summary (1716122382094924596) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage (2389212910758076024) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage_summary (2113341923988958266) -->
+    <skip />
+    <!-- no translation found for window_animation_scale_title (6162587588166114700) -->
+    <skip />
+    <!-- no translation found for transition_animation_scale_title (387527540523595875) -->
+    <skip />
+    <!-- no translation found for debug_applications_category (6221644998451283813) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities (3622005081180597749) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities_summary (3592221124808773368) -->
+    <skip />
+    <!-- no translation found for app_process_limit_title (4121324758038197598) -->
+    <skip />
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Adathasználat"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"Adatforgalmi ciklus"</string>
+    <string name="data_usage_menu_split_4g" msgid="7417435609285381968">"4G forgalom elkülönítve"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Wi-Fi forgalom megjelenítése"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"Ciklus módosítása..."</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Az adatforgalmi ciklus visszaállítása a hónap e napján:"</string>
+    <string name="data_usage_disable_mobile_limit" msgid="289740911281022322">"Adatok letiltása a korlátnál"</string>
+    <string name="data_usage_disable_4g_limit" msgid="5808210773758699800">"4G adatok letiltása a korlátnál"</string>
+    <string name="data_usage_disable_3g_limit" msgid="3856971004328238231">"2G-3G adatok letilt. a korlátnál"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_mobile" msgid="454140350007299045">"Mobil"</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">"Mobiladatok"</string>
+    <string name="data_usage_enable_3g" msgid="6304006671869578254">"2G-3G adatforgalom"</string>
+    <string name="data_usage_enable_4g" msgid="3635854097335036738">"4G adatforgalom"</string>
+    <string name="data_usage_app_settings" msgid="3727561362090820369">"Beállítások megtekintése"</string>
+    <string name="data_usage_app_restrict_background" msgid="8856643905291165256">"Háttéradat-forgalom korlátozása"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="1503361245973512092">"Háttéradatok engedélyezése csak korlátlan hálózat esetén"</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="8110736468987743260">"Háttéradatok korlátozása"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="100001698378554777">"Ez a funkció negatívan befolyásolhatja azokat az alkalmazásokat, amelyek a háttérben zajló adatforgalomra támaszkodnak."\n\n"Lehet, hogy beállítható megfelelőbb adathasználat az alkalmazás beállításai között."</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Használati ciklus visszaállításának ideje"</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Hónap napja:"</string>
+    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Beállítás"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Adatforgalom korlátozása"</string>
+    <string name="data_usage_limit_dialog_mobile" msgid="7931094451923591578">"A mobil adatkapcsolat le lesz tiltva a megadott korlát elérésekor."\n\n"A többletdíjak elkerülése érdekében fontolja meg csökkentett korlát használatát, mivel az eszköz és a szolgáltató számolási módszerei eltérők lehetnek."</string>
+    <string name="data_usage_limit_dialog_3g" msgid="5478553071420316963">"A 2G-3G adatkapcsolat le lesz tiltva a megadott korlát elérésekor."\n\n"A többletdíjak elkerülése érdekében fontolja meg csökkentett korlát használatát, mivel az eszköz és a szolgáltató számolási módszerei eltérők lehetnek."</string>
+    <string name="data_usage_limit_dialog_4g" msgid="6134008906742403777">"A 4G adatkapcsolat le lesz tiltva a megadott korlát elérésekor."\n\n"A többletdíjak elkerülése érdekében fontolja meg csökkentett korlát használatát, mivel az eszköz és a szolgáltató számolási módszerei eltérők lehetnek."</string>
+    <string name="data_usage_disabled_dialog_3g_title" msgid="4221584306492812040">"2G-3G adatforgalom letiltva"</string>
+    <string name="data_usage_disabled_dialog_4g_title" msgid="715585612162185936">"4G adatforgalom letiltva"</string>
+    <string name="data_usage_disabled_dialog_mobile_title" msgid="209516216265000221">"Mobil adatforgalom letiltva"</string>
+    <string name="data_usage_disabled_dialog" msgid="2874031671067845964">"Elérte a megadott adathasználati korlátot."\n\n"A további adathasználatért a szolgáltató díjat számolhat fel."</string>
+    <string name="data_usage_disabled_dialog_enable" msgid="2441219164620753329">"Adatforgalom engedélyezése"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="32">"<xliff:g id="NUMBER">%1$s</xliff:g>"</font>" "<font size="12">"<xliff:g id="UNIT">%2$s</xliff:g>"</font>\n<font size="12">"figyelmeztetés"</font></string>
+    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Segélyhívás"</string>
+    <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Hívás folytatása"</string>
+    <string name="vpn_name" msgid="4689699885361002297">"Név"</string>
+    <string name="vpn_type" msgid="5435733139514388070">"Típus"</string>
+    <string name="vpn_server" msgid="2123096727287421913">"Szerver címe"</string>
+    <string name="vpn_mppe" msgid="6639001940500288972">"PPP-titkosítás (MPPE)"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"L2TP titok"</string>
+    <string name="vpn_ipsec_identifier" msgid="4098175859460006296">"IPSec azonosító"</string>
+    <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Megosztott IPSec-kulcs"</string>
+    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"IPSec felhasználói tanúsítvány"</string>
+    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec CA tanúsítvány"</string>
+    <!-- no translation found for vpn_search_domains (5391995501541199624) -->
+    <skip />
+    <!-- no translation found for vpn_routes (8556236801755260073) -->
+    <skip />
+    <string name="vpn_username" msgid="1863901629860867849">"Felhasználónév"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Jelszó"</string>
+    <!-- no translation found for vpn_save_login (6350322456427484881) -->
+    <skip />
+    <!-- no translation found for vpn_not_used (9094191054524660891) -->
+    <skip />
+    <string name="vpn_no_ca_cert" msgid="7820884983947090538">"(a szervereket ne ellenőrizze)"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"Mégse"</string>
+    <string name="vpn_save" msgid="4233484051644764510">"Mentés"</string>
+    <string name="vpn_connect" msgid="8469608541746132301">"Csatlakozás"</string>
+    <string name="vpn_edit" msgid="1111459297288136079">"VPN-hálózat szerkesztése"</string>
+    <string name="vpn_connect_to" msgid="7328758950427515753">"Csatlakozás ide: <xliff:g id="NETWORK">%s</xliff:g>"</string>
+    <string name="vpn_title" msgid="7982620762043790565">"VPN-beállítások"</string>
+    <string name="vpn_create" msgid="8966010925994175306">"VPN-hálózat hozzáadása"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"Hálózat szerkesztése"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"Hálózat törlése"</string>
+    <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Rendszer"</string>
+    <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Felhasználó"</string>
+    <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Kikapcsolás"</string>
+    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Bekapcsolás"</string>
+    <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Eltávolítás"</string>
+    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Engedélyezi a rendszer CA tanúsítványát?"</string>
+    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Letiltja a rendszer CA tanúsítványát?"</string>
+    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Véglegesen eltávolítja a felhasználó CA tanúsítványát?"</string>
 </resources>
diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
index c29d7f8..a8d6801 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>
@@ -214,4 +240,36 @@
     <item msgid="3878793616631049349">"Gunakan pemeriksaan HDCP untuk konten DRM saja"</item>
     <item msgid="45075631231212732">"Selalu gunakan pemeriksaan HDCP"</item>
   </string-array>
+    <!-- no translation found for window_animation_scale_entries:0 (8134156599370824081) -->
+    <!-- no translation found for window_animation_scale_entries:1 (6624864048416710414) -->
+    <!-- no translation found for window_animation_scale_entries:2 (2219332261255416635) -->
+    <!-- no translation found for window_animation_scale_entries:3 (3544428804137048509) -->
+    <!-- no translation found for window_animation_scale_entries:4 (3110710404225974514) -->
+    <!-- no translation found for window_animation_scale_entries:5 (4402738611528318731) -->
+    <!-- no translation found for window_animation_scale_entries:6 (6189539267968330656) -->
+    <!-- no translation found for transition_animation_scale_entries:0 (8464255836173039442) -->
+    <!-- no translation found for transition_animation_scale_entries:1 (3375781541913316411) -->
+    <!-- no translation found for transition_animation_scale_entries:2 (1991041427801869945) -->
+    <!-- no translation found for transition_animation_scale_entries:3 (4012689927622382874) -->
+    <!-- no translation found for transition_animation_scale_entries:4 (3289156759925947169) -->
+    <!-- no translation found for transition_animation_scale_entries:5 (7705857441213621835) -->
+    <!-- no translation found for transition_animation_scale_entries:6 (6660750935954853365) -->
+    <!-- no translation found for app_process_limit_entries:0 (6799596560242275471) -->
+    <!-- no translation found for app_process_limit_entries:1 (2412794376818632575) -->
+    <!-- no translation found for app_process_limit_entries:2 (1578904888612645001) -->
+    <!-- no translation found for app_process_limit_entries:3 (8819235336299873577) -->
+  <string-array name="vpn_types_long">
+    <item msgid="2732002039459078847">"PPTP VPN"</item>
+    <item msgid="3799752201662127867">"L2TP/IPSec VPN dengan kunci pra-bagi"</item>
+    <item msgid="4725504331295252103">"L2TP/IPSec VPN dengan sertifikat"</item>
+    <item msgid="7526551163264034377">"IPSec VPN dengan kunci pra-bagi dan autentikasi Xauth"</item>
+    <item msgid="8064740940687465039">"IPSec VPN dengan sertifikat dan autentikasi Xauth"</item>
+    <item msgid="4946199982372391490">"IPSec VPN dengan sertifikat dan autentikasi hibrida"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:0 (8621078286418985762) -->
+    <!-- no translation found for vpn_states:1 (6692305604213080515) -->
+    <!-- no translation found for vpn_states:2 (8001704909356800092) -->
+    <!-- no translation found for vpn_states:3 (4039737283841672166) -->
+    <!-- no translation found for vpn_states:4 (4042143101664725090) -->
+    <!-- no translation found for vpn_states:5 (2690164254699635531) -->
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 79d1d3a..10ace02 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -19,6 +19,10 @@
     <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="header_category_wireless_networks" msgid="4944823405420438623">"NIRKABEL &amp; JARINGAN"</string>
+    <string name="header_category_device" msgid="5781174212691167553">"PERANGKAT"</string>
+    <string name="header_category_personal" msgid="6225932173498802187">"PRIBADI"</string>
+    <string name="header_category_system" msgid="2073558547468647128">"SISTEM"</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>
@@ -111,7 +115,11 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Menyandingkan..."</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"Disandingkan tetapi tidak tersambung"</string>
     <string name="bluetooth_device" msgid="6873461446424952003">"handsfree/headset"</string>
-    <string name="progress_scanning" msgid="3760897655335759141">"Memindai"</string>
+    <!-- outdated translation 3760897655335759141 -->     <string name="progress_scanning" msgid="192587958424295789">"Memindai"</string>
+    <!-- no translation found for progress_tap_to_pair (4192342336107106334) -->
+    <skip />
+    <!-- no translation found for bluetooth_no_devices_found (2412462335116297668) -->
+    <skip />
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Permintaan penyandingan bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Permintaan penyandingan"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Pilih untuk disandingkan dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
@@ -130,6 +138,9 @@
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Aplikasi pada ponsel Anda meminta izin untuk mengaktifkan Bluetooth dan membuat ponsel dapat ditemukan oleh perangkat lain. Anda ingin melakukannya?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Menghidupkan Bluetooth..."</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Sambung otomatis"</string>
+    <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Permintaan sambungan bluetooth"</string>
+    <string name="bluetooth_connection_notif_message" msgid="1833221950512058309">"Sentuh untuk menyambung ke \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\""</string>
+    <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Sambungkan ke \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Setelan tanggal &amp; waktu"</string>
     <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>
@@ -235,7 +246,7 @@
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Nonaktifkan semua sambungan nirkabel"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"Menonaktifkan sambungan nirkabel..."</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"Aktifkan sambungan nirkabel..."</string>
-    <string name="radio_controls_title" msgid="5868688473587168882">"Jaringan &amp; nirkabel"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Selengkapnya..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Jaringan &amp; nirkabel"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"Kelola Wi-Fi, Bluetooth, mode pesawat, jaringan seluler, &amp; VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Data roaming"</string>
@@ -271,8 +282,8 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Info pemilik"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="2382525043173672857">"Masukkan teks untuk ditampilkan pada layar kunci"</string>
-    <string name="security_settings_title" msgid="5168491784222013179">"Lokasi &amp; keamanan"</string>
-    <string name="location_security_settings_title" msgid="4624434296446625554">"Lokasi &amp; setelan keamanan"</string>
+    <string name="location_settings_title" msgid="8935806698251432196">"Layanan lokasi"</string>
+    <string name="security_settings_title" msgid="7945465324818485460">"Keamanan"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Setel Lokasiku, pembuka kunci layar, kunci kartu SIM, kunci penyimpanan kredensial"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Setel Lokasiku, pembuka kunci layar, kunci penyimpanan kredensial"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Sandi"</string>
@@ -316,7 +327,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>
@@ -375,8 +386,8 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Lihat atau nonaktifkan administrator perangkat"</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">"Setelan bluetooth"</string>
-    <string name="bluetooth_settings_title" msgid="2824020086246268296">"Setelan bluetooth"</string>
+    <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
+    <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Kelola sambungan, setel nama perangkat &amp; dapat ditemukan"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Permintaan penyandingan bluetooth"</string>
     <string name="bluetooth_enter_pin_msg" msgid="1499285355129256289">\n"Masukkan PIN untuk menyandingkan dengan \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". (Coba 0000 atau 1234) Anda mungkin harus memasukkan PIN yang sama ke perangkat Bluetooth."</string>
@@ -394,7 +405,10 @@
     <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Penyandingan ditolak oleh <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"Terjadi masalah saat menyambung ke <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Memindai perangkat"</string>
-    <string name="bluetooth_preference_find_nearby_title" msgid="5087410003465463318">"Cari perangkat terdekat"</string>
+    <!-- no translation found for bluetooth_search_for_devices (5957007154213560390) -->
+    <skip />
+    <!-- no translation found for bluetooth_searching_for_devices (9203739709307871727) -->
+    <skip />
     <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"Pengaturan perangkat"</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Perangkat dipasangkan"</string>
     <string name="bluetooth_preference_found_devices" msgid="3133019331974936204">"Perangkat ditemukan"</string>
@@ -404,6 +418,10 @@
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Menghapus penyandingan"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Putuskan &amp; lepaskan pasangan"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Opsi…"</string>
+    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Lanjutan"</string>
+    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth Lanjutan"</string>
+    <string name="bluetooth_advanced_settings_label" msgid="8659717781212434173">"Bluetooth Lanjutan"</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="3631028334811113629">"Nyalakan bluetooth utk melihat perangkat yang aktif"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Sambungkan ke…"</string>
     <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"Media"</string>
     <string name="bluetooth_profile_headset" msgid="81844079120986198">"Handsfree"</string>
@@ -445,27 +463,31 @@
     <string name="nfc_toggle_error" msgid="2233172102497535522">"Terjadi galat."</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">"Setelan Wi-Fi"</string>
+    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="2810363951104753710">"Setelan Wi-Fi"</string>
+    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Siapkan &amp; kelola titik akses nirkabel"</string>
-    <string name="wifi_starting" msgid="6710266609710860129">"Menghidupkan..."</string>
-    <string name="wifi_stopping" msgid="5952909472548218348">"Mematikan…"</string>
+    <string name="wifi_starting" msgid="7732330327758522943">"Menghidupkan Wi-Fi..."</string>
+    <string name="wifi_stopping" msgid="244864762599017659">"Mematikan Wi-Fi..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"Galat"</string>
     <string name="wifi_in_airplane_mode" msgid="7618393787965366655">"Dalam mode pesawat"</string>
     <string name="wifi_fail_to_scan" msgid="6194542252808587669">"Tidak dapat memindai jaringan"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Pemberitahuan jaringan"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Beri tahu saya ketika ada jaringan yang tersedia"</string>
+    <string name="wifi_enable_watchdog_service" msgid="4723544454066601706">"Pemeriksaan Konektivitas Wi-Fi"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="8687400936839455926">"Mendeteksi dan mengelola kemungkinan masalah konektivitas jaringan"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Kebijakan pemutusan sambungan Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Tentukan saat beralih dari Wi-Fi ke data seluler"</string>
     <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" msgid="6234851776910938957">"Tambahkan jaringan"</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>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Hubungkan ke jaringan"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Lupakan jaringan"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Ubah jaringan"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="3682507011071029311">"Hidupkan wifi untuk melihat jaringan yang aktif"</string>
     <string name="wifi_network_setup" msgid="7974851890019344870">"Penyiapan Jaringan"</string>
     <string name="wifi_wps_pin" msgid="5471842298708321115">"Masukkan pin dari titik akses"</string>
     <string name="wifi_wps_setup_title" msgid="150518971269252336">"Penyiapan WPS"</string>
@@ -501,13 +523,13 @@
     <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 lainnya terdeteksi, coba lagi dalam beberapa menit"</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Lanjutan"</string>
+    <!-- outdated translation 5419052271935350999 -->     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Lanjutan"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Pita frekuensi Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Tentukan rentang frekuensi operasi"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Ada masalah saat menyetel pita 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">"Setelan IP"</string>
+    <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Setelan 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">"Ketikkan alamat IP yang valid."</string>
@@ -525,7 +547,7 @@
     <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> hotspot Wi-Fi portabel"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="sound_settings_title" msgid="8735891486683305886">"Suara"</string>
-    <string name="display_settings_title" msgid="2378894265964357591">"Layar"</string>
+    <string name="display_settings_title" msgid="1708697328627382561">"Tampilan"</string>
     <string name="sound_settings" msgid="5007659014828162881">"Setelan suara"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Mode senyap"</string>
     <string name="silent_mode_summary" msgid="3309650676072917899">"Senyapkan semua suara kecuali media &amp; alarm"</string>
@@ -598,7 +620,18 @@
     <string name="brightness_summary" msgid="838917350127550703">"Sesuaikan kecerahan layar"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Waktu tunggu"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Layar mati secara otomatis setelah <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Wallpaper"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android Dreams"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Tirai layar dan pengalihan menganggur lainnya"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Dream terpilih"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Waktu mengaktifkan"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"Setelah menganggur selama <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Tidak pernah"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Cobalah!"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Kecerahan otomatis"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Ukuran fon"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Ukuran fon keseluruhan"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Pilih ukuran fon"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Setelan kunci kartu SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Siapkan kunci kartu SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Kunci kartu SIM"</string>
@@ -643,8 +676,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>
@@ -696,6 +730,16 @@
     <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"Kartu SD akan dilepas."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Melepaskan"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Pelepasan sedang berlangsung"</string>
+    <!-- no translation found for storage_menu_usb (1580545228584324704) -->
+    <skip />
+    <!-- no translation found for storage_title_usb (5775322159427546546) -->
+    <skip />
+    <!-- no translation found for usb_label_mtp (4157227401755543412) -->
+    <skip />
+    <!-- no translation found for usb_label_ptp (7417254019489575819) -->
+    <skip />
+    <!-- no translation found for usb_label_installer_cd (7438467574756086977) -->
+    <skip />
     <string name="battery_status_title" msgid="9159414319574976203">"Status baterai"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Tingkat baterai"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -806,6 +850,8 @@
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"Tidak dapat menambatkan ke lebih dari <xliff:g id="MAXCONNECTION">%1$d</xliff:g> perangkat"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan dilepas dari penambatan."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Bantuan"</string>
+    <string name="wireless_category_general" msgid="2973810407987118067">"Umum"</string>
+    <string name="wireless_category_mobile_networks" msgid="1254629216798424288">"Jaringan seluler"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Jaringan seluler"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Setel opsi untuk roaming, jaringan, APN"</string>
     <string name="location_title" msgid="1029961368397484576">"Lokasiku"</string>
@@ -883,7 +929,7 @@
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Mengamankan tablet Anda"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Mengamankan ponsel Anda"</string>
     <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"Lindungi tablet Anda dari penggunaan yang tidak sah dengan membuat pola pembuka kunci layar pribadi. Gunakan jari Anda untuk menghubungkan titik-titik dengan sembarang urutan di layar berikutnya. Anda paling tidak harus menghubungkan empat titik. "\n"Siap memulai?"\n" Sentuh \"Selanjutnya\"."</string>
-    <string name="lock_intro_message" product="default" msgid="9100785646737118042"><font size="17">"Lindungi ponsel Anda dari penggunaan tanpa izin dengan membuat suatu pola pembuka kunci pribadi. "\n<font height="17">\n</font><b>"1"</b>"  Pada layar selanjutnya, perhatikan ketika pola contoh dibuat. "\n<font height="17">\n</font><b>"2"</b>"  Lalu, buat pola pembuka kunci Anda sendiri. Coba berbagai pola berbeda, tetapi sambungkan paling tidak empat titik. "\n<font height="17">\n</font><b>"3"</b>"  Buat lagi pola Anda untuk mengonfirmasi. "\n<font height="17">\n</font><b>"Siap untuk memulai? Sentuh “Selanjutnya”"</b>". "\n<font height="3">\n</font>"Untuk membiarkan ponsel Anda tanpa perlindungan, sentuh \"Batalkan”."</font></string>
+    <!-- outdated translation 3692151094288835065 -->     <string name="lock_intro_message" product="default" msgid="5796785892741212873">"Lindungi tablet Anda dari penggunaan yang tidak sah dengan membuat pola pembuka kunci layar pribadi. Gunakan jari Anda untuk menghubungkan titik-titik dengan sembarang urutan di layar berikutnya. Anda paling tidak harus menghubungkan empat titik. "\n"Siap memulai?"\n" Sentuh \"Selanjutnya\"."</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Kelola aplikasi"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Mengelola dan menghapus aplikasi terpasang"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Aplikasi"</string>
@@ -893,6 +939,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>
@@ -905,9 +953,10 @@
     <string name="force_stop" msgid="7435006169872876756">"Paksa berhenti"</string>
     <string name="total_size_label" msgid="1048676419552557254">"Total"</string>
     <string name="application_size_label" msgid="5055196275624686382">"Aplikasi"</string>
+    <string name="external_code_size_label" msgid="3459343140355961335">"Apl penyimpanan USB"</string>
     <string name="data_size_label" msgid="8679376373625710107">"Data"</string>
-    <string name="external_size_label" product="nosdcard" msgid="4465530017830945766">"Penyimpanan USB"</string>
-    <string name="external_size_label" product="default" msgid="2107155737635944440">"Kartu SD"</string>
+    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Data penyimpanan USB"</string>
+    <string name="external_data_size_label" product="default" msgid="626414192825329708">"Kartu SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Copot pemasangan"</string>
     <string name="disable_text" msgid="6544054052049395202">"Nonaktifkan"</string>
     <string name="enable_text" msgid="9217362512327828987">"Aktifkan"</string>
@@ -1026,7 +1075,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 +1085,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>
@@ -1066,7 +1117,7 @@
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Setelan keyboard layar"</string>
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Keyboard fisik"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Setelan keyboard fisik"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Pengembangan"</string>
+    <string name="development_settings_title" msgid="215179176067683667">"Opsi pengembang"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"Setel opsi pengembangan aplikasi"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Debugging USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Mode debug ketika USB tersambung"</string>
@@ -1091,14 +1142,14 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Aksesibilitas"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Setelan aksesibilitas"</string>
     <string name="accessibility_settings_summary" msgid="8185181964847149507">"Kelola opsi aksesibilitas"</string>
-    <string name="toggle_accessibility_title" msgid="650839277066574497">"Aksesibilitas"</string>
+    <string name="toggle_large_text_title" msgid="42259643359869436">"Teks besar"</string>
     <string name="accessibility_services_category" msgid="8127851026323672607">"Layanan aksesibilitas"</string>
+    <string name="toggle_accessibility_title" msgid="7338739354952553958">"Izinkan layanan aksesibilitas"</string>
     <string name="no_accessibility_services_summary" msgid="694578333333808159">"Layanan aksesibilitas tidak terpasang."</string>
     <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Layanan aksesibilitas ini mungkin dapat mengumpulkan semua teks yang Anda ketikkan, termasuk data pribadi dan nomor kartu kredit kecuali sandi. Juga mungkin mencatat interaksi antarmuka pengguna Anda. Berasal dari <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> aplikasi. Gunakan metode masukan ini?"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Nonaktifkan aksesibilitas?"</string>
     <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"Tidak ada aplikasi terkait aksesibilitas yang ditemukan"</string>
     <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"Anda tidak memasang aplikasi terkait aksesibilitas apa pun."\n\n"Anda dapat mengunduh pembaca layar untuk perangkat Anda dari Android Market."\n\n"Klik OK untuk memasang pembaca layar."</string>
-    <string name="accessibility_script_injection_category" msgid="8649951751131431904">"Skrip aksesibilitas"</string>
     <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"Unduh skrip aksesibilitas"</string>
     <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"Izinkan aplikasi mengunduh skrip aksesibilitas dari Google"</string>
     <string name="accessibility_script_injection_security_warning" product="tablet" msgid="1113600871264359828">"Beberapa aplikasi dapat meminta Google untuk mengunduh skrip ke tablet Anda agar membuat konten mereka lebih dapat diakses. Anda yakin ingin membolehkan Google memasang skrip aksesibilitas pada tablet Anda?"</string>
@@ -1106,10 +1157,11 @@
     <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>
+    <string name="power_usage_summary_title" msgid="7190304207330319919">"Baterai"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Apa yang menggunakan daya baterai"</string>
     <string name="power_usage_not_available" msgid="3583407442633768046">"Data penggunaan baterai tidak tersedia"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Penggunaan baterai sejak dicabut"</string>
@@ -1218,6 +1270,8 @@
     <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>
+    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Setelan mesin"</string>
+    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Setelan untuk <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
     <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>
@@ -1228,114 +1282,33 @@
     <string name="gadget_title" msgid="7455548605888590466">"Kontrol Daya"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Memperbarui setelan Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Memperbarui setelan Bluetooth"</string>
-    <string name="vpn_settings_activity_title" msgid="7276864950701612579">"Setelan 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">"Sandi:"</string>
-    <string name="vpn_a_username" msgid="6664733641993968692">"nama pengguna"</string>
-    <string name="vpn_a_password" msgid="1537213632501483753">"sandi"</string>
-    <string name="vpn_save_username" msgid="1408415289165970790">"Ingat nama pengguna"</string>
-    <string name="vpn_connect_button" msgid="1699007212602470655">"Sambungkan"</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">"Kembalikan"</string>
-    <string name="vpn_menu_connect" msgid="1089399414463784218">"Hubungkan ke jaringan"</string>
-    <string name="vpn_menu_disconnect" msgid="8254492450022562235">"Putuskan dari jaringan"</string>
-    <string name="vpn_menu_edit" msgid="4526245173583195618">"Edit jaringan"</string>
-    <string name="vpn_menu_delete" msgid="3326527392609513129">"Hapus jaringan"</string>
-    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"Anda harus memasukkan <xliff:g id="CODE">%s</xliff:g>."</string>
-    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"Anda harus 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 ada. Cari nama yang lain."</string>
-    <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"Apakah Anda yakin ingin menghapus VPN ini?"</string>
-    <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"Apakah Anda yakin tidak ingin membuat profil ini?"</string>
-    <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"Apakah Anda yakin ingin membuang perubahan yang dilakukan pada profil ini?"</string>
-    <string name="vpn_confirm_reconnect" msgid="5748535476278674296">"Tidak dapat menyambung ke jaringan. Apakah Anda ingin mencoba lagi?"</string>
-    <string name="vpn_reconnect_from_lost" msgid="2442844155623372118">"Sambungan terputus. Apakah Anda ingin menyambung lagi?"</string>
-    <string name="vpn_unknown_server_dialog_msg" msgid="3080742299823671319">"Nama server tidak dapat dikenali. Anda mau memeriksa setelan nama server?"</string>
-    <string name="vpn_challenge_error_dialog_msg" msgid="6174901754230038601">"Galat tantangan. Apakah Anda ingin memeriksa setelan rahasia Anda?"</string>
-    <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"Satu rahasia atau lebih hilang di dalam konfigurasi VPN. Apakah Anda ingin memeriksa setelan rahasia Anda?"</string>
-    <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"Nama pengguna atau sandi yang Anda masukkan salah. Apakah Anda ingin mencoba lagi?"</string>
-    <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"Server tidak merespons. Nama pengguna dan sandi yang Anda masukkan mungkin salah. Ingin mencoba lagi?"</string>
-    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"Server tidak merespons. Kemungkinan Anda berada di belakang firewall yang menghalangi Anda tersambung ke server. Ingin mencoba lagi?"</string>
-    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"Negosiasi server gagal. Server mungkin tidak setuju dengan opsi enkripsi Anda. Apakah Anda ingin memeriksa setelan enkripsi?"</string>
-    <string name="vpn_type_title" msgid="6392933604218676224">"Tambahkan VPN"</string>
-    <string name="vpn_add_new_vpn" msgid="5438260689052714550">"Tambahkan VPN"</string>
-    <string name="vpn_details_title" msgid="418806440938510331">"Detail VPN"</string>
-    <string name="vpn_edit_title_add" msgid="2121313217989682890">"Tambahkan VPN <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"<xliff:g id="NAME">%s</xliff:g> detail"</string>
-    <string name="vpns" msgid="3148141862835492816">"VPN"</string>
-    <string name="vpn_connecting" msgid="8039521381692090116">"Menyambung..."</string>
-    <string name="vpn_disconnecting" msgid="7748050200708257066">"Memutus sambungan..."</string>
-    <string name="vpn_connected" msgid="7641723116362845781">"Terhubung"</string>
-    <string name="vpn_connect_hint" msgid="7442898962925875181">"Hubungkan ke jaringan"</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 untuk \'<xliff:g id="NAME">%s</xliff:g>\'"</string>
-    <string name="vpn_user_certificate_title" msgid="6812545893924071742">"Setel sertifikat pengguna"</string>
-    <string name="vpn_user_certificate" msgid="949322691686938888">"Sertifikat pengguna"</string>
-    <string name="vpn_a_user_certificate" msgid="8943983437956898649">"sertifikat pengguna"</string>
-    <string name="vpn_ca_certificate_title" msgid="7846466160795589985">"Setel sertifikat CA"</string>
-    <string name="vpn_ca_certificate" msgid="465085144064264742">"Sertifikat certificate authority (CA)"</string>
-    <string name="vpn_a_ca_certificate" msgid="3374242520974884295">"Sertifikat CA"</string>
-    <string name="vpn_l2tp_secret_string_title" msgid="5039677186748940987">"Setel rahasia L2TP"</string>
-    <string name="vpn_l2tp_secret" msgid="529359749677142076">"Rahasia L2TP"</string>
-    <string name="vpn_a_l2tp_secret" msgid="6612042930810981845">"rahasia L2TP"</string>
-    <string name="vpn_pptp_encryption_title" msgid="2236795167467896499">"enkripsi"</string>
-    <string name="vpn_pptp_encryption" msgid="2602329949737259686">"Enkripsi PPTP"</string>
-    <string name="vpn_ipsec_presharedkey_title" msgid="2184060087690539175">"Setel kunci pra-bagi IPSec"</string>
-    <string name="vpn_ipsec_presharedkey" msgid="5434316521616673741">"Kunci pra-bagi IPSec"</string>
-    <string name="vpn_a_ipsec_presharedkey" msgid="1255301923217898418">"Kunci pra-bagi IPSec"</string>
-    <string name="vpn_vpn_server_title" msgid="8897005887420358913">"Setel server VPN"</string>
-    <string name="vpn_vpn_server" msgid="1141754908824209260">"Server VPN"</string>
-    <string name="vpn_a_vpn_server" msgid="5960906152125045853">"server VPN"</string>
-    <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"Nama server VPN"</string>
-    <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"Domain penelusuran DNS"</string>
-    <string name="vpn_dns_search_list" msgid="4230034234026605360">"Domain penelusuran DNS"</string>
-    <string name="vpn_field_is_set" msgid="7137320847812992243">"<xliff:g id="VALUE">%s</xliff:g> telah disetel"</string>
-    <string name="vpn_field_not_set" msgid="2972519243515893804">"<xliff:g id="VALUE">%s</xliff:g> belum disetel"</string>
-    <string name="vpn_field_not_set_optional" msgid="8840557698252556791">"<xliff:g id="VALUE">%s</xliff:g> belum disetel (opsional)"</string>
-    <string name="vpn_enable_field" msgid="3700967675854517191">"Aktifkan <xliff:g id="OPTION">%s</xliff:g>"</string>
-    <string name="vpn_disable_field" msgid="6905658811179634005">"Nonaktifkan <xliff:g id="OPTION">%s</xliff:g>"</string>
-    <string name="vpn_is_enabled" msgid="1266304230417098877">"<xliff:g id="OPTION">%s</xliff:g> diaktifkan"</string>
-    <string name="vpn_is_disabled" msgid="2013622485867806167">"<xliff:g id="OPTION">%s</xliff:g> dinonaktifkan"</string>
     <string name="vpn_settings_title" msgid="7327468307909556719">"Setelan VPN"</string>
     <string name="vpn_settings_summary" msgid="8849924181594963972">"Siapkan &amp; kelola VPN"</string>
-    <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="trusted_credentials" msgid="4266945289534242402">"Kredensial tepercaya"</string>
+    <string name="trusted_credentials_summary" msgid="6735221351155686632">"Tampilkan sertifikat CA tepercaya"</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>
-    <string name="privacy_settings_title" msgid="1987089301293213705">"Setelan privasi"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"Buat cadangan &amp; setel ulang"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"Buat cadangan &amp; setel ulang"</string>
     <string name="backup_section_title" msgid="8856083167469467588">"Buat cadangan dan pulihkan"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Data pribadi"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Mencadangkan dataku"</string>
@@ -1440,4 +1413,107 @@
     <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>
+    <!-- no translation found for debug_ui_category (9023948280291055349) -->
+    <skip />
+    <!-- no translation found for strict_mode (1938795874357830695) -->
+    <skip />
+    <!-- no translation found for strict_mode_summary (142834318897332338) -->
+    <skip />
+    <!-- no translation found for pointer_location (6084434787496938001) -->
+    <skip />
+    <!-- no translation found for pointer_location_summary (840819275172753713) -->
+    <skip />
+    <!-- no translation found for show_screen_updates (8282711794220426931) -->
+    <skip />
+    <!-- no translation found for show_screen_updates_summary (1716122382094924596) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage (2389212910758076024) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage_summary (2113341923988958266) -->
+    <skip />
+    <!-- no translation found for window_animation_scale_title (6162587588166114700) -->
+    <skip />
+    <!-- no translation found for transition_animation_scale_title (387527540523595875) -->
+    <skip />
+    <!-- no translation found for debug_applications_category (6221644998451283813) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities (3622005081180597749) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities_summary (3592221124808773368) -->
+    <skip />
+    <!-- no translation found for app_process_limit_title (4121324758038197598) -->
+    <skip />
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Penggunaan data"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"Daur penggunaan data"</string>
+    <string name="data_usage_menu_split_4g" msgid="7417435609285381968">"Pisahkan penggunaan 4G"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Tampilkan penggunaan Wi-Fi"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"Ubah daur..."</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Tanggal dalam bulan untuk menyetel ulang daur penggunaan data:"</string>
+    <string name="data_usage_disable_mobile_limit" msgid="289740911281022322">"Nonaktifkan data seluler pd batas"</string>
+    <string name="data_usage_disable_4g_limit" msgid="5808210773758699800">"Nonaktifkan data 4G pada batas"</string>
+    <string name="data_usage_disable_3g_limit" msgid="3856971004328238231">"Nonaktifkan data 2G-3G pd batas"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_mobile" msgid="454140350007299045">"Seluler"</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">"Data seluler"</string>
+    <string name="data_usage_enable_3g" msgid="6304006671869578254">"Data 2G-3G"</string>
+    <string name="data_usage_enable_4g" msgid="3635854097335036738">"Data 4G"</string>
+    <string name="data_usage_app_settings" msgid="3727561362090820369">"Lihat setelan aplikasi"</string>
+    <string name="data_usage_app_restrict_background" msgid="8856643905291165256">"Batasi penggunaan data latar blkg"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="1503361245973512092">"Hanya izinkan data latar aplikasi saat memakai jaringan tnp batas"</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="8110736468987743260">"Membatasi data latar belakang"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="100001698378554777">"Fitur ini dapat berdampak negatif terhadap aplikasi yang tergantung pada penggunaan data latar belakang."\n\n"Kontrol penggunaan data yang lebih sesuai mungkin dapat ditemukan dalam setelan aplikasi."</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Tanggal penyetelan ulang daur penggunaan"</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Tanggal setiap bulannya:"</string>
+    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Setel"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Membatasi penggunaan data"</string>
+    <string name="data_usage_limit_dialog_mobile" msgid="7931094451923591578">"Koneksi data seluler Anda akan dinonaktifkan saat mencapai batas yang ditentukan."\n\n"Untuk menghindari tagihan berlebih, pertimbangkan mengurangi batas karena metode penghitungan operator dan perangkat mungkin berbeda."</string>
+    <string name="data_usage_limit_dialog_3g" msgid="5478553071420316963">"Koneksi data 2G-3G Anda akan dinonaktifkan saat mencapai batas yang ditentukan."\n\n"Untuk menghindari tagihan berlebih, pertimbangkan mengurangi batas karena metode penghitungan operator dan perangkat mungkin berbeda."</string>
+    <string name="data_usage_limit_dialog_4g" msgid="6134008906742403777">"Koneksi data 4G Anda akan dinonaktifkan saat mencapai batas yang ditentukan."\n\n"Untuk menghindari tagihan berlebih, pertimbangkan mengurangi batas karena metode penghitungan operator dan perangkat mungkin berbeda."</string>
+    <string name="data_usage_disabled_dialog_3g_title" msgid="4221584306492812040">"Data 2G-3G dinonaktifkan"</string>
+    <string name="data_usage_disabled_dialog_4g_title" msgid="715585612162185936">"Data 4G dinonaktifkan"</string>
+    <string name="data_usage_disabled_dialog_mobile_title" msgid="209516216265000221">"Data seluler dinonaktifkan"</string>
+    <string name="data_usage_disabled_dialog" msgid="2874031671067845964">"Telah mencapai batas penggunaan data yang ditetapkan."\n\n"Penggunaan data tambahan mungkin akan dikenai biaya operator."</string>
+    <string name="data_usage_disabled_dialog_enable" msgid="2441219164620753329">"Aktifkan ulang data"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="32">"<xliff:g id="NUMBER">%1$s</xliff:g>"</font><font size="12">"<xliff:g id="UNIT">%2$s</xliff:g>"</font>\n<font size="12">"peringatan"</font></string>
+    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Panggilan darurat"</string>
+    <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Kembali ke panggilan"</string>
+    <string name="vpn_name" msgid="4689699885361002297">"Nama"</string>
+    <string name="vpn_type" msgid="5435733139514388070">"Jenis"</string>
+    <string name="vpn_server" msgid="2123096727287421913">"Alamat server"</string>
+    <string name="vpn_mppe" msgid="6639001940500288972">"Enkripsi PPP (MPPE)"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"Rahasia L2TP"</string>
+    <string name="vpn_ipsec_identifier" msgid="4098175859460006296">"Pengenal IPSec"</string>
+    <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Kunci pra-bagi IPSec"</string>
+    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"Sertifikat pengguna IPSec"</string>
+    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"Sertifikat CA IPSec"</string>
+    <!-- no translation found for vpn_search_domains (5391995501541199624) -->
+    <skip />
+    <!-- no translation found for vpn_routes (8556236801755260073) -->
+    <skip />
+    <string name="vpn_username" msgid="1863901629860867849">"Nama pengguna"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Sandi"</string>
+    <!-- no translation found for vpn_save_login (6350322456427484881) -->
+    <skip />
+    <!-- no translation found for vpn_not_used (9094191054524660891) -->
+    <skip />
+    <string name="vpn_no_ca_cert" msgid="7820884983947090538">"(jangan verifikasi server)"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"Batal"</string>
+    <string name="vpn_save" msgid="4233484051644764510">"Simpan"</string>
+    <string name="vpn_connect" msgid="8469608541746132301">"Sambungkan"</string>
+    <string name="vpn_edit" msgid="1111459297288136079">"Edit jaringan VPN"</string>
+    <string name="vpn_connect_to" msgid="7328758950427515753">"Sambungkan ke <xliff:g id="NETWORK">%s</xliff:g>"</string>
+    <string name="vpn_title" msgid="7982620762043790565">"Setelan VPN"</string>
+    <string name="vpn_create" msgid="8966010925994175306">"Tambahkan jaringan VPN"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"Edit jaringan"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"Hapus jaringan"</string>
+    <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Sistem"</string>
+    <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Pengguna"</string>
+    <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Nonaktifkan"</string>
+    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Aktifkan"</string>
+    <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Hapus"</string>
+    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Aktifkan sertifikat CA sistem?"</string>
+    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Nonaktifkan sertifikat CA sistem?"</string>
+    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Hapus sertifikat CA pengguna secara permanen?"</string>
 </resources>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index ecef4cf..9c6125d 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>
@@ -214,4 +240,36 @@
     <item msgid="3878793616631049349">"Usa la verifica HDCP solo per contenuti DRM"</item>
     <item msgid="45075631231212732">"Usa sempre la verifica HDCP"</item>
   </string-array>
+    <!-- no translation found for window_animation_scale_entries:0 (8134156599370824081) -->
+    <!-- no translation found for window_animation_scale_entries:1 (6624864048416710414) -->
+    <!-- no translation found for window_animation_scale_entries:2 (2219332261255416635) -->
+    <!-- no translation found for window_animation_scale_entries:3 (3544428804137048509) -->
+    <!-- no translation found for window_animation_scale_entries:4 (3110710404225974514) -->
+    <!-- no translation found for window_animation_scale_entries:5 (4402738611528318731) -->
+    <!-- no translation found for window_animation_scale_entries:6 (6189539267968330656) -->
+    <!-- no translation found for transition_animation_scale_entries:0 (8464255836173039442) -->
+    <!-- no translation found for transition_animation_scale_entries:1 (3375781541913316411) -->
+    <!-- no translation found for transition_animation_scale_entries:2 (1991041427801869945) -->
+    <!-- no translation found for transition_animation_scale_entries:3 (4012689927622382874) -->
+    <!-- no translation found for transition_animation_scale_entries:4 (3289156759925947169) -->
+    <!-- no translation found for transition_animation_scale_entries:5 (7705857441213621835) -->
+    <!-- no translation found for transition_animation_scale_entries:6 (6660750935954853365) -->
+    <!-- no translation found for app_process_limit_entries:0 (6799596560242275471) -->
+    <!-- no translation found for app_process_limit_entries:1 (2412794376818632575) -->
+    <!-- no translation found for app_process_limit_entries:2 (1578904888612645001) -->
+    <!-- no translation found for app_process_limit_entries:3 (8819235336299873577) -->
+  <string-array name="vpn_types_long">
+    <item msgid="2732002039459078847">"VPN PPTP"</item>
+    <item msgid="3799752201662127867">"VPN L2TP/IPSec con chiavi precondivise"</item>
+    <item msgid="4725504331295252103">"VPN L2TP/IPSec con certificati"</item>
+    <item msgid="7526551163264034377">"VPN IPSec con chiavi precondivise e autenticazione Xauth"</item>
+    <item msgid="8064740940687465039">"VPN IPSec con certificati e autenticazione Xauth"</item>
+    <item msgid="4946199982372391490">"VPN IPSec con certificati e autenticazione ibrida"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:0 (8621078286418985762) -->
+    <!-- no translation found for vpn_states:1 (6692305604213080515) -->
+    <!-- no translation found for vpn_states:2 (8001704909356800092) -->
+    <!-- no translation found for vpn_states:3 (4039737283841672166) -->
+    <!-- no translation found for vpn_states:4 (4042143101664725090) -->
+    <!-- no translation found for vpn_states:5 (2690164254699635531) -->
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 5f4b63b..7a3bc9a 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -19,6 +19,10 @@
     <string name="yes" msgid="4676390750360727396">"Sì"</string>
     <string name="no" msgid="6731231425810196216">"No"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Sconosciuto"</string>
+    <string name="header_category_wireless_networks" msgid="4944823405420438623">"WIRELESS E RETI"</string>
+    <string name="header_category_device" msgid="5781174212691167553">"DISPOSITIVO"</string>
+    <string name="header_category_personal" msgid="6225932173498802187">"PERSONALE"</string>
+    <string name="header_category_system" msgid="2073558547468647128">"SISTEMA"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Attiva segnale cellulare"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Disattiva segnale cellulare"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Visualizza rubrica SIM"</string>
@@ -111,7 +115,11 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Accoppiamento..."</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"Accoppiato ma non collegato"</string>
     <string name="bluetooth_device" msgid="6873461446424952003">"vivavoce/auricolare"</string>
-    <string name="progress_scanning" msgid="3760897655335759141">"Ricerca"</string>
+    <!-- outdated translation 3760897655335759141 -->     <string name="progress_scanning" msgid="192587958424295789">"Ricerca"</string>
+    <!-- no translation found for progress_tap_to_pair (4192342336107106334) -->
+    <skip />
+    <!-- no translation found for bluetooth_no_devices_found (2412462335116297668) -->
+    <skip />
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Richiesta accoppiamento Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Richiesta accoppiamento"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Seleziona per accoppiare <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
@@ -130,6 +138,9 @@
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Un\'applicazione sul tuo telefono chiede l\'autorizzazione per attivare Bluetooth e rendere il tuo telefono rilevabile da altri dispositivi. Procedere?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Attivazione Bluetooth in corso…"</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Connessione automatica"</string>
+    <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Richiesta di connessione Bluetooth"</string>
+    <string name="bluetooth_connection_notif_message" msgid="1833221950512058309">"Tocca per connetterti a \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\""</string>
+    <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Vuoi connetterti a \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Impostazioni data e ora"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"13:00"</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
@@ -235,7 +246,7 @@
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Disattiva tutte le connessioni wireless"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"Disattivazione connessioni wireless..."</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"Attivazione connessioni wireless..."</string>
-    <string name="radio_controls_title" msgid="5868688473587168882">"Wireless e reti"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Altro..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Wireless e reti"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"Gestisci Wi-Fi, Bluetooth, modalità aereo, reti mobili e VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming dati"</string>
@@ -271,8 +282,8 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Info proprietario"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="2382525043173672857">"Inserisci il testo da visualizzare"</string>
-    <string name="security_settings_title" msgid="5168491784222013179">"Posizione e sicurezza"</string>
-    <string name="location_security_settings_title" msgid="4624434296446625554">"Impostazioni di posizione e sicurezza"</string>
+    <string name="location_settings_title" msgid="8935806698251432196">"Servizi di localizzazione"</string>
+    <string name="security_settings_title" msgid="7945465324818485460">"Sicurezza"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Imposta La mia posizione, sblocco schermo, blocco SIM, blocco cred."</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Imposta La mia posizione, sblocco schermo, blocco archivio credenziali"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Password"</string>
@@ -316,7 +327,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>
@@ -375,8 +386,8 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Visualizza o disattiva amministratori dispositivo"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Attiva Bluetooth"</string>
-    <string name="bluetooth_settings" msgid="2725796451253089609">"Impostazioni Bluetooth"</string>
-    <string name="bluetooth_settings_title" msgid="2824020086246268296">"Impostazioni Bluetooth"</string>
+    <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
+    <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Gestisci le connessioni, imposta il nome e la rilevabilità del dispositivo"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Richiesta accoppiamento Bluetooth"</string>
     <string name="bluetooth_enter_pin_msg" msgid="1499285355129256289">\n"Inserisci il PIN per effettuare l\'accoppiamento con \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". Prova 0000 o 1234. Potrebbe essere necessario inserire lo stesso PIN sul dispositivo Bluetooth."</string>
@@ -394,7 +405,10 @@
     <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Accoppiamento rifiutato da <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"Errore durante la connessione a <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Cerca dispositivi"</string>
-    <string name="bluetooth_preference_find_nearby_title" msgid="5087410003465463318">"Trova dispositivi vicini"</string>
+    <!-- no translation found for bluetooth_search_for_devices (5957007154213560390) -->
+    <skip />
+    <!-- no translation found for bluetooth_searching_for_devices (9203739709307871727) -->
+    <skip />
     <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"Impostazioni dispositivo"</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Dispositivi accoppiati"</string>
     <string name="bluetooth_preference_found_devices" msgid="3133019331974936204">"Dispositivi trovati"</string>
@@ -404,6 +418,10 @@
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Disaccoppia"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Disconnetti e disaccoppia"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Opzioni..."</string>
+    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Avanzate"</string>
+    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth avanzato"</string>
+    <string name="bluetooth_advanced_settings_label" msgid="8659717781212434173">"Bluetooth avanzato"</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="3631028334811113629">"Attiva Bluetooth per vedere dispositivi disponib."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Connessione a…"</string>
     <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"Multimediali"</string>
     <string name="bluetooth_profile_headset" msgid="81844079120986198">"Vivavoce"</string>
@@ -445,27 +463,31 @@
     <string name="nfc_toggle_error" msgid="2233172102497535522">"Si è verificato un errore."</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Attiva Wi-Fi"</string>
-    <string name="wifi_settings" msgid="4746946030627213196">"Impostazioni Wi-Fi"</string>
+    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="2810363951104753710">"Impostazioni Wi-Fi"</string>
+    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Configura e gestisci punti di accesso wireless"</string>
-    <string name="wifi_starting" msgid="6710266609710860129">"Attivazione..."</string>
-    <string name="wifi_stopping" msgid="5952909472548218348">"Spegnimento..."</string>
+    <string name="wifi_starting" msgid="7732330327758522943">"Attivazione Wi-Fi in corso..."</string>
+    <string name="wifi_stopping" msgid="244864762599017659">"Disattivazione Wi-Fi in corso..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"Errore"</string>
     <string name="wifi_in_airplane_mode" msgid="7618393787965366655">"In modalità aereo"</string>
     <string name="wifi_fail_to_scan" msgid="6194542252808587669">"Impossibile cercare le reti"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Notifica rete"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Avvisa quando è disponibile una rete aperta"</string>
+    <string name="wifi_enable_watchdog_service" msgid="4723544454066601706">"Verifiche connessione Wi-Fi"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="8687400936839455926">"Rileva e gestisci i potenziali problemi di connettività di rete"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Norma di scollegamento Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Specifica quando passare da Wi-Fi a dati cellulare"</string>
     <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" msgid="6234851776910938957">"Aggiungi rete"</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>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Connetti alla rete"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Elimina rete"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modifica rete"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="3682507011071029311">"Attiva Wi-Fi per visualizzare reti disponibili"</string>
     <string name="wifi_network_setup" msgid="7974851890019344870">"Configurazione rete"</string>
     <string name="wifi_wps_pin" msgid="5471842298708321115">"Inserisci il PIN del punto di accesso"</string>
     <string name="wifi_wps_setup_title" msgid="150518971269252336">"Impostazione WPS"</string>
@@ -501,13 +523,13 @@
     <string name="wifi_save" msgid="3331121567988522826">"Salva"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Annulla"</string>
     <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"Rilevata un\'altra sessione WPS. Riprova tra alcuni minuti."</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Avanzate"</string>
+    <!-- outdated translation 5419052271935350999 -->     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Avanzate"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Banda di frequenza Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Specifica campo di frequenza di funzionamento"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Errore di impostazione della banda di frequenza."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Indirizzo MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Indirizzo IP"</string>
-    <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"Impostazioni IP"</string>
+    <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Impostazioni IP"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Salva"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Annulla"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Digita un indirizzo IP valido."</string>
@@ -525,7 +547,7 @@
     <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"Hotspot Wi-Fi <xliff:g id="NETWORK_SSID">%1$s</xliff:g><xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> portatile"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"HotspotAndroid"</string>
     <string name="sound_settings_title" msgid="8735891486683305886">"Audio"</string>
-    <string name="display_settings_title" msgid="2378894265964357591">"Schermo"</string>
+    <string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
     <string name="sound_settings" msgid="5007659014828162881">"Impostazioni audio"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Modalità silenziosa"</string>
     <string name="silent_mode_summary" msgid="3309650676072917899">"Disattiva tutti i suoni eccetto quelli multimediali e gli allarmi"</string>
@@ -598,7 +620,18 @@
     <string name="brightness_summary" msgid="838917350127550703">"Regola la luminosità dello schermo"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Timeout"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Lo schermo si spegne automaticamente dopo <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Sfondo"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android Dreams"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Screen saver e altri diversivi inattività"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Sogno selezionato"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Quando attivare"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"Dopo <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> di inattività"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Mai"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Provalo."</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Luminosità automatica"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Dimensioni carattere"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Dimensioni complessive dei caratteri"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Seleziona dimensioni carattere"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Impostazioni blocco SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Impostazioni blocco SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Blocco della SIM"</string>
@@ -643,8 +676,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>
@@ -696,6 +730,16 @@
     <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"La scheda SD condiviso verrà smontata."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Smontaggio in corso"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Smontaggio in corso"</string>
+    <!-- no translation found for storage_menu_usb (1580545228584324704) -->
+    <skip />
+    <!-- no translation found for storage_title_usb (5775322159427546546) -->
+    <skip />
+    <!-- no translation found for usb_label_mtp (4157227401755543412) -->
+    <skip />
+    <!-- no translation found for usb_label_ptp (7417254019489575819) -->
+    <skip />
+    <!-- no translation found for usb_label_installer_cd (7438467574756086977) -->
+    <skip />
     <string name="battery_status_title" msgid="9159414319574976203">"Stato batteria"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Livello batteria"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -806,6 +850,8 @@
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"Tethering impossibile con più di <xliff:g id="MAXCONNECTION">%1$d</xliff:g> dispositivi"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Sarà annullato il tethering per <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Guida"</string>
+    <string name="wireless_category_general" msgid="2973810407987118067">"Generale"</string>
+    <string name="wireless_category_mobile_networks" msgid="1254629216798424288">"Reti mobili"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Reti mobili"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Imposta le opzioni per roaming, reti e APN"</string>
     <string name="location_title" msgid="1029961368397484576">"La mia posizione"</string>
@@ -883,7 +929,7 @@
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Protezione del tablet"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Protezione del telefono"</string>
     <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"Proteggi il tuo tablet dall\'uso non autorizzato creando una sequenza di sblocco personale. Usa il dito per collegare i puntini in qualsiasi ordine nella schermata successiva. Devi collegare almeno quattro puntini. "\n\n"Sei pronto per iniziare? Tocca \"Avanti\"."</string>
-    <string name="lock_intro_message" product="default" msgid="9100785646737118042"><font size="17">"Proteggi il telefono dall\'uso non autorizzato creando una sequenza di sblocco dello schermo personale. "\n<font height="17">\n</font><b>"1"</b>" Nella schermata successiva, osserva la creazione di una sequenza di esempio. "\n<font height="17">\n</font><b>"2"</b>" Quando sei pronto, crea la tua sequenza di sblocco personale. Prova diverse sequenze collegando sempre almeno quattro punti. "\n<font height="17">\n</font><b>"3"</b>" Inserisci di nuovo la sequenza per confermare. "\n<font height="17">\n</font><b>"Pronto per iniziare? Tocca \"Avanti\""</b>". "\n<font height="3">\n</font>"Se non desideri proteggere il telefono, tocca \"Annulla\"."</font></string>
+    <!-- outdated translation 3692151094288835065 -->     <string name="lock_intro_message" product="default" msgid="5796785892741212873">"Proteggi il tuo tablet dall\'uso non autorizzato creando una sequenza di sblocco personale. Usa il dito per collegare i puntini in qualsiasi ordine nella schermata successiva. Devi collegare almeno quattro puntini. "\n\n"Sei pronto per iniziare? Tocca \"Avanti\"."</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Gestisci applicazioni"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Gestisci e rimuovi applicazioni installate"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Applicazioni"</string>
@@ -893,6 +939,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>
@@ -905,9 +953,10 @@
     <string name="force_stop" msgid="7435006169872876756">"Termina"</string>
     <string name="total_size_label" msgid="1048676419552557254">"Totale"</string>
     <string name="application_size_label" msgid="5055196275624686382">"Applicazione"</string>
+    <string name="external_code_size_label" msgid="3459343140355961335">"Applicazione in archivio USB"</string>
     <string name="data_size_label" msgid="8679376373625710107">"Dati"</string>
-    <string name="external_size_label" product="nosdcard" msgid="4465530017830945766">"Archivio USB"</string>
-    <string name="external_size_label" product="default" msgid="2107155737635944440">"Scheda SD"</string>
+    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Dati in archivio USB"</string>
+    <string name="external_data_size_label" product="default" msgid="626414192825329708">"Scheda SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Disinstalla"</string>
     <string name="disable_text" msgid="6544054052049395202">"Disattiva"</string>
     <string name="enable_text" msgid="9217362512327828987">"Attiva"</string>
@@ -1026,7 +1075,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 +1085,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>
@@ -1066,7 +1117,7 @@
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Impostazioni tastiera sullo schermo"</string>
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Tastiera fisica"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Impostazioni tastiera fisica"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Sviluppo"</string>
+    <string name="development_settings_title" msgid="215179176067683667">"Opzioni sviluppatore"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"Imposta opzioni per lo sviluppo di applicazioni"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Debug USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Modalità debug quando è connesso USB"</string>
@@ -1091,14 +1142,14 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Accessibilità"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Impostazioni di accessibilità"</string>
     <string name="accessibility_settings_summary" msgid="8185181964847149507">"Gestisci opzioni di accessibilità"</string>
-    <string name="toggle_accessibility_title" msgid="650839277066574497">"Accessibilità"</string>
+    <string name="toggle_large_text_title" msgid="42259643359869436">"Testo grande"</string>
     <string name="accessibility_services_category" msgid="8127851026323672607">"Servizi di accessibilità"</string>
+    <string name="toggle_accessibility_title" msgid="7338739354952553958">"Consenti servizi di accesso"</string>
     <string name="no_accessibility_services_summary" msgid="694578333333808159">"Nessun servizio di accessibilità installato."</string>
     <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Questo servizio di accessibilità potrebbe riuscire a raccogliere tutto il testo digitato, compresi i numeri di carte di credito ma eccetto le password. Potrebbe anche registrare le tue interazioni con l\'interfaccia utente. Deriva dall\'applicazione <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Utilizzare questo servizio?"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Disattivare accessibilità?"</string>
     <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"Nessuna applicazione di accessibilità trovata"</string>
     <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"Nessuna applicazione di accessibilitào installata."\n\n"Puoi scaricare uno screen reader per il tuo dispositivo da Android Market."\n\n"Fai clic su OK per installare lo screen reader."</string>
-    <string name="accessibility_script_injection_category" msgid="8649951751131431904">"Script accessibilità"</string>
     <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"Scarica script accessibilità"</string>
     <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"Consentono di scaricare script di accessibilità da Google"</string>
     <string name="accessibility_script_injection_security_warning" product="tablet" msgid="1113600871264359828">"Alcune applicazioni possono chiedere a Google di scaricare sul tablet script che rendono i contenuti più accessibili. Consentire a Google di installare script di accessibilità sul tablet?"</string>
@@ -1106,10 +1157,11 @@
     <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>
-    <string name="power_usage_summary_title" msgid="5180282911164282324">"Utilizzo batteria"</string>
+    <string name="power_usage_summary_title" msgid="7190304207330319919">"Batteria"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Consumo batteria"</string>
     <string name="power_usage_not_available" msgid="3583407442633768046">"Dati uso batteria non dispon."</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Utilizzo batteria dallo scollegamento"</string>
@@ -1218,6 +1270,8 @@
     <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>
+    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Impostazioni motore"</string>
+    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Impostazioni per <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
     <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>
@@ -1228,114 +1282,33 @@
     <string name="gadget_title" msgid="7455548605888590466">"Controllo risparmio energia"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Aggiornamento impostazione Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Aggiornamento impostazione Bluetooth"</string>
-    <string name="vpn_settings_activity_title" msgid="7276864950701612579">"Impostazioni VPN"</string>
-    <string name="vpn_connect_to" msgid="2541409082892684362">"Connessione a <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpn_username_colon" msgid="7854930370861306247">"Nome utente:"</string>
-    <string name="vpn_password_colon" msgid="5716278710848606626">"Password:"</string>
-    <string name="vpn_a_username" msgid="6664733641993968692">"un nome utente"</string>
-    <string name="vpn_a_password" msgid="1537213632501483753">"una password"</string>
-    <string name="vpn_save_username" msgid="1408415289165970790">"Memorizza nome utente"</string>
-    <string name="vpn_connect_button" msgid="1699007212602470655">"Connetti"</string>
-    <string name="vpn_yes_button" msgid="8034531001149843119">"Sì"</string>
-    <string name="vpn_no_button" msgid="7620339571187119107">"No"</string>
-    <string name="vpn_back_button" msgid="192036339792734970">"Indietro"</string>
-    <string name="vpn_mistake_button" msgid="1683383660912491270">"No"</string>
-    <string name="vpn_menu_done" msgid="93528279226907926">"Salva"</string>
-    <string name="vpn_menu_cancel" msgid="7234451214611202868">"Annulla"</string>
-    <string name="vpn_menu_revert" msgid="4407762442281467659">"Annulla"</string>
-    <string name="vpn_menu_connect" msgid="1089399414463784218">"Connetti a rete"</string>
-    <string name="vpn_menu_disconnect" msgid="8254492450022562235">"Disconnetti dalla rete"</string>
-    <string name="vpn_menu_edit" msgid="4526245173583195618">"Modifica rete"</string>
-    <string name="vpn_menu_delete" msgid="3326527392609513129">"Elimina rete"</string>
-    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"Devi inserire <xliff:g id="CODE">%s</xliff:g>."</string>
-    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"Seleziona <xliff:g id="OPTION">%s</xliff:g>."</string>
-    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"Il nome VPN \"<xliff:g id="NAME">%s</xliff:g>\" esiste già. Trova un altro nome."</string>
-    <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"Eliminare questa VPN?"</string>
-    <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"Non creare questo profilo?"</string>
-    <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"Ignorare le modifiche apportate a questo profilo?"</string>
-    <string name="vpn_confirm_reconnect" msgid="5748535476278674296">"Impossibile collegarsi alla rete. Riprovare?"</string>
-    <string name="vpn_reconnect_from_lost" msgid="2442844155623372118">"Connessione interrotta. Riprovare?"</string>
-    <string name="vpn_unknown_server_dialog_msg" msgid="3080742299823671319">"Impossibile risolvere il nome del server. Controllare l\'impostazione del nome del server?"</string>
-    <string name="vpn_challenge_error_dialog_msg" msgid="6174901754230038601">"Errore di verifica. Controllare l\'impostazione segreta?"</string>
-    <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"In questa configurazione VPN mancano uno o più segreti. Controllare l\'impostazione segreta?"</string>
-    <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"La password o il nome utente inserito non è corretto. Riprovare?"</string>
-    <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"Server bloccato. La password o il nome utente inserito potrebbe non essere corretto. Riprovare?"</string>
-    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"Server bloccato. È possibile che un firewall ti impedisca di collegarti al server. Riprovare?"</string>
-    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"Negoziazione con il server non riuscita. È possibile che il server non accetti la tua opzione di crittografia. Controllare l\'impostazione di crittografia?"</string>
-    <string name="vpn_type_title" msgid="6392933604218676224">"Aggiungi VPN"</string>
-    <string name="vpn_add_new_vpn" msgid="5438260689052714550">"Aggiungi VPN"</string>
-    <string name="vpn_details_title" msgid="418806440938510331">"Dettagli VPN"</string>
-    <string name="vpn_edit_title_add" msgid="2121313217989682890">"Aggiungi VPN <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"Dettagli <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpns" msgid="3148141862835492816">"VPN"</string>
-    <string name="vpn_connecting" msgid="8039521381692090116">"Connessione..."</string>
-    <string name="vpn_disconnecting" msgid="7748050200708257066">"Disconnessione..."</string>
-    <string name="vpn_connected" msgid="7641723116362845781">"Connessa"</string>
-    <string name="vpn_connect_hint" msgid="7442898962925875181">"Connetti alla rete"</string>
-    <string name="vpn_name" msgid="1550918148476193076">"Nome VPN"</string>
-    <string name="vpn_a_name" msgid="8445736942405283509">"un nome VPN"</string>
-    <string name="vpn_profile_added" msgid="9061017910337129840">"\"<xliff:g id="NAME">%s</xliff:g>\" è stato aggiunto"</string>
-    <string name="vpn_profile_replaced" msgid="587435576816273815">"Le modifiche vengono apportate a \"<xliff:g id="NAME">%s</xliff:g>\""</string>
-    <string name="vpn_user_certificate_title" msgid="6812545893924071742">"Imposta certificato utente"</string>
-    <string name="vpn_user_certificate" msgid="949322691686938888">"Certificato utente"</string>
-    <string name="vpn_a_user_certificate" msgid="8943983437956898649">"un certificato utente"</string>
-    <string name="vpn_ca_certificate_title" msgid="7846466160795589985">"Imposta certificato CA"</string>
-    <string name="vpn_ca_certificate" msgid="465085144064264742">"Certificato di autorità di certificazione (CA)"</string>
-    <string name="vpn_a_ca_certificate" msgid="3374242520974884295">"un certificato CA"</string>
-    <string name="vpn_l2tp_secret_string_title" msgid="5039677186748940987">"Imposta segreto L2TP"</string>
-    <string name="vpn_l2tp_secret" msgid="529359749677142076">"Segreto L2TP"</string>
-    <string name="vpn_a_l2tp_secret" msgid="6612042930810981845">"un segreto L2TP"</string>
-    <string name="vpn_pptp_encryption_title" msgid="2236795167467896499">"crittografia"</string>
-    <string name="vpn_pptp_encryption" msgid="2602329949737259686">"Crittografia PPTP"</string>
-    <string name="vpn_ipsec_presharedkey_title" msgid="2184060087690539175">"Imposta chiave pre-condivisa IPSec"</string>
-    <string name="vpn_ipsec_presharedkey" msgid="5434316521616673741">"Chiave pre-condivisa IPSec"</string>
-    <string name="vpn_a_ipsec_presharedkey" msgid="1255301923217898418">"una chiave pre-condivisa IPSec"</string>
-    <string name="vpn_vpn_server_title" msgid="8897005887420358913">"Imposta server VPN"</string>
-    <string name="vpn_vpn_server" msgid="1141754908824209260">"Server VPN"</string>
-    <string name="vpn_a_vpn_server" msgid="5960906152125045853">"un server VPN"</string>
-    <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"Nome server VPN"</string>
-    <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"Domini di ricerca DNS"</string>
-    <string name="vpn_dns_search_list" msgid="4230034234026605360">"Domini di ricerca DNS"</string>
-    <string name="vpn_field_is_set" msgid="7137320847812992243">"<xliff:g id="VALUE">%s</xliff:g> impostato"</string>
-    <string name="vpn_field_not_set" msgid="2972519243515893804">"<xliff:g id="VALUE">%s</xliff:g> non impostato"</string>
-    <string name="vpn_field_not_set_optional" msgid="8840557698252556791">"<xliff:g id="VALUE">%s</xliff:g> non impostato (facoltativo)"</string>
-    <string name="vpn_enable_field" msgid="3700967675854517191">"Attiva <xliff:g id="OPTION">%s</xliff:g>"</string>
-    <string name="vpn_disable_field" msgid="6905658811179634005">"Disattiva <xliff:g id="OPTION">%s</xliff:g>"</string>
-    <string name="vpn_is_enabled" msgid="1266304230417098877">"<xliff:g id="OPTION">%s</xliff:g> è attiva"</string>
-    <string name="vpn_is_disabled" msgid="2013622485867806167">"<xliff:g id="OPTION">%s</xliff:g> non è attiva"</string>
     <string name="vpn_settings_title" msgid="7327468307909556719">"Impostazioni VPN"</string>
     <string name="vpn_settings_summary" msgid="8849924181594963972">"Configura e gestisci le reti private virtuali (VPN)"</string>
-    <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="trusted_credentials" msgid="4266945289534242402">"Credenziali attendibili"</string>
+    <string name="trusted_credentials_summary" msgid="6735221351155686632">"Visualizza certificati CA attendibili"</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>
-    <string name="privacy_settings_title" msgid="1987089301293213705">"Impostazioni privacy"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"Backup e ripristino"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"Backup e ripristino"</string>
     <string name="backup_section_title" msgid="8856083167469467588">"Backup e ripristino"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Dati personali"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Backup dei miei dati"</string>
@@ -1439,4 +1412,107 @@
     <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>
+    <!-- no translation found for debug_ui_category (9023948280291055349) -->
+    <skip />
+    <!-- no translation found for strict_mode (1938795874357830695) -->
+    <skip />
+    <!-- no translation found for strict_mode_summary (142834318897332338) -->
+    <skip />
+    <!-- no translation found for pointer_location (6084434787496938001) -->
+    <skip />
+    <!-- no translation found for pointer_location_summary (840819275172753713) -->
+    <skip />
+    <!-- no translation found for show_screen_updates (8282711794220426931) -->
+    <skip />
+    <!-- no translation found for show_screen_updates_summary (1716122382094924596) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage (2389212910758076024) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage_summary (2113341923988958266) -->
+    <skip />
+    <!-- no translation found for window_animation_scale_title (6162587588166114700) -->
+    <skip />
+    <!-- no translation found for transition_animation_scale_title (387527540523595875) -->
+    <skip />
+    <!-- no translation found for debug_applications_category (6221644998451283813) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities (3622005081180597749) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities_summary (3592221124808773368) -->
+    <skip />
+    <!-- no translation found for app_process_limit_title (4121324758038197598) -->
+    <skip />
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Utilizzo dati"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"Ciclo utilizzo dati"</string>
+    <string name="data_usage_menu_split_4g" msgid="7417435609285381968">"Separa utilizzo 4G"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Mostra utilizzo Wi-Fi"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"Cambia ciclo..."</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Giorno del mese in cui reimpostare ciclo di utilizzo dei dati:"</string>
+    <string name="data_usage_disable_mobile_limit" msgid="289740911281022322">"Disattiva dati mobili al limite"</string>
+    <string name="data_usage_disable_4g_limit" msgid="5808210773758699800">"Disattiva dati 4G al limite"</string>
+    <string name="data_usage_disable_3g_limit" msgid="3856971004328238231">"Disattiva dati 2G-3G al limite"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_mobile" msgid="454140350007299045">"Mobili"</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">"Dati mobili"</string>
+    <string name="data_usage_enable_3g" msgid="6304006671869578254">"Dati 2G-3G"</string>
+    <string name="data_usage_enable_4g" msgid="3635854097335036738">"Dati 4G"</string>
+    <string name="data_usage_app_settings" msgid="3727561362090820369">"Visualizza impostazioni applicaz."</string>
+    <string name="data_usage_app_restrict_background" msgid="8856643905291165256">"Limita uso dati in background"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="1503361245973512092">"Consenti dati background applicazione solo con rete non limitata"</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="8110736468987743260">"Limitazione dati in background"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="100001698378554777">"Questa funzione può influire negativamente sulle applicazioni che dipendono dall\'utilizzo dei dati in background."\n\n"Puoi trovare controlli più adeguati dell\'utilizzo dei dati nelle impostazioni di questa applicazione."</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Data reimpostazione ciclo utilizzo"</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Data di ogni mese:"</string>
+    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Imposta"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Limitazione utilizzo dati"</string>
+    <string name="data_usage_limit_dialog_mobile" msgid="7931094451923591578">"La connessione dati mobili verrà disattivata una volta raggiunto il limite specificato."\n\n"Per evitare costi aggiuntivi, potresti utilizzare un limite ridotto perché i metodi contabili di dispositivi e operatori potrebbero essere diversi."</string>
+    <string name="data_usage_limit_dialog_3g" msgid="5478553071420316963">"La connessione dati 2G-3G verrà disattivata una volta raggiunto il limite specificato."\n\n"Per evitare costi aggiuntivi, potresti utilizzare un limite ridotto perché i metodi contabili di dispositivi e operatori potrebbero essere diversi."</string>
+    <string name="data_usage_limit_dialog_4g" msgid="6134008906742403777">"La connessione dati 4G verrà disattivata una volta raggiunto il limite specificato."\n\n"Per evitare costi aggiuntivi, potresti utilizzare un limite ridotto perché i metodi contabili di dispositivi e operatori potrebbero essere diversi."</string>
+    <string name="data_usage_disabled_dialog_3g_title" msgid="4221584306492812040">"Dati 2G-3G disattivati"</string>
+    <string name="data_usage_disabled_dialog_4g_title" msgid="715585612162185936">"Dati 4G disattivati"</string>
+    <string name="data_usage_disabled_dialog_mobile_title" msgid="209516216265000221">"Dati mobili disattivati"</string>
+    <string name="data_usage_disabled_dialog" msgid="2874031671067845964">"Il limite di utilizzo dei dati specificato è stato raggiunto."\n\n"Un ulteriore utilizzo di dati può comportare l\'applicazione di costi dell\'operatore."</string>
+    <string name="data_usage_disabled_dialog_enable" msgid="2441219164620753329">"Riattiva dati"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="32">"<xliff:g id="NUMBER">%1$s</xliff:g>"</font>" "<font size="12">"<xliff:g id="UNIT">%2$s</xliff:g>"</font>\n<font size="12">"avviso"</font></string>
+    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Chiamata di emergenza"</string>
+    <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Torna a chiamata"</string>
+    <string name="vpn_name" msgid="4689699885361002297">"Nome"</string>
+    <string name="vpn_type" msgid="5435733139514388070">"Tipo"</string>
+    <string name="vpn_server" msgid="2123096727287421913">"Indirizzo server"</string>
+    <string name="vpn_mppe" msgid="6639001940500288972">"Crittografia PPP  (MPPE)"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"Segreto L2TP"</string>
+    <string name="vpn_ipsec_identifier" msgid="4098175859460006296">"Identificatore IPSec"</string>
+    <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Chiave pre-condivisa IPSec"</string>
+    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"Certificato IPSec dell\'utente"</string>
+    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"Certificato CA per IPSec"</string>
+    <!-- no translation found for vpn_search_domains (5391995501541199624) -->
+    <skip />
+    <!-- no translation found for vpn_routes (8556236801755260073) -->
+    <skip />
+    <string name="vpn_username" msgid="1863901629860867849">"Nome utente"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Password"</string>
+    <!-- no translation found for vpn_save_login (6350322456427484881) -->
+    <skip />
+    <!-- no translation found for vpn_not_used (9094191054524660891) -->
+    <skip />
+    <string name="vpn_no_ca_cert" msgid="7820884983947090538">"(non eseguire verifica server)"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"Annulla"</string>
+    <string name="vpn_save" msgid="4233484051644764510">"Salva"</string>
+    <string name="vpn_connect" msgid="8469608541746132301">"Connetti"</string>
+    <string name="vpn_edit" msgid="1111459297288136079">"Modifica rete VPN"</string>
+    <string name="vpn_connect_to" msgid="7328758950427515753">"Collegati a <xliff:g id="NETWORK">%s</xliff:g>"</string>
+    <string name="vpn_title" msgid="7982620762043790565">"Impostazioni VPN"</string>
+    <string name="vpn_create" msgid="8966010925994175306">"Aggiungi rete VPN"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"Modifica rete"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"Elimina rete"</string>
+    <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Sistema"</string>
+    <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Utente"</string>
+    <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Disattiva"</string>
+    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Attiva"</string>
+    <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Rimuovi"</string>
+    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Abilitare il certificato CA installato sul sistema?"</string>
+    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Disabilitare il certificato CA installato sul sistema?"</string>
+    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Rimuovere definitivamente il certificato CA dell\'utente?"</string>
 </resources>
diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml
index e58814e..7c9c6ae 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>
@@ -214,4 +240,36 @@
     <item msgid="3878793616631049349">"השתמש בבדיקת HDCP עבור תוכן DRM בלבד"</item>
     <item msgid="45075631231212732">"תמיד השתמש בבדיקת HDCP"</item>
   </string-array>
+    <!-- no translation found for window_animation_scale_entries:0 (8134156599370824081) -->
+    <!-- no translation found for window_animation_scale_entries:1 (6624864048416710414) -->
+    <!-- no translation found for window_animation_scale_entries:2 (2219332261255416635) -->
+    <!-- no translation found for window_animation_scale_entries:3 (3544428804137048509) -->
+    <!-- no translation found for window_animation_scale_entries:4 (3110710404225974514) -->
+    <!-- no translation found for window_animation_scale_entries:5 (4402738611528318731) -->
+    <!-- no translation found for window_animation_scale_entries:6 (6189539267968330656) -->
+    <!-- no translation found for transition_animation_scale_entries:0 (8464255836173039442) -->
+    <!-- no translation found for transition_animation_scale_entries:1 (3375781541913316411) -->
+    <!-- no translation found for transition_animation_scale_entries:2 (1991041427801869945) -->
+    <!-- no translation found for transition_animation_scale_entries:3 (4012689927622382874) -->
+    <!-- no translation found for transition_animation_scale_entries:4 (3289156759925947169) -->
+    <!-- no translation found for transition_animation_scale_entries:5 (7705857441213621835) -->
+    <!-- no translation found for transition_animation_scale_entries:6 (6660750935954853365) -->
+    <!-- no translation found for app_process_limit_entries:0 (6799596560242275471) -->
+    <!-- no translation found for app_process_limit_entries:1 (2412794376818632575) -->
+    <!-- no translation found for app_process_limit_entries:2 (1578904888612645001) -->
+    <!-- no translation found for app_process_limit_entries:3 (8819235336299873577) -->
+  <string-array name="vpn_types_long">
+    <item msgid="2732002039459078847">"PPTP VPN"</item>
+    <item msgid="3799752201662127867">"L2TP/IPSec VPN עם מפתחות משותפים מראש"</item>
+    <item msgid="4725504331295252103">"L2TP/IPSec VPN עם אישורים"</item>
+    <item msgid="7526551163264034377">"IPSec VPN עם מפתחות משותפים מראש ואימות Xauth"</item>
+    <item msgid="8064740940687465039">"IPSec VPN עם אישורים ואימות Xauth"</item>
+    <item msgid="4946199982372391490">"IPSec VPN עם אישורים ואימות משולב"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:0 (8621078286418985762) -->
+    <!-- no translation found for vpn_states:1 (6692305604213080515) -->
+    <!-- no translation found for vpn_states:2 (8001704909356800092) -->
+    <!-- no translation found for vpn_states:3 (4039737283841672166) -->
+    <!-- no translation found for vpn_states:4 (4042143101664725090) -->
+    <!-- no translation found for vpn_states:5 (2690164254699635531) -->
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 53e68a3..bdbdc36 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -19,6 +19,10 @@
     <string name="yes" msgid="4676390750360727396">"כן"</string>
     <string name="no" msgid="6731231425810196216">"לא"</string>
     <string name="device_info_default" msgid="7847265875578739287">"לא ידוע"</string>
+    <string name="header_category_wireless_networks" msgid="4944823405420438623">"אלחוטי ורשתות"</string>
+    <string name="header_category_device" msgid="5781174212691167553">"מכשיר"</string>
+    <string name="header_category_personal" msgid="6225932173498802187">"אישי"</string>
+    <string name="header_category_system" msgid="2073558547468647128">"מערכת"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"הפעלת רדיו"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"כיבוי רדיו"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"הצג פנקס כתובות של SIM"</string>
@@ -111,7 +115,11 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"מתאים..."</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"מותאם אך לא מחובר"</string>
     <string name="bluetooth_device" msgid="6873461446424952003">"דיבורית/אוזניות"</string>
-    <string name="progress_scanning" msgid="3760897655335759141">"סורק"</string>
+    <!-- outdated translation 3760897655335759141 -->     <string name="progress_scanning" msgid="192587958424295789">"סורק"</string>
+    <!-- no translation found for progress_tap_to_pair (4192342336107106334) -->
+    <skip />
+    <!-- no translation found for bluetooth_no_devices_found (2412462335116297668) -->
+    <skip />
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"בקשת התאמה של Bluetooth"</string>
     <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>
@@ -130,6 +138,9 @@
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"יישום בטלפון מבקש הרשאה להפעיל Bluetooth ולהפוך את הטלפון לגלוי להתקנים אחרים. האם ברצונך לבצע זאת?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"מפעיל Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"חיבור אוטומטי"</string>
+    <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"בקשה לחיבור Bluetooth"</string>
+    <string name="bluetooth_connection_notif_message" msgid="1833221950512058309">"גע כדי להתחבר אל \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\""</string>
+    <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"האם ברצונך להתחבר אל \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"הגדרות תאריך ושעה"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"13:00"</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
@@ -235,7 +246,7 @@
     <string name="airplane_mode_summary" msgid="3154817401368780988">"השבת את כל החיבורים האלחוטיים"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"משבית חיבורים אלחוטיים..."</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"מאפשר חיבורים אלחוטיים..."</string>
-    <string name="radio_controls_title" msgid="5868688473587168882">"אלחוטי ורשתות"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"עוד..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"אלחוטי ורשתות"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"ניהול Wi-Fi, ‏Bluetooth, מצב טיסה, רשתות סלולריות ו-VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"נדידת נתונים"</string>
@@ -271,8 +282,8 @@
     <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">"מיקום ואבטחה"</string>
-    <string name="location_security_settings_title" msgid="4624434296446625554">"הגדרות מיקום ואבטחה"</string>
+    <string name="location_settings_title" msgid="8935806698251432196">"שירותי מיקום"</string>
+    <string name="security_settings_title" msgid="7945465324818485460">"אבטחה"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"הגדר את \'המיקום שלי\', ביטול נעילת צג, נעילת כרטיס SIM, נעילת אחסון אישורים"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"הגדר את \'המיקום שלי\', ביטול נעילת מסך, נעילת אחסון אישורים"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"סיסמאות"</string>
@@ -316,7 +327,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>
@@ -375,8 +386,8 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"הצג או השבת מנהלי התקנים"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"הפעל Bluetooth"</string>
-    <string name="bluetooth_settings" msgid="2725796451253089609">"הגדרות Bluetooth"</string>
-    <string name="bluetooth_settings_title" msgid="2824020086246268296">"הגדרות Bluetooth"</string>
+    <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
+    <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"ניהול חיבורים, הגדרת שם התקן ויכולת גילוי"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"בקשת התאמה של Bluetooth"</string>
     <string name="bluetooth_enter_pin_msg" msgid="1499285355129256289">\n"הזן  PIN כדי להתאים עם \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". (נסה להזין 0000 או 1234.) ייתכן שתצטרך להזין את אותו PIN בהתקן ה-Bluetooth."</string>
@@ -394,7 +405,10 @@
     <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>
+    <!-- no translation found for bluetooth_search_for_devices (5957007154213560390) -->
+    <skip />
+    <!-- no translation found for bluetooth_searching_for_devices (9203739709307871727) -->
+    <skip />
     <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>
@@ -404,6 +418,10 @@
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"בטל התאמה"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"התנתק ובטל התאמה"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"אפשרויות…"</string>
+    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"מתקדם"</string>
+    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth מתקדם"</string>
+    <string name="bluetooth_advanced_settings_label" msgid="8659717781212434173">"Bluetooth מתקדם"</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="3631028334811113629">"הפעל את Bluetooth כדי להציג מכשירים זמינים"</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>
@@ -445,27 +463,31 @@
     <string name="nfc_toggle_error" msgid="2233172102497535522">"אירעה שגיאה."</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"הפעל Wi-Fi"</string>
-    <string name="wifi_settings" msgid="4746946030627213196">"הגדרות Wi-Fi"</string>
+    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="2810363951104753710">"הגדרות Wi-Fi"</string>
+    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"הגדרה וניהול של נקודות גישה אלחוטיות"</string>
-    <string name="wifi_starting" msgid="6710266609710860129">"מפעיל…"</string>
-    <string name="wifi_stopping" msgid="5952909472548218348">"מכבה…"</string>
+    <string name="wifi_starting" msgid="7732330327758522943">"מפעיל Wi-Fi..."</string>
+    <string name="wifi_stopping" msgid="244864762599017659">"מכבה את האינטרנט האלחוטי..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"שגיאה"</string>
     <string name="wifi_in_airplane_mode" msgid="7618393787965366655">"במצב טיסה"</string>
     <string name="wifi_fail_to_scan" msgid="6194542252808587669">"אין אפשרות לסרוק כדי לחפש רשתות"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"התראת רשת"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"הודע לי כשיש רשת פתוחה זמינה"</string>
+    <string name="wifi_enable_watchdog_service" msgid="4723544454066601706">"בדיקות קישוריות של Wi-Fi"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="8687400936839455926">"אתר ונהל בעיות אפשריות בקישוריות רשת"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"מדיניות ניתוק Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"ציין מתי לעבור מ-Wi-Fi לנתונים להתקנים ניידים"</string>
     <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" msgid="6234851776910938957">"הוסף רשת"</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>
     <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_empty_list_wifi_off" msgid="3682507011071029311">"הפעל wifi כדי להציג רשתות זמינות"</string>
     <string name="wifi_network_setup" msgid="7974851890019344870">"הגדרות רשת"</string>
     <string name="wifi_wps_pin" msgid="5471842298708321115">"הזן PIN מנקודת גישה"</string>
     <string name="wifi_wps_setup_title" msgid="150518971269252336">"הגדרת WPS"</string>
@@ -501,13 +523,13 @@
     <string name="wifi_save" msgid="3331121567988522826">"שמור"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"ביטול"</string>
     <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"זוהתה הפעלת WPS נוספת, נסה שוב בעוד מספר דקות"</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"מתקדם"</string>
+    <!-- outdated translation 5419052271935350999 -->     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"מתקדם"</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>
-    <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"הגדרות IP"</string>
+    <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"הגדרות IP"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"שמור"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"ביטול"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"הקלד כתובת IP חוקית."</string>
@@ -525,7 +547,7 @@
     <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"נקודה חמה ניידת של Wi-Fi של <xliff:g id="NETWORK_SSID">%1$s</xliff:g><xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="sound_settings_title" msgid="8735891486683305886">"קול"</string>
-    <string name="display_settings_title" msgid="2378894265964357591">"מסך"</string>
+    <string name="display_settings_title" msgid="1708697328627382561">"תצוגה"</string>
     <string name="sound_settings" msgid="5007659014828162881">"הגדרות קול"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"מצב שקט"</string>
     <string name="silent_mode_summary" msgid="3309650676072917899">"השתק את כל הצלילים פרט למדיה והתראות"</string>
@@ -598,7 +620,18 @@
     <string name="brightness_summary" msgid="838917350127550703">"התאמת בהירות המסך"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"זמן קצוב לתפוגה"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"המסך נכבה אוטומטית לאחר <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"טפט"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android Dreams"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"שומרי מסך והסחות חוסר פעילות אחרות"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"חלום נבחר"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"מתי להפעיל"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"לאחר חוסר פעילות של <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"לעולם לא"</string>
+    <string name="dream_test" msgid="5968002644622194481">"נסה זאת!"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"בהירות אוטומטית"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"גודל גופן"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"גודל כולל של גופנים"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"בחר גודל גופן"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"הגדרות נעילת כרטיס SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"הגדרת נעילת כרטיס SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"נעילת כרטיס SIM"</string>
@@ -643,8 +676,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>
@@ -696,6 +730,16 @@
     <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 storage_menu_usb (1580545228584324704) -->
+    <skip />
+    <!-- no translation found for storage_title_usb (5775322159427546546) -->
+    <skip />
+    <!-- no translation found for usb_label_mtp (4157227401755543412) -->
+    <skip />
+    <!-- no translation found for usb_label_ptp (7417254019489575819) -->
+    <skip />
+    <!-- no translation found for usb_label_installer_cd (7438467574756086977) -->
+    <skip />
     <string name="battery_status_title" msgid="9159414319574976203">"מצב סוללה"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"רמת סוללה"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -806,6 +850,8 @@
     <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>
+    <string name="wireless_category_general" msgid="2973810407987118067">"כללי"</string>
+    <string name="wireless_category_mobile_networks" msgid="1254629216798424288">"רשתות לנייד"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"רשתות סלולריות"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"הגדר אפשרויות לנדידה, רשתות, APN"</string>
     <string name="location_title" msgid="1029961368397484576">"המיקום שלי"</string>
@@ -883,7 +929,7 @@
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"אבטחת הטבלט"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"אבטחת הטלפון"</string>
     <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"הגן על הטבלט שלך מפני שימוש לא מורשה על ידי יצירת קו ביטול נעילה אישי למסך. השתמש באצבע כדי לחבר את הנקודות בכל סדר שתבחר במסך הבא. עליך לחבר ארבע נקודות לפחות. "\n\n"מוכן להתחיל? גע ב\"הבא\"."</string>
-    <string name="lock_intro_message" product="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>
+    <!-- outdated translation 3692151094288835065 -->     <string name="lock_intro_message" product="default" msgid="5796785892741212873">"הגן על הטבלט שלך מפני שימוש לא מורשה על ידי יצירת קו ביטול נעילה אישי למסך. השתמש באצבע כדי לחבר את הנקודות בכל סדר שתבחר במסך הבא. עליך לחבר ארבע נקודות לפחות. "\n\n"מוכן להתחיל? גע ב\"הבא\"."</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"נהל יישומים"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"נהל והסר יישומים שהותקנו"</string>
     <string name="applications_settings" msgid="3736173521008476946">"יישומים"</string>
@@ -893,6 +939,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>
@@ -905,9 +953,10 @@
     <string name="force_stop" msgid="7435006169872876756">"אלץ עצירה"</string>
     <string name="total_size_label" msgid="1048676419552557254">"סך הכל"</string>
     <string name="application_size_label" msgid="5055196275624686382">"יישום"</string>
+    <string name="external_code_size_label" msgid="3459343140355961335">"יישום של אחסון USB"</string>
     <string name="data_size_label" msgid="8679376373625710107">"נתונים"</string>
-    <string name="external_size_label" product="nosdcard" msgid="4465530017830945766">"אמצעי אחסון מסוג USB"</string>
-    <string name="external_size_label" product="default" msgid="2107155737635944440">"כרטיס SD"</string>
+    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"נתוני אחסון USB"</string>
+    <string name="external_data_size_label" product="default" msgid="626414192825329708">"כרטיס SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"הסר התקנה"</string>
     <string name="disable_text" msgid="6544054052049395202">"השבת"</string>
     <string name="enable_text" msgid="9217362512327828987">"הפוך לפעיל"</string>
@@ -1026,7 +1075,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 +1085,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>
@@ -1066,7 +1117,7 @@
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"הגדרות מקלדת על המסך"</string>
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"מקלדת פיזית"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"הגדרות מקלדת פיזית"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"פיתוח"</string>
+    <string name="development_settings_title" msgid="215179176067683667">"אפשרויות מפתח"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"הגדרת אפשרויות לפיתוח יישום"</string>
     <string name="enable_adb" msgid="7982306934419797485">"ניקוי באגים של USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"מצב תיקון באגים כאשר USB מחובר"</string>
@@ -1091,14 +1142,14 @@
     <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="toggle_large_text_title" msgid="42259643359869436">"טקסט גדול"</string>
     <string name="accessibility_services_category" msgid="8127851026323672607">"שירותי נגישות"</string>
+    <string name="toggle_accessibility_title" msgid="7338739354952553958">"הפעלת שירותי נגישות"</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\'."\n\n"לחץ על \'אישור\' כדי להתקין את קורא המסך."</string>
-    <string name="accessibility_script_injection_category" msgid="8649951751131431904">"קובצי script של נגישות"</string>
     <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"הורד קובצי script של נגישות"</string>
     <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"אפשר ליישומים להוריד קובצי script של נגישות מ-Google"</string>
     <string name="accessibility_script_injection_security_warning" product="tablet" msgid="1113600871264359828">"חלק מהיישומים יכולים לבקש מ-Google להוריד קובצי script לטבלט כדי שהתוכן שלהם יהיה נגיש יותר. האם אתה בטוח שברצונך לאפשר ל-Google להתקין קובצי script של נגישות בטבלט?"</string>
@@ -1106,10 +1157,11 @@
     <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>
-    <string name="power_usage_summary_title" msgid="5180282911164282324">"צריכת סוללה"</string>
+    <string name="power_usage_summary_title" msgid="7190304207330319919">"סוללה"</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>
@@ -1218,6 +1270,8 @@
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"הגדרות <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> מופעל"</string>
     <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> מושבת"</string>
+    <string name="tts_engine_settings_section" msgid="2346105138448751893">"הגדרות מנוע"</string>
+    <string name="tts_engine_settings_title" msgid="3499112142425680334">"הגדרות עבור <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"שפות וצלילים"</string>
     <string name="pico_installed" msgid="2452546687858267414">"הותקן"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"לא מותקן"</string>
@@ -1228,114 +1282,33 @@
     <string name="gadget_title" msgid="7455548605888590466">"Power Control"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"מעדכן הגדרת Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"מעדכן הגדרת Bluetooth"</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">"הוסף את ה-VPN <xliff:g id="NAME">%s</xliff:g>"</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">"הגדרה וניהול של רשתות פרטיות וירטואליות (VPN)"</string>
-    <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="trusted_credentials" msgid="4266945289534242402">"אישורים מהימנים"</string>
+    <string name="trusted_credentials_summary" msgid="6735221351155686632">"הצג אישורי CA מהימנים"</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>
-    <string name="privacy_settings_title" msgid="1987089301293213705">"הגדרות פרטיות"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"גיבוי ואיפוס"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"גיבוי ואיפוס"</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>
@@ -1439,4 +1412,107 @@
     <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>
+    <!-- no translation found for debug_ui_category (9023948280291055349) -->
+    <skip />
+    <!-- no translation found for strict_mode (1938795874357830695) -->
+    <skip />
+    <!-- no translation found for strict_mode_summary (142834318897332338) -->
+    <skip />
+    <!-- no translation found for pointer_location (6084434787496938001) -->
+    <skip />
+    <!-- no translation found for pointer_location_summary (840819275172753713) -->
+    <skip />
+    <!-- no translation found for show_screen_updates (8282711794220426931) -->
+    <skip />
+    <!-- no translation found for show_screen_updates_summary (1716122382094924596) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage (2389212910758076024) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage_summary (2113341923988958266) -->
+    <skip />
+    <!-- no translation found for window_animation_scale_title (6162587588166114700) -->
+    <skip />
+    <!-- no translation found for transition_animation_scale_title (387527540523595875) -->
+    <skip />
+    <!-- no translation found for debug_applications_category (6221644998451283813) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities (3622005081180597749) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities_summary (3592221124808773368) -->
+    <skip />
+    <!-- no translation found for app_process_limit_title (4121324758038197598) -->
+    <skip />
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"שימוש בנתונים"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"מחזור שימוש בנתונים"</string>
+    <string name="data_usage_menu_split_4g" msgid="7417435609285381968">"פצל את השימוש ב-4G"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"הצג שימוש ב-Wi-Fi"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"שנה את הגדרת המחזור..."</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"היום בחודש שבו יש לאפס את מחזור השימוש בנתונים:"</string>
+    <string name="data_usage_disable_mobile_limit" msgid="289740911281022322">"השבת נתונים לנייד במגבלה"</string>
+    <string name="data_usage_disable_4g_limit" msgid="5808210773758699800">"השבת נתוני 4G במגבלה"</string>
+    <string name="data_usage_disable_3g_limit" msgid="3856971004328238231">"השבת נתוני 2G-3G במגבלה"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_mobile" msgid="454140350007299045">"נייד"</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">"נתונים לנייד"</string>
+    <string name="data_usage_enable_3g" msgid="6304006671869578254">"נתוני 2G-3G"</string>
+    <string name="data_usage_enable_4g" msgid="3635854097335036738">"נתוני 4G"</string>
+    <string name="data_usage_app_settings" msgid="3727561362090820369">"הצג את הגדרות היישום"</string>
+    <string name="data_usage_app_restrict_background" msgid="8856643905291165256">"הגבל שימוש בנתוני רקע"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="1503361245973512092">"אפשר נתוני רקע של יישום רק בזמן השימוש ברשת לא מוגבלת"</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="8110736468987743260">"הגבלת נתוני רקע"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="100001698378554777">"תכונה זו עשויה להשפיע לרעה על יישומים התלויים בשימוש בנתוני רקע."\n\n"ניתן למצוא פקדים מתאימים יותר של שימוש בנתונים בהגדרות של יישום זה."</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"תאריך איפוס של מחזור שימוש"</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"תאריך בכל חודש:"</string>
+    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"הגדר"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"הגבלת שימוש בנתונים"</string>
+    <string name="data_usage_limit_dialog_mobile" msgid="7931094451923591578">"חיבור הנתונים הנייד יושבת כאשר תגיע למגבלה שצוינה."\n\n"כדי להימנע מחיובים בגין חריגה, שקול להשתמש במגבלה קטנה יותר, מאחר ששיטות החישוב של המכשיר והספק עשויות להיות שונות."</string>
+    <string name="data_usage_limit_dialog_3g" msgid="5478553071420316963">"החיבור של נתוני 2G-3G יושבת כאשר תגיע למגבלה שצוינה."\n\n"כדי להימנע מחיובים בגין חריגה, שקול להשתמש במגבלה קטנה יותר, מאחר ששיטות החישוב של המכשיר והספק עשויות להיות שונות."</string>
+    <string name="data_usage_limit_dialog_4g" msgid="6134008906742403777">"החיבור של נתוני 4G יושבת כאשר תגיע למגבלה שצוינה."\n\n"כדי להימנע מחיובים בגין חריגה, שקול להשתמש במגבלה קטנה יותר, מאחר ששיטות החישוב של המכשיר והספק עשויות להיות שונות."</string>
+    <string name="data_usage_disabled_dialog_3g_title" msgid="4221584306492812040">"נתוני 2G-3G מושבתים"</string>
+    <string name="data_usage_disabled_dialog_4g_title" msgid="715585612162185936">"נתוני 4G מושבתים"</string>
+    <string name="data_usage_disabled_dialog_mobile_title" msgid="209516216265000221">"נתונים לנייד מושבתים"</string>
+    <string name="data_usage_disabled_dialog" msgid="2874031671067845964">"הגעת למגבלת השימוש בנתונים שצוינה."\n\n"ייתכן שתחויב בתשלום לספק על שימוש נוסף בנתונים."</string>
+    <string name="data_usage_disabled_dialog_enable" msgid="2441219164620753329">"הפעל מחדש את הנתונים"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="32">"<xliff:g id="NUMBER">%1$s</xliff:g>"</font>" "<font size="12">"<xliff:g id="UNIT">%2$s</xliff:g>"</font>\n<font size="12">"אזהרה"</font></string>
+    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"שיחת חירום"</string>
+    <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"חזור לשיחה"</string>
+    <string name="vpn_name" msgid="4689699885361002297">"שם"</string>
+    <string name="vpn_type" msgid="5435733139514388070">"סוג"</string>
+    <string name="vpn_server" msgid="2123096727287421913">"כתובת שרת"</string>
+    <string name="vpn_mppe" msgid="6639001940500288972">"הצפנת PPP‏ (MPPE)"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"סוד של L2TP"</string>
+    <string name="vpn_ipsec_identifier" msgid="4098175859460006296">"מזהה IPSec"</string>
+    <string name="vpn_ipsec_secret" msgid="4526453255704888704">"מפתח משותף מראש של IPSec"</string>
+    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"אישור משתמש IPSec"</string>
+    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"אישור CA של IPSec"</string>
+    <!-- no translation found for vpn_search_domains (5391995501541199624) -->
+    <skip />
+    <!-- no translation found for vpn_routes (8556236801755260073) -->
+    <skip />
+    <string name="vpn_username" msgid="1863901629860867849">"שם משתמש"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"סיסמה"</string>
+    <!-- no translation found for vpn_save_login (6350322456427484881) -->
+    <skip />
+    <!-- no translation found for vpn_not_used (9094191054524660891) -->
+    <skip />
+    <string name="vpn_no_ca_cert" msgid="7820884983947090538">"(אל תאמת שרת)"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"ביטול"</string>
+    <string name="vpn_save" msgid="4233484051644764510">"שמור"</string>
+    <string name="vpn_connect" msgid="8469608541746132301">"התחבר"</string>
+    <string name="vpn_edit" msgid="1111459297288136079">"עריכת רשת VPN"</string>
+    <string name="vpn_connect_to" msgid="7328758950427515753">"התחבר ל-<xliff:g id="NETWORK">%s</xliff:g>"</string>
+    <string name="vpn_title" msgid="7982620762043790565">"הגדרות VPN"</string>
+    <string name="vpn_create" msgid="8966010925994175306">"הוסף רשת VPN"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"ערוך רשת"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"מחק רשת"</string>
+    <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"מערכת"</string>
+    <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"משתמש"</string>
+    <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"השבת"</string>
+    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"הפוך לפעיל"</string>
+    <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"הסר"</string>
+    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"להפוך את אישור ה-CA של המערכת לפעיל?"</string>
+    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"להשבית את אישור ה-CA של המערכת?"</string>
+    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"להסיר לצמיתות את אישור ה-CA של המשתמש?"</string>
 </resources>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index f31dad3..d7db46d 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>
@@ -214,4 +240,36 @@
     <item msgid="3878793616631049349">"DRMコンテンツにのみHDCPチェックを使用する"</item>
     <item msgid="45075631231212732">"HDCPチェックを常に使用する"</item>
   </string-array>
+    <!-- no translation found for window_animation_scale_entries:0 (8134156599370824081) -->
+    <!-- no translation found for window_animation_scale_entries:1 (6624864048416710414) -->
+    <!-- no translation found for window_animation_scale_entries:2 (2219332261255416635) -->
+    <!-- no translation found for window_animation_scale_entries:3 (3544428804137048509) -->
+    <!-- no translation found for window_animation_scale_entries:4 (3110710404225974514) -->
+    <!-- no translation found for window_animation_scale_entries:5 (4402738611528318731) -->
+    <!-- no translation found for window_animation_scale_entries:6 (6189539267968330656) -->
+    <!-- no translation found for transition_animation_scale_entries:0 (8464255836173039442) -->
+    <!-- no translation found for transition_animation_scale_entries:1 (3375781541913316411) -->
+    <!-- no translation found for transition_animation_scale_entries:2 (1991041427801869945) -->
+    <!-- no translation found for transition_animation_scale_entries:3 (4012689927622382874) -->
+    <!-- no translation found for transition_animation_scale_entries:4 (3289156759925947169) -->
+    <!-- no translation found for transition_animation_scale_entries:5 (7705857441213621835) -->
+    <!-- no translation found for transition_animation_scale_entries:6 (6660750935954853365) -->
+    <!-- no translation found for app_process_limit_entries:0 (6799596560242275471) -->
+    <!-- no translation found for app_process_limit_entries:1 (2412794376818632575) -->
+    <!-- no translation found for app_process_limit_entries:2 (1578904888612645001) -->
+    <!-- no translation found for app_process_limit_entries:3 (8819235336299873577) -->
+  <string-array name="vpn_types_long">
+    <item msgid="2732002039459078847">"PPTP VPN"</item>
+    <item msgid="3799752201662127867">"事前共有鍵付きのL2TP/IPSec VPN"</item>
+    <item msgid="4725504331295252103">"証明書付きのL2TP/IPSec VPN"</item>
+    <item msgid="7526551163264034377">"事前共有鍵とXauth認証付きのIPSec VPN"</item>
+    <item msgid="8064740940687465039">"証明書とXauth認証付きのIPSec VPN"</item>
+    <item msgid="4946199982372391490">"証明書とハイブリッド認証付きのIPSec VPN"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:0 (8621078286418985762) -->
+    <!-- no translation found for vpn_states:1 (6692305604213080515) -->
+    <!-- no translation found for vpn_states:2 (8001704909356800092) -->
+    <!-- no translation found for vpn_states:3 (4039737283841672166) -->
+    <!-- no translation found for vpn_states:4 (4042143101664725090) -->
+    <!-- no translation found for vpn_states:5 (2690164254699635531) -->
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index b41aeff..e4993f5 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -19,6 +19,10 @@
     <string name="yes" msgid="4676390750360727396">"はい"</string>
     <string name="no" msgid="6731231425810196216">"いいえ"</string>
     <string name="device_info_default" msgid="7847265875578739287">"不明"</string>
+    <string name="header_category_wireless_networks" msgid="4944823405420438623">"無線とネットワーク"</string>
+    <string name="header_category_device" msgid="5781174212691167553">"端末"</string>
+    <string name="header_category_personal" msgid="6225932173498802187">"ユーザー設定"</string>
+    <string name="header_category_system" msgid="2073558547468647128">"システム"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"無線通信をON"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"無線通信をOFF"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"SIMのアドレス帳を表示"</string>
@@ -111,7 +115,11 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"ペアとして設定中..."</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"ペア設定、非接続"</string>
     <string name="bluetooth_device" msgid="6873461446424952003">"ハンズフリー/ヘッドセット"</string>
-    <string name="progress_scanning" msgid="3760897655335759141">"スキャン中"</string>
+    <!-- outdated translation 3760897655335759141 -->     <string name="progress_scanning" msgid="192587958424295789">"スキャン中"</string>
+    <!-- no translation found for progress_tap_to_pair (4192342336107106334) -->
+    <skip />
+    <!-- no translation found for bluetooth_no_devices_found (2412462335116297668) -->
+    <skip />
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Bluetoothペア設定リクエスト"</string>
     <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>
@@ -130,6 +138,9 @@
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"アプリケーションが、BluetoothをONにしてこの端末を他のデバイスから検出できるようにする許可をリクエストしています。許可しますか？"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"BluetoothをONにしています..."</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"自動接続"</string>
+    <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth接続リクエスト"</string>
+    <string name="bluetooth_connection_notif_message" msgid="1833221950512058309">"「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」に接続するにはタップしてください"</string>
+    <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」に接続してもよろしいですか？"</string>
     <string name="date_and_time" msgid="4114084177056654663">"日付と時刻"</string>
     <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>
@@ -235,7 +246,7 @@
     <string name="airplane_mode_summary" msgid="3154817401368780988">"ワイヤレス接続をすべて無効にする"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"ワイヤレス接続を無効にしています..."</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"ワイヤレス接続を有効にしています..."</string>
-    <string name="radio_controls_title" msgid="5868688473587168882">"無線とネットワーク"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"その他..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"無線とネットワーク"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"Wi-Fi、Bluetooth、機内モード、モバイルネットワーク、VPNの設定"</string>
     <string name="roaming" msgid="3596055926335478572">"データローミング"</string>
@@ -271,8 +282,8 @@
     <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">"現在地情報とセキュリティ"</string>
-    <string name="location_security_settings_title" msgid="4624434296446625554">"位置情報とセキュリティの設定"</string>
+    <string name="location_settings_title" msgid="8935806698251432196">"位置情報サービス"</string>
+    <string name="security_settings_title" msgid="7945465324818485460">"セキュリティ"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"現在地、画面ロック、SIMカードロック、認証情報ストレージのロック"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"現在地、画面のロック解除、認証情報ストレージのロックを設定します"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"パスワード"</string>
@@ -316,7 +327,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>
@@ -375,8 +386,8 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"端末管理者を表示または無効にする"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"BluetoothをONにする"</string>
-    <string name="bluetooth_settings" msgid="2725796451253089609">"Bluetooth設定"</string>
-    <string name="bluetooth_settings_title" msgid="2824020086246268296">"Bluetooth設定"</string>
+    <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
+    <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"接続、端末名、検出の許可を設定する"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Bluetoothのペア設定リクエスト"</string>
     <string name="bluetooth_enter_pin_msg" msgid="1499285355129256289">\n"「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」とペア設定するPINを入力してください（0000か1234を試してください）。Bluetoothデバイスと同じPINの入力が必要になる場合があります。"</string>
@@ -394,7 +405,10 @@
     <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>
+    <!-- no translation found for bluetooth_search_for_devices (5957007154213560390) -->
+    <skip />
+    <!-- no translation found for bluetooth_searching_for_devices (9203739709307871727) -->
+    <skip />
     <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>
@@ -404,6 +418,10 @@
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"ペアを解除"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"切断してペアを解除"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"オプション..."</string>
+    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"詳細設定"</string>
+    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth詳細設定"</string>
+    <string name="bluetooth_advanced_settings_label" msgid="8659717781212434173">"Bluetooth詳細設定"</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="3631028334811113629">"BluetoothをONにすると利用可能な端末を確認できます"</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>
@@ -445,27 +463,31 @@
     <string name="nfc_toggle_error" msgid="2233172102497535522">"エラーが発生しました。"</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Wi-FiをONにする"</string>
-    <string name="wifi_settings" msgid="4746946030627213196">"Wi-Fi設定"</string>
+    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="2810363951104753710">"Wi-Fi設定"</string>
+    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"ワイヤレスアクセスポイントを設定する"</string>
-    <string name="wifi_starting" msgid="6710266609710860129">"ONにしています..."</string>
-    <string name="wifi_stopping" msgid="5952909472548218348">"OFFにしています..."</string>
+    <string name="wifi_starting" msgid="7732330327758522943">"Wi-FiをONにします..."</string>
+    <string name="wifi_stopping" msgid="244864762599017659">"Wi-FiをOFFにします..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"エラー"</string>
     <string name="wifi_in_airplane_mode" msgid="7618393787965366655">"機内モード"</string>
     <string name="wifi_fail_to_scan" msgid="6194542252808587669">"ネットワークをスキャンできません"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"ネットワークの通知"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"オープンネットワークが利用可能なときに通知する"</string>
+    <string name="wifi_enable_watchdog_service" msgid="4723544454066601706">"Wi-Fi接続をチェック"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="8687400936839455926">"ネットワーク接続障害の可能性を検出、管理する"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Wi-Fiの切断ポリシー"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Wi-Fiをスリープに切り替えるタイミング"</string>
     <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" msgid="6234851776910938957">"ネットワークを追加"</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>
     <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_empty_list_wifi_off" msgid="3682507011071029311">"Wi-FiをONにすると利用可能ネットワークを確認できます"</string>
     <string name="wifi_network_setup" msgid="7974851890019344870">"ネットワーク設定"</string>
     <string name="wifi_wps_pin" msgid="5471842298708321115">"アクセスポイントに記載のPINを入力してください"</string>
     <string name="wifi_wps_setup_title" msgid="150518971269252336">"WPS設定"</string>
@@ -501,13 +523,13 @@
     <string name="wifi_save" msgid="3331121567988522826">"保存"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"キャンセル"</string>
     <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"別のWPSセッションが検出されました。数秒後にもう一度お試しください。"</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"詳細設定"</string>
+    <!-- outdated translation 5419052271935350999 -->     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"詳細設定"</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>
-    <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"IP設定"</string>
+    <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP設定"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"保存"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"キャンセル"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"有効なIPアドレスを入力してください。"</string>
@@ -525,7 +547,7 @@
     <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">"AndroidHotspot"</string>
     <string name="sound_settings_title" msgid="8735891486683305886">"音"</string>
-    <string name="display_settings_title" msgid="2378894265964357591">"画面"</string>
+    <string name="display_settings_title" msgid="1708697328627382561">"表示"</string>
     <string name="sound_settings" msgid="5007659014828162881">"音の設定"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"マナーモード"</string>
     <string name="silent_mode_summary" msgid="3309650676072917899">"音楽、動画メディア、アラーム以外は消音する"</string>
@@ -598,7 +620,18 @@
     <string name="brightness_summary" msgid="838917350127550703">"画面の明るさを調整する"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"タイムアウト"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"画面を<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>後に自動的にOFFにする"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"壁紙"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android Dreams"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"スクリーンセーバーとその他のアイドル状態ツール"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"選択されているスクリーンセーバー"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"起動のタイミング"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"アイドル状態が<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>続いた後"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"起動しない"</string>
+    <string name="dream_test" msgid="5968002644622194481">"再生してみる"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"明るさを自動調整"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"フォントサイズ"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"全体のフォントサイズ"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"フォントサイズの選択"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIMカードロック設定"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"SIMカードロック設定"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIMカードロック"</string>
@@ -643,8 +676,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>
@@ -696,6 +730,16 @@
     <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 storage_menu_usb (1580545228584324704) -->
+    <skip />
+    <!-- no translation found for storage_title_usb (5775322159427546546) -->
+    <skip />
+    <!-- no translation found for usb_label_mtp (4157227401755543412) -->
+    <skip />
+    <!-- no translation found for usb_label_ptp (7417254019489575819) -->
+    <skip />
+    <!-- no translation found for usb_label_installer_cd (7438467574756086977) -->
+    <skip />
     <string name="battery_status_title" msgid="9159414319574976203">"電池の状態:"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"電池残量"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -806,6 +850,8 @@
     <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>
+    <string name="wireless_category_general" msgid="2973810407987118067">"全般"</string>
+    <string name="wireless_category_mobile_networks" msgid="1254629216798424288">"モバイルネットワーク"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"モバイルネットワーク"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"ローミング、ネットワーク、APNを設定する"</string>
     <string name="location_title" msgid="1029961368397484576">"現在地"</string>
@@ -883,7 +929,7 @@
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"タブレットの保護"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"携帯電話の保護"</string>
     <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"秘密の画面ロック解除パターンを作成してタブレットを不正使用から守ります。次の画面で指を使って点を好きな順序で結んでください。4つ以上の点を結ぶ必要があります。"\n\n"準備ができたら[次へ]をタップしてください。"</string>
-    <string name="lock_intro_message" product="default" msgid="9100785646737118042"><font size="17">"画面ロックの解除パターンを作成して携帯電話の不正使用を防ぐことができます。 "\n<font height="17">\n</font><b>"1"</b>" 次の画面に示すパターン作成の例を参考にしてください。"\n<font height="17">\n</font><b>"2"</b>"  ロック解除パターンを決めたら、そのパターンを指でなぞって描きます。さまざまなパターンを作成できますが、最低4つの点を結んでください。"\n<font height="17">\n</font><b>"3"</b>"  確認のためもう一度そのパターンを入力します。"\n<font height="17">\n</font><b>"[次へ]をタップすると次に進みます"</b>"。"\n<font height="3">\n</font>"パターンロックを設定しない場合は[キャンセル]を選択してください。"</font></string>
+    <!-- outdated translation 3692151094288835065 -->     <string name="lock_intro_message" product="default" msgid="5796785892741212873">"秘密の画面ロック解除パターンを作成してタブレットを不正使用から守ります。次の画面で指を使って点を好きな順序で結んでください。4つ以上の点を結ぶ必要があります。"\n\n"準備ができたら[次へ]をタップしてください。"</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"アプリケーションの管理"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"インストール済みアプリケーションを管理/削除する"</string>
     <string name="applications_settings" msgid="3736173521008476946">"アプリケーション"</string>
@@ -893,6 +939,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>
@@ -905,9 +953,10 @@
     <string name="force_stop" msgid="7435006169872876756">"強制停止"</string>
     <string name="total_size_label" msgid="1048676419552557254">"合計"</string>
     <string name="application_size_label" msgid="5055196275624686382">"アプリケーション"</string>
+    <string name="external_code_size_label" msgid="3459343140355961335">"USBストレージアプリ"</string>
     <string name="data_size_label" msgid="8679376373625710107">"データ"</string>
-    <string name="external_size_label" product="nosdcard" msgid="4465530017830945766">"USBストレージ"</string>
-    <string name="external_size_label" product="default" msgid="2107155737635944440">"SDカード"</string>
+    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USBストレージデータ"</string>
+    <string name="external_data_size_label" product="default" msgid="626414192825329708">"SDカード"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"アンインストール"</string>
     <string name="disable_text" msgid="6544054052049395202">"無効にする"</string>
     <string name="enable_text" msgid="9217362512327828987">"有効にする"</string>
@@ -1026,7 +1075,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 +1085,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>
@@ -1066,7 +1117,7 @@
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"画面キーボードを設定する"</string>
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"物理キーボード"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"物理キーボードの設定"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"開発"</string>
+    <string name="development_settings_title" msgid="215179176067683667">"デベロッパー向けオプション"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"アプリケーション開発オプション"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USBデバッグ"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"USB接続時はデバッグモードにする"</string>
@@ -1091,14 +1142,14 @@
     <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="toggle_large_text_title" msgid="42259643359869436">"文字サイズ大"</string>
     <string name="accessibility_services_category" msgid="8127851026323672607">"ユーザー補助サービス"</string>
+    <string name="toggle_accessibility_title" msgid="7338739354952553958">"ユーザー補助サービスを許可"</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マーケットから携帯端末用のスクリーンリーダーをダウンロードできます。"\n\n"スクリーンリーダーをインストールするには[OK]をタップします。"</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">"一部のアプリケーションでは、アプリケーションコンテンツへのアクセスについてユーザーを補助するスクリプトをタブレットにダウンロードするよう求められることがあります。タブレット上にユーザー補助スクリプトをインストールすることを許可してもよろしいですか？"</string>
@@ -1106,10 +1157,11 @@
     <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>
-    <string name="power_usage_summary_title" msgid="5180282911164282324">"電池使用量"</string>
+    <string name="power_usage_summary_title" msgid="7190304207330319919">"電池"</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>
@@ -1218,6 +1270,8 @@
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>の設定"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>は有効です"</string>
     <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>は無効です"</string>
+    <string name="tts_engine_settings_section" msgid="2346105138448751893">"エンジンの設定"</string>
+    <string name="tts_engine_settings_title" msgid="3499112142425680334">"<xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>の設定"</string>
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"言語と音声"</string>
     <string name="pico_installed" msgid="2452546687858267414">"インストール済み"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"未インストール"</string>
@@ -1228,114 +1282,33 @@
     <string name="gadget_title" msgid="7455548605888590466">"電源管理"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Wi-Fi設定の更新"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetooth設定の更新"</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">"VPNを設定および管理する"</string>
-    <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="trusted_credentials" msgid="4266945289534242402">"信頼できる認証情報"</string>
+    <string name="trusted_credentials_summary" msgid="6735221351155686632">"信頼できるCA証明書を表示する"</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>
-    <string name="privacy_settings_title" msgid="1987089301293213705">"プライバシーの設定"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"バックアップとリセット"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"バックアップとリセット"</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>
@@ -1439,4 +1412,107 @@
     <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>
+    <!-- no translation found for debug_ui_category (9023948280291055349) -->
+    <skip />
+    <!-- no translation found for strict_mode (1938795874357830695) -->
+    <skip />
+    <!-- no translation found for strict_mode_summary (142834318897332338) -->
+    <skip />
+    <!-- no translation found for pointer_location (6084434787496938001) -->
+    <skip />
+    <!-- no translation found for pointer_location_summary (840819275172753713) -->
+    <skip />
+    <!-- no translation found for show_screen_updates (8282711794220426931) -->
+    <skip />
+    <!-- no translation found for show_screen_updates_summary (1716122382094924596) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage (2389212910758076024) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage_summary (2113341923988958266) -->
+    <skip />
+    <!-- no translation found for window_animation_scale_title (6162587588166114700) -->
+    <skip />
+    <!-- no translation found for transition_animation_scale_title (387527540523595875) -->
+    <skip />
+    <!-- no translation found for debug_applications_category (6221644998451283813) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities (3622005081180597749) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities_summary (3592221124808773368) -->
+    <skip />
+    <!-- no translation found for app_process_limit_title (4121324758038197598) -->
+    <skip />
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"データ使用"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"データ使用サイクル"</string>
+    <string name="data_usage_menu_split_4g" msgid="7417435609285381968">"4G使用を別にする"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Wi-Fi使用を表示する"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"サイクルを変更…"</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"毎月データ使用サイクルをリセットする日:"</string>
+    <string name="data_usage_disable_mobile_limit" msgid="289740911281022322">"上限でモバイルデータを無効にする"</string>
+    <string name="data_usage_disable_4g_limit" msgid="5808210773758699800">"上限で4Gデータを無効にする"</string>
+    <string name="data_usage_disable_3g_limit" msgid="3856971004328238231">"上限で2G～3Gデータを無効にする"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_mobile" msgid="454140350007299045">"モバイル"</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">"モバイルデータ"</string>
+    <string name="data_usage_enable_3g" msgid="6304006671869578254">"2G～3Gデータ"</string>
+    <string name="data_usage_enable_4g" msgid="3635854097335036738">"4Gデータ"</string>
+    <string name="data_usage_app_settings" msgid="3727561362090820369">"アプリケーション設定を表示"</string>
+    <string name="data_usage_app_restrict_background" msgid="8856643905291165256">"バックグラウンドデータ使用を制限"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="1503361245973512092">"無制限ネットワーク使用時のみアプリのバックグラウンドデータを許可"</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="8110736468987743260">"バックグラウンドデータの制限"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="100001698378554777">"この機能は、バックグラウンドデータ使用に依存するアプリケーションに悪影響を及ぼす恐れがあります。"\n\n"このアプリケーションの設定で、他にデータ使用を適切に管理できるオプションがないか確認してください。"</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"使用サイクルのリセット日"</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"毎月のリセット日:"</string>
+    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"設定"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"データ使用上限の設定"</string>
+    <string name="data_usage_limit_dialog_mobile" msgid="7931094451923591578">"指定した上限に達するとモバイルデータ接続が無効になります。"\n\n"端末や携帯通信会社によって課金方法が異なる可能性があるため、追加料金が発生しないようにするには上限を引き下げることを検討してください。"</string>
+    <string name="data_usage_limit_dialog_3g" msgid="5478553071420316963">"指定した上限に達すると2G～3Gデータ接続が無効になります。"\n\n"端末や携帯通信会社によって課金方法が異なる可能性があるため、追加料金が発生しないようにするには上限を引き下げることを検討してください。"</string>
+    <string name="data_usage_limit_dialog_4g" msgid="6134008906742403777">"指定した上限に達すると4Gデータ接続が無効になります。"\n\n"端末や携帯通信会社によって課金方法が異なる可能性があるため、追加料金が発生しないようにするには上限を引き下げることを検討してください。"</string>
+    <string name="data_usage_disabled_dialog_3g_title" msgid="4221584306492812040">"2G～3Gデータが無効になりました"</string>
+    <string name="data_usage_disabled_dialog_4g_title" msgid="715585612162185936">"4Gデータが無効になりました"</string>
+    <string name="data_usage_disabled_dialog_mobile_title" msgid="209516216265000221">"モバイルデータが無効になりました"</string>
+    <string name="data_usage_disabled_dialog" msgid="2874031671067845964">"指定したデータ使用上限に達しました。"\n\n"これ以上データを使用すると、携帯通信会社への料金が発生する可能性があります。"</string>
+    <string name="data_usage_disabled_dialog_enable" msgid="2441219164620753329">"データを再度有効にする"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="32">"<xliff:g id="NUMBER">%1$s</xliff:g>"</font>" "<font size="12">"<xliff:g id="UNIT">%2$s</xliff:g>"</font>\n<font size="12">"警告"</font></string>
+    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"緊急通報"</string>
+    <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"通話に戻る"</string>
+    <string name="vpn_name" msgid="4689699885361002297">"名前"</string>
+    <string name="vpn_type" msgid="5435733139514388070">"タイプ"</string>
+    <string name="vpn_server" msgid="2123096727287421913">"サーバーアドレス"</string>
+    <string name="vpn_mppe" msgid="6639001940500288972">"PPP暗号化（MPPE）"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"L2TPセキュリティ保護"</string>
+    <string name="vpn_ipsec_identifier" msgid="4098175859460006296">"IPSec ID"</string>
+    <string name="vpn_ipsec_secret" msgid="4526453255704888704">"IPSec事前共有鍵"</string>
+    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"IPSecユーザー証明書"</string>
+    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec CA証明書"</string>
+    <!-- no translation found for vpn_search_domains (5391995501541199624) -->
+    <skip />
+    <!-- no translation found for vpn_routes (8556236801755260073) -->
+    <skip />
+    <string name="vpn_username" msgid="1863901629860867849">"ユーザー名"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"パスワード"</string>
+    <!-- no translation found for vpn_save_login (6350322456427484881) -->
+    <skip />
+    <!-- no translation found for vpn_not_used (9094191054524660891) -->
+    <skip />
+    <string name="vpn_no_ca_cert" msgid="7820884983947090538">"（サーバーを確認しない）"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"キャンセル"</string>
+    <string name="vpn_save" msgid="4233484051644764510">"保存"</string>
+    <string name="vpn_connect" msgid="8469608541746132301">"接続"</string>
+    <string name="vpn_edit" msgid="1111459297288136079">"VPNネットワークの編集"</string>
+    <string name="vpn_connect_to" msgid="7328758950427515753">"<xliff:g id="NETWORK">%s</xliff:g>に接続"</string>
+    <string name="vpn_title" msgid="7982620762043790565">"VPN設定"</string>
+    <string name="vpn_create" msgid="8966010925994175306">"VPNネットワークの追加"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"ネットワークの編集"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"ネットワークを削除"</string>
+    <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"システム"</string>
+    <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"ユーザー"</string>
+    <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"無効にする"</string>
+    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"有効にする"</string>
+    <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"削除"</string>
+    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"システムのCA証明書を有効にしますか？"</string>
+    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"システムのCA証明書を無効にしますか？"</string>
+    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"ユーザーのCA証明書を完全に削除しますか？"</string>
 </resources>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index 664dd8c..a31b096 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>
@@ -214,4 +240,36 @@
     <item msgid="3878793616631049349">"DRM 콘텐츠에 대해서만 HDCP 확인 사용"</item>
     <item msgid="45075631231212732">"항상 HDCP 확인 사용"</item>
   </string-array>
+    <!-- no translation found for window_animation_scale_entries:0 (8134156599370824081) -->
+    <!-- no translation found for window_animation_scale_entries:1 (6624864048416710414) -->
+    <!-- no translation found for window_animation_scale_entries:2 (2219332261255416635) -->
+    <!-- no translation found for window_animation_scale_entries:3 (3544428804137048509) -->
+    <!-- no translation found for window_animation_scale_entries:4 (3110710404225974514) -->
+    <!-- no translation found for window_animation_scale_entries:5 (4402738611528318731) -->
+    <!-- no translation found for window_animation_scale_entries:6 (6189539267968330656) -->
+    <!-- no translation found for transition_animation_scale_entries:0 (8464255836173039442) -->
+    <!-- no translation found for transition_animation_scale_entries:1 (3375781541913316411) -->
+    <!-- no translation found for transition_animation_scale_entries:2 (1991041427801869945) -->
+    <!-- no translation found for transition_animation_scale_entries:3 (4012689927622382874) -->
+    <!-- no translation found for transition_animation_scale_entries:4 (3289156759925947169) -->
+    <!-- no translation found for transition_animation_scale_entries:5 (7705857441213621835) -->
+    <!-- no translation found for transition_animation_scale_entries:6 (6660750935954853365) -->
+    <!-- no translation found for app_process_limit_entries:0 (6799596560242275471) -->
+    <!-- no translation found for app_process_limit_entries:1 (2412794376818632575) -->
+    <!-- no translation found for app_process_limit_entries:2 (1578904888612645001) -->
+    <!-- no translation found for app_process_limit_entries:3 (8819235336299873577) -->
+  <string-array name="vpn_types_long">
+    <item msgid="2732002039459078847">"PPTP VPN"</item>
+    <item msgid="3799752201662127867">"사전 공유 키를 사용하는 L2TP/IPSec VPN"</item>
+    <item msgid="4725504331295252103">"인증서가 있는 L2TP/IPSec VPN"</item>
+    <item msgid="7526551163264034377">"사전 공유 키 및 Xauth 인증을 가진 IPSec VPN"</item>
+    <item msgid="8064740940687465039">"인증서 및 Xauth 인증을 가진 IPSec VPN"</item>
+    <item msgid="4946199982372391490">"인증서 및 하이브리드 인증을 가진 IPSec VPN"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:0 (8621078286418985762) -->
+    <!-- no translation found for vpn_states:1 (6692305604213080515) -->
+    <!-- no translation found for vpn_states:2 (8001704909356800092) -->
+    <!-- no translation found for vpn_states:3 (4039737283841672166) -->
+    <!-- no translation found for vpn_states:4 (4042143101664725090) -->
+    <!-- no translation found for vpn_states:5 (2690164254699635531) -->
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 69c5b08..87af798 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -19,6 +19,10 @@
     <string name="yes" msgid="4676390750360727396">"예"</string>
     <string name="no" msgid="6731231425810196216">"아니요"</string>
     <string name="device_info_default" msgid="7847265875578739287">"알 수 없음"</string>
+    <string name="header_category_wireless_networks" msgid="4944823405420438623">"무선 및 네트워크"</string>
+    <string name="header_category_device" msgid="5781174212691167553">"기기"</string>
+    <string name="header_category_personal" msgid="6225932173498802187">"개인 설정"</string>
+    <string name="header_category_system" msgid="2073558547468647128">"시스템"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"무선 켜기"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"무선 끄기"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"SIM 주소록 보기"</string>
@@ -111,7 +115,11 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"페어링 중..."</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"페어링된 상태이지만 연결되지 않음"</string>
     <string name="bluetooth_device" msgid="6873461446424952003">"핸즈프리/헤드셋"</string>
-    <string name="progress_scanning" msgid="3760897655335759141">"검색 중"</string>
+    <!-- outdated translation 3760897655335759141 -->     <string name="progress_scanning" msgid="192587958424295789">"검색 중"</string>
+    <!-- no translation found for progress_tap_to_pair (4192342336107106334) -->
+    <skip />
+    <!-- no translation found for bluetooth_no_devices_found (2412462335116297668) -->
+    <skip />
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Bluetooth 페어링 요청"</string>
     <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>
@@ -130,6 +138,9 @@
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"휴대전화의 애플리케이션이 블루투스를 사용할 권한 및 다른 기기에서 사용자의 휴대전화를 검색할 수 있도록 하는 권한을 요청하고 있습니다. 사용하시겠습니까?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"블루투스 켜는 중..."</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"자동 연결"</string>
+    <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"블루투스 연결 요청"</string>
+    <string name="bluetooth_connection_notif_message" msgid="1833221950512058309">"\'<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\'에 연결하려면 터치하세요."</string>
+    <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"\'<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\'에 연결하시겠습니까?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"날짜 및 시간 설정"</string>
     <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>
@@ -235,7 +246,7 @@
     <string name="airplane_mode_summary" msgid="3154817401368780988">"모든 무선 연결 사용 안함"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"무선 연결을 끊는 중..."</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"무선 연결 사용 중..."</string>
-    <string name="radio_controls_title" msgid="5868688473587168882">"무선 및 네트워크"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"더보기..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"무선 및 네트워크 설정"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"Wi-Fi, 블루투스, 비행기 모드, 모바일 네트워크 및 VPN 관리"</string>
     <string name="roaming" msgid="3596055926335478572">"데이터 로밍"</string>
@@ -271,8 +282,8 @@
     <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">"위치 및 보안"</string>
-    <string name="location_security_settings_title" msgid="4624434296446625554">"위치 및 보안 설정"</string>
+    <string name="location_settings_title" msgid="8935806698251432196">"위치 서비스"</string>
+    <string name="security_settings_title" msgid="7945465324818485460">"보안"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"내 위치, 화면 잠금해제, SIM 카드 잠금, 자격증명 저장소 잠금 설정"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"내 위치, 화면 잠금해제, 자격증명 저장소 잠금 설정"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"비밀번호"</string>
@@ -316,7 +327,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>
@@ -375,8 +386,8 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"기기 관리자 보기 또는 비활성화"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Bluetooth 켜기"</string>
-    <string name="bluetooth_settings" msgid="2725796451253089609">"Bluetooth 설정"</string>
-    <string name="bluetooth_settings_title" msgid="2824020086246268296">"Bluetooth 설정"</string>
+    <string name="bluetooth_settings" msgid="1810521656168174329">"블루투스"</string>
+    <string name="bluetooth_settings_title" msgid="1908745291161353016">"블루투스"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"연결 관리, 장치 이름 및 검색 가능 여부 설정"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Bluetooth 페어링 요청"</string>
     <string name="bluetooth_enter_pin_msg" msgid="1499285355129256289">\n"\'<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\'와(과) 페어링하려면 PIN을 입력하세요. 0000 또는 1234을 사용해 보세요. 블루투스 기기에서 동일한 PIN을 입력해야 할 수 있습니다."</string>
@@ -394,7 +405,10 @@
     <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>
+    <!-- no translation found for bluetooth_search_for_devices (5957007154213560390) -->
+    <skip />
+    <!-- no translation found for bluetooth_searching_for_devices (9203739709307871727) -->
+    <skip />
     <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>
@@ -404,6 +418,10 @@
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"페어링 해제"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"연결끊기 및 페어링 끊기"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"옵션..."</string>
+    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"고급"</string>
+    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"고급 블루투스"</string>
+    <string name="bluetooth_advanced_settings_label" msgid="8659717781212434173">"고급 블루투스"</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="3631028334811113629">"블루투스를 사용 설정하여 사용 가능한 기기를 확인하세요."</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>
@@ -445,27 +463,31 @@
     <string name="nfc_toggle_error" msgid="2233172102497535522">"오류가 발생했습니다."</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Wi-Fi 켜기"</string>
-    <string name="wifi_settings" msgid="4746946030627213196">"Wi-Fi 설정"</string>
+    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="2810363951104753710">"Wi-Fi 설정"</string>
+    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"무선 액세스포인트(AP) 설정 및 관리"</string>
-    <string name="wifi_starting" msgid="6710266609710860129">"켜는 중..."</string>
-    <string name="wifi_stopping" msgid="5952909472548218348">"끄는 중..."</string>
+    <string name="wifi_starting" msgid="7732330327758522943">"Wi-Fi 사용 설정 중..."</string>
+    <string name="wifi_stopping" msgid="244864762599017659">"Wi-Fi 사용 중지 중..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"오류"</string>
     <string name="wifi_in_airplane_mode" msgid="7618393787965366655">"비행기 모드"</string>
     <string name="wifi_fail_to_scan" msgid="6194542252808587669">"네트워크를 검색할 수 없습니다."</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"네트워크 알림"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"개방형 네트워크를 사용할 수 있을 때 알림"</string>
+    <string name="wifi_enable_watchdog_service" msgid="4723544454066601706">"Wi-Fi 연결 확인"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="8687400936839455926">"잠재적인 네트워크 연결 문제를 탐색 및 관리"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Wi-Fi 연결 해제 정책"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Wi-Fi에서 모바일 데이터로 전환될 때 표시"</string>
     <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" msgid="6234851776910938957">"네트워크 추가"</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>
     <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_empty_list_wifi_off" msgid="3682507011071029311">"Wi-Fi를 사용 설정하여 사용 가능한 네트워크를 확인하세요."</string>
     <string name="wifi_network_setup" msgid="7974851890019344870">"네트워크 설정"</string>
     <string name="wifi_wps_pin" msgid="5471842298708321115">"액세스 포인트에서 PIN 입력"</string>
     <string name="wifi_wps_setup_title" msgid="150518971269252336">"WPS 설정"</string>
@@ -501,13 +523,13 @@
     <string name="wifi_save" msgid="3331121567988522826">"저장"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"취소"</string>
     <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"다른 WPS 세션이 발견되었습니다. 잠시 후 다시 시도해 주세요."</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"고급"</string>
+    <!-- outdated translation 5419052271935350999 -->     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"고급"</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>
-    <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"IP 설정"</string>
+    <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP 설정"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"저장"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"취소"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"올바른 IP 주소를 입력하세요."</string>
@@ -525,7 +547,7 @@
     <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">"AndroidHotspot"</string>
     <string name="sound_settings_title" msgid="8735891486683305886">"소리"</string>
-    <string name="display_settings_title" msgid="2378894265964357591">"화면"</string>
+    <string name="display_settings_title" msgid="1708697328627382561">"디스플레이"</string>
     <string name="sound_settings" msgid="5007659014828162881">"소리 설정"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"무음 모드"</string>
     <string name="silent_mode_summary" msgid="3309650676072917899">"미디어 &amp; 알람을 제외한 모든 소리를 무음 모드로 전환"</string>
@@ -598,7 +620,18 @@
     <string name="brightness_summary" msgid="838917350127550703">"화면 밝기 조정"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"시간제한"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> 후에 화면이 자동으로 꺼짐"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"배경화면"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android Dreams"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"화면 보호기 및 기타 유휴 상태 전환"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"선택한 드림"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"활성화 시기"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> 후 유휴 상태"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"사용 안함"</string>
+    <string name="dream_test" msgid="5968002644622194481">"직접 사용해 보세요!"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"자동 밝기"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"글꼴 크기"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"전체 글꼴 크기"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"글꼴 크기 선택"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM 카드 잠금 설정"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"SIM 카드 잠금 설정"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM 카드 잠금"</string>
@@ -643,8 +676,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>
@@ -696,6 +730,16 @@
     <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 storage_menu_usb (1580545228584324704) -->
+    <skip />
+    <!-- no translation found for storage_title_usb (5775322159427546546) -->
+    <skip />
+    <!-- no translation found for usb_label_mtp (4157227401755543412) -->
+    <skip />
+    <!-- no translation found for usb_label_ptp (7417254019489575819) -->
+    <skip />
+    <!-- no translation found for usb_label_installer_cd (7438467574756086977) -->
+    <skip />
     <string name="battery_status_title" msgid="9159414319574976203">"배터리 상태"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"배터리 수준"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -806,6 +850,8 @@
     <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>
+    <string name="wireless_category_general" msgid="2973810407987118067">"일반"</string>
+    <string name="wireless_category_mobile_networks" msgid="1254629216798424288">"모바일 네트워크"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"모바일 네트워크"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"로밍, 네트워크, APN에 대한 옵션 설정"</string>
     <string name="location_title" msgid="1029961368397484576">"사용자 위치"</string>
@@ -883,7 +929,7 @@
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"태블릿 보안 설정"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"휴대전화 보안 설정"</string>
     <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"나만의 화면 잠금해제 패턴을 만들어서 인증되지 않은 사람이 태블릿을 사용하지 못하게 할 수 있습니다. 다음 화면에서 원하는 순서로 점을 연결하세요. 최소한 4개의 점을 연결해야 합니다. "\n" "\n"시작할 준비가 되었으면 \'다음\'을 터치합니다."</string>
-    <string name="lock_intro_message" product="default" msgid="9100785646737118042"><font size="17">"나만의 화면 잠금해제 패턴을 만들어서 인증되지 않은 사람이 전화를 사용하지 못하게 하세요. "\n<font height="17">\n</font><b>"1"</b>"  다음 화면에서 패턴 예가 그려지는 것을 보세요. "\n<font height="17">\n</font><b>"2"</b>" 준비가 되었으면 나만의 잠금해제 패턴을 그리세요. 다른 패턴으로 실험해 볼 수 있으나 최소한 4개의 점을 연결해야 합니다. "\n<font height="17">\n</font><b>"3"</b>" 확인을 위해 패턴을 다시 그립니다. "\n<font height="17">\n</font><b>"시작할 준비가 되었으면 \'다음\'을 터치합니다"</b>". "\n<font height="3">\n</font>"인증되지 않은 사람도 전화를 사용할 수 있게 하려면 \'취소\'를 터치하세요."</font></string>
+    <!-- outdated translation 3692151094288835065 -->     <string name="lock_intro_message" product="default" msgid="5796785892741212873">"나만의 화면 잠금해제 패턴을 만들어서 인증되지 않은 사람이 태블릿을 사용하지 못하게 할 수 있습니다. 다음 화면에서 원하는 순서로 점을 연결하세요. 최소한 4개의 점을 연결해야 합니다. "\n" "\n"시작할 준비가 되었으면 \'다음\'을 터치합니다."</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"애플리케이션 관리"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"설치된 애플리케이션 관리 및 제거"</string>
     <string name="applications_settings" msgid="3736173521008476946">"애플리케이션"</string>
@@ -893,6 +939,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>
@@ -905,9 +953,10 @@
     <string name="force_stop" msgid="7435006169872876756">"강제 종료"</string>
     <string name="total_size_label" msgid="1048676419552557254">"전체"</string>
     <string name="application_size_label" msgid="5055196275624686382">"애플리케이션"</string>
+    <string name="external_code_size_label" msgid="3459343140355961335">"USB 저장소 애플리케이션"</string>
     <string name="data_size_label" msgid="8679376373625710107">"데이터"</string>
-    <string name="external_size_label" product="nosdcard" msgid="4465530017830945766">"USB 저장소"</string>
-    <string name="external_size_label" product="default" msgid="2107155737635944440">"SD 카드"</string>
+    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB 저장소 데이터"</string>
+    <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD 카드"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"제거"</string>
     <string name="disable_text" msgid="6544054052049395202">"사용 안함"</string>
     <string name="enable_text" msgid="9217362512327828987">"사용"</string>
@@ -1026,7 +1075,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 +1085,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>
@@ -1066,7 +1117,7 @@
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"화면 키보드 설정"</string>
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"물리적 키보드"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"물리적 키보드 설정"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"개발"</string>
+    <string name="development_settings_title" msgid="215179176067683667">"개발자 옵션"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"애플리케이션 개발 옵션 설정"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB 디버깅"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"USB가 연결된 경우 디버그 모드"</string>
@@ -1091,14 +1142,14 @@
     <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="toggle_large_text_title" msgid="42259643359869436">"큰 텍스트"</string>
     <string name="accessibility_services_category" msgid="8127851026323672607">"접근성 서비스"</string>
+    <string name="toggle_accessibility_title" msgid="7338739354952553958">"접근성 서비스 허용"</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 마켓에서 기기에 대한 스크린 리더를 다운로드할 수 있습니다."\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>
@@ -1106,10 +1157,11 @@
     <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>
-    <string name="power_usage_summary_title" msgid="5180282911164282324">"배터리 사용"</string>
+    <string name="power_usage_summary_title" msgid="7190304207330319919">"배터리"</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>
@@ -1218,6 +1270,8 @@
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> 설정"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> 사용"</string>
     <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> 사용 안함"</string>
+    <string name="tts_engine_settings_section" msgid="2346105138448751893">"엔진 설정"</string>
+    <string name="tts_engine_settings_title" msgid="3499112142425680334">"<xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>에 대한 설정"</string>
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"언어 및 음성"</string>
     <string name="pico_installed" msgid="2452546687858267414">"설치됨"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"설치되지 않음"</string>
@@ -1228,114 +1282,33 @@
     <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">"VPN 설정 및 관리"</string>
-    <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="trusted_credentials" msgid="4266945289534242402">"신뢰할 수 있는 자격증명"</string>
+    <string name="trusted_credentials_summary" msgid="6735221351155686632">"신뢰할 수 있는 CA 인증서 표시"</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>
-    <string name="privacy_settings_title" msgid="1987089301293213705">"개인정보 설정"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"백업 및 초기화"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"백업 및 초기화"</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>
@@ -1439,4 +1412,107 @@
     <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>
+    <!-- no translation found for debug_ui_category (9023948280291055349) -->
+    <skip />
+    <!-- no translation found for strict_mode (1938795874357830695) -->
+    <skip />
+    <!-- no translation found for strict_mode_summary (142834318897332338) -->
+    <skip />
+    <!-- no translation found for pointer_location (6084434787496938001) -->
+    <skip />
+    <!-- no translation found for pointer_location_summary (840819275172753713) -->
+    <skip />
+    <!-- no translation found for show_screen_updates (8282711794220426931) -->
+    <skip />
+    <!-- no translation found for show_screen_updates_summary (1716122382094924596) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage (2389212910758076024) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage_summary (2113341923988958266) -->
+    <skip />
+    <!-- no translation found for window_animation_scale_title (6162587588166114700) -->
+    <skip />
+    <!-- no translation found for transition_animation_scale_title (387527540523595875) -->
+    <skip />
+    <!-- no translation found for debug_applications_category (6221644998451283813) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities (3622005081180597749) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities_summary (3592221124808773368) -->
+    <skip />
+    <!-- no translation found for app_process_limit_title (4121324758038197598) -->
+    <skip />
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"데이터 사용량"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"데이터 사용 주기"</string>
+    <string name="data_usage_menu_split_4g" msgid="7417435609285381968">"4G 사용량 분할"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Wi-Fi 사용량 표시"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"주기 변경..."</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"데이터 사용 주기를 재설정할 날짜:"</string>
+    <string name="data_usage_disable_mobile_limit" msgid="289740911281022322">"한도에 도달하면 모바일 데이터 사용 안함"</string>
+    <string name="data_usage_disable_4g_limit" msgid="5808210773758699800">"한도에 도달하면 4G 데이터 사용 안함"</string>
+    <string name="data_usage_disable_3g_limit" msgid="3856971004328238231">"한도에 도달하면 2G-3G 데이터 사용 안함"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_mobile" msgid="454140350007299045">"모바일"</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">"모바일 데이터"</string>
+    <string name="data_usage_enable_3g" msgid="6304006671869578254">"2G-3G 데이터"</string>
+    <string name="data_usage_enable_4g" msgid="3635854097335036738">"4G 데이터"</string>
+    <string name="data_usage_app_settings" msgid="3727561362090820369">"애플리케이션 설정 보기"</string>
+    <string name="data_usage_app_restrict_background" msgid="8856643905291165256">"백그라운드 데이터 사용 제한"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="1503361245973512092">"무제한 네트워크를 사용하는 때에만 애플리케이션에 백그라운드 데이터 허용"</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="8110736468987743260">"백그라운드 데이터 제한"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="100001698378554777">"이 기능은 백그라운드 데이터 사용에 의존하는 애플리케이션에 좋지 않은 영향을 줄 수 있습니다."\n\n"이 애플리케이션의 설정에서 데이터 사용을 보다 적절하게 제어할 설정을 찾을 수 있습니다."</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"사용 주기 재설정 날짜"</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"매월 날짜:"</string>
+    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"설정"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"데이터 사용 제한 중"</string>
+    <string name="data_usage_limit_dialog_mobile" msgid="7931094451923591578">"지정된 한도에 도달하면 모바일 데이터 연결 사용이 중지됩니다."\n\n"기기 및 이동통신사의 요금 계산 방법이 다를 수 있으므로 추가 요금이 부과되지 않도록 하려면 한도를 줄여서 사용해 보세요."</string>
+    <string name="data_usage_limit_dialog_3g" msgid="5478553071420316963">"지정된 한도에 도달하면 2G-3G 데이터 연결 사용이 중지됩니다."\n\n"기기 및 이동통신사의 요금 계산 방법이 다를 수 있으므로 추가 요금이 부과되지 않도록 하려면 한도를 줄여서 사용해 보세요."</string>
+    <string name="data_usage_limit_dialog_4g" msgid="6134008906742403777">"지정된 한도에 도달하면 4G 데이터 연결 사용이 중지됩니다."\n\n"기기 및 이동통신사의 요금 계산 방법이 다를 수 있으므로 추가 요금이 부과되지 않도록 하려면 한도를 줄여서 사용해 보세요."</string>
+    <string name="data_usage_disabled_dialog_3g_title" msgid="4221584306492812040">"2G-3G 데이터 사용중지됨"</string>
+    <string name="data_usage_disabled_dialog_4g_title" msgid="715585612162185936">"4G 데이터 사용중지됨"</string>
+    <string name="data_usage_disabled_dialog_mobile_title" msgid="209516216265000221">"모바일 데이터 사용중지됨"</string>
+    <string name="data_usage_disabled_dialog" msgid="2874031671067845964">"지정된 데이터 사용 한도에 도달했습니다."\n\n"데이터를 추가로 사용하면 이동통신사에서 요금을 부과할 수 있습니다."</string>
+    <string name="data_usage_disabled_dialog_enable" msgid="2441219164620753329">"데이터 연결 다시 사용"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="32">"<xliff:g id="NUMBER">%1$s</xliff:g>"</font><font size="12">"<xliff:g id="UNIT">%2$s</xliff:g>"</font>\n<font size="12">"경고"</font></string>
+    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"긴급 전화"</string>
+    <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"통화로 돌아가기"</string>
+    <string name="vpn_name" msgid="4689699885361002297">"이름"</string>
+    <string name="vpn_type" msgid="5435733139514388070">"유형"</string>
+    <string name="vpn_server" msgid="2123096727287421913">"서버 주소"</string>
+    <string name="vpn_mppe" msgid="6639001940500288972">"PPP 암호화(MPPE)"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"L2TP 보안"</string>
+    <string name="vpn_ipsec_identifier" msgid="4098175859460006296">"IPSec 식별자"</string>
+    <string name="vpn_ipsec_secret" msgid="4526453255704888704">"IPSec 사전 공유 키"</string>
+    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"IPSec 사용자 인증서"</string>
+    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec CA 인증서"</string>
+    <!-- no translation found for vpn_search_domains (5391995501541199624) -->
+    <skip />
+    <!-- no translation found for vpn_routes (8556236801755260073) -->
+    <skip />
+    <string name="vpn_username" msgid="1863901629860867849">"사용자 이름"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"비밀번호"</string>
+    <!-- no translation found for vpn_save_login (6350322456427484881) -->
+    <skip />
+    <!-- no translation found for vpn_not_used (9094191054524660891) -->
+    <skip />
+    <string name="vpn_no_ca_cert" msgid="7820884983947090538">"(서버를 인증하지 않음)"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"취소"</string>
+    <string name="vpn_save" msgid="4233484051644764510">"저장"</string>
+    <string name="vpn_connect" msgid="8469608541746132301">"연결"</string>
+    <string name="vpn_edit" msgid="1111459297288136079">"VPN 네트워크 수정"</string>
+    <string name="vpn_connect_to" msgid="7328758950427515753">"<xliff:g id="NETWORK">%s</xliff:g>에 연결"</string>
+    <string name="vpn_title" msgid="7982620762043790565">"VPN 설정"</string>
+    <string name="vpn_create" msgid="8966010925994175306">"VPN 네트워크 추가"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"네트워크 수정"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"네트워크 삭제"</string>
+    <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"시스템"</string>
+    <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"사용자"</string>
+    <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"사용 중지"</string>
+    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"사용"</string>
+    <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"삭제"</string>
+    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"시스템 CA 인증서를 사용하시겠습니까?"</string>
+    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"시스템 CA 인증서를 사용 중지하시겠습니까?"</string>
+    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"사용자 CA 인증서를 영구 삭제하시겠습니까?"</string>
 </resources>
diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml
index 88eedf3..39df976 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>
@@ -214,4 +240,36 @@
     <item msgid="3878793616631049349">"Taikyti HDCP tikrinimą tik DRM turiniui"</item>
     <item msgid="45075631231212732">"Visada naudoti HDCP tikrinimą"</item>
   </string-array>
+    <!-- no translation found for window_animation_scale_entries:0 (8134156599370824081) -->
+    <!-- no translation found for window_animation_scale_entries:1 (6624864048416710414) -->
+    <!-- no translation found for window_animation_scale_entries:2 (2219332261255416635) -->
+    <!-- no translation found for window_animation_scale_entries:3 (3544428804137048509) -->
+    <!-- no translation found for window_animation_scale_entries:4 (3110710404225974514) -->
+    <!-- no translation found for window_animation_scale_entries:5 (4402738611528318731) -->
+    <!-- no translation found for window_animation_scale_entries:6 (6189539267968330656) -->
+    <!-- no translation found for transition_animation_scale_entries:0 (8464255836173039442) -->
+    <!-- no translation found for transition_animation_scale_entries:1 (3375781541913316411) -->
+    <!-- no translation found for transition_animation_scale_entries:2 (1991041427801869945) -->
+    <!-- no translation found for transition_animation_scale_entries:3 (4012689927622382874) -->
+    <!-- no translation found for transition_animation_scale_entries:4 (3289156759925947169) -->
+    <!-- no translation found for transition_animation_scale_entries:5 (7705857441213621835) -->
+    <!-- no translation found for transition_animation_scale_entries:6 (6660750935954853365) -->
+    <!-- no translation found for app_process_limit_entries:0 (6799596560242275471) -->
+    <!-- no translation found for app_process_limit_entries:1 (2412794376818632575) -->
+    <!-- no translation found for app_process_limit_entries:2 (1578904888612645001) -->
+    <!-- no translation found for app_process_limit_entries:3 (8819235336299873577) -->
+  <string-array name="vpn_types_long">
+    <item msgid="2732002039459078847">"PPTP VPN"</item>
+    <item msgid="3799752201662127867">"L2TP / „IPSec“ VPN su iš anksto bendrinamais raktais"</item>
+    <item msgid="4725504331295252103">"L2TP / „IPSec“ VPN su sertifikatais"</item>
+    <item msgid="7526551163264034377">"„IPSec“ VPN su iš anksto bendrinamais raktais ir „Xauth“ autentifikavimu"</item>
+    <item msgid="8064740940687465039">"„IPSec“ VPN su sertifikatais ir „Xauth“ autentifikavimu"</item>
+    <item msgid="4946199982372391490">"„IPSec“ VPN su sertifikatu ir hibridiniu autentifikavimu"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:0 (8621078286418985762) -->
+    <!-- no translation found for vpn_states:1 (6692305604213080515) -->
+    <!-- no translation found for vpn_states:2 (8001704909356800092) -->
+    <!-- no translation found for vpn_states:3 (4039737283841672166) -->
+    <!-- no translation found for vpn_states:4 (4042143101664725090) -->
+    <!-- no translation found for vpn_states:5 (2690164254699635531) -->
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index d4eedcb..7dcf389 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -19,6 +19,10 @@
     <string name="yes" msgid="4676390750360727396">"Taip"</string>
     <string name="no" msgid="6731231425810196216">"Ne"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Nežinomas"</string>
+    <string name="header_category_wireless_networks" msgid="4944823405420438623">"BEVIELIS RYŠYS IR TINKLAI"</string>
+    <string name="header_category_device" msgid="5781174212691167553">"ĮRENGINYS"</string>
+    <string name="header_category_personal" msgid="6225932173498802187">"ASMENIŠKA"</string>
+    <string name="header_category_system" msgid="2073558547468647128">"SISTEMA"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Įjungti radiją"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Išjungti radiją"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Žiūrėti SIM kortelės adresų knygą"</string>
@@ -111,7 +115,11 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Susiejama..."</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"Susieta, bet nesujungta"</string>
     <string name="bluetooth_device" msgid="6873461446424952003">"laisvų rankų / ausinės"</string>
-    <string name="progress_scanning" msgid="3760897655335759141">"Nuskaitoma"</string>
+    <!-- outdated translation 3760897655335759141 -->     <string name="progress_scanning" msgid="192587958424295789">"Nuskaitoma"</string>
+    <!-- no translation found for progress_tap_to_pair (4192342336107106334) -->
+    <skip />
+    <!-- no translation found for bluetooth_no_devices_found (2412462335116297668) -->
+    <skip />
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"„Bluetooth“ susiejimo užklausa"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Susiejimo užklausa"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Pasirinkti susieti su „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“"</string>
@@ -130,6 +138,9 @@
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Telefone esanti programa prašo leidimo įjungti „Bluetooth“ ir padaryti telefoną aptinkamą kitų įrenginių. Ar norite tai atlikti?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Įjungiamas „Bluetooth“..."</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Automatinis prijungimas"</string>
+    <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"„Bluetooth“ ryšio užklausa"</string>
+    <string name="bluetooth_connection_notif_message" msgid="1833221950512058309">"Palieskite, kad prisijungtumėte prie „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“"</string>
+    <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Ar norite prisijungti prie „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Datos ir laiko nustatymai"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"13:00"</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
@@ -235,7 +246,7 @@
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Išjungti visus bevielius ryšius"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"Išjungiami bevieliai ryšiai..."</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"Įgalinami bevieliai ryšiai..."</string>
-    <string name="radio_controls_title" msgid="5868688473587168882">"Bevielis ryšys ir tinklai"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Daugiau…"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Bevielis ryšys ir tinklai"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"Valdyti „Wi-Fi“, „Bluetooth“, lėktuvo režimą, mobilius tinklus, ir VPT"</string>
     <string name="roaming" msgid="3596055926335478572">"Tarptinklinis duomenų ryšys"</string>
@@ -271,8 +282,8 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Savininko informac."</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="2382525043173672857">"Įveskite tekstą, kuris bus rodomas užrakinimo ekrane"</string>
-    <string name="security_settings_title" msgid="5168491784222013179">"Vieta ir sauga"</string>
-    <string name="location_security_settings_title" msgid="4624434296446625554">"Vietos ir saugos nustatymai"</string>
+    <string name="location_settings_title" msgid="8935806698251432196">"Vietos paslaugos"</string>
+    <string name="security_settings_title" msgid="7945465324818485460">"Sauga"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Nustatyti mano vietą, ekrano atrakinimą, SIM kortelės užraktą, įgaliojimų saugyklos užraktą"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Nustatyti mano vietą, ekrano atrakinimą, įgaliojimų saugyklos užraktą"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Slaptažodžiai"</string>
@@ -316,7 +327,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>
@@ -375,8 +386,8 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Žiūrėti arba išaktyvinti įrenginio administratorius"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Įjungti „Bluetooth“"</string>
-    <string name="bluetooth_settings" msgid="2725796451253089609">"„Bluetooth“ nustatymai"</string>
-    <string name="bluetooth_settings_title" msgid="2824020086246268296">"„Bluetooth“ nustatymai"</string>
+    <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
+    <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Valdyti ryšius, nustatyti įrenginio pavadinimą ir atrandamumą"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"„Bluetooth“ susiejimo užklausa"</string>
     <string name="bluetooth_enter_pin_msg" msgid="1499285355129256289">\n"Įveskite PIN kodą, kad susietumėte su „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“. (Pabandykite įvesti 0000 arba 1234.) Tą patį PIN kodą gali reikėti įvesti „Bluetooth“ įrenginyje."</string>
@@ -394,7 +405,10 @@
     <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Susiejimą atmetė <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"Prisijungiant prie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> iškilo problema."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Nuskaityti ieškant įrenginių"</string>
-    <string name="bluetooth_preference_find_nearby_title" msgid="5087410003465463318">"Rasti netoliese esanč. įreng."</string>
+    <!-- no translation found for bluetooth_search_for_devices (5957007154213560390) -->
+    <skip />
+    <!-- no translation found for bluetooth_searching_for_devices (9203739709307871727) -->
+    <skip />
     <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"Įrenginių nustatymai"</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Susieti įrenginiai"</string>
     <string name="bluetooth_preference_found_devices" msgid="3133019331974936204">"Rasti įrenginiai"</string>
@@ -404,6 +418,10 @@
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Panaikinti susiejimą"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Atjungti ir atsieti"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Parinktys…"</string>
+    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Išplėst. nust."</string>
+    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Išplėst. „Bluetooth“ nust."</string>
+    <string name="bluetooth_advanced_settings_label" msgid="8659717781212434173">"Išpl. „Bluetooth“ n."</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="3631028334811113629">"Įj. „Bluetooth“, kad matytumėte galimus įreng."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Prijungti prie..."</string>
     <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"Medija"</string>
     <string name="bluetooth_profile_headset" msgid="81844079120986198">"Laisvų rankų įranga"</string>
@@ -445,27 +463,31 @@
     <string name="nfc_toggle_error" msgid="2233172102497535522">"Įvyko klaida."</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Įjungti „Wi-Fi“"</string>
-    <string name="wifi_settings" msgid="4746946030627213196">"„Wi-Fi“ nustatymai"</string>
+    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="2810363951104753710">"„Wi-Fi“ nustatymai"</string>
+    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Nustatyti ir valdyti bevielius prieigos taškus"</string>
-    <string name="wifi_starting" msgid="6710266609710860129">"Įjungiama..."</string>
-    <string name="wifi_stopping" msgid="5952909472548218348">"Išjungiama..."</string>
+    <string name="wifi_starting" msgid="7732330327758522943">"Įjungiamas „Wi-Fi“..."</string>
+    <string name="wifi_stopping" msgid="244864762599017659">"Išjungiamas „Wi-Fi“..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"Klaida"</string>
     <string name="wifi_in_airplane_mode" msgid="7618393787965366655">"Veikia lėktuvo režimu"</string>
     <string name="wifi_fail_to_scan" msgid="6194542252808587669">"Neįmanoma nuskaityti tinklų"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Tinklo įspėjimas"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Pranešti, kai bus galimas atviras tinklas"</string>
+    <string name="wifi_enable_watchdog_service" msgid="4723544454066601706">"„Wi-Fi“ ryšio tikrinimai"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="8687400936839455926">"Aptikti ir valdyti galimas tinklo ryšio problemas"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"„Wi-Fi“ atjungimo politika"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Nurodyti, kada perjungti iš „Wi-Fi“ į mobilius duomenis"</string>
     <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" msgid="6234851776910938957">"Pridėti 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>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Prijungti prie tinklo"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Pamiršti tinklą"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Keisti tinklą"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="3682507011071029311">"Įjunkite „Wi-Fi“, kad matytumėte galimus tinklus"</string>
     <string name="wifi_network_setup" msgid="7974851890019344870">"Tinklo sąranka"</string>
     <string name="wifi_wps_pin" msgid="5471842298708321115">"Įvesti PIN kodą iš prieigos taško"</string>
     <string name="wifi_wps_setup_title" msgid="150518971269252336">"WPS sąranka"</string>
@@ -501,13 +523,13 @@
     <string name="wifi_save" msgid="3331121567988522826">"Išsaugoti"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Atšaukti"</string>
     <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"Aptikta kita WPS sesija; po kelių minučių bandykite iš naujo"</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Išplėstinis"</string>
+    <!-- outdated translation 5419052271935350999 -->     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Išplėstinis"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"„Wi-Fi“ dažnių juosta"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Nurodyti veikimo dažnumą"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Nustatant dažnių juostą iškilo problema."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC adresas"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP adresas"</string>
-    <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"IP nustatymai"</string>
+    <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP nustatymai"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Išsaugoti"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Atšaukti"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Įveskite galiojantį IP adresą."</string>
@@ -525,7 +547,7 @@
     <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> perkeliama „Wi-Fi“ aktyvioji sritis"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"„AndroidHotspot“"</string>
     <string name="sound_settings_title" msgid="8735891486683305886">"Garsas"</string>
-    <string name="display_settings_title" msgid="2378894265964357591">"Ekranas"</string>
+    <string name="display_settings_title" msgid="1708697328627382561">"Pateiktis"</string>
     <string name="sound_settings" msgid="5007659014828162881">"Garso nustatymai"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Tylus režimas"</string>
     <string name="silent_mode_summary" msgid="3309650676072917899">"Nutildyti visus garsus, išskyrus mediją ir signalus"</string>
@@ -598,7 +620,18 @@
     <string name="brightness_summary" msgid="838917350127550703">"Reguliuoti ekrano ryškumą"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Baigėsi laikas"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Ekranas automatiškai išsijungia po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Darbalaukio fonas"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"„Android“ sapnai"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Ekrano užsklandos ir kitos neveikos diversijos"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Pasirinktas sapnas"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Kada aktyvinti"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"Kai <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neatliekama jokių veiksmų"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Niekada"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Išbandykite!"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatinis ryškumas"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Šrifto dydis"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Visas šriftų dydis"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Pasirinkite šrifto dydį"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM kortelės užrakto nustatymai"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Nustatyti SIM kortelės užraktą"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM kortelės užraktas"</string>
@@ -643,8 +676,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>
@@ -696,6 +730,16 @@
     <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"SD kortelė bus atjungta."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Išėmimas"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Vykdomas išėmimas"</string>
+    <!-- no translation found for storage_menu_usb (1580545228584324704) -->
+    <skip />
+    <!-- no translation found for storage_title_usb (5775322159427546546) -->
+    <skip />
+    <!-- no translation found for usb_label_mtp (4157227401755543412) -->
+    <skip />
+    <!-- no translation found for usb_label_ptp (7417254019489575819) -->
+    <skip />
+    <!-- no translation found for usb_label_installer_cd (7438467574756086977) -->
+    <skip />
     <string name="battery_status_title" msgid="9159414319574976203">"Akumuliatoriaus būsena"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Akumuliatoriaus lygis"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -806,6 +850,8 @@
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"Negalima susieti su daugiau nei <xliff:g id="MAXCONNECTION">%1$d</xliff:g> įreng."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"„<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“ bus atsietas."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Pagalba"</string>
+    <string name="wireless_category_general" msgid="2973810407987118067">"Bendra"</string>
+    <string name="wireless_category_mobile_networks" msgid="1254629216798424288">"Mobiliojo ryšio tinklai"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobilūs tinklai"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Nustatyti tarptinklinio ryšio, tinklų, APN parinktis"</string>
     <string name="location_title" msgid="1029961368397484576">"Mano vieta"</string>
@@ -883,7 +929,7 @@
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Planšetinio kompiuterio saugumo užtikrinimas"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Telefono apsaugojimas"</string>
     <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"Apsaugokite planšetinį kompiuterį nuo neteisėto naudojimo sukurdami asmeninį ekrano atrakinimo modelį. Pirštu bet kokia tvarka sujunkite taškus kitame ekrane. Reikia sujungti bent keturis taškus. "\n\n"Pasiruošę pradėti? Palieskite „Kitas“."</string>
-    <string name="lock_intro_message" product="default" msgid="9100785646737118042"><font size="17">"Apsaugokite savo telefoną nuo neteisėto naudojimo sukurdami asmeninį ekrano atrakinimo modelį. "\n<font height="17">\n</font><b>"1"</b>"  Kitame ekrane žiūrėkite, kaip nustatomas pavyzdinis modelis. "\n<font height="17">\n</font><b>"2"</b>"  Kai būsite pasiruošę, nustatykite savo asmeninį atrakinimo modelį. Eksperimentuokite su skirtingais modeliais, bet sujunkite bent keturis taškus. "\n<font height="17">\n</font><b>"3"</b>"  Iš naujo nustatykite modelį, kad patvirtintumėte. "\n<font height="17">\n</font><b>"Esate pasirengę pradėti? Palieskite „Kitas“"</b>". "\n<font height="3">\n</font>"Jei norite palikti telefoną neapsaugotą, palieskite „Atšaukti“."</font></string>
+    <!-- outdated translation 3692151094288835065 -->     <string name="lock_intro_message" product="default" msgid="5796785892741212873">"Apsaugokite planšetinį kompiuterį nuo neteisėto naudojimo sukurdami asmeninį ekrano atrakinimo modelį. Pirštu bet kokia tvarka sujunkite taškus kitame ekrane. Reikia sujungti bent keturis taškus. "\n\n"Pasiruošę pradėti? Palieskite „Kitas“."</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Valdyti programas"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Valdyti ir pašalinti įdiegtas programas"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Programos"</string>
@@ -893,6 +939,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>
@@ -905,9 +953,10 @@
     <string name="force_stop" msgid="7435006169872876756">"Sustabdyti"</string>
     <string name="total_size_label" msgid="1048676419552557254">"Iš viso"</string>
     <string name="application_size_label" msgid="5055196275624686382">"Programa"</string>
+    <string name="external_code_size_label" msgid="3459343140355961335">"USB atminties programa"</string>
     <string name="data_size_label" msgid="8679376373625710107">"Duomenys"</string>
-    <string name="external_size_label" product="nosdcard" msgid="4465530017830945766">"USB atmintinė"</string>
-    <string name="external_size_label" product="default" msgid="2107155737635944440">"SD kortelė"</string>
+    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB atminties duomenys"</string>
+    <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD kortelė"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Pašalinti"</string>
     <string name="disable_text" msgid="6544054052049395202">"Neleisti"</string>
     <string name="enable_text" msgid="9217362512327828987">"Įgalinti"</string>
@@ -1026,7 +1075,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 +1085,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>
@@ -1066,7 +1117,7 @@
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Ekraninės klaviatūros nustatymai"</string>
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Fizinė klaviatūra"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Fizinės klaviatūros nustatymai"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Kūrimas"</string>
+    <string name="development_settings_title" msgid="215179176067683667">"Kūrėjo parinktis"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"Nustatyti programos kūrimo parinktis"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB perkrova"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Derinimo režimas, kai prijungtas USB"</string>
@@ -1091,14 +1142,14 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Pasiekiamumas"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Pasiekiamumo nustatymai"</string>
     <string name="accessibility_settings_summary" msgid="8185181964847149507">"Valdyti pasiekiamumo parinktis"</string>
-    <string name="toggle_accessibility_title" msgid="650839277066574497">"Pasiekiamumas"</string>
+    <string name="toggle_large_text_title" msgid="42259643359869436">"Didelis tekstas"</string>
     <string name="accessibility_services_category" msgid="8127851026323672607">"Pasiekiamumo paslaugos"</string>
+    <string name="toggle_accessibility_title" msgid="7338739354952553958">"Leisti prieigos paslaugas"</string>
     <string name="no_accessibility_services_summary" msgid="694578333333808159">"Nėra įdiegtų pasiekiamumo paslaugų."</string>
     <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Ši pasiekiamumo paslauga gali rinkti visą įvedamą tekstą, įskaitant asmeninius duomenis, pvz., kredito kortelės numerius, išskyrus slaptažodžius. Tai vyksta dėl programos <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Naudoti šią pasiekiamumo paslaugą?"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Išjungti pasiekiamumą?"</string>
     <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"Nerasta su pasiekiamumu susijusių programų"</string>
     <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"Neturite įdiegtų su pasiekiamumu susijusių programų."\n\n"Galite į įrenginį atsisiųsti ekrano skaitytuvą iš „Android“ prekyvietės."\n\n"Jei norite įdiegti ekrano skaitytuvą, spustelėkite „Gerai“."</string>
-    <string name="accessibility_script_injection_category" msgid="8649951751131431904">"Pasiekiamumo scenarijai"</string>
     <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"Atsisiųsti pasiekiamumo scenarijus"</string>
     <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"Leisti programoms atsisiųsti pasiekiamumo scenarijus iš „Google“"</string>
     <string name="accessibility_script_injection_security_warning" product="tablet" msgid="1113600871264359828">"Naudojant kai kurias programas gali būti prašoma „Google“ atsisiųsti scenarijus į planšetinį kompiuterį, kad būtų galima lengviau pasiekti jų turinį. Ar tikrai norite leisti „Google“ įdiegti pasiekiamumo scenarijus planšetiniame kompiuteryje?"</string>
@@ -1106,10 +1157,11 @@
     <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>
-    <string name="power_usage_summary_title" msgid="5180282911164282324">"Akumuliatoriaus naudojimas"</string>
+    <string name="power_usage_summary_title" msgid="7190304207330319919">"Baterija"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Kas naudojo akumuliatorių"</string>
     <string name="power_usage_not_available" msgid="3583407442633768046">"Akum. naudojimo duom. nepas."</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Akumuliatoriaus naudojimas po to, kai buvo ištrauktas iš lizdo"</string>
@@ -1218,6 +1270,8 @@
     <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>
+    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Variklio nustatymai"</string>
+    <string name="tts_engine_settings_title" msgid="3499112142425680334">"„<xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>“ nustatymai"</string>
     <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>
@@ -1228,114 +1282,33 @@
     <string name="gadget_title" msgid="7455548605888590466">"Maitinimo valdymas"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Atnaujinamas „Wi-Fi“ nustatymas"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Atnaujinamas „Bluetooth“ nustatymas"</string>
-    <string name="vpn_settings_activity_title" msgid="7276864950701612579">"VPT nustatymai"</string>
-    <string name="vpn_connect_to" msgid="2541409082892684362">"Prijungti prie <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpn_username_colon" msgid="7854930370861306247">"Naudotojo vardas:"</string>
-    <string name="vpn_password_colon" msgid="5716278710848606626">"Slaptažodis:"</string>
-    <string name="vpn_a_username" msgid="6664733641993968692">"naudotojo vardas"</string>
-    <string name="vpn_a_password" msgid="1537213632501483753">"slaptažodis"</string>
-    <string name="vpn_save_username" msgid="1408415289165970790">"Atsiminti naudotojo vardą"</string>
-    <string name="vpn_connect_button" msgid="1699007212602470655">"Prijungti"</string>
-    <string name="vpn_yes_button" msgid="8034531001149843119">"Taip"</string>
-    <string name="vpn_no_button" msgid="7620339571187119107">"Ne"</string>
-    <string name="vpn_back_button" msgid="192036339792734970">"Atgal"</string>
-    <string name="vpn_mistake_button" msgid="1683383660912491270">"Ne"</string>
-    <string name="vpn_menu_done" msgid="93528279226907926">"Išsaugoti"</string>
-    <string name="vpn_menu_cancel" msgid="7234451214611202868">"Atšaukti"</string>
-    <string name="vpn_menu_revert" msgid="4407762442281467659">"Grąžinti"</string>
-    <string name="vpn_menu_connect" msgid="1089399414463784218">"Prijungti prie tinklo"</string>
-    <string name="vpn_menu_disconnect" msgid="8254492450022562235">"Atjungti nuo tinklo"</string>
-    <string name="vpn_menu_edit" msgid="4526245173583195618">"Redaguoti tinklą"</string>
-    <string name="vpn_menu_delete" msgid="3326527392609513129">"Ištrinti tinklą"</string>
-    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"Turite įvesti <xliff:g id="CODE">%s</xliff:g>."</string>
-    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"Turite pasirinkti <xliff:g id="OPTION">%s</xliff:g>."</string>
-    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"VPT pavadinimas „<xliff:g id="NAME">%s</xliff:g>“ jau yra. Raskite kitą pavadinimą."</string>
-    <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"Ar tikrai norite ištrinti šį VPT?"</string>
-    <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"Ar tikrai nenorite kurti šio profilio?"</string>
-    <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"Ar tikrai norite atmesti šiame profilyje atliktus pakeitimus?"</string>
-    <string name="vpn_confirm_reconnect" msgid="5748535476278674296">"Neįmanoma prijungti prie tinklo. Ar norite bandyti dar kartą?"</string>
-    <string name="vpn_reconnect_from_lost" msgid="2442844155623372118">"Ryšys nutrūko. Ar norite prisijungti iš naujo?"</string>
-    <string name="vpn_unknown_server_dialog_msg" msgid="3080742299823671319">"Neįmanoma nustatyti serverio pavadinimo. Ar norite patikrinti serverio pavadinimo nustatymą?"</string>
-    <string name="vpn_challenge_error_dialog_msg" msgid="6174901754230038601">"Iššūkio klaida. Ar norite patikrinti slaptą nustatymą?"</string>
-    <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"Šioje VPT konfigūracijoje trūksta vienos ar daugiau paslapčių. Ar norite patikrinti slaptą nustatymą?"</string>
-    <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"Įvesti naudotojo vardas ir slaptažodis neteisingi. Ar norite bandyti dar kartą?"</string>
-    <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"Serveris pakibo. Įvestas naudotojo vardas ar slaptažodis gali būti neteisingas. Ar norite bandyti dar kartą?"</string>
-    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"Serverio strigtis. Gali būti, kad esate už užkardos, kuri neleidžia prisijungti prie serverio. Ar norite bandyti dar kartą?"</string>
-    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"Nepavyko serverio derybos. Serveris gali nesutikti su jūsų šifravimo parinktimi. Ar norite patikrinti savo šifravimo nustatymą?"</string>
-    <string name="vpn_type_title" msgid="6392933604218676224">"Pridėti VPT"</string>
-    <string name="vpn_add_new_vpn" msgid="5438260689052714550">"Pridėti VPT"</string>
-    <string name="vpn_details_title" msgid="418806440938510331">"Išsami VPT informacija"</string>
-    <string name="vpn_edit_title_add" msgid="2121313217989682890">"Pridėti <xliff:g id="NAME">%s</xliff:g> VPT"</string>
-    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"<xliff:g id="NAME">%s</xliff:g> išsami informacija"</string>
-    <string name="vpns" msgid="3148141862835492816">"VPT"</string>
-    <string name="vpn_connecting" msgid="8039521381692090116">"Jungiama..."</string>
-    <string name="vpn_disconnecting" msgid="7748050200708257066">"Atjungiama..."</string>
-    <string name="vpn_connected" msgid="7641723116362845781">"Prisijungta"</string>
-    <string name="vpn_connect_hint" msgid="7442898962925875181">"Prijungti prie tinklo"</string>
-    <string name="vpn_name" msgid="1550918148476193076">"VPT pavadinimas"</string>
-    <string name="vpn_a_name" msgid="8445736942405283509">"VPT pavadinimas"</string>
-    <string name="vpn_profile_added" msgid="9061017910337129840">"„<xliff:g id="NAME">%s</xliff:g>“ pridėta"</string>
-    <string name="vpn_profile_replaced" msgid="587435576816273815">"Pakeitimai atlikti „<xliff:g id="NAME">%s</xliff:g>“"</string>
-    <string name="vpn_user_certificate_title" msgid="6812545893924071742">"Nustatyti naudotojo sertifikatą"</string>
-    <string name="vpn_user_certificate" msgid="949322691686938888">"Naudotojo sertifikatas"</string>
-    <string name="vpn_a_user_certificate" msgid="8943983437956898649">"naudotojo sertifikatas"</string>
-    <string name="vpn_ca_certificate_title" msgid="7846466160795589985">"Nustatyti CA sertifikatą"</string>
-    <string name="vpn_ca_certificate" msgid="465085144064264742">"Sertifikavimo tarnybos (CA) sertifikatas"</string>
-    <string name="vpn_a_ca_certificate" msgid="3374242520974884295">"CA sertifikatas"</string>
-    <string name="vpn_l2tp_secret_string_title" msgid="5039677186748940987">"Nustatyti L2TP paslaptį"</string>
-    <string name="vpn_l2tp_secret" msgid="529359749677142076">"L2TP paslaptis"</string>
-    <string name="vpn_a_l2tp_secret" msgid="6612042930810981845">"L2TP paslaptis"</string>
-    <string name="vpn_pptp_encryption_title" msgid="2236795167467896499">"šifruotė"</string>
-    <string name="vpn_pptp_encryption" msgid="2602329949737259686">"PPTP šifravimas"</string>
-    <string name="vpn_ipsec_presharedkey_title" msgid="2184060087690539175">"Nustatyti IPSec iš anksto bendrinamą raktą"</string>
-    <string name="vpn_ipsec_presharedkey" msgid="5434316521616673741">"IPSec iš anksto bendrinamas raktas"</string>
-    <string name="vpn_a_ipsec_presharedkey" msgid="1255301923217898418">"„IPSec“ iš anksto bendrinamas raktas"</string>
-    <string name="vpn_vpn_server_title" msgid="8897005887420358913">"Nustatyti VPT serverį"</string>
-    <string name="vpn_vpn_server" msgid="1141754908824209260">"VPT serveris"</string>
-    <string name="vpn_a_vpn_server" msgid="5960906152125045853">"VPT serveris"</string>
-    <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"VPT serverio pavadinimas"</string>
-    <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"DNS paieškos domenai"</string>
-    <string name="vpn_dns_search_list" msgid="4230034234026605360">"DNS paieškos domenai"</string>
-    <string name="vpn_field_is_set" msgid="7137320847812992243">"<xliff:g id="VALUE">%s</xliff:g> nustatyta"</string>
-    <string name="vpn_field_not_set" msgid="2972519243515893804">"<xliff:g id="VALUE">%s</xliff:g> nenustatyta"</string>
-    <string name="vpn_field_not_set_optional" msgid="8840557698252556791">"<xliff:g id="VALUE">%s</xliff:g> nenustatyta (pasirenkama)"</string>
-    <string name="vpn_enable_field" msgid="3700967675854517191">"Įjungti <xliff:g id="OPTION">%s</xliff:g>"</string>
-    <string name="vpn_disable_field" msgid="6905658811179634005">"Išjungti <xliff:g id="OPTION">%s</xliff:g>"</string>
-    <string name="vpn_is_enabled" msgid="1266304230417098877">"<xliff:g id="OPTION">%s</xliff:g> įgalinta"</string>
-    <string name="vpn_is_disabled" msgid="2013622485867806167">"<xliff:g id="OPTION">%s</xliff:g> išjungta"</string>
     <string name="vpn_settings_title" msgid="7327468307909556719">"VPT nustatymai"</string>
     <string name="vpn_settings_summary" msgid="8849924181594963972">"Nustatyti ir valdyti virtualius privačius tinklus (VPT)"</string>
-    <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="trusted_credentials" msgid="4266945289534242402">"Patikimi įgaliojimai"</string>
+    <string name="trusted_credentials_summary" msgid="6735221351155686632">"Rodyti patikimus CA 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>
-    <string name="privacy_settings_title" msgid="1987089301293213705">"Privatumo nustatymai"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"Kurti atsarginę kopiją ir nustatyti iš naujo"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"Kurti atsarginę kopiją ir nustatyti iš naujo"</string>
     <string name="backup_section_title" msgid="8856083167469467588">"Atsarginė kopija ir atkūrimas"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Asmeniniai duomenys"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Kurti atsarginę duomenų kopiją"</string>
@@ -1440,4 +1413,107 @@
     <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>
+    <!-- no translation found for debug_ui_category (9023948280291055349) -->
+    <skip />
+    <!-- no translation found for strict_mode (1938795874357830695) -->
+    <skip />
+    <!-- no translation found for strict_mode_summary (142834318897332338) -->
+    <skip />
+    <!-- no translation found for pointer_location (6084434787496938001) -->
+    <skip />
+    <!-- no translation found for pointer_location_summary (840819275172753713) -->
+    <skip />
+    <!-- no translation found for show_screen_updates (8282711794220426931) -->
+    <skip />
+    <!-- no translation found for show_screen_updates_summary (1716122382094924596) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage (2389212910758076024) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage_summary (2113341923988958266) -->
+    <skip />
+    <!-- no translation found for window_animation_scale_title (6162587588166114700) -->
+    <skip />
+    <!-- no translation found for transition_animation_scale_title (387527540523595875) -->
+    <skip />
+    <!-- no translation found for debug_applications_category (6221644998451283813) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities (3622005081180597749) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities_summary (3592221124808773368) -->
+    <skip />
+    <!-- no translation found for app_process_limit_title (4121324758038197598) -->
+    <skip />
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Duomenų naudojimas"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"Duomenų naudojimo ciklas"</string>
+    <string name="data_usage_menu_split_4g" msgid="7417435609285381968">"Išskaidyti 4G naudojimą"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Rodyti „Wi-Fi“ naudojimą"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"Keisti ciklą…"</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Mėnesio diena, kai iš naujo nustatomas naudojimo ciklas:"</string>
+    <string name="data_usage_disable_mobile_limit" msgid="289740911281022322">"Neleis. mob. duom. pasiek. apr."</string>
+    <string name="data_usage_disable_4g_limit" msgid="5808210773758699800">"Neleis. 4G duom. pasiek. apr."</string>
+    <string name="data_usage_disable_3g_limit" msgid="3856971004328238231">"Neleis. 2G–3G duom. pasiek. apr."</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_mobile" msgid="454140350007299045">"Mobilieji"</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">"Mobilieji duomenys"</string>
+    <string name="data_usage_enable_3g" msgid="6304006671869578254">"2G–3G duomenys"</string>
+    <string name="data_usage_enable_4g" msgid="3635854097335036738">"4G duomenys"</string>
+    <string name="data_usage_app_settings" msgid="3727561362090820369">"Žiūrėti programos nustatymus"</string>
+    <string name="data_usage_app_restrict_background" msgid="8856643905291165256">"Apriboti fono duomenų naudojimą"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="1503361245973512092">"Programos fono duomenis leisti tik naudojant neribotą tinklą"</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="8110736468987743260">"Fono duomenų ribojimas"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="100001698378554777">"Ši funkcija gali turėti neigiamos įtakos programoms, kurių veikimas priklauso nuo fono duomenų naudojimo."\n\n"Tinkamesnių duomenų naudojimo valdiklių galima rasti šios programos nustatymuose."</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Naudojimo ciklo nustatymo iš naujo data"</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Kiekvieno mėnesio diena:"</string>
+    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Nustatyti"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Duomenų naudojimo ribojimas"</string>
+    <string name="data_usage_limit_dialog_mobile" msgid="7931094451923591578">"Mobiliųjų duomenų ryšys bus neleidžiamas pasiekus nurodytą apribojimą."\n\n"Kad išvengtumėte didesnių mokesčių, apsvarstykite galimybę naudoti sumažintą apribojimą, nes įrenginio ir operatoriaus apskaitos metodai gali skirtis."</string>
+    <string name="data_usage_limit_dialog_3g" msgid="5478553071420316963">"2G–3G duomenų ryšys bus neleidžiamas pasiekus nurodytą apribojimą."\n\n"Kad išvengtumėte didesnių mokesčių, apsvarstykite galimybę naudoti sumažintą apribojimą, nes įrenginio ir operatoriaus apskaitos metodai gali skirtis."</string>
+    <string name="data_usage_limit_dialog_4g" msgid="6134008906742403777">"4G duomenų ryšys bus neleidžiamas pasiekus nurodytą apribojimą."\n\n"Kad išvengtumėte didesnių mokesčių, apsvarstykite galimybę naudoti sumažintą apribojimą, nes įrenginio ir operatoriaus apskaitos metodai gali skirtis."</string>
+    <string name="data_usage_disabled_dialog_3g_title" msgid="4221584306492812040">"2G–3G duomenys neleidžiami"</string>
+    <string name="data_usage_disabled_dialog_4g_title" msgid="715585612162185936">"4G duomenys neleidžiami"</string>
+    <string name="data_usage_disabled_dialog_mobile_title" msgid="209516216265000221">"Mobilieji duomenys neleidžiami"</string>
+    <string name="data_usage_disabled_dialog" msgid="2874031671067845964">"Pasiektas nurodytas duomenų naudojimo apribojimas."\n\n"Naudojant papildomų duomenų gali būti taikomi operatoriaus mokesčiai."</string>
+    <string name="data_usage_disabled_dialog_enable" msgid="2441219164620753329">"Iš naujo įgalinti duomenis"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="32">"<xliff:g id="NUMBER">%1$s</xliff:g>"</font>" "<font size="12">"<xliff:g id="UNIT">%2$s</xliff:g>"</font>\n<font size="12">"įspėjimas"</font></string>
+    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Skambutis pagalbos numeriu"</string>
+    <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Grįžti prie skambučio"</string>
+    <string name="vpn_name" msgid="4689699885361002297">"Pavadinimas"</string>
+    <string name="vpn_type" msgid="5435733139514388070">"Tipas"</string>
+    <string name="vpn_server" msgid="2123096727287421913">"Serverio adresas"</string>
+    <string name="vpn_mppe" msgid="6639001940500288972">"PPP šifruotė (MPPE)"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"L2TP paslaptis"</string>
+    <string name="vpn_ipsec_identifier" msgid="4098175859460006296">"„IPSec“ identifikatorius"</string>
+    <string name="vpn_ipsec_secret" msgid="4526453255704888704">"„IPSec“ iš anksto bendrinamas raktas"</string>
+    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"„IPSec“ naudotojo sertifikatas"</string>
+    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"„IPSec“ CA sertifikatas"</string>
+    <!-- no translation found for vpn_search_domains (5391995501541199624) -->
+    <skip />
+    <!-- no translation found for vpn_routes (8556236801755260073) -->
+    <skip />
+    <string name="vpn_username" msgid="1863901629860867849">"Naudotojo vardas"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Slaptažodis"</string>
+    <!-- no translation found for vpn_save_login (6350322456427484881) -->
+    <skip />
+    <!-- no translation found for vpn_not_used (9094191054524660891) -->
+    <skip />
+    <string name="vpn_no_ca_cert" msgid="7820884983947090538">"(nepatvirtinti serverio)"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"Atšaukti"</string>
+    <string name="vpn_save" msgid="4233484051644764510">"Išsaugoti"</string>
+    <string name="vpn_connect" msgid="8469608541746132301">"Prisijungti"</string>
+    <string name="vpn_edit" msgid="1111459297288136079">"Redaguoti VPN tinklą"</string>
+    <string name="vpn_connect_to" msgid="7328758950427515753">"Prijungti prie <xliff:g id="NETWORK">%s</xliff:g>"</string>
+    <string name="vpn_title" msgid="7982620762043790565">"VPN nustatymai"</string>
+    <string name="vpn_create" msgid="8966010925994175306">"Pridėti VPN tinklą"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"Redaguoti tinklą"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"Ištrinti tinklą"</string>
+    <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Sistema"</string>
+    <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Naudotojas"</string>
+    <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Neleisti"</string>
+    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Įgalinti"</string>
+    <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Pašalinti"</string>
+    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Įgalinti sistemos CA sertifikatą?"</string>
+    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Neleisti sistemos CA sertifikato?"</string>
+    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Visam laikui pašalinti naudotojo CA sertifikatą?"</string>
 </resources>
diff --git a/res/values-lv/arrays.xml b/res/values-lv/arrays.xml
index 23ef36d..54f8c90 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>
@@ -214,4 +240,36 @@
     <item msgid="3878793616631049349">"Izmantot HDCP pārbaudi tikai DRM saturam"</item>
     <item msgid="45075631231212732">"Vienmēr izmantot HDCP pārbaudi"</item>
   </string-array>
+    <!-- no translation found for window_animation_scale_entries:0 (8134156599370824081) -->
+    <!-- no translation found for window_animation_scale_entries:1 (6624864048416710414) -->
+    <!-- no translation found for window_animation_scale_entries:2 (2219332261255416635) -->
+    <!-- no translation found for window_animation_scale_entries:3 (3544428804137048509) -->
+    <!-- no translation found for window_animation_scale_entries:4 (3110710404225974514) -->
+    <!-- no translation found for window_animation_scale_entries:5 (4402738611528318731) -->
+    <!-- no translation found for window_animation_scale_entries:6 (6189539267968330656) -->
+    <!-- no translation found for transition_animation_scale_entries:0 (8464255836173039442) -->
+    <!-- no translation found for transition_animation_scale_entries:1 (3375781541913316411) -->
+    <!-- no translation found for transition_animation_scale_entries:2 (1991041427801869945) -->
+    <!-- no translation found for transition_animation_scale_entries:3 (4012689927622382874) -->
+    <!-- no translation found for transition_animation_scale_entries:4 (3289156759925947169) -->
+    <!-- no translation found for transition_animation_scale_entries:5 (7705857441213621835) -->
+    <!-- no translation found for transition_animation_scale_entries:6 (6660750935954853365) -->
+    <!-- no translation found for app_process_limit_entries:0 (6799596560242275471) -->
+    <!-- no translation found for app_process_limit_entries:1 (2412794376818632575) -->
+    <!-- no translation found for app_process_limit_entries:2 (1578904888612645001) -->
+    <!-- no translation found for app_process_limit_entries:3 (8819235336299873577) -->
+  <string-array name="vpn_types_long">
+    <item msgid="2732002039459078847">"PPTP VPN"</item>
+    <item msgid="3799752201662127867">"Otrā slāņa tunelēšanas protokola/protokola IPsec VPN ar iepriekš kopīgotām atslēgām"</item>
+    <item msgid="4725504331295252103">"Otrā slāņa tunelēšanas protokola/protokola IPsec VPN ar sertifikātiem"</item>
+    <item msgid="7526551163264034377">"Protokola IPsec VPN ar iepriekš kopīgotām atslēgām un autentifikāciju Xauth"</item>
+    <item msgid="8064740940687465039">"Protokola IPsec VPN ar sertifikātiem un autentifikāciju Xauth"</item>
+    <item msgid="4946199982372391490">"Protokola IPsec VPN ar sertifikātiem un hibrīdautentifikāciju"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:0 (8621078286418985762) -->
+    <!-- no translation found for vpn_states:1 (6692305604213080515) -->
+    <!-- no translation found for vpn_states:2 (8001704909356800092) -->
+    <!-- no translation found for vpn_states:3 (4039737283841672166) -->
+    <!-- no translation found for vpn_states:4 (4042143101664725090) -->
+    <!-- no translation found for vpn_states:5 (2690164254699635531) -->
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 1574916..2eb52c0 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -19,6 +19,10 @@
     <string name="yes" msgid="4676390750360727396">"Jā"</string>
     <string name="no" msgid="6731231425810196216">"Nē"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Nezināms"</string>
+    <string name="header_category_wireless_networks" msgid="4944823405420438623">"BEZVADU PAKALPOJUMI UN TĪKLI"</string>
+    <string name="header_category_device" msgid="5781174212691167553">"IERĪCE"</string>
+    <string name="header_category_personal" msgid="6225932173498802187">"PERSONISKIE"</string>
+    <string name="header_category_system" msgid="2073558547468647128">"SISTĒMA"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Ieslēgt radio"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Izslēgt radio"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Skatīt SIM adrešu grāmatu"</string>
@@ -111,7 +115,11 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Notiek pāra izveide..."</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"Ir izveidots pāris, bet nav izveidots savienojums"</string>
     <string name="bluetooth_device" msgid="6873461446424952003">"brīvroku/austiņas"</string>
-    <string name="progress_scanning" msgid="3760897655335759141">"Notiek skenēšana"</string>
+    <!-- outdated translation 3760897655335759141 -->     <string name="progress_scanning" msgid="192587958424295789">"Notiek skenēšana"</string>
+    <!-- no translation found for progress_tap_to_pair (4192342336107106334) -->
+    <skip />
+    <!-- no translation found for bluetooth_no_devices_found (2412462335116297668) -->
+    <skip />
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Bluetooth pāra izveidošanas pieprasījums"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Pāra izveides pieprasījums"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Atlasīt, lai izveidotu savienojumu pārī ar <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
@@ -130,6 +138,9 @@
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Lietojumprogramma jūsu tālrunī pieprasa atļauju ieslēgt Bluetooth un iestatīt jūsu tālruni kā atklājamu citām ierīcēm. Vai vēlaties to darīt?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Notiek Bluetooth ieslēgšana…"</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Automātiska savienošana"</string>
+    <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth savienojuma pieprasījums"</string>
+    <string name="bluetooth_connection_notif_message" msgid="1833221950512058309">"Pieskarieties, lai izveidotu savienojumu ar ierīci <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Vai vēlaties izveidot savienojumu ar ierīci <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Datuma un laika iestatījumi"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"13.00"</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13.00"</string>
@@ -235,7 +246,7 @@
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Atspējot visus bezvadu savienojumus"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"Notiek bezvadu savienojumu atvienošana..."</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"Notiek bezvadu savienojumu iespējošana..."</string>
-    <string name="radio_controls_title" msgid="5868688473587168882">"Bezvadu pakalpojums un tīkli"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Vēl..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Bezvadu pakalpojums un tīkli"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"Wi-Fi, Bluetooth, lidojuma režīma, mobilo sakaru tīklu un VPN pārvaldība"</string>
     <string name="roaming" msgid="3596055926335478572">"Datu viesabonēšana"</string>
@@ -271,8 +282,8 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Inf. par īpašnieku"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="2382525043173672857">"Ievadiet bloķēšanas ekrānā parādāmo tekstu"</string>
-    <string name="security_settings_title" msgid="5168491784222013179">"Atrašanās vieta un drošība"</string>
-    <string name="location_security_settings_title" msgid="4624434296446625554">"Atrašanās vietas un drošības iestatījumi"</string>
+    <string name="location_settings_title" msgid="8935806698251432196">"Atrašanās vietu pakalpojumi"</string>
+    <string name="security_settings_title" msgid="7945465324818485460">"Drošība"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Manas atrašanās vietas, ekrāna atbloķēšanas, SIM kartes bloķēšanas, akreditācijas datu krātuves bloķēšanas iestatīšana"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Manas atrašanās vietas, ekrāna atbloķēšanas, akreditācijas datu krātuves bloķēšanas iestatīšana"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Paroles"</string>
@@ -316,7 +327,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>
@@ -375,8 +386,8 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Skatiet vai deaktivizējiet ierīces administratorus"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Ieslēgt Bluetooth"</string>
-    <string name="bluetooth_settings" msgid="2725796451253089609">"Bluetooth iestatījumi"</string>
-    <string name="bluetooth_settings_title" msgid="2824020086246268296">"Bluetooth iestatījumi"</string>
+    <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
+    <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Savienojumu pārvaldība, ierīces nosaukuma un atklājamības iestatīšana"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Bluetooth pāra izveidošanas pieprasījums"</string>
     <string name="bluetooth_enter_pin_msg" msgid="1499285355129256289">\n"Ievadiet PIN, lai izveidotu savienojumu pārī ar <xliff:g id="DEVICE_NAME">%1$s</xliff:g> (pamēģiniet ievadīt 0000 vai 1234.) Iespējams, Bluetooth ierīcē būs jāievada tas pats PIN kods."</string>
@@ -394,7 +405,10 @@
     <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> noraidīja pāra izveidi."</string>
     <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"Savienojot pārī ar <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, radās problēma."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Skenēt ierīces"</string>
-    <string name="bluetooth_preference_find_nearby_title" msgid="5087410003465463318">"Atrast tuvumā esošas ierīces"</string>
+    <!-- no translation found for bluetooth_search_for_devices (5957007154213560390) -->
+    <skip />
+    <!-- no translation found for bluetooth_searching_for_devices (9203739709307871727) -->
+    <skip />
     <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"Ierīces iestatījumi"</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Pārī savienotās ierīces"</string>
     <string name="bluetooth_preference_found_devices" msgid="3133019331974936204">"Ir atrastas ierīces"</string>
@@ -404,6 +418,10 @@
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Atcelt pāra izveidi"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Atvienot un atcelt pāra izveidi"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Iespējas…"</string>
+    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Papildu iestatījumi"</string>
+    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth papildu iestatījumi"</string>
+    <string name="bluetooth_advanced_settings_label" msgid="8659717781212434173">"Bluetooth pap. iest."</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="3631028334811113629">"Ieslēdziet Bluetooth, lai skatītu pieej. ierīces."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Savienot ar..."</string>
     <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"Multivide"</string>
     <string name="bluetooth_profile_headset" msgid="81844079120986198">"Brīvroku"</string>
@@ -445,27 +463,31 @@
     <string name="nfc_toggle_error" msgid="2233172102497535522">"Radās kļūda."</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Ieslēgt Wi-Fi"</string>
-    <string name="wifi_settings" msgid="4746946030627213196">"Wi-Fi iestatījumi"</string>
+    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="2810363951104753710">"Wi-Fi iestatījumi"</string>
+    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Bezvadu piekļuves punktu iestatīšana un pārvaldība"</string>
-    <string name="wifi_starting" msgid="6710266609710860129">"Notiek ieslēgšana…"</string>
-    <string name="wifi_stopping" msgid="5952909472548218348">"Notiek izslēgšana…"</string>
+    <string name="wifi_starting" msgid="7732330327758522943">"Notiek Wi-Fi ieslēgšana..."</string>
+    <string name="wifi_stopping" msgid="244864762599017659">"Notiek Wi-Fi izslēgšana..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"Kļūda"</string>
     <string name="wifi_in_airplane_mode" msgid="7618393787965366655">"Lidojuma režīmā"</string>
     <string name="wifi_fail_to_scan" msgid="6194542252808587669">"Nav iespējams meklēt tīklus"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Tīkla paziņojums"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Informēt mani, kad ir pieejams atvērts tīkls"</string>
+    <string name="wifi_enable_watchdog_service" msgid="4723544454066601706">"Wi-Fi savienojamības pārbaudes"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="8687400936839455926">"Atklāt un pārvaldīt iespējamas tīkla savienojamības problēmas"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Wi-Fi atvienošanas politika"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Norādīt, kad pārslēgt no Wi-Fi uz mobilajiem datiem"</string>
     <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" msgid="6234851776910938957">"Pievienot tīklu"</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>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Izveidot savienojumu ar tīklu"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Neiegaumēt tīklu"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Pārveidot tīklu"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="3682507011071029311">"Ieslēdziet Wi-Fi, lai skatītu pieejamos tīklus."</string>
     <string name="wifi_network_setup" msgid="7974851890019344870">"Tīkla iestatīšana"</string>
     <string name="wifi_wps_pin" msgid="5471842298708321115">"Ievadīt PIN no piekļuves punkta"</string>
     <string name="wifi_wps_setup_title" msgid="150518971269252336">"WPS iestatīšana"</string>
@@ -501,13 +523,13 @@
     <string name="wifi_save" msgid="3331121567988522826">"Saglabāt"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Atcelt"</string>
     <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"Ir noteikta cita WPS sesija. Pēc dažām minūtēm mēģiniet vēlreiz."</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Papildu"</string>
+    <!-- outdated translation 5419052271935350999 -->     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Papildu"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi frekvences josla"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Norādiet darbības frekvences diapazonu"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Iestatot frekvences joslu, radās problēma."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC adrese"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP adrese"</string>
-    <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"IP iestatījumi"</string>
+    <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP iestatījumi"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Saglabāt"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Atcelt"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Lūdzu, ierakstiet derīgu IP adresi."</string>
@@ -525,7 +547,7 @@
     <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> pārnēsājams Wi-Fi tīklājs"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="sound_settings_title" msgid="8735891486683305886">"Skaņa"</string>
-    <string name="display_settings_title" msgid="2378894265964357591">"Demonstrēt ekrānā"</string>
+    <string name="display_settings_title" msgid="1708697328627382561">"Displejs"</string>
     <string name="sound_settings" msgid="5007659014828162881">"Skaņas iestatījumi"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Klusuma režīms"</string>
     <string name="silent_mode_summary" msgid="3309650676072917899">"Atslēgt visas skaņas, izņemot multividi un signālus"</string>
@@ -598,7 +620,18 @@
     <string name="brightness_summary" msgid="838917350127550703">"Noregulēt ekrāna spilgtumu"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Noildze"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Ekrāns automātiski izslēdzas pēc šāda laika: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Fona tapete"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android ekrānsaudzētāji"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Ekrānsaudzētāji un citas izklaides iespējas dīkstāves laikā"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Atlasītais ekrānsaudzētājs"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Aktivizēšanas laiks"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"Pēc dīkstāves laika: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Nekad"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Izmēģināt"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automātisks spilgtums"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Fonta lielums"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Vispārējs fontu lielums"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Atlasīt fonta lielumu"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM kartes bloķēšanas iestatījumi"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Iestatīt SIM kartes bloķēšanu"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM kartes bloķēšana"</string>
@@ -643,8 +676,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>
@@ -696,6 +730,16 @@
     <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"SD karte tiks atvienota."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Atvienošana"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Notiek atvienošana"</string>
+    <!-- no translation found for storage_menu_usb (1580545228584324704) -->
+    <skip />
+    <!-- no translation found for storage_title_usb (5775322159427546546) -->
+    <skip />
+    <!-- no translation found for usb_label_mtp (4157227401755543412) -->
+    <skip />
+    <!-- no translation found for usb_label_ptp (7417254019489575819) -->
+    <skip />
+    <!-- no translation found for usb_label_installer_cd (7438467574756086977) -->
+    <skip />
     <string name="battery_status_title" msgid="9159414319574976203">"Akumulatora statuss"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Akumulatora uzlādes līmenis"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -806,6 +850,8 @@
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"Nevar saistīt vairāk par <xliff:g id="MAXCONNECTION">%1$d</xliff:g> ierīcēm"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Ierīce <xliff:g id="DEVICE_NAME">%1$s</xliff:g> tiks atsaistīta."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Palīdzība"</string>
+    <string name="wireless_category_general" msgid="2973810407987118067">"Vispārīgi"</string>
+    <string name="wireless_category_mobile_networks" msgid="1254629216798424288">"Mobilie tīkli"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobilo sakaru tīkli"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Viesabonēšanas, tīklu, APN opciju iestatīšana"</string>
     <string name="location_title" msgid="1029961368397484576">"Mana atrašanās vieta"</string>
@@ -883,7 +929,7 @@
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Planšetdatora drošība"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Tālruņa nodrošināšana"</string>
     <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"Aizsargājiet savu planšetdatoru no neatļautas izmantošanas, izveidojot personisku ekrāna atbloķēšanas kombināciju. Ar pirkstu savienojiet nākamajā ekrānā redzamos punktus jebkurā secībā. Jums ir jāsavieno vismaz četri punkti."\n\n"Vai esat gatavs sākt? Pieskarieties Tālāk."</string>
-    <string name="lock_intro_message" product="default" msgid="9100785646737118042"><font size="17">"Aizsargājiet tālruni no neautorizētas lietošanas, izveidojot personīgo ekrāna atbloķēšanas kombināciju. "\n<font height="17">\n</font><b>"1"</b>"  Nākamajā ekrānā skatiet, kā tiek zīmēts kombinācijas piemērs. "\n<font height="17">\n</font><b>"2"</b>"  Kad esat gatavs, zīmējiet pats savu personīgo atbloķēšanas kombināciju. Eksperimentējiet ar dažādām kombinācijām, taču savienojiet vismaz četrus punktus. "\n<font height="17">\n</font><b>"3"</b>"  Vēlreiz zīmējiet kombināciju, lai apstiprinātu. "\n<font height="17">\n</font><b>"Vai esat gatavs sākt? Pieskarieties Tālāk"</b>". "\n<font height="3">\n</font>"Lai tālrunim nelietotu aizsardzību, pieskarieties Atcelt."</font></string>
+    <!-- outdated translation 3692151094288835065 -->     <string name="lock_intro_message" product="default" msgid="5796785892741212873">"Aizsargājiet savu planšetdatoru no neatļautas izmantošanas, izveidojot personisku ekrāna atbloķēšanas kombināciju. Ar pirkstu savienojiet nākamajā ekrānā redzamos punktus jebkurā secībā. Jums ir jāsavieno vismaz četri punkti."\n\n"Vai esat gatavs sākt? Pieskarieties Tālāk."</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Lietojumprogrammu pārvaldība"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Instalēto lietojumprogrammu pārvaldība un noņemšana"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Lietojumprogrammas"</string>
@@ -893,6 +939,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>
@@ -905,9 +953,10 @@
     <string name="force_stop" msgid="7435006169872876756">"Forsēt apturēšanu"</string>
     <string name="total_size_label" msgid="1048676419552557254">"Kopā"</string>
     <string name="application_size_label" msgid="5055196275624686382">"Lietojumprogramma"</string>
+    <string name="external_code_size_label" msgid="3459343140355961335">"USB atmiņas lietotne"</string>
     <string name="data_size_label" msgid="8679376373625710107">"Dati"</string>
-    <string name="external_size_label" product="nosdcard" msgid="4465530017830945766">"USB atmiņa"</string>
-    <string name="external_size_label" product="default" msgid="2107155737635944440">"SD karte"</string>
+    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB atmiņas dati"</string>
+    <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD karte"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Atinstalēt"</string>
     <string name="disable_text" msgid="6544054052049395202">"Atspējot"</string>
     <string name="enable_text" msgid="9217362512327828987">"Iespējot"</string>
@@ -1026,7 +1075,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 +1085,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>
@@ -1066,7 +1117,7 @@
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Ekrāntastatūras iestatījumi"</string>
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Fiziskā tastatūra"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Fiziskās tastatūras iestatījumi"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Izstrāde"</string>
+    <string name="development_settings_title" msgid="215179176067683667">"Izstrādātājiem paredzētas opcijas"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"Lietojumprogrammas izstrādes opciju iestatīšana"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB atkļūdošana"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Atkļūdošanas režīms, kad ir pievienota kopne USB"</string>
@@ -1091,14 +1142,14 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Pieejamība"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Pieejamības iestatījumi"</string>
     <string name="accessibility_settings_summary" msgid="8185181964847149507">"Pieejamības opciju pārvaldība"</string>
-    <string name="toggle_accessibility_title" msgid="650839277066574497">"Pieejamība"</string>
+    <string name="toggle_large_text_title" msgid="42259643359869436">"Liels teksts"</string>
     <string name="accessibility_services_category" msgid="8127851026323672607">"Pieejamības pakalpojumi"</string>
+    <string name="toggle_accessibility_title" msgid="7338739354952553958">"Atļaut pieejamības pakalpojumus"</string>
     <string name="no_accessibility_services_summary" msgid="694578333333808159">"Nav instalēti pieejamības pakalpojumi."</string>
     <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Lietojot šo pakalpojumu, var tikt apkopts viss jūsu ievadītais teksts, tostarp, personīgie dati, kredītkaršu numuri, bet ne paroles. Var tikt reģistrētas arī jūsu lietotāja saskarnes mijiedarbības. Tas ir no <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> lietojumprogrammas. Vai izmantot šo pakalpojumu?"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Vai atspējot pieejamību?"</string>
     <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"Nav atrastas ar pieejamību saistītas lietojumprogrammas"</string>
     <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"Ierīcē nav instalēta neviena ar pieejamību saistīta lietojumprogramma."\n\n"Varat lejupielādēt savai ierīcei paredzētu ekrāna lasītāju vietnē Android Market."\n\n"Noklikšķiniet uz Labi, lai instalētu ekrāna lasītāju."</string>
-    <string name="accessibility_script_injection_category" msgid="8649951751131431904">"Pieejamības skripti"</string>
     <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"Lejupielādēt pieejamības skriptus"</string>
     <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"Atļaut lietojumpr. lejupielādēt pieejamības skriptus no Google"</string>
     <string name="accessibility_script_injection_security_warning" product="tablet" msgid="1113600871264359828">"Dažās lietojumprogrammās, iespējams, tiks pieprasīts uzņēmumam Google lejupielādēt skriptus jūsu planšetdatoram, ar kuriem tiks padarīts pieejams to saturs. Vai tiešām vēlaties atļaut uzņēmumam Google instalēt pieejamības skriptus jūsu planšetdatorā?"</string>
@@ -1106,10 +1157,11 @@
     <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>
-    <string name="power_usage_summary_title" msgid="5180282911164282324">"Akumulatora lietojums"</string>
+    <string name="power_usage_summary_title" msgid="7190304207330319919">"Akumulators"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Kas patērējis akumulatoru"</string>
     <string name="power_usage_not_available" msgid="3583407442633768046">"Akum. liet. dati nav pieejami"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Akumulatora lietojums kopš atslēgšanas"</string>
@@ -1218,6 +1270,8 @@
     <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>
+    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Programmas iestatījumi"</string>
+    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Programmas <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g> iestatījumi"</string>
     <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>
@@ -1228,114 +1282,33 @@
     <string name="gadget_title" msgid="7455548605888590466">"Barošanas vadība"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Wi-Fi iestatījumu atjaunināšana"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetooth iestatījumu atjaunināšana"</string>
-    <string name="vpn_settings_activity_title" msgid="7276864950701612579">"VPN iestatījumi"</string>
-    <string name="vpn_connect_to" msgid="2541409082892684362">"Savienot ar <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpn_username_colon" msgid="7854930370861306247">"Lietotājvārds:"</string>
-    <string name="vpn_password_colon" msgid="5716278710848606626">"Parole:"</string>
-    <string name="vpn_a_username" msgid="6664733641993968692">"lietotājvārds"</string>
-    <string name="vpn_a_password" msgid="1537213632501483753">"parole"</string>
-    <string name="vpn_save_username" msgid="1408415289165970790">"Iegaumēt lietotājvārdu"</string>
-    <string name="vpn_connect_button" msgid="1699007212602470655">"Izveidot savienojumu"</string>
-    <string name="vpn_yes_button" msgid="8034531001149843119">"Jā"</string>
-    <string name="vpn_no_button" msgid="7620339571187119107">"Nē"</string>
-    <string name="vpn_back_button" msgid="192036339792734970">"Atpakaļ"</string>
-    <string name="vpn_mistake_button" msgid="1683383660912491270">"Nē"</string>
-    <string name="vpn_menu_done" msgid="93528279226907926">"Saglabāt"</string>
-    <string name="vpn_menu_cancel" msgid="7234451214611202868">"Atcelt"</string>
-    <string name="vpn_menu_revert" msgid="4407762442281467659">"Atjaunot"</string>
-    <string name="vpn_menu_connect" msgid="1089399414463784218">"Izveidot savienojumu ar tīklu"</string>
-    <string name="vpn_menu_disconnect" msgid="8254492450022562235">"Atvienot no tīkla"</string>
-    <string name="vpn_menu_edit" msgid="4526245173583195618">"Rediģēt tīklu"</string>
-    <string name="vpn_menu_delete" msgid="3326527392609513129">"Dzēst tīklu"</string>
-    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"Jāievada <xliff:g id="CODE">%s</xliff:g>."</string>
-    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"Atlasiet <xliff:g id="OPTION">%s</xliff:g>."</string>
-    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"VPN nosaukums “<xliff:g id="NAME">%s</xliff:g>” jau pastāv. Meklējiet citu nosaukumu."</string>
-    <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"Vai tiešām vēlaties dzēst šo VPN?"</string>
-    <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"Vai tiešām nevēlaties izveidot šo profilu?"</string>
-    <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"Vai tiešām vēlaties atmest šim profilam veiktās izmaiņas?"</string>
-    <string name="vpn_confirm_reconnect" msgid="5748535476278674296">"Neizdevās izveidot savienojumu ar tīklu. Vai vēlaties mēģināt vēlreiz?"</string>
-    <string name="vpn_reconnect_from_lost" msgid="2442844155623372118">"Savienojums ir zaudēts. Vai vēlaties vēlreiz izveidot savienojumu?"</string>
-    <string name="vpn_unknown_server_dialog_msg" msgid="3080742299823671319">"Servera nosaukumu nevar atrisināt. Vai vēlaties pārbaudiet servera nosaukuma iestatījumu?"</string>
-    <string name="vpn_challenge_error_dialog_msg" msgid="6174901754230038601">"Izaicinājuma kļūda. Vai vēlaties pārbaudīt slepeno iestatījumu?"</string>
-    <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"Šajā VPN konfigurācijā trūkst viena vai vairāk slepeno elementu. Vai vēlaties pārbaudīt slepeno iestatījumu?"</string>
-    <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"Ievadījāt nepareizu lietotājvārdu vai paroli. Vai vēlaties mēģināt vēlreiz?"</string>
-    <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"Serveris uzkārās. Iespējams, ievadījāt nepareizu lietotājvārdu vai paroli. Vai vēlaties mēģināt vēlreiz?"</string>
-    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"Serveris uzkārās. Iespējams, ka izmantojat ugunsmūri, kas neļauj izveidot savienojumu ar serveri. Vai vēlaties mēģināt vēlreiz?"</string>
-    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"Servera saskaņošana neizdevās. Iespējams, serveris neatbilst šifrējuma opcijai. Vai vēlaties pārbaudīt šifrējuma iestatījumu?"</string>
-    <string name="vpn_type_title" msgid="6392933604218676224">"Pievienot VPN"</string>
-    <string name="vpn_add_new_vpn" msgid="5438260689052714550">"Pievienot VPN"</string>
-    <string name="vpn_details_title" msgid="418806440938510331">"VPN dati"</string>
-    <string name="vpn_edit_title_add" msgid="2121313217989682890">"Pievienot <xliff:g id="NAME">%s</xliff:g> VPN"</string>
-    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"<xliff:g id="NAME">%s</xliff:g> details"</string>
-    <string name="vpns" msgid="3148141862835492816">"VPN"</string>
-    <string name="vpn_connecting" msgid="8039521381692090116">"Notiek savienojuma izveide..."</string>
-    <string name="vpn_disconnecting" msgid="7748050200708257066">"Notiek atvienošana..."</string>
-    <string name="vpn_connected" msgid="7641723116362845781">"Izveidots savienojums"</string>
-    <string name="vpn_connect_hint" msgid="7442898962925875181">"Izveidot savienojumu ar tīklu"</string>
-    <string name="vpn_name" msgid="1550918148476193076">"VPN nosaukums"</string>
-    <string name="vpn_a_name" msgid="8445736942405283509">"VPN nosaukums"</string>
-    <string name="vpn_profile_added" msgid="9061017910337129840">"<xliff:g id="NAME">%s</xliff:g> ir pievienots"</string>
-    <string name="vpn_profile_replaced" msgid="587435576816273815">"Tika veiktas <xliff:g id="NAME">%s</xliff:g> izmaiņas"</string>
-    <string name="vpn_user_certificate_title" msgid="6812545893924071742">"Iestatīt lietotāja sertifikātu"</string>
-    <string name="vpn_user_certificate" msgid="949322691686938888">"Lietotāja sertifikāts"</string>
-    <string name="vpn_a_user_certificate" msgid="8943983437956898649">"lietotāja sertifikāts"</string>
-    <string name="vpn_ca_certificate_title" msgid="7846466160795589985">"Iestatīt CA sertifikātu"</string>
-    <string name="vpn_ca_certificate" msgid="465085144064264742">"Sertifikāta autoritātes (CA) apliecība"</string>
-    <string name="vpn_a_ca_certificate" msgid="3374242520974884295">"CA sertifikāts"</string>
-    <string name="vpn_l2tp_secret_string_title" msgid="5039677186748940987">"Iestatīt slepeno L2TP"</string>
-    <string name="vpn_l2tp_secret" msgid="529359749677142076">"Slepenais L2TP"</string>
-    <string name="vpn_a_l2tp_secret" msgid="6612042930810981845">"slepens L2TP"</string>
-    <string name="vpn_pptp_encryption_title" msgid="2236795167467896499">"šifrējums"</string>
-    <string name="vpn_pptp_encryption" msgid="2602329949737259686">"PPTP šifrējums"</string>
-    <string name="vpn_ipsec_presharedkey_title" msgid="2184060087690539175">"Iestatīt IPSec iepriekš kopīgotu atslēgu"</string>
-    <string name="vpn_ipsec_presharedkey" msgid="5434316521616673741">"IPSec iepriekš kopīgota atslēga"</string>
-    <string name="vpn_a_ipsec_presharedkey" msgid="1255301923217898418">"IPSec iepriekš kopīgota atslēga"</string>
-    <string name="vpn_vpn_server_title" msgid="8897005887420358913">"Iestatīt VPN serveri"</string>
-    <string name="vpn_vpn_server" msgid="1141754908824209260">"VPN serveris"</string>
-    <string name="vpn_a_vpn_server" msgid="5960906152125045853">"VPN serveris"</string>
-    <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"VPN servera nosaukums"</string>
-    <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"Sistēmas DNS meklēšanas domēni"</string>
-    <string name="vpn_dns_search_list" msgid="4230034234026605360">"Sistēmas DNS meklēšanas domēni"</string>
-    <string name="vpn_field_is_set" msgid="7137320847812992243">"<xliff:g id="VALUE">%s</xliff:g> ir iestatīts"</string>
-    <string name="vpn_field_not_set" msgid="2972519243515893804">"<xliff:g id="VALUE">%s</xliff:g> nav iestatīts"</string>
-    <string name="vpn_field_not_set_optional" msgid="8840557698252556791">"<xliff:g id="VALUE">%s</xliff:g> nav iestatīts (neobligāti)"</string>
-    <string name="vpn_enable_field" msgid="3700967675854517191">"Aktivizēt <xliff:g id="OPTION">%s</xliff:g>"</string>
-    <string name="vpn_disable_field" msgid="6905658811179634005">"Atspējot <xliff:g id="OPTION">%s</xliff:g>"</string>
-    <string name="vpn_is_enabled" msgid="1266304230417098877">"<xliff:g id="OPTION">%s</xliff:g> ir iespējots"</string>
-    <string name="vpn_is_disabled" msgid="2013622485867806167">"<xliff:g id="OPTION">%s</xliff:g> ir atspējots"</string>
     <string name="vpn_settings_title" msgid="7327468307909556719">"VPN iestatījumi"</string>
     <string name="vpn_settings_summary" msgid="8849924181594963972">"Virtuālo privāto tīklu (VPN) iestatīšana un pārvaldība"</string>
-    <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="trusted_credentials" msgid="4266945289534242402">"Uzticami akreditācijas dati"</string>
+    <string name="trusted_credentials_summary" msgid="6735221351155686632">"Attēlot uzticamus CA 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>
-    <string name="privacy_settings_title" msgid="1987089301293213705">"Konfidencialitātes iestatījumi"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"Dublēt un atiestatīt"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"Dublēt un atiestatīt"</string>
     <string name="backup_section_title" msgid="8856083167469467588">"Dublēt un atjaunot"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Personīgie dati"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Dublēt manus datus"</string>
@@ -1440,4 +1413,107 @@
     <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>
+    <!-- no translation found for debug_ui_category (9023948280291055349) -->
+    <skip />
+    <!-- no translation found for strict_mode (1938795874357830695) -->
+    <skip />
+    <!-- no translation found for strict_mode_summary (142834318897332338) -->
+    <skip />
+    <!-- no translation found for pointer_location (6084434787496938001) -->
+    <skip />
+    <!-- no translation found for pointer_location_summary (840819275172753713) -->
+    <skip />
+    <!-- no translation found for show_screen_updates (8282711794220426931) -->
+    <skip />
+    <!-- no translation found for show_screen_updates_summary (1716122382094924596) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage (2389212910758076024) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage_summary (2113341923988958266) -->
+    <skip />
+    <!-- no translation found for window_animation_scale_title (6162587588166114700) -->
+    <skip />
+    <!-- no translation found for transition_animation_scale_title (387527540523595875) -->
+    <skip />
+    <!-- no translation found for debug_applications_category (6221644998451283813) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities (3622005081180597749) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities_summary (3592221124808773368) -->
+    <skip />
+    <!-- no translation found for app_process_limit_title (4121324758038197598) -->
+    <skip />
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Datu lietojums"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"Datu izmantošanas cikls"</string>
+    <string name="data_usage_menu_split_4g" msgid="7417435609285381968">"Sadalīt 4G izmantošanu"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Rādīt inform. par Wi-Fi izmant."</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"Mainīt ciklu..."</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Mēneša diena, kad tiks atiestatīts datu izmantošanas cikls:"</string>
+    <string name="data_usage_disable_mobile_limit" msgid="289740911281022322">"Atspēj. mob. d., sasniedzot lim."</string>
+    <string name="data_usage_disable_4g_limit" msgid="5808210773758699800">"Atspējot 4G datus, sasn. lim."</string>
+    <string name="data_usage_disable_3g_limit" msgid="3856971004328238231">"Atspēj. 2G–3G datus, sasn. lim."</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_mobile" msgid="454140350007299045">"Mob. dati"</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">"Mobilie dati"</string>
+    <string name="data_usage_enable_3g" msgid="6304006671869578254">"2G–3G dati"</string>
+    <string name="data_usage_enable_4g" msgid="3635854097335036738">"4G dati"</string>
+    <string name="data_usage_app_settings" msgid="3727561362090820369">"Skatīt lietojumpr. iestatījumus"</string>
+    <string name="data_usage_app_restrict_background" msgid="8856643905291165256">"Ierobežot fona datu izmantošanu"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="1503361245973512092">"Atļaut fona datus tikai, kad tiek izmantots neierobežots tīkls"</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="8110736468987743260">"Fona datu ierobežošana"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="100001698378554777">"Šī funkcija var negatīvi ietekmēt lietojumprogrammas, kurās tiek izmantoti fona dati."\n\n"Piemērotākas datu izmantošanas vadīklas ir pieejamas šīs lietojumprogrammas iestatījumos."</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Izmantošanas cikla atiestatīšanas datums"</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Katra mēneša datums:"</string>
+    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Iestatīt"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Datu izmantošanas ierobežošana"</string>
+    <string name="data_usage_limit_dialog_mobile" msgid="7931094451923591578">"Mobilo datu savienojums tiks atspējots, kad tiks sasniegts noteiktais limits."\n\n"Lai novērstu papildu izmaksas, apsveriet iespēju samazināt izmantošanas limitu, jo aprēķini var atšķirties atkarībā no ierīces un sakaru operatora."</string>
+    <string name="data_usage_limit_dialog_3g" msgid="5478553071420316963">"2G–3G datu savienojums tiks atspējots, kad tiks sasniegts noteiktais limits."\n\n"Lai novērstu papildu izmaksas, apsveriet iespēju samazināt izmantošanas limitu, jo aprēķini var atšķirties atkarībā no ierīces un sakaru operatora."</string>
+    <string name="data_usage_limit_dialog_4g" msgid="6134008906742403777">"4G datu savienojums tiks atspējots, kad tiks sasniegts noteiktais limits."\n\n"Lai novērstu papildu izmaksas, apsveriet iespēju samazināt izmantošanas limitu, jo aprēķini var atšķirties atkarībā no ierīces un sakaru operatora."</string>
+    <string name="data_usage_disabled_dialog_3g_title" msgid="4221584306492812040">"2G–3G dati ir atspējoti"</string>
+    <string name="data_usage_disabled_dialog_4g_title" msgid="715585612162185936">"4G dati ir atspējoti"</string>
+    <string name="data_usage_disabled_dialog_mobile_title" msgid="209516216265000221">"Mobilie dati ir atspējoti"</string>
+    <string name="data_usage_disabled_dialog" msgid="2874031671067845964">"Norādītais datu izmantošanas limits ir sasniegts."\n\n"Izmantojot papildu datus, sakaru operators var no jums iekasēt maksu."</string>
+    <string name="data_usage_disabled_dialog_enable" msgid="2441219164620753329">"Atkārtoti iespējot datus"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="32">"<xliff:g id="NUMBER">%1$s</xliff:g>"</font>" "<font size="12">"<xliff:g id="UNIT">%2$s</xliff:g>"</font>\n<font size="12">"brīdinājums"</font></string>
+    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Ārkārtas zvans"</string>
+    <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Atgriezties pie zvana"</string>
+    <string name="vpn_name" msgid="4689699885361002297">"Nosaukums"</string>
+    <string name="vpn_type" msgid="5435733139514388070">"Veids"</string>
+    <string name="vpn_server" msgid="2123096727287421913">"Servera adrese"</string>
+    <string name="vpn_mppe" msgid="6639001940500288972">"PPP šifrējums (MPPE)"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"Slepenais L2TP"</string>
+    <string name="vpn_ipsec_identifier" msgid="4098175859460006296">"Protokola IPsec identifikators"</string>
+    <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Protokola IPsec iepriekš kopīgotā atsl."</string>
+    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"Protokola IPsec lietotāja sertifikāts"</string>
+    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"Protokola IPsec CA sertifikāts"</string>
+    <!-- no translation found for vpn_search_domains (5391995501541199624) -->
+    <skip />
+    <!-- no translation found for vpn_routes (8556236801755260073) -->
+    <skip />
+    <string name="vpn_username" msgid="1863901629860867849">"Lietotājvārds"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Parole"</string>
+    <!-- no translation found for vpn_save_login (6350322456427484881) -->
+    <skip />
+    <!-- no translation found for vpn_not_used (9094191054524660891) -->
+    <skip />
+    <string name="vpn_no_ca_cert" msgid="7820884983947090538">"(neverificēt serveri)"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"Atcelt"</string>
+    <string name="vpn_save" msgid="4233484051644764510">"Saglabāt"</string>
+    <string name="vpn_connect" msgid="8469608541746132301">"Savienot"</string>
+    <string name="vpn_edit" msgid="1111459297288136079">"VPN tīkla rediģēšana"</string>
+    <string name="vpn_connect_to" msgid="7328758950427515753">"Savienojuma izveide ar tīklu <xliff:g id="NETWORK">%s</xliff:g>"</string>
+    <string name="vpn_title" msgid="7982620762043790565">"VPN iestatījumi"</string>
+    <string name="vpn_create" msgid="8966010925994175306">"Pievienot VPN tīklu"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"Rediģēt tīklu"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"Dzēst tīklu"</string>
+    <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Sistēma"</string>
+    <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Lietotājs"</string>
+    <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Atspējot"</string>
+    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Iespējot"</string>
+    <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Noņemt"</string>
+    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Vai iespējot sistēmas CA sertifikātu?"</string>
+    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Vai atspējot sistēmas CA sertifikātu?"</string>
+    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Vai neatgriezeniski noņemt lietotāja CA sertifikātu?"</string>
 </resources>
diff --git a/res/xml/vpn_type.xml b/res/values-ms-nokeys/strings.xml
similarity index 62%
copy from res/xml/vpn_type.xml
copy to res/values-ms-nokeys/strings.xml
index fbc7822..7da53ba 100644
--- a/res/xml/vpn_type.xml
+++ b/res/values-ms-nokeys/strings.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
+<?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.
@@ -12,10 +12,9 @@
      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"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
-        android:title="@string/vpn_type_title">
-
-</PreferenceScreen>   
+<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..e1752d8
--- /dev/null
+++ b/res/values-ms/arrays.xml
@@ -0,0 +1,273 @@
+<?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>
+    <!-- no translation found for window_animation_scale_entries:0 (8134156599370824081) -->
+    <!-- no translation found for window_animation_scale_entries:1 (6624864048416710414) -->
+    <!-- no translation found for window_animation_scale_entries:2 (2219332261255416635) -->
+    <!-- no translation found for window_animation_scale_entries:3 (3544428804137048509) -->
+    <!-- no translation found for window_animation_scale_entries:4 (3110710404225974514) -->
+    <!-- no translation found for window_animation_scale_entries:5 (4402738611528318731) -->
+    <!-- no translation found for window_animation_scale_entries:6 (6189539267968330656) -->
+    <!-- no translation found for transition_animation_scale_entries:0 (8464255836173039442) -->
+    <!-- no translation found for transition_animation_scale_entries:1 (3375781541913316411) -->
+    <!-- no translation found for transition_animation_scale_entries:2 (1991041427801869945) -->
+    <!-- no translation found for transition_animation_scale_entries:3 (4012689927622382874) -->
+    <!-- no translation found for transition_animation_scale_entries:4 (3289156759925947169) -->
+    <!-- no translation found for transition_animation_scale_entries:5 (7705857441213621835) -->
+    <!-- no translation found for transition_animation_scale_entries:6 (6660750935954853365) -->
+    <!-- no translation found for app_process_limit_entries:0 (6799596560242275471) -->
+    <!-- no translation found for app_process_limit_entries:1 (2412794376818632575) -->
+    <!-- no translation found for app_process_limit_entries:2 (1578904888612645001) -->
+    <!-- no translation found for app_process_limit_entries:3 (8819235336299873577) -->
+  <string-array name="vpn_types_long">
+    <item msgid="2732002039459078847">"VPN PPTP"</item>
+    <item msgid="3799752201662127867">"VPN L2TP/IPSec dengan kunci prakongsi"</item>
+    <item msgid="4725504331295252103">"VPN L2TP/IPSec dengan sijil"</item>
+    <item msgid="7526551163264034377">"VPN IPSec dengan kunci prakongsi dan pengesahan Xauth"</item>
+    <item msgid="8064740940687465039">"VPN IPSec dengan sijil dan pengesahan Xauth"</item>
+    <item msgid="4946199982372391490">"VPN IPSec dengan sijil dan pengesahan hibrid"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:0 (8621078286418985762) -->
+    <!-- no translation found for vpn_states:1 (6692305604213080515) -->
+    <!-- no translation found for vpn_states:2 (8001704909356800092) -->
+    <!-- no translation found for vpn_states:3 (4039737283841672166) -->
+    <!-- no translation found for vpn_states:4 (4042143101664725090) -->
+    <!-- no translation found for vpn_states:5 (2690164254699635531) -->
+</resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
new file mode 100644
index 0000000..a86b2cd
--- /dev/null
+++ b/res/values-ms/strings.xml
@@ -0,0 +1,1597 @@
+<?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>
+    <!-- no translation found for header_category_wireless_networks (4944823405420438623) -->
+    <skip />
+    <!-- no translation found for header_category_device (5781174212691167553) -->
+    <skip />
+    <!-- no translation found for header_category_personal (6225932173498802187) -->
+    <skip />
+    <!-- no translation found for header_category_system (2073558547468647128) -->
+    <skip />
+    <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>
+    <!-- outdated translation 3760897655335759141 -->     <string name="progress_scanning" msgid="192587958424295789">"Mengimbas"</string>
+    <!-- no translation found for progress_tap_to_pair (4192342336107106334) -->
+    <skip />
+    <!-- no translation found for bluetooth_no_devices_found (2412462335116297668) -->
+    <skip />
+    <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>
+    <!-- no translation found for bluetooth_connection_permission_request (4747918249032890077) -->
+    <skip />
+    <!-- no translation found for bluetooth_connection_notif_message (1833221950512058309) -->
+    <skip />
+    <!-- no translation found for bluetooth_connection_dialog_text (8455427559949998023) -->
+    <skip />
+    <string name="date_and_time" msgid="4114084177056654663">"Tetapan tarikh &amp; masa"</string>
+    <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00 tengah hari"</string>
+    <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
+    <string name="choose_timezone" msgid="7762866468013985022">"Pilih zon waktu"</string>
+    <string name="normal_date_format" msgid="1982904221918374153">"Normal (<xliff:g id="DATE">%s</xliff:g>)"</string>
+    <string name="display_preview_label" msgid="1127597250917274792">"Pratonton:"</string>
+    <string name="display_font_size_label" msgid="8941851418397475389">"Saiz fon:"</string>
+    <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
+    <skip />
+    <string name="intent_sender_sendbroadcast_text" msgid="1415735148895872715">"Hantar <xliff:g id="BROADCAST">broadcast</xliff:g>"</string>
+    <string name="intent_sender_action_label" msgid="616458370005452389">"<xliff:g id="ACTION">Action</xliff:g>:"</string>
+    <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Mulakan <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
+    <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
+    <string name="intent_sender_account_label" msgid="465210404475603404">"Akaun:"</string>
+    <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">"Slmat utk keluarkan storan 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>
+    <!-- unknown quoting pattern: original -1, translation 1 -->
+    <!-- outdated translation 5868688473587168882 -->     <string name="radio_controls_title" msgid="6889937359495515769">"Wayarles &amp;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>
+    <!-- no translation found for location_settings_title (8935806698251432196) -->
+    <skip />
+    <!-- unknown quoting pattern: original -1, translation 1 -->
+    <!-- outdated translation 5168491784222013179 -->     <string name="security_settings_title" msgid="7945465324818485460">"Lokasi &amp;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 setiap 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>
+    <!-- outdated translation 2725796451253089609 -->     <string name="bluetooth_settings" msgid="1810521656168174329">"Tetapan Bluetooth"</string>
+    <!-- outdated translation 2824020086246268296 -->     <string name="bluetooth_settings_title" msgid="1908745291161353016">"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>
+    <!-- no translation found for bluetooth_search_for_devices (5957007154213560390) -->
+    <skip />
+    <!-- no translation found for bluetooth_searching_for_devices (9203739709307871727) -->
+    <skip />
+    <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>
+    <!-- no translation found for bluetooth_menu_advanced (8572178316357220524) -->
+    <skip />
+    <!-- no translation found for bluetooth_advanced_titlebar (2142159726881547669) -->
+    <skip />
+    <!-- no translation found for bluetooth_advanced_settings_label (8659717781212434173) -->
+    <skip />
+    <!-- no translation found for bluetooth_empty_list_bluetooth_off (3631028334811113629) -->
+    <skip />
+    <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>
+    <!-- outdated translation 4746946030627213196 -->     <string name="wifi_settings" msgid="1277428034634973011">"Tetapan Wi-Fi"</string>
+    <string name="wifi_settings_category" msgid="2810363951104753710">"Tetapan Wi-Fi"</string>
+    <!-- no translation found for wifi_settings_title (4351120897298124250) -->
+    <skip />
+    <string name="wifi_settings_summary" msgid="668767638556052820">"Sediakan &amp; urus titik capaian wayarles"</string>
+    <!-- outdated translation 6710266609710860129 -->     <string name="wifi_starting" msgid="7732330327758522943">"Menghidupkan..."</string>
+    <!-- outdated translation 5952909472548218348 -->     <string name="wifi_stopping" msgid="244864762599017659">"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_enable_watchdog_service" msgid="4723544454066601706">"Semakan Kesambungan Wi-Fi"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="8687400936839455926">"Kesan dan urus masalah kesambungan rangkaian yang boleh berlaku"</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>
+    <!-- outdated translation 1671334951296205616 -->     <string name="wifi_add_network" msgid="6234851776910938957">"Tambah rangkaian Wi-Fi"</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>
+    <!-- no translation found for wifi_empty_list_wifi_off (3682507011071029311) -->
+    <skip />
+    <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>
+    <!-- outdated translation 5419052271935350999 -->     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"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>
+    <!-- no translation found for wifi_advanced_settings_label (3654366894867838338) -->
+    <skip />
+    <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 awalan rgkaian yg pjgnya antara 0 &amp; 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="1708697328627382561">"Paparan"</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">"Padamkan 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>
+    <!-- no translation found for storage_menu_usb (1580545228584324704) -->
+    <skip />
+    <!-- no translation found for storage_title_usb (5775322159427546546) -->
+    <skip />
+    <!-- no translation found for usb_label_mtp (4157227401755543412) -->
+    <skip />
+    <!-- no translation found for usb_label_ptp (7417254019489575819) -->
+    <skip />
+    <!-- no translation found for usb_label_installer_cd (7438467574756086977) -->
+    <skip />
+    <string name="battery_status_title" msgid="9159414319574976203">"Status bateri"</string>
+    <string name="battery_level_title" msgid="2965679202786873272">"Aras bateri"</string>
+    <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
+    <string name="apn_edit" msgid="1354715499708424718">"Edit titik capaian"</string>
+    <string name="apn_not_set" msgid="7422262558097875757">"&lt;Tidak ditetapkan&gt;"</string>
+    <string name="apn_name" msgid="4115580098369824123">"Nama"</string>
+    <string name="apn_apn" msgid="2479425126733513353">"APN"</string>
+    <string name="apn_http_proxy" msgid="1826885957243696354">"Proksi"</string>
+    <string name="apn_http_port" msgid="3763259523984976226">"Port"</string>
+    <string name="apn_user" msgid="455637547356117761">"Nama pengguna"</string>
+    <string name="apn_password" msgid="5412301994998250968">"Kata laluan"</string>
+    <string name="apn_server" msgid="2436185314756372858">"Pelayan"</string>
+    <string name="apn_mmsc" msgid="3670124402105585737">"MMSC"</string>
+    <string name="apn_mms_proxy" msgid="5374082621073999275">"Proksi MMS"</string>
+    <string name="apn_mms_port" msgid="4074188088199243040">"Port MMS"</string>
+    <string name="apn_mcc" msgid="4258628382260674636">"MCC"</string>
+    <string name="apn_mnc" msgid="8629374076888809874">"MNC"</string>
+    <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>"kad SD"</b>" perlu dipadamkan."</string>
+    <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Padamkan 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 panas m.alih"</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>
+    <!-- no translation found for wireless_category_general (2973810407987118067) -->
+    <skip />
+    <!-- no translation found for wireless_category_mobile_networks (1254629216798424288) -->
+    <skip />
+    <string name="network_settings_title" msgid="7967552516440151852">"Rangkaian mudah alih"</string>
+    <string name="network_settings_summary" msgid="5149750850846813553">"Tetapkan pilihan untuk perayauan, rangkaian, APN"</string>
+    <string name="location_title" msgid="1029961368397484576">"Lokasi Saya"</string>
+    <string name="location_network_based" msgid="8815705866861993344">"Gunakan rangkaian wayarles"</string>
+    <string name="location_networks_disabled" msgid="2708968452901433980">"Lihat lokasi dalam aplikasi (seperti Peta) menggunakan rangkaian wayarles"</string>
+    <string name="location_neighborhood_level" msgid="4656658097932515921">"Lokasi ditentukan oleh Wi-Fi dan/atau rangkaian mudah alih"</string>
+    <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 yang 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>
+    <!-- outdated translation 3692151094288835065 -->     <string name="lock_intro_message" product="default" msgid="5796785892741212873">"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="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>
+    <!-- no translation found for external_code_size_label (3459343140355961335) -->
+    <skip />
+    <string name="data_size_label" msgid="8679376373625710107">"Data"</string>
+    <!-- no translation found for external_data_size_label (7533821466482000453) -->
+    <skip />
+    <!-- no translation found for external_data_size_label (626414192825329708) -->
+    <skip />
+    <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 untuk 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="215179176067683667">"Pilihan pemaju"</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_large_text_title" msgid="42259643359869436">"Teks besar"</string>
+    <string name="accessibility_services_category" msgid="8127851026323672607">"Perkhidmatan kebolehaksesan"</string>
+    <string name="toggle_accessibility_title" msgid="7338739354952553958">"Benarkan 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_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="7190304207330319919">"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 prtuturan dipasang"</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_title" msgid="7327468307909556719">"Tetapan VPN"</string>
+    <string name="vpn_settings_summary" msgid="8849924181594963972">"Sediakan &amp; urus Rangkaian Persendirian Maya (VPN)"</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="trusted_credentials" msgid="4266945289534242402">"Bukti kelayakan dipercayai"</string>
+    <string name="trusted_credentials_summary" msgid="6735221351155686632">"Paparkan sijil CA yang dipercayai"</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="5446972770562918934">"Penyandaran &amp; penetapan semula"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"Penyandaran &amp; penetapan semula"</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 memadamkan 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 debug_ui_category (9023948280291055349) -->
+    <skip />
+    <!-- no translation found for strict_mode (1938795874357830695) -->
+    <skip />
+    <!-- no translation found for strict_mode_summary (142834318897332338) -->
+    <skip />
+    <!-- no translation found for pointer_location (6084434787496938001) -->
+    <skip />
+    <!-- no translation found for pointer_location_summary (840819275172753713) -->
+    <skip />
+    <!-- no translation found for show_screen_updates (8282711794220426931) -->
+    <skip />
+    <!-- no translation found for show_screen_updates_summary (1716122382094924596) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage (2389212910758076024) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage_summary (2113341923988958266) -->
+    <skip />
+    <!-- no translation found for window_animation_scale_title (6162587588166114700) -->
+    <skip />
+    <!-- no translation found for transition_animation_scale_title (387527540523595875) -->
+    <skip />
+    <!-- no translation found for debug_applications_category (6221644998451283813) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities (3622005081180597749) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities_summary (3592221124808773368) -->
+    <skip />
+    <!-- no translation found for app_process_limit_title (4121324758038197598) -->
+    <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 (8821760330497941117) -->
+    <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 (2441219164620753329) -->
+    <skip />
+    <!-- no translation found for data_usage_sweep_warning (6387081852568846982) -->
+    <skip />
+    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Panggilan kecemasan"</string>
+    <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Kembali ke panggilan"</string>
+    <string name="vpn_name" msgid="4689699885361002297">"Nama"</string>
+    <string name="vpn_type" msgid="5435733139514388070">"Jenis"</string>
+    <string name="vpn_server" msgid="2123096727287421913">"Alamat pelayan"</string>
+    <string name="vpn_mppe" msgid="6639001940500288972">"Penyulitan PPP (MPPE)"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"Rahsia L2TP"</string>
+    <string name="vpn_ipsec_identifier" msgid="4098175859460006296">"Pengecam IPSec"</string>
+    <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Kunci prakongsi IPSec"</string>
+    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"Sijil pengguna IPSec"</string>
+    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"Sijil CA IPSec"</string>
+    <!-- no translation found for vpn_search_domains (5391995501541199624) -->
+    <skip />
+    <!-- no translation found for vpn_routes (8556236801755260073) -->
+    <skip />
+    <string name="vpn_username" msgid="1863901629860867849">"Nama pengguna"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Kata laluan"</string>
+    <!-- no translation found for vpn_save_login (6350322456427484881) -->
+    <skip />
+    <!-- no translation found for vpn_not_used (9094191054524660891) -->
+    <skip />
+    <string name="vpn_no_ca_cert" msgid="7820884983947090538">"(jangan sahkan pelayan)"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"Batal"</string>
+    <string name="vpn_save" msgid="4233484051644764510">"Simpan"</string>
+    <string name="vpn_connect" msgid="8469608541746132301">"Sambung"</string>
+    <string name="vpn_edit" msgid="1111459297288136079">"Edit rangkaian VPN"</string>
+    <string name="vpn_connect_to" msgid="7328758950427515753">"Sambung kepada <xliff:g id="NETWORK">%s</xliff:g>"</string>
+    <string name="vpn_title" msgid="7982620762043790565">"Tetapan VPN"</string>
+    <string name="vpn_create" msgid="8966010925994175306">"Tambah rangkaian VPN"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"Edit rangkaian"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"Padamkan rangkaian"</string>
+    <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Sistem"</string>
+    <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Pengguna"</string>
+    <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Lumpuhkan"</string>
+    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Dayakan"</string>
+    <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Alih keluar"</string>
+    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Dayakan sijil CA sistem?"</string>
+    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Lumpuhkan sijil CA sistem?"</string>
+    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Alih keluar sijil CA pengguna secara kekal?"</string>
+</resources>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index aa2ee0a..3ee1731 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>
@@ -214,4 +240,36 @@
     <item msgid="3878793616631049349">"Bruk HDCP-kontroll kun for DRM-innhold"</item>
     <item msgid="45075631231212732">"Bruk alltid HDCP-kontroll"</item>
   </string-array>
+    <!-- no translation found for window_animation_scale_entries:0 (8134156599370824081) -->
+    <!-- no translation found for window_animation_scale_entries:1 (6624864048416710414) -->
+    <!-- no translation found for window_animation_scale_entries:2 (2219332261255416635) -->
+    <!-- no translation found for window_animation_scale_entries:3 (3544428804137048509) -->
+    <!-- no translation found for window_animation_scale_entries:4 (3110710404225974514) -->
+    <!-- no translation found for window_animation_scale_entries:5 (4402738611528318731) -->
+    <!-- no translation found for window_animation_scale_entries:6 (6189539267968330656) -->
+    <!-- no translation found for transition_animation_scale_entries:0 (8464255836173039442) -->
+    <!-- no translation found for transition_animation_scale_entries:1 (3375781541913316411) -->
+    <!-- no translation found for transition_animation_scale_entries:2 (1991041427801869945) -->
+    <!-- no translation found for transition_animation_scale_entries:3 (4012689927622382874) -->
+    <!-- no translation found for transition_animation_scale_entries:4 (3289156759925947169) -->
+    <!-- no translation found for transition_animation_scale_entries:5 (7705857441213621835) -->
+    <!-- no translation found for transition_animation_scale_entries:6 (6660750935954853365) -->
+    <!-- no translation found for app_process_limit_entries:0 (6799596560242275471) -->
+    <!-- no translation found for app_process_limit_entries:1 (2412794376818632575) -->
+    <!-- no translation found for app_process_limit_entries:2 (1578904888612645001) -->
+    <!-- no translation found for app_process_limit_entries:3 (8819235336299873577) -->
+  <string-array name="vpn_types_long">
+    <item msgid="2732002039459078847">"PPTP VPN"</item>
+    <item msgid="3799752201662127867">"L2TP/IPSec VPN med forhåndsdelte nøkler"</item>
+    <item msgid="4725504331295252103">"L2TP/IPSec VPN med sertifikater"</item>
+    <item msgid="7526551163264034377">"IPSec VPN med forhåndsdelte taster og Xauth-autentisering"</item>
+    <item msgid="8064740940687465039">"IPSec VPN med sertifikater og Xauth-autentisering"</item>
+    <item msgid="4946199982372391490">"IPSec VPN med sertifikater og hybridautentisering"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:0 (8621078286418985762) -->
+    <!-- no translation found for vpn_states:1 (6692305604213080515) -->
+    <!-- no translation found for vpn_states:2 (8001704909356800092) -->
+    <!-- no translation found for vpn_states:3 (4039737283841672166) -->
+    <!-- no translation found for vpn_states:4 (4042143101664725090) -->
+    <!-- no translation found for vpn_states:5 (2690164254699635531) -->
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 07d4463..415046c 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -19,6 +19,10 @@
     <string name="yes" msgid="4676390750360727396">"Ja"</string>
     <string name="no" msgid="6731231425810196216">"Nei"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Ukjent"</string>
+    <string name="header_category_wireless_networks" msgid="4944823405420438623">"TRÅDLØST OG NETTVERK"</string>
+    <string name="header_category_device" msgid="5781174212691167553">"ENHET"</string>
+    <string name="header_category_personal" msgid="6225932173498802187">"PRIVAT"</string>
+    <string name="header_category_system" msgid="2073558547468647128">"SYSTEM"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Slå på radio"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Slå av radio"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Se SIM-adressebok"</string>
@@ -111,7 +115,11 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Parer…"</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"Paret"</string>
     <string name="bluetooth_device" msgid="6873461446424952003">"handsfree/håndsett"</string>
-    <string name="progress_scanning" msgid="3760897655335759141">"Søker"</string>
+    <!-- outdated translation 3760897655335759141 -->     <string name="progress_scanning" msgid="192587958424295789">"Søker"</string>
+    <!-- no translation found for progress_tap_to_pair (4192342336107106334) -->
+    <skip />
+    <!-- no translation found for bluetooth_no_devices_found (2412462335116297668) -->
+    <skip />
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Paringsforespørsel for Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Paringsforespørsel"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Velg å pare med <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
@@ -130,6 +138,9 @@
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Et program på telefonen ber om tillatelse til å aktivere Bluetooth og gjøre telefonen synlig for andre enheter. Ønsker du å gjøre dette?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Aktiverer Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Automatisk tilkobling"</string>
+    <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth-tilkoblingsforespørsel"</string>
+    <string name="bluetooth_connection_notif_message" msgid="1833221950512058309">"Trykk for å koble til «<xliff:g id="DEVICE_NAME">%1$s</xliff:g>»"</string>
+    <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Ønsker du å koble til «<xliff:g id="DEVICE_NAME">%1$s</xliff:g>»?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Innstillinger for dato og tid"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00 ettermiddag"</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
@@ -235,7 +246,7 @@
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Slå av alle trådløse tilkoblinger"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"Slår av trådløse tilkoblinger…"</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"Slår på trådløse tilkoblinger…"</string>
-    <string name="radio_controls_title" msgid="5868688473587168882">"Trådløst og nettverk"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Mer"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Trådløst og nettverk"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"Trådløse nett, Bluetooth, flymodus, mobile nettverk, VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Dataroaming"</string>
@@ -271,8 +282,8 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Eierinformasjon"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="2382525043173672857">"Skriv inn teksten som skal vises på låseskjermen"</string>
-    <string name="security_settings_title" msgid="5168491784222013179">"Plassering og sikkerhet"</string>
-    <string name="location_security_settings_title" msgid="4624434296446625554">"Plassering og sikkerhet"</string>
+    <string name="location_settings_title" msgid="8935806698251432196">"Posisjonstjenester"</string>
+    <string name="security_settings_title" msgid="7945465324818485460">"Sikkerhet"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Plassering, skjermlås, SIM-kort-lås"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Angi Min posisjon, lås opp skjerm, lås påloggingsopplysninger"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Passord"</string>
@@ -316,7 +327,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>
@@ -375,8 +386,8 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Vis eller deaktiver enhetsadministratorer"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Slå på Bluetooth"</string>
-    <string name="bluetooth_settings" msgid="2725796451253089609">"Bluetooth-innstillinger"</string>
-    <string name="bluetooth_settings_title" msgid="2824020086246268296">"Bluetooth-innstillinger"</string>
+    <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
+    <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Tilkoblinger, enhetsnavn og synlighet"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Bluetooth-paringsforespørsel"</string>
     <string name="bluetooth_enter_pin_msg" msgid="1499285355129256289">\n"Oppgi personlig kode for å pare med «<xliff:g id="DEVICE_NAME">%1$s</xliff:g>». (Prøv 0000 eller 1234.) Det kan hende at du må oppgi samme kode på Bluetooth-enheten."</string>
@@ -394,7 +405,10 @@
     <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> avslo paring."</string>
     <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"Kunne ikke koble til <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Let etter enheter"</string>
-    <string name="bluetooth_preference_find_nearby_title" msgid="5087410003465463318">"Finn enheter i nærheten"</string>
+    <!-- no translation found for bluetooth_search_for_devices (5957007154213560390) -->
+    <skip />
+    <!-- no translation found for bluetooth_searching_for_devices (9203739709307871727) -->
+    <skip />
     <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"Enhetsinnstillinger"</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Sammenkoblede enheter"</string>
     <string name="bluetooth_preference_found_devices" msgid="3133019331974936204">"Oppdagede enheter"</string>
@@ -404,6 +418,10 @@
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Fjern paring"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Koble fra og fjern paring"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Innstillinger…"</string>
+    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Avansert"</string>
+    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Avansert Bluetooth"</string>
+    <string name="bluetooth_advanced_settings_label" msgid="8659717781212434173">"Avansert Bluetooth"</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="3631028334811113629">"Slå på Bluetooth for å se tilgjengelige enheter"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Koble til…"</string>
     <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"Media"</string>
     <string name="bluetooth_profile_headset" msgid="81844079120986198">"Håndfri"</string>
@@ -445,27 +463,31 @@
     <string name="nfc_toggle_error" msgid="2233172102497535522">"Det oppstod en feil."</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Trådløst nett"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Slå på trådløst nett"</string>
-    <string name="wifi_settings" msgid="4746946030627213196">"Trådløsinnstillinger"</string>
+    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="2810363951104753710">"Innstillinger for trådløst nett"</string>
+    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Sett opp og styr trådløse aksesspunkt"</string>
-    <string name="wifi_starting" msgid="6710266609710860129">"Slår på…"</string>
-    <string name="wifi_stopping" msgid="5952909472548218348">"Slår av…"</string>
+    <string name="wifi_starting" msgid="7732330327758522943">"Slår på Wi-Fi …"</string>
+    <string name="wifi_stopping" msgid="244864762599017659">"Slår av Wi-Fi …"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Feil"</string>
     <string name="wifi_in_airplane_mode" msgid="7618393787965366655">"I flymodus"</string>
     <string name="wifi_fail_to_scan" msgid="6194542252808587669">"Kan ikke søke etter nettverk"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Varsling om nettverk"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Varsle når et åpent nettverk er tilgjengelig"</string>
+    <string name="wifi_enable_watchdog_service" msgid="4723544454066601706">"Kontroll av tilkoblingsmuligheter for Wi-Fi"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="8687400936839455926">"Oppdag og håndter eventuelle problemer med nettverkstilkobling"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Retningslinjer for frakoblet Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Spesifiser når telefonen skal bytte fra trådløsnett til mobiltelefonidata"</string>
     <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" msgid="6234851776910938957">"Legg til 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>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Koble til nettverket"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Slett nettverk"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Endre nettverk"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="3682507011071029311">"Slå på Wi-Fi for å se tilgjengelige nettverk"</string>
     <string name="wifi_network_setup" msgid="7974851890019344870">"Nettverksinnstillinger"</string>
     <string name="wifi_wps_pin" msgid="5471842298708321115">"Angi kode fra tilgangspunkt"</string>
     <string name="wifi_wps_setup_title" msgid="150518971269252336">"WPS-konfigurasjon"</string>
@@ -501,13 +523,13 @@
     <string name="wifi_save" msgid="3331121567988522826">"Lagre"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Avbryt"</string>
     <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"En annen WPS-økt er oppdaget. Prøv på nytt om noen minutter"</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Avansert"</string>
+    <!-- outdated translation 5419052271935350999 -->     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Avansert"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi-frekvensbånd"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Angi operasjonens frekvensområde"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Det oppsto et problem med frekvensbåndet."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC-adresse"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP-adresse"</string>
-    <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"IP-innstillinger"</string>
+    <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP-innstillinger"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Lagre"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Avbryt"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Angi en gyldig IP-adresse."</string>
@@ -525,7 +547,7 @@
     <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> flyttbar trådløs sone"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="sound_settings_title" msgid="8735891486683305886">"Lyd"</string>
-    <string name="display_settings_title" msgid="2378894265964357591">"Skjerm"</string>
+    <string name="display_settings_title" msgid="1708697328627382561">"Skjerm"</string>
     <string name="sound_settings" msgid="5007659014828162881">"Lydinnstillinger"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Stillemodus"</string>
     <string name="silent_mode_summary" msgid="3309650676072917899">"Kutt all lyd utenom medieprogrammer og alarmer"</string>
@@ -553,7 +575,7 @@
     <string name="dock_settings_summary" msgid="455802113668982481">"Lydinnstillinger for festet forankring"</string>
     <string name="dtmf_tone_enable_title" msgid="1453831168789523185">"Hørbare tastetoner"</string>
     <string name="dtmf_tone_enable_summary_on" msgid="3028201873989887327">"Spill toner når talltastaturet benyttes"</string>
-    <string name="dtmf_tone_enable_summary_off" msgid="7791065951268525678">"Spill toner når talltastaturet benytes"</string>
+    <string name="dtmf_tone_enable_summary_off" msgid="7791065951268525678">"Spill toner når talltastaturet benyttes"</string>
     <string name="sound_effects_enable_title" msgid="3197313718929122833">"Hørbart valg"</string>
     <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Lag lyd under skjermvalg"</string>
     <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Lag lyd under skjermvalg"</string>
@@ -598,7 +620,18 @@
     <string name="brightness_summary" msgid="838917350127550703">"Juster skjermens lysstyrke"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Tidsavbrudd"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Skjermen slås automatisk av etter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Bakgrunnsbilde"</string>
+    <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 +676,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>
@@ -696,6 +730,16 @@
     <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"SD-kort kobles fra."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Kobler fra minnekort"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Frakobling pågår"</string>
+    <!-- no translation found for storage_menu_usb (1580545228584324704) -->
+    <skip />
+    <!-- no translation found for storage_title_usb (5775322159427546546) -->
+    <skip />
+    <!-- no translation found for usb_label_mtp (4157227401755543412) -->
+    <skip />
+    <!-- no translation found for usb_label_ptp (7417254019489575819) -->
+    <skip />
+    <!-- no translation found for usb_label_installer_cd (7438467574756086977) -->
+    <skip />
     <string name="battery_status_title" msgid="9159414319574976203">"Batteristatus"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Batterinivå"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -806,6 +850,8 @@
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"Kan ikke knytte til mer enn <xliff:g id="MAXCONNECTION">%1$d</xliff:g> enheter"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kobles fra."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Hjelp"</string>
+    <string name="wireless_category_general" msgid="2973810407987118067">"Generelt"</string>
+    <string name="wireless_category_mobile_networks" msgid="1254629216798424288">"Mobilnettverk"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobile nettverk"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Innstillinger for roaming, nettverk, APN"</string>
     <string name="location_title" msgid="1029961368397484576">"Min plassering"</string>
@@ -883,7 +929,7 @@
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Slik sikrer du nettbrettet"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Sikring av telefonen"</string>
     <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"Beskytt nettbrettet mot uautorisert bruk ved å opprette et personlig skjermopplåsingsmønster. På neste skjermbilde kan du dra fingeren fra prikk til prikk i en hvilken som helst rekkefølge. Du må berøre minst fire prikker. "\n\n"Klar til å begynne? Berør Neste."</string>
-    <string name="lock_intro_message" product="default" msgid="9100785646737118042"><font size="17">"Beskytt telefonen fra uautorisert bruk ved å lage et personlig opplåsingsmønster for skjermen. "\n<font height="17">\n</font><b>"1"</b>"  På den neste skjermen, se på mens et eksempelmønster blir tegnet. "\n<font height="17">\n</font><b>"2"</b>"  Når du er klar, tegn ditt eget personlige opplåsingsmønster. Prøv med forskjellige mønster, men tegn over minst fire prikker. "\n<font height="17">\n</font><b>"3"</b>"  Tegn mønsteret på nytt for å bekrefte. "\n<font height="17">\n</font><b>"Klar? Velg «neste»."</b>" "\n<font height="3">\n</font>"For å la telefonen forbli ubeskyttet, velg «Avbryt»."</font></string>
+    <!-- outdated translation 3692151094288835065 -->     <string name="lock_intro_message" product="default" msgid="5796785892741212873">"Beskytt nettbrettet mot uautorisert bruk ved å opprette et personlig skjermopplåsingsmønster. På neste skjermbilde kan du dra fingeren fra prikk til prikk i en hvilken som helst rekkefølge. Du må berøre minst fire prikker. "\n\n"Klar til å begynne? Berør Neste."</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Installerte applikasjoner"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Hold orden på og fjern installerte applikasjoner"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Applikasjoner"</string>
@@ -893,6 +939,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>
@@ -905,9 +953,10 @@
     <string name="force_stop" msgid="7435006169872876756">"Tving avslutning"</string>
     <string name="total_size_label" msgid="1048676419552557254">"Totalt"</string>
     <string name="application_size_label" msgid="5055196275624686382">"Applikasjon"</string>
+    <string name="external_code_size_label" msgid="3459343140355961335">"USB-lagringsvolum for app"</string>
     <string name="data_size_label" msgid="8679376373625710107">"Data"</string>
-    <string name="external_size_label" product="nosdcard" msgid="4465530017830945766">"USB-lagring"</string>
-    <string name="external_size_label" product="default" msgid="2107155737635944440">"SD-kort"</string>
+    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB-lagringsvolum for data"</string>
+    <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD-kort"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Avinstaller"</string>
     <string name="disable_text" msgid="6544054052049395202">"Deaktiver"</string>
     <string name="enable_text" msgid="9217362512327828987">"Aktiver"</string>
@@ -1026,7 +1075,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 +1085,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>
@@ -1066,7 +1117,7 @@
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Innstillinger for skjermtastatur"</string>
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Fysisk tastatur"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Innstillinger for fysisk tastatur"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Utvikling"</string>
+    <string name="development_settings_title" msgid="215179176067683667">"Utvikleralternativer"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"Innstillinger for applikasjonsutvikling"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB-debugging"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Debug-modus når USB er koblet til"</string>
@@ -1091,14 +1142,14 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Tilgjengelighet"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Tilgjengelighetsinnstillinger"</string>
     <string name="accessibility_settings_summary" msgid="8185181964847149507">"Tilgjengelighetsvalg"</string>
-    <string name="toggle_accessibility_title" msgid="650839277066574497">"Tilgjengelighet"</string>
+    <string name="toggle_large_text_title" msgid="42259643359869436">"Stor tekst"</string>
     <string name="accessibility_services_category" msgid="8127851026323672607">"Tjenester for tilgjengelighet"</string>
+    <string name="toggle_accessibility_title" msgid="7338739354952553958">"Tillat tilgjengelighetstjenester"</string>
     <string name="no_accessibility_services_summary" msgid="694578333333808159">"Ingen tilgjengelighetstjenester er installert."</string>
     <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Denne tilgjengelighetstjenesten har tilgang til all tekst du skriver, inkludert personlig data som passord og kredittkortnummer. Den kan også loggføre alt som skjer i brukergrensesnittet. Det kommer fra programmet <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Vil du aktivere denne tjenesten?"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Slå av tilgjengelighetsstøtten?"</string>
     <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"Finner ingen tilgjengelighetsprogrammer"</string>
     <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"Du har ikke installert et tilgjengelighetsprogram."\n\n"Du kan laste ned en skjermleser for enheten på Android Market."\n\n"Klikk på OK for å installere skjermleseren."</string>
-    <string name="accessibility_script_injection_category" msgid="8649951751131431904">"Tilgjengelighetsskript"</string>
     <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"Last ned tilgjengelighetsskript"</string>
     <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"Tillat prog. å laste ned tilgjengelighetsskript fra Google"</string>
     <string name="accessibility_script_injection_security_warning" product="tablet" msgid="1113600871264359828">"Enkelte applikasjoner kan be Google om å laste ned skript til nettbrettet som gjør innholdet deres mer tilgjengelig. Er du sikker på at du vil tillate Google å installere tilgjengelighetsskript på nettbrettet?"</string>
@@ -1106,10 +1157,11 @@
     <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>
-    <string name="power_usage_summary_title" msgid="5180282911164282324">"Batteribruk"</string>
+    <string name="power_usage_summary_title" msgid="7190304207330319919">"Batteri"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Hva som har brukt batteri"</string>
     <string name="power_usage_not_available" msgid="3583407442633768046">"Batteribrukinfo ikke tilgj."</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Batteribruk siden strømmen ble trukket ut"</string>
@@ -1218,6 +1270,8 @@
     <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>
+    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Innstillinger for motor"</string>
+    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Innstillinger for <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
     <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>
@@ -1228,114 +1282,33 @@
     <string name="gadget_title" msgid="7455548605888590466">"Strømkontroll"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Oppdaterer innstilling for Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Oppdatere Bluetooth-innstilling"</string>
-    <string name="vpn_settings_activity_title" msgid="7276864950701612579">"VPN-innstillinger"</string>
-    <string name="vpn_connect_to" msgid="2541409082892684362">"Koble til <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpn_username_colon" msgid="7854930370861306247">"Brukernavn:"</string>
-    <string name="vpn_password_colon" msgid="5716278710848606626">"Passord:"</string>
-    <string name="vpn_a_username" msgid="6664733641993968692">"et brukernavn"</string>
-    <string name="vpn_a_password" msgid="1537213632501483753">"et passord"</string>
-    <string name="vpn_save_username" msgid="1408415289165970790">"Husk brukernavn"</string>
-    <string name="vpn_connect_button" msgid="1699007212602470655">"Koble til"</string>
-    <string name="vpn_yes_button" msgid="8034531001149843119">"Ja"</string>
-    <string name="vpn_no_button" msgid="7620339571187119107">"Nei"</string>
-    <string name="vpn_back_button" msgid="192036339792734970">"Tilbake"</string>
-    <string name="vpn_mistake_button" msgid="1683383660912491270">"Nei"</string>
-    <string name="vpn_menu_done" msgid="93528279226907926">"Lagre"</string>
-    <string name="vpn_menu_cancel" msgid="7234451214611202868">"Avbryt"</string>
-    <string name="vpn_menu_revert" msgid="4407762442281467659">"Tilbakestill"</string>
-    <string name="vpn_menu_connect" msgid="1089399414463784218">"Koble til nettverk"</string>
-    <string name="vpn_menu_disconnect" msgid="8254492450022562235">"Koble fra nettverk"</string>
-    <string name="vpn_menu_edit" msgid="4526245173583195618">"Rediger nettverk"</string>
-    <string name="vpn_menu_delete" msgid="3326527392609513129">"Slett nettverk"</string>
-    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"Du må skrive inn <xliff:g id="CODE">%s</xliff:g>."</string>
-    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"Du må velge <xliff:g id="OPTION">%s</xliff:g>."</string>
-    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"VPN-navnet «<xliff:g id="NAME">%s</xliff:g>»·finnes allerede. Velg et annet navn."</string>
-    <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"Er du sikker på at du ønsker å slette dette VPN-et?"</string>
-    <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"Er du sikker på at du ikke ønsker å opprette denne profilen?"</string>
-    <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"Er du sikker på at du vil forkaste endringene for denne profilen?"</string>
-    <string name="vpn_confirm_reconnect" msgid="5748535476278674296">"Kunne ikke koble til nettverket. Prøv igjen?"</string>
-    <string name="vpn_reconnect_from_lost" msgid="2442844155623372118">"Mistet tilkoblingen. Koble til på nytt?"</string>
-    <string name="vpn_unknown_server_dialog_msg" msgid="3080742299823671319">"Kunne ikke slå opp tjenernavnet. Ønsker du å sjekke innstillingen for tjenernavn?"</string>
-    <string name="vpn_challenge_error_dialog_msg" msgid="6174901754230038601">"Autentiseringsfeil. Ønsker du å sjekke passordinnstillingene?"</string>
-    <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"Et eller flere passord mangler i denne VPN-innstillingen. Ønsker du å sjekke passordinnstillingene?"</string>
-    <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"Brukernavnet eller passordet er feil. Prøv igjen?"</string>
-    <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"Tjeneren la på. Brukernavnet eller passordet kan være feil. Prøv igjen?"</string>
-    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"Tjeneren brøt forbindelsen. Det kan hende du befinner deg bak en brannmur som hindrer deg i å koble til tjeneren. Vil du prøve igjen?"</string>
-    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"Tjenerforhandling mislyktes. Det kan hende at tjeneren ikke er enig i krypteringsalternativet ditt. Vil du kontrollere krypteringsinnstillingene?"</string>
-    <string name="vpn_type_title" msgid="6392933604218676224">"Legg til VPN"</string>
-    <string name="vpn_add_new_vpn" msgid="5438260689052714550">"Legg til VPN"</string>
-    <string name="vpn_details_title" msgid="418806440938510331">"VPN-detaljer"</string>
-    <string name="vpn_edit_title_add" msgid="2121313217989682890">"Legg til <xliff:g id="NAME">%s</xliff:g>-VPN"</string>
-    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"Detaljer om <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpns" msgid="3148141862835492816">"VPN"</string>
-    <string name="vpn_connecting" msgid="8039521381692090116">"Kobler til ..."</string>
-    <string name="vpn_disconnecting" msgid="7748050200708257066">"Kobler fra ..."</string>
-    <string name="vpn_connected" msgid="7641723116362845781">"Tilkoblet"</string>
-    <string name="vpn_connect_hint" msgid="7442898962925875181">"Koblet til nettverket"</string>
-    <string name="vpn_name" msgid="1550918148476193076">"VPN-navn"</string>
-    <string name="vpn_a_name" msgid="8445736942405283509">"et VPN-navn"</string>
-    <string name="vpn_profile_added" msgid="9061017910337129840">"«<xliff:g id="NAME">%s</xliff:g>» ble lagt til"</string>
-    <string name="vpn_profile_replaced" msgid="587435576816273815">"«<xliff:g id="NAME">%s</xliff:g>» ble endret"</string>
-    <string name="vpn_user_certificate_title" msgid="6812545893924071742">"Velg klientsertifikat"</string>
-    <string name="vpn_user_certificate" msgid="949322691686938888">"Klientsertifikat"</string>
-    <string name="vpn_a_user_certificate" msgid="8943983437956898649">"et klientsertifikat"</string>
-    <string name="vpn_ca_certificate_title" msgid="7846466160795589985">"Velg CA-sertifikat"</string>
-    <string name="vpn_ca_certificate" msgid="465085144064264742">"Sertifikatautoritetens (CAs) sertifikat"</string>
-    <string name="vpn_a_ca_certificate" msgid="3374242520974884295">"et CA-sertifikat"</string>
-    <string name="vpn_l2tp_secret_string_title" msgid="5039677186748940987">"Velg L2TP-passord"</string>
-    <string name="vpn_l2tp_secret" msgid="529359749677142076">"L2TP-passord"</string>
-    <string name="vpn_a_l2tp_secret" msgid="6612042930810981845">"et L2TP-passord"</string>
-    <string name="vpn_pptp_encryption_title" msgid="2236795167467896499">"kryptering"</string>
-    <string name="vpn_pptp_encryption" msgid="2602329949737259686">"PPTP-kryptering"</string>
-    <string name="vpn_ipsec_presharedkey_title" msgid="2184060087690539175">"Velg forhåndsdelt nøkkel for IPSec"</string>
-    <string name="vpn_ipsec_presharedkey" msgid="5434316521616673741">"Forhåndsdelt nøkkel for IPSec"</string>
-    <string name="vpn_a_ipsec_presharedkey" msgid="1255301923217898418">"en forhåndsdelt nøkkel for IPSec"</string>
-    <string name="vpn_vpn_server_title" msgid="8897005887420358913">"Velg VPN-tjener"</string>
-    <string name="vpn_vpn_server" msgid="1141754908824209260">"VPN-tjener"</string>
-    <string name="vpn_a_vpn_server" msgid="5960906152125045853">"en VPN-tjener"</string>
-    <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"VPN-tjenernavn"</string>
-    <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"DNS-søkesti"</string>
-    <string name="vpn_dns_search_list" msgid="4230034234026605360">"DNS-søkesti"</string>
-    <string name="vpn_field_is_set" msgid="7137320847812992243">"<xliff:g id="VALUE">%s</xliff:g> er angitt"</string>
-    <string name="vpn_field_not_set" msgid="2972519243515893804">"<xliff:g id="VALUE">%s</xliff:g> ikke angitt"</string>
-    <string name="vpn_field_not_set_optional" msgid="8840557698252556791">"<xliff:g id="VALUE">%s</xliff:g> er ikke angitt (valgfritt)"</string>
-    <string name="vpn_enable_field" msgid="3700967675854517191">"Aktiver <xliff:g id="OPTION">%s</xliff:g>"</string>
-    <string name="vpn_disable_field" msgid="6905658811179634005">"Deaktiver <xliff:g id="OPTION">%s</xliff:g>"</string>
-    <string name="vpn_is_enabled" msgid="1266304230417098877">"<xliff:g id="OPTION">%s</xliff:g> er aktivert"</string>
-    <string name="vpn_is_disabled" msgid="2013622485867806167">"<xliff:g id="OPTION">%s</xliff:g> er deaktivert"</string>
     <string name="vpn_settings_title" msgid="7327468307909556719">"VPN-innstillinger"</string>
     <string name="vpn_settings_summary" msgid="8849924181594963972">"Sett opp og vedlikehold virtuelle private nettverk (VPN)"</string>
-    <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="trusted_credentials" msgid="4266945289534242402">"Pålitelig legitimasjon"</string>
+    <string name="trusted_credentials_summary" msgid="6735221351155686632">"Vis pålitelige CA-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>
-    <string name="privacy_settings_title" msgid="1987089301293213705">"Personverninnstillinger"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"Sikkerhetskopier og tilbakestill"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"Sikkerhetskopier og tilbakestill"</string>
     <string name="backup_section_title" msgid="8856083167469467588">"Sikkerhetskopiering og gjenoppretting"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Personlige data"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Sikkerhetskopier data"</string>
@@ -1439,4 +1412,107 @@
     <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>
+    <!-- no translation found for debug_ui_category (9023948280291055349) -->
+    <skip />
+    <!-- no translation found for strict_mode (1938795874357830695) -->
+    <skip />
+    <!-- no translation found for strict_mode_summary (142834318897332338) -->
+    <skip />
+    <!-- no translation found for pointer_location (6084434787496938001) -->
+    <skip />
+    <!-- no translation found for pointer_location_summary (840819275172753713) -->
+    <skip />
+    <!-- no translation found for show_screen_updates (8282711794220426931) -->
+    <skip />
+    <!-- no translation found for show_screen_updates_summary (1716122382094924596) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage (2389212910758076024) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage_summary (2113341923988958266) -->
+    <skip />
+    <!-- no translation found for window_animation_scale_title (6162587588166114700) -->
+    <skip />
+    <!-- no translation found for transition_animation_scale_title (387527540523595875) -->
+    <skip />
+    <!-- no translation found for debug_applications_category (6221644998451283813) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities (3622005081180597749) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities_summary (3592221124808773368) -->
+    <skip />
+    <!-- no translation found for app_process_limit_title (4121324758038197598) -->
+    <skip />
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Databruk"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"Databruksyklus"</string>
+    <string name="data_usage_menu_split_4g" msgid="7417435609285381968">"Del 4G-bruk"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Vis Wi-Fi-bruk"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"Endre syklus …"</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Dag i måneden for å tilbakestille databruksyklusen:"</string>
+    <string name="data_usage_disable_mobile_limit" msgid="289740911281022322">"Deaktiver mobildata ved grensen"</string>
+    <string name="data_usage_disable_4g_limit" msgid="5808210773758699800">"Deaktiver 4G-data ved grensen"</string>
+    <string name="data_usage_disable_3g_limit" msgid="3856971004328238231">"Deaktiver 2G-3G-data ved grensen"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_mobile" msgid="454140350007299045">"Mobil"</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">"Mobildata"</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">"Se applikasjoninnstillinger"</string>
+    <string name="data_usage_app_restrict_background" msgid="8856643905291165256">"Begrens bruk av bakgrunnsdata"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="1503361245973512092">"Tillat kun bakgrunnsdata fra apper når ubegrenset nettverk brukes"</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="8110736468987743260">"Begrensing av bakgrunnsdata"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="100001698378554777">"Denne funksjonen kan innvirke negativt på applikasjoner som er avhengig av databruk i bakgrunnen."\n\n"Du finner mer hensiktsmessige kontroller for databruk i denne applikasjonens innstillinger."</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Tilbakestillingsdato for brukssyklus"</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Dato for hver måned:"</string>
+    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Bekreft"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Begrensing av databruk"</string>
+    <string name="data_usage_limit_dialog_mobile" msgid="7931094451923591578">"Den mobile dataforbindelsen din blir deaktivert når den angitte grensen er nådd."\n\n"Med tanke på å unngå ekstra kostnader, kan du vurdere å bruke en lavere grense siden beregningsmåtene på enheten og hos leverandøren kan variere."</string>
+    <string name="data_usage_limit_dialog_3g" msgid="5478553071420316963">"2G-3G-dataforbindelsen din blir deaktivert når den angitte grensen er nådd. "\n\n"Med tanke på å unngå ekstra kostnader, kan du vurdere å bruke en lavere grense siden beregningsmåtene på enheten og hos leverandøren kan variere."</string>
+    <string name="data_usage_limit_dialog_4g" msgid="6134008906742403777">"4G-dataforbindelsen din blir deaktivert når den angitte grensen er nådd."\n\n"Med tanke på å unngå ekstra kostnader, kan du vurdere å bruke en lavere grense siden beregningsmåtene på enheten og hos leverandøren kan variere."</string>
+    <string name="data_usage_disabled_dialog_3g_title" msgid="4221584306492812040">"2G-3G-data er deaktivert"</string>
+    <string name="data_usage_disabled_dialog_4g_title" msgid="715585612162185936">"4G-data er deaktivert"</string>
+    <string name="data_usage_disabled_dialog_mobile_title" msgid="209516216265000221">"Mobildata er deaktivert"</string>
+    <string name="data_usage_disabled_dialog" msgid="2874031671067845964">"Den angitte databruksgrensen er nådd."\n\n"Ytterligere databruk kan medføre høyere kostnader hos leverandøren."</string>
+    <string name="data_usage_disabled_dialog_enable" msgid="2441219164620753329">"Reaktiver data"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="32">"<xliff:g id="NUMBER">%1$s</xliff:g>"</font>" "<font size="12">"<xliff:g id="UNIT">%2$s</xliff:g>"</font>\n<font size="12">"advarsel"</font></string>
+    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Nødanrop"</string>
+    <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Tilbake til anrop"</string>
+    <string name="vpn_name" msgid="4689699885361002297">"Navn"</string>
+    <string name="vpn_type" msgid="5435733139514388070">"Type"</string>
+    <string name="vpn_server" msgid="2123096727287421913">"Tjeneradresse"</string>
+    <string name="vpn_mppe" msgid="6639001940500288972">"PPP-kryptering (MPPE)"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"L2TP-passord"</string>
+    <string name="vpn_ipsec_identifier" msgid="4098175859460006296">"IPSec-identifikator"</string>
+    <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Forhåndsdelt nøkkel for IPSec"</string>
+    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"Brukersertifikat for IPSec"</string>
+    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec CA-sertifikat"</string>
+    <!-- no translation found for vpn_search_domains (5391995501541199624) -->
+    <skip />
+    <!-- no translation found for vpn_routes (8556236801755260073) -->
+    <skip />
+    <string name="vpn_username" msgid="1863901629860867849">"Brukernavn"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Passord"</string>
+    <!-- no translation found for vpn_save_login (6350322456427484881) -->
+    <skip />
+    <!-- no translation found for vpn_not_used (9094191054524660891) -->
+    <skip />
+    <string name="vpn_no_ca_cert" msgid="7820884983947090538">"(ikke bekreft tjener)"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"Avbryt"</string>
+    <string name="vpn_save" msgid="4233484051644764510">"Lagre"</string>
+    <string name="vpn_connect" msgid="8469608541746132301">"Koble til"</string>
+    <string name="vpn_edit" msgid="1111459297288136079">"Rediger VPN-nettverk"</string>
+    <string name="vpn_connect_to" msgid="7328758950427515753">"Koble til <xliff:g id="NETWORK">%s</xliff:g>"</string>
+    <string name="vpn_title" msgid="7982620762043790565">"VPN-innstillinger"</string>
+    <string name="vpn_create" msgid="8966010925994175306">"Legg til VPN-nettverk"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"Rediger nettverk"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"Slett nettverk"</string>
+    <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"System"</string>
+    <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Bruker"</string>
+    <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Deaktiver"</string>
+    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Aktiver"</string>
+    <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Fjern"</string>
+    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Vil du aktivere systemets CA-sertifikat?"</string>
+    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Vil du deaktivere systemets CA-sertifikat?"</string>
+    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Vil du fjerne brukerens CA-sertifikat permanent?"</string>
 </resources>
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index d4137cc..a16e7e8 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>
@@ -214,4 +240,36 @@
     <item msgid="3878793616631049349">"HDCP-controle alleen voor DRM-inhoud gebruiken"</item>
     <item msgid="45075631231212732">"HDCP-controle altijd gebruiken"</item>
   </string-array>
+    <!-- no translation found for window_animation_scale_entries:0 (8134156599370824081) -->
+    <!-- no translation found for window_animation_scale_entries:1 (6624864048416710414) -->
+    <!-- no translation found for window_animation_scale_entries:2 (2219332261255416635) -->
+    <!-- no translation found for window_animation_scale_entries:3 (3544428804137048509) -->
+    <!-- no translation found for window_animation_scale_entries:4 (3110710404225974514) -->
+    <!-- no translation found for window_animation_scale_entries:5 (4402738611528318731) -->
+    <!-- no translation found for window_animation_scale_entries:6 (6189539267968330656) -->
+    <!-- no translation found for transition_animation_scale_entries:0 (8464255836173039442) -->
+    <!-- no translation found for transition_animation_scale_entries:1 (3375781541913316411) -->
+    <!-- no translation found for transition_animation_scale_entries:2 (1991041427801869945) -->
+    <!-- no translation found for transition_animation_scale_entries:3 (4012689927622382874) -->
+    <!-- no translation found for transition_animation_scale_entries:4 (3289156759925947169) -->
+    <!-- no translation found for transition_animation_scale_entries:5 (7705857441213621835) -->
+    <!-- no translation found for transition_animation_scale_entries:6 (6660750935954853365) -->
+    <!-- no translation found for app_process_limit_entries:0 (6799596560242275471) -->
+    <!-- no translation found for app_process_limit_entries:1 (2412794376818632575) -->
+    <!-- no translation found for app_process_limit_entries:2 (1578904888612645001) -->
+    <!-- no translation found for app_process_limit_entries:3 (8819235336299873577) -->
+  <string-array name="vpn_types_long">
+    <item msgid="2732002039459078847">"PPTP-VPN"</item>
+    <item msgid="3799752201662127867">"L2TP/IPSec-VPN met van tevoren gedeelde sleutels"</item>
+    <item msgid="4725504331295252103">"L2TP/IPSec-VPN met certificaten"</item>
+    <item msgid="7526551163264034377">"IPSec VPN-met van tevoren gedeelde sleutels en Xauth-authenticatie"</item>
+    <item msgid="8064740940687465039">"IPSec-VPN met certificaten en Xauth-authenticatie"</item>
+    <item msgid="4946199982372391490">"IPSec-VPN met certificaten en hybride authenticatie"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:0 (8621078286418985762) -->
+    <!-- no translation found for vpn_states:1 (6692305604213080515) -->
+    <!-- no translation found for vpn_states:2 (8001704909356800092) -->
+    <!-- no translation found for vpn_states:3 (4039737283841672166) -->
+    <!-- no translation found for vpn_states:4 (4042143101664725090) -->
+    <!-- no translation found for vpn_states:5 (2690164254699635531) -->
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 858ca1e..1a96d83 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -19,6 +19,10 @@
     <string name="yes" msgid="4676390750360727396">"Ja"</string>
     <string name="no" msgid="6731231425810196216">"Nee"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Onbekend"</string>
+    <string name="header_category_wireless_networks" msgid="4944823405420438623">"DRAADLOOS EN NETWERKEN"</string>
+    <string name="header_category_device" msgid="5781174212691167553">"APPARAAT"</string>
+    <string name="header_category_personal" msgid="6225932173498802187">"PERSOONLIJK"</string>
+    <string name="header_category_system" msgid="2073558547468647128">"SYSTEEM"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Radio inschakelen"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Radio uitschakelen"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"SIM-adresboek weergeven"</string>
@@ -111,7 +115,11 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Koppelen..."</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"Gekoppeld maar niet verbonden"</string>
     <string name="bluetooth_device" msgid="6873461446424952003">"handsfree/headset"</string>
-    <string name="progress_scanning" msgid="3760897655335759141">"Scannen"</string>
+    <!-- outdated translation 3760897655335759141 -->     <string name="progress_scanning" msgid="192587958424295789">"Scannen"</string>
+    <!-- no translation found for progress_tap_to_pair (4192342336107106334) -->
+    <skip />
+    <!-- no translation found for bluetooth_no_devices_found (2412462335116297668) -->
+    <skip />
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Bluetooth-koppelingsverzoek"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Koppelingsverzoek"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Selecteer dit om te koppelen met <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
@@ -130,6 +138,9 @@
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Een app op uw telefoon vraagt toestemming Bluetooth in te schakelen en uw telefoon vindbaar te maken voor andere apparaten. Wilt u dit toestaan?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Bluetooth inschakelen…"</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Automatisch verbinding maken"</string>
+    <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth-verbindingsverzoek"</string>
+    <string name="bluetooth_connection_notif_message" msgid="1833221950512058309">"Raak aan om verbinding te maken met \'<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\'"</string>
+    <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Wilt u verbinding maken met \'<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\'?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Datum- en tijdinstellingen"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"13:00 uur"</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"01:00:00 PM"</string>
@@ -235,7 +246,7 @@
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Alle draadloze verbindingen uitschakelen"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"Draadloze verbindingen uitschakelen..."</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"Draadloze verbindingen inschakelen..."</string>
-    <string name="radio_controls_title" msgid="5868688473587168882">"Draadloos en netwerken"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Meer…"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Draadloos en netwerken"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"Wi-Fi, Bluetooth, vliegmodus, mobiele netwerken en VPN\'s beheren"</string>
     <string name="roaming" msgid="3596055926335478572">"Gegevensroaming"</string>
@@ -271,8 +282,8 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Eigenaarsgegevens"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="2382525043173672857">"Voer tekst in voor weergave op vergrendeld scherm"</string>
-    <string name="security_settings_title" msgid="5168491784222013179">"Locatie en beveiliging"</string>
-    <string name="location_security_settings_title" msgid="4624434296446625554">"Locatie- en beveiligingsinstellingen"</string>
+    <string name="location_settings_title" msgid="8935806698251432196">"Locatieservices"</string>
+    <string name="security_settings_title" msgid="7945465324818485460">"Beveiliging"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Mijn locatie\', schermontgrendeling, SIM- en referentieopslagvergrendeling instellen"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"\'Mijn locatie\' instellen, scherm ontgrendelen, opslag van referenties vergrendelen"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Wachtwoorden"</string>
@@ -316,7 +327,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>
@@ -375,8 +386,8 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Apparaatbeheerders weergeven of uitschakelen"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Bluetooth inschakelen"</string>
-    <string name="bluetooth_settings" msgid="2725796451253089609">"Bluetooth-instellingen"</string>
-    <string name="bluetooth_settings_title" msgid="2824020086246268296">"Bluetooth-instellingen"</string>
+    <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
+    <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Verbindingen beheren, apparaatnaam en vindbaarheid instellen"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Bluetooth-koppelingsverzoek"</string>
     <string name="bluetooth_enter_pin_msg" msgid="1499285355129256289">\n"Geef de PIN-code op om te koppelen met \'<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\'. (Probeer 0000 of 1234.) U moet dezelfde PIN-code wellicht opgeven op het Bluetooth-apparaat."</string>
@@ -394,7 +405,10 @@
     <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Koppeling geweigerd door <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"Er is een probleem opgetreden bij het verbinden met <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Scannen naar apparaten"</string>
-    <string name="bluetooth_preference_find_nearby_title" msgid="5087410003465463318">"Apparaten in de buurt vinden"</string>
+    <!-- no translation found for bluetooth_search_for_devices (5957007154213560390) -->
+    <skip />
+    <!-- no translation found for bluetooth_searching_for_devices (9203739709307871727) -->
+    <skip />
     <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"Apparaatinstellingen"</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Gekoppelde apparaten"</string>
     <string name="bluetooth_preference_found_devices" msgid="3133019331974936204">"Gevonden apparaten"</string>
@@ -404,6 +418,10 @@
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Koppeling ongedaan maken"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Verbinding verbreken en koppeling opheffen"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Opties..."</string>
+    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Geavanceerd"</string>
+    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Geavanceerde Bluetooth"</string>
+    <string name="bluetooth_advanced_settings_label" msgid="8659717781212434173">"Geavanceerde Bluetooth"</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="3631028334811113629">"Bluetooth inschakelen om beschikbare apparaten te bekijken"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Verbinding maken met…"</string>
     <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"Media"</string>
     <string name="bluetooth_profile_headset" msgid="81844079120986198">"Handsfree"</string>
@@ -445,27 +463,31 @@
     <string name="nfc_toggle_error" msgid="2233172102497535522">"Er is een fout opgetreden."</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Wi-Fi inschakelen"</string>
-    <string name="wifi_settings" msgid="4746946030627213196">"Wi-Fi-instellingen"</string>
+    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="2810363951104753710">"Wi-Fi-instellingen"</string>
+    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Draadloze toegangspunten instellen en beheren"</string>
-    <string name="wifi_starting" msgid="6710266609710860129">"Inschakelen..."</string>
-    <string name="wifi_stopping" msgid="5952909472548218348">"Uitschakelen..."</string>
+    <string name="wifi_starting" msgid="7732330327758522943">"Wi-Fi inschakelen…"</string>
+    <string name="wifi_stopping" msgid="244864762599017659">"Wi-Fi uitschakelen…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Fout"</string>
     <string name="wifi_in_airplane_mode" msgid="7618393787965366655">"In vliegmodus"</string>
     <string name="wifi_fail_to_scan" msgid="6194542252808587669">"Kan niet scannen naar netwerken"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Netwerkmelding"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Melden wanneer een open netwerk beschikbaar is"</string>
+    <string name="wifi_enable_watchdog_service" msgid="4723544454066601706">"Wi-Fi-verbindingscontroles"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="8687400936839455926">"Potentiële netwerkverbindingsproblemen detecteren en beheren"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Beleid inzake verbreken van Wi-Fi-verbinding"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Overschakelen opgeven van Wi-Fi naar mobiele gegevens"</string>
     <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" msgid="6234851776910938957">"Netwerk toevoegen"</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>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Verbinding maken met netwerk"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Netwerk vergeten"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Netwerk aanpassen"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="3682507011071029311">"Wi-Fi inschakelen om beschikbare netwerken te bekijken"</string>
     <string name="wifi_network_setup" msgid="7974851890019344870">"Netwerkinstelling"</string>
     <string name="wifi_wps_pin" msgid="5471842298708321115">"PIN opgeven via toegangspunt"</string>
     <string name="wifi_wps_setup_title" msgid="150518971269252336">"WPS instellen"</string>
@@ -501,13 +523,13 @@
     <string name="wifi_save" msgid="3331121567988522826">"Opslaan"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Annuleren"</string>
     <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"Er is nog een WPS-sessie gedetecteerd. Probeer het over een paar minuten opnieuw"</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Geavanceerd"</string>
+    <!-- outdated translation 5419052271935350999 -->     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Geavanceerd"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi-frequentieband"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Het frequentiebereik voor gebruik opgeven"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Probleem bij instellen van het frequentiebeleid."</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>
-    <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"IP-instellingen"</string>
+    <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP-instellingen"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Opslaan"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Annuleren"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Voer een geldig IP-adres in."</string>
@@ -525,7 +547,7 @@
     <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> draagbare Wi-Fi-hotspot"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="sound_settings_title" msgid="8735891486683305886">"Geluid"</string>
-    <string name="display_settings_title" msgid="2378894265964357591">"Scherm"</string>
+    <string name="display_settings_title" msgid="1708697328627382561">"Weergave"</string>
     <string name="sound_settings" msgid="5007659014828162881">"Geluidsinstellingen"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Stille modus"</string>
     <string name="silent_mode_summary" msgid="3309650676072917899">"Alle geluiden dempen, behalve media en alarmen"</string>
@@ -598,7 +620,18 @@
     <string name="brightness_summary" msgid="838917350127550703">"Helderheid van het scherm aanpassen"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Time-out"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Het scherm wordt automatisch uitgeschakeld na <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Achtergrond"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android Dreams"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Screensavers en andere opties voor inactiviteit"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Geselecteerde droom"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Activeringsmoment"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"Na <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inactiviteit"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Nooit"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Probeer het zelf!"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatische helderheid"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Lettergrootte"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Algemene lettergrootte"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Lettergrootte selecteren"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Instellingen SIM-kaartvergrendeling"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"SIM-vergrendeling instellen"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM-kaartvergrendeling"</string>
@@ -643,8 +676,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>
@@ -686,8 +720,8 @@
     <string name="read_only" msgid="6702420168629076340">" (Alleen-lezen)"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="2349876662428231297">"USB-opslag ontkoppelen"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="8612140627310646730">"SD-kaart ontkoppelen"</string>
-    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"Als u de USB-opslag ontkoppelt, worden bepaalde toepassingen die u gebruikt, gestopt en worden deze mogelijk pas weer beschikbaar wanneer u de USB-opslag opnieuw koppelt."</string>
-    <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Als u de SD-kaart ontkoppelt, worden bepaalde toepassingen die u gebruikt, gestopt en worden deze mogelijk pas weer beschikbaar wanneer u de SD-kaart opnieuw koppelt."</string>
+    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="3390169455621185223">"Als u de USB-opslag ontkoppelt, worden bepaalde apps die u gebruikt, gestopt en worden deze mogelijk pas weer beschikbaar wanneer u de USB-opslag opnieuw koppelt."</string>
+    <string name="dlg_confirm_unmount_text" product="default" msgid="5851214273718817727">"Als u de SD-kaart ontkoppelt, worden bepaalde apps die u gebruikt, gestopt en worden deze mogelijk pas weer beschikbaar wanneer u de SD-kaart opnieuw koppelt."</string>
     <string name="dlg_error_unmount_title" product="nosdcard" msgid="7695491947411836733">"Ontkoppelen USB-opslag mislukt"</string>
     <string name="dlg_error_unmount_title" product="default" msgid="4004106918266783081">"Ontkoppelen van SD-kaart is mislukt"</string>
     <string name="dlg_error_unmount_text" product="nosdcard" msgid="1450864147013376592">"Kan USB-opslag niet koppelen. Probeer het later opnieuw."</string>
@@ -696,6 +730,16 @@
     <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"SD-kaart wordt ontkoppeld."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Ontkoppelen"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Ontkoppelen wordt uitgevoerd"</string>
+    <!-- no translation found for storage_menu_usb (1580545228584324704) -->
+    <skip />
+    <!-- no translation found for storage_title_usb (5775322159427546546) -->
+    <skip />
+    <!-- no translation found for usb_label_mtp (4157227401755543412) -->
+    <skip />
+    <!-- no translation found for usb_label_ptp (7417254019489575819) -->
+    <skip />
+    <!-- no translation found for usb_label_installer_cd (7438467574756086977) -->
+    <skip />
     <string name="battery_status_title" msgid="9159414319574976203">"Accustatus"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Accuniveau"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN\'s"</string>
@@ -747,7 +791,7 @@
     <string name="erase_external_storage_description" product="default" msgid="46603515218075174">"Alle gegevens op de SD-kaart wissen, zoals muziek en foto\'s."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Tablet opnieuw instellen"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Telefoon opnieuw instellen"</string>
-    <string name="master_clear_final_desc" msgid="6917971132484622696">"Alle persoonlijke gegevens en gedownloade toepassingen wissen? U kunt deze actie niet ongedaan maken."</string>
+    <string name="master_clear_final_desc" msgid="6917971132484622696">"Alle persoonlijke gegevens en gedownloade apps wissen? U kunt deze actie niet ongedaan maken."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Alles wissen"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Teken uw ontgrendelingspatroon"</string>
     <string name="master_clear_gesture_explanation" msgid="2234954758550554549">"U moet uw ontgrendelingspatroon tekenen om het terugzetten van de fabriekswaarden te bevestigen."</string>
@@ -806,11 +850,13 @@
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"Kan niet meer dan <xliff:g id="MAXCONNECTION">%1$d</xliff:g> apparaten tetheren"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Tethering van <xliff:g id="DEVICE_NAME">%1$s</xliff:g> wordt opgeheven."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Help"</string>
+    <string name="wireless_category_general" msgid="2973810407987118067">"Algemeen"</string>
+    <string name="wireless_category_mobile_networks" msgid="1254629216798424288">"Mobiele netwerken"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobiele netwerken"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Opties voor roaming, netwerken, APN\'s instellen"</string>
     <string name="location_title" msgid="1029961368397484576">"Mijn locatie"</string>
     <string name="location_network_based" msgid="8815705866861993344">"Draadloze netwerken"</string>
-    <string name="location_networks_disabled" msgid="2708968452901433980">"Locatie in toepassingen (zoals Maps) bekijken via draadloze netwerken"</string>
+    <string name="location_networks_disabled" msgid="2708968452901433980">"Locatie in apps (zoals Maps) bekijken via draadloze netwerken"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Locatie bepaald door Wi-Fi en/of mobiele netwerken"</string>
     <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Locatie bepaald via Wi-Fi"</string>
     <string name="location_gps" msgid="6296125378829097831">"GPS-satellieten"</string>
@@ -883,16 +929,18 @@
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Uw tablet beveiligen"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Uw telefoon beveiligen"</string>
     <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"Beveilig uw tablet tegen ongeoorloofd gebruik door een persoonlijk schermontgrendelingspatroon in te stellen. Gebruik op het volgende scherm uw vinger om de punten met elkaar te verbinden. U moet minimaal vier punten met elkaar verbinden. "\n\n"Bent u er klaar voor? Raak \'Volgende\' aan."</string>
-    <string name="lock_intro_message" product="default" msgid="9100785646737118042"><font size="17">"Beveilig uw telefoon tegen ongeoorloofd gebruik door het instellen van een persoonlijk schermdeblokkeringspatroon. "\n<font height="17">\n</font><b>"1"</b>" Op het volgende scherm ziet u hoe een voorbeeldpatroon wordt getekend. "\n<font height="17">\n</font><b>"2"</b>" Teken uw eigen persoonlijke deblokkeringspatroon als het voorbeeld is voltooid. U kunt verschillende patronen uitproberen, maar u moet minimaal vier punten met elkaar verbinden. "\n<font height="17">\n</font><b>"3"</b>" Teken uw patroon nogmaals ter bevestiging. "\n<font height="17">\n</font><b>"Bent u er klaar voor? Selecteer \'Volgende\'"</b>". "\n<font height="3">\n</font>"Als u uw telefoon niet wilt beveiligen, selecteert u \'Annuleren\'."</font></string>
+    <!-- outdated translation 3692151094288835065 -->     <string name="lock_intro_message" product="default" msgid="5796785892741212873">"Beveilig uw tablet tegen ongeoorloofd gebruik door een persoonlijk schermontgrendelingspatroon in te stellen. Gebruik op het volgende scherm uw vinger om de punten met elkaar te verbinden. U moet minimaal vier punten met elkaar verbinden. "\n\n"Bent u er klaar voor? Raak \'Volgende\' aan."</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Toepassingen beheren"</string>
-    <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Geïnstalleerde toepassingen beheren en verwijderen"</string>
+    <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Geïnstalleerde apps beheren en verwijderen"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Apps"</string>
     <string name="applications_settings_summary" msgid="2714215108369119717">"Toepassingen beheren, sneltoetsen voor snelstarten instellen"</string>
     <string name="applications_settings_header" msgid="6018266337275422250">"Toepassingsinstellingen"</string>
     <string name="install_applications" msgid="4872012136210802181">"Onbekende bronnen"</string>
-    <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="install_unknown_applications" msgid="6612824788917283662">"Installatie van andere apps dan Market-apps toestaan"</string>
+    <string name="install_all_warning" product="tablet" msgid="8143969767997876735">"Uw tablet en persoonlijke gegevens zijn gevoeliger voor aanvallen door apps 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 apps."</string>
+    <string name="install_all_warning" product="default" msgid="1923717607319933741">"Uw telefoon en persoonlijke gegevens zijn gevoeliger voor aanvallen door apps 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 apps."</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>
@@ -905,9 +953,10 @@
     <string name="force_stop" msgid="7435006169872876756">"Nu stoppen"</string>
     <string name="total_size_label" msgid="1048676419552557254">"Totaal"</string>
     <string name="application_size_label" msgid="5055196275624686382">"App"</string>
+    <string name="external_code_size_label" msgid="3459343140355961335">"USB-opslagapp"</string>
     <string name="data_size_label" msgid="8679376373625710107">"Gegevens"</string>
-    <string name="external_size_label" product="nosdcard" msgid="4465530017830945766">"USB-opslag"</string>
-    <string name="external_size_label" product="default" msgid="2107155737635944440">"SD-kaart"</string>
+    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB-opslaggegevens"</string>
+    <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD-kaart"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Verwijderen"</string>
     <string name="disable_text" msgid="6544054052049395202">"Uitschakelen"</string>
     <string name="enable_text" msgid="9217362512327828987">"Inschakelen"</string>
@@ -933,7 +982,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-opslag"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Op SD-kaart"</string>
     <string name="disabled" msgid="9206776641295849915">"Uitgeschakeld"</string>
-    <string name="no_applications" msgid="5190227407135243904">"Geen toepassingen."</string>
+    <string name="no_applications" msgid="5190227407135243904">"Geen apps."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Interne opslag"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB-opslag"</string>
     <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD-kaartopslag"</string>
@@ -953,7 +1002,7 @@
     <string name="security_settings_desc" product="default" msgid="3116027624526915561">"Deze app heeft toegang tot de volgende opties van uw telefoon:"</string>
     <string name="computing_size" msgid="1599186977475211186">"Berekenen…"</string>
     <string name="invalid_size_value" msgid="1901940003700269523">"Kan grootte van pakket niet berekenen"</string>
-    <string name="empty_list_msg" msgid="2901049162265094971">"U heeft geen toepassingen van derden geïnstalleerd."</string>
+    <string name="empty_list_msg" msgid="2901049162265094971">"U heeft geen apps van derden geïnstalleerd."</string>
     <string name="version_text" msgid="9189073826278676425">"versie <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Verplaatsen"</string>
     <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Verplaatsen naar tablet"</string>
@@ -971,9 +1020,9 @@
     <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"App verplaatsen"</string>
     <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Verplaatsen van app is mislukt. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Voorkeursinstallatielocatie"</string>
-    <string name="app_install_location_summary" msgid="879753854530300436">"De voorkeursinstallatielocatie voor nieuwe toepassingen wijzigen."</string>
+    <string name="app_install_location_summary" msgid="879753854530300436">"De voorkeursinstallatielocatie voor nieuwe apps wijzigen."</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Opslaggebruik"</string>
-    <string name="storageuse_settings_summary" msgid="2556057379120846792">"Gebruikte opslagruimte voor toepassingen weergeven"</string>
+    <string name="storageuse_settings_summary" msgid="2556057379120846792">"Gebruikte opslagruimte voor apps weergeven"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Actieve services"</string>
     <string name="runningservices_settings_summary" msgid="854608995821032748">"Services die momenteel actief zijn, weergeven en beheren"</string>
     <string name="service_restarting" msgid="2242747937372354306">"Opnieuw starten"</string>
@@ -1026,7 +1075,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,12 +1085,13 @@
     <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>
     <string name="testing_battery_info" msgid="3497865525976497848">"Accu-informatie"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"Snelstarten"</string>
-    <string name="quick_launch_summary" msgid="3453825712466417452">"Sneltoetsen instellen voor starten toepassingen"</string>
+    <string name="quick_launch_summary" msgid="3453825712466417452">"Sneltoetsen instellen voor starten apps"</string>
     <string name="quick_launch_assign_application" msgid="4521368464929956350">"App toewijzen"</string>
     <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"Geen sneltoets"</string>
     <string name="quick_launch_shortcut" msgid="5090405067413522300">"Zoeken + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
@@ -1066,7 +1117,7 @@
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Instellingen voor schermtoetsenbord"</string>
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Fysiek toetsenbord"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Instellingen voor vast toetsenbord"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Ontwikkeling"</string>
+    <string name="development_settings_title" msgid="215179176067683667">"Opties voor ontwikkelaars"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"Opties instellen voor toepassingsontwikkeling"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB-foutopsporing"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Foutopsporingsmodus bij USB-verbinding"</string>
@@ -1075,7 +1126,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"Neplocaties toestaan"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Neplocaties toestaan"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USB-foutopsporing toestaan?"</string>
-    <string name="adb_warning_message" msgid="5352555112049663033">"USB-foutopsporing is alleen bedoeld voor ontwikkelingsdoeleinden. Het kan worden gebruikt om gegevens te kopiëren tussen uw computer en uw apparaat, om toepassingen zonder melding op uw apparaat te installeren en om loggegevens te lezen."</string>
+    <string name="adb_warning_message" msgid="5352555112049663033">"USB-foutopsporing is alleen bedoeld voor ontwikkelingsdoeleinden. Het kan worden gebruikt om gegevens te kopiëren tussen uw computer en uw apparaat, om apps zonder melding op uw apparaat te installeren en om loggegevens te lezen."</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Gadget kiezen"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Widget kiezen"</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>u <xliff:g id="MINUTES">%3$d</xliff:g>m <xliff:g id="SECONDS">%4$d</xliff:g>s"</string>
@@ -1091,25 +1142,26 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Toegankelijkheid"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Instellingen voor toegankelijkheid"</string>
     <string name="accessibility_settings_summary" msgid="8185181964847149507">"Toegankelijkheidsopties beheren"</string>
-    <string name="toggle_accessibility_title" msgid="650839277066574497">"Toegankelijkheid"</string>
+    <string name="toggle_large_text_title" msgid="42259643359869436">"Grote tekst"</string>
     <string name="accessibility_services_category" msgid="8127851026323672607">"Toegankelijkheidsservices"</string>
+    <string name="toggle_accessibility_title" msgid="7338739354952553958">"Toegankelijkheidsservices toestaan"</string>
     <string name="no_accessibility_services_summary" msgid="694578333333808159">"Geen geïnstalleerde toegankelijkheidsservices."</string>
     <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Deze toegankelijkheidsservice verzamelt mogelijk alle tekst die u typt, inclusief persoonlijke gegevens en creditcardnummers, maar geen wachtwoorden. De service kan ook uw interacties met de gebruikersinterface vastleggen. De service is afkomstig uit de app <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Deze toegankelijkheidsservice inschakelen?"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Toegankelijkheid uitschakelen?"</string>
-    <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"Geen toepassingen voor toegankelijkheid gevonden"</string>
-    <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"Er zijn geen toepassingen voor toegankelijkheid geïnstalleerd."\n\n"U kunt een schermlezer voor uw apparaat downloaden van Android Market."\n\n"Klik op \'OK\' om de schermlezer te installeren."</string>
-    <string name="accessibility_script_injection_category" msgid="8649951751131431904">"Toegankelijkheidsscripts"</string>
+    <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"Geen apps voor toegankelijkheid gevonden"</string>
+    <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"Er zijn geen apps voor toegankelijkheid geïnstalleerd."\n\n"U kunt een schermlezer voor uw apparaat downloaden van Android Market."\n\n"Klik op \'OK\' om de schermlezer te installeren."</string>
     <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"Toegankelijkheidsscripts downloaden"</string>
     <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"Toepassingen mogen toegankelijkheidsscripts downloaden via Google"</string>
     <string name="accessibility_script_injection_security_warning" product="tablet" msgid="1113600871264359828">"Sommige apps kunnen Google vragen scripts naar uw tablet te downloaden die hun inhoud toegankelijker maakt. Weet u zeker dat u Google wilt toestaan toegankelijkheidsscripts op uw tablet te installeren?"</string>
-    <string name="accessibility_script_injection_security_warning" product="default" msgid="9078893361741942109">"Sommige toepassingen kunnen Google vragen scripts naar uw telefoon te downloaden die hun inhoud toegankelijker maakt. Weet u zeker dat u Google wilt toestaan toegankelijkheidsscripts op uw telefoon te installeren?"</string>
+    <string name="accessibility_script_injection_security_warning" product="default" msgid="9078893361741942109">"Sommige apps kunnen Google vragen scripts naar uw telefoon te downloaden die hun inhoud toegankelijker maakt. Weet u zeker dat u Google wilt toestaan toegankelijkheidsscripts op uw telefoon te installeren?"</string>
     <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>
-    <string name="power_usage_summary_title" msgid="5180282911164282324">"Accugebruik"</string>
+    <string name="power_usage_summary_title" msgid="7190304207330319919">"Accu"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Waarvoor de accu is gebruikt"</string>
     <string name="power_usage_not_available" msgid="3583407442633768046">"Accugebruikgegevens niet beschikb."</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Accugebruik sinds losgekoppeld"</string>
@@ -1218,6 +1270,8 @@
     <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>
+    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Zoekmachine-instellingen"</string>
+    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Instellingen voor <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
     <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>
@@ -1228,114 +1282,33 @@
     <string name="gadget_title" msgid="7455548605888590466">"Energiebeheer"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Wi-Fi-instelling bijwerken"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetooth-instelling bijwerken"</string>
-    <string name="vpn_settings_activity_title" msgid="7276864950701612579">"VPN-instellingen"</string>
-    <string name="vpn_connect_to" msgid="2541409082892684362">"Verbinding maken met <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpn_username_colon" msgid="7854930370861306247">"Gebruikersnaam:"</string>
-    <string name="vpn_password_colon" msgid="5716278710848606626">"Wachtwoord:"</string>
-    <string name="vpn_a_username" msgid="6664733641993968692">"een gebruikersnaam"</string>
-    <string name="vpn_a_password" msgid="1537213632501483753">"een wachtwoord"</string>
-    <string name="vpn_save_username" msgid="1408415289165970790">"Gebruikersnaam onthouden"</string>
-    <string name="vpn_connect_button" msgid="1699007212602470655">"Verbinden"</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">"Opslaan"</string>
-    <string name="vpn_menu_cancel" msgid="7234451214611202868">"Annuleren"</string>
-    <string name="vpn_menu_revert" msgid="4407762442281467659">"Terugzetten"</string>
-    <string name="vpn_menu_connect" msgid="1089399414463784218">"Verbinding maken met netwerk"</string>
-    <string name="vpn_menu_disconnect" msgid="8254492450022562235">"Verbinding met netwerk verbreken"</string>
-    <string name="vpn_menu_edit" msgid="4526245173583195618">"Netwerk bewerken"</string>
-    <string name="vpn_menu_delete" msgid="3326527392609513129">"Netwerk verwijderen"</string>
-    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"U moet \'<xliff:g id="CODE">%s</xliff:g>\' invoeren."</string>
-    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"U moet \'<xliff:g id="OPTION">%s</xliff:g>\' selecteren."</string>
-    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"De VPN-naam \'<xliff:g id="NAME">%s</xliff:g>\' bestaat al. Geef een andere naam op."</string>
-    <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"Weet u zeker dat u dit VPN wilt verwijderen?"</string>
-    <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"Weet u zeker dat u dit profiel niet wilt maken?"</string>
-    <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"Weet u zeker dat u de wijzigingen in dit profiel wilt annuleren?"</string>
-    <string name="vpn_confirm_reconnect" msgid="5748535476278674296">"Kan geen verbinding maken met het netwerk. Wilt u het opnieuw proberen?"</string>
-    <string name="vpn_reconnect_from_lost" msgid="2442844155623372118">"Verbinding verbroken. Wilt u opnieuw verbinding maken?"</string>
-    <string name="vpn_unknown_server_dialog_msg" msgid="3080742299823671319">"De servernaam kan niet worden opgelost. Wilt u uw instellingen voor de servernaam controleren?"</string>
-    <string name="vpn_challenge_error_dialog_msg" msgid="6174901754230038601">"Fout bij aanvraag. Wilt u uw geheime instelling controleren?"</string>
-    <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"Een of meer geheimen ontbreken in deze VPN-configuratie. Wilt u uw geheime instelling controleren?"</string>
-    <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"De door u ingevoerde gebruikersnaam of het door u ingevoerde wachtwoord is onjuist. Wilt u het opnieuw proberen?"</string>
-    <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"Serververbinding verbroken. De gebruikersnaam of het wachtwoord dat u heeft ingevoerd, is onjuist. Wilt u het opnieuw proberen?"</string>
-    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"De server is vastgelopen. Wellicht bevindt u zich achter een firewall die een verbinding met de server blokkeert. Wilt u het opnieuw proberen?"</string>
-    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"Het contact met de server is mislukt. De server gaat wellicht niet akkoord met uw optie voor codering. Wilt u de instelling voor de codering controleren?"</string>
-    <string name="vpn_type_title" msgid="6392933604218676224">"VPN toevoegen"</string>
-    <string name="vpn_add_new_vpn" msgid="5438260689052714550">"VPN toevoegen"</string>
-    <string name="vpn_details_title" msgid="418806440938510331">"VPN-details"</string>
-    <string name="vpn_edit_title_add" msgid="2121313217989682890">"VPN \'<xliff:g id="NAME">%s</xliff:g>\' toevoegen"</string>
-    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"Details voor <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpns" msgid="3148141862835492816">"VPN\'s"</string>
-    <string name="vpn_connecting" msgid="8039521381692090116">"Verbinding maken..."</string>
-    <string name="vpn_disconnecting" msgid="7748050200708257066">"Verbinding verbreken..."</string>
-    <string name="vpn_connected" msgid="7641723116362845781">"Verbonden"</string>
-    <string name="vpn_connect_hint" msgid="7442898962925875181">"Verbinding maken met netwerk"</string>
-    <string name="vpn_name" msgid="1550918148476193076">"VPN-naam"</string>
-    <string name="vpn_a_name" msgid="8445736942405283509">"een VPN-naam"</string>
-    <string name="vpn_profile_added" msgid="9061017910337129840">"\'<xliff:g id="NAME">%s</xliff:g>\' is toegevoegd"</string>
-    <string name="vpn_profile_replaced" msgid="587435576816273815">"Er zijn wijzigingen aangebracht in \'<xliff:g id="NAME">%s</xliff:g>\'"</string>
-    <string name="vpn_user_certificate_title" msgid="6812545893924071742">"Gebruikerscertificaat instellen"</string>
-    <string name="vpn_user_certificate" msgid="949322691686938888">"Gebruikerscertificaat"</string>
-    <string name="vpn_a_user_certificate" msgid="8943983437956898649">"een gebruikerscertificaat"</string>
-    <string name="vpn_ca_certificate_title" msgid="7846466160795589985">"CA-certificaat instellen"</string>
-    <string name="vpn_ca_certificate" msgid="465085144064264742">"Certificaat van CA (certificaatverlenende autoriteit)"</string>
-    <string name="vpn_a_ca_certificate" msgid="3374242520974884295">"een CA-certificaat"</string>
-    <string name="vpn_l2tp_secret_string_title" msgid="5039677186748940987">"L2TP-geheim instellen"</string>
-    <string name="vpn_l2tp_secret" msgid="529359749677142076">"L2TP-geheim"</string>
-    <string name="vpn_a_l2tp_secret" msgid="6612042930810981845">"een L2TP-geheim"</string>
-    <string name="vpn_pptp_encryption_title" msgid="2236795167467896499">"codering"</string>
-    <string name="vpn_pptp_encryption" msgid="2602329949737259686">"PPTP-codering"</string>
-    <string name="vpn_ipsec_presharedkey_title" msgid="2184060087690539175">"Van tevoren gedeelde IPSec-sleutel instellen"</string>
-    <string name="vpn_ipsec_presharedkey" msgid="5434316521616673741">"Van tevoren gedeelde IPSec-sleutel"</string>
-    <string name="vpn_a_ipsec_presharedkey" msgid="1255301923217898418">"een van tevoren gedeelde IPSec-sleutel"</string>
-    <string name="vpn_vpn_server_title" msgid="8897005887420358913">"VPN-server instellen"</string>
-    <string name="vpn_vpn_server" msgid="1141754908824209260">"VPN-server"</string>
-    <string name="vpn_a_vpn_server" msgid="5960906152125045853">"een VPN-server"</string>
-    <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"Naam VPN-server"</string>
-    <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"DNS-zoekdomeinen"</string>
-    <string name="vpn_dns_search_list" msgid="4230034234026605360">"DNS-zoekdomeinen"</string>
-    <string name="vpn_field_is_set" msgid="7137320847812992243">"<xliff:g id="VALUE">%s</xliff:g> is ingesteld"</string>
-    <string name="vpn_field_not_set" msgid="2972519243515893804">"<xliff:g id="VALUE">%s</xliff:g> is niet ingesteld"</string>
-    <string name="vpn_field_not_set_optional" msgid="8840557698252556791">"<xliff:g id="VALUE">%s</xliff:g> is niet ingesteld (optioneel)"</string>
-    <string name="vpn_enable_field" msgid="3700967675854517191">"<xliff:g id="OPTION">%s</xliff:g> inschakelen"</string>
-    <string name="vpn_disable_field" msgid="6905658811179634005">"\'<xliff:g id="OPTION">%s</xliff:g>\' uitschakelen"</string>
-    <string name="vpn_is_enabled" msgid="1266304230417098877">"\'<xliff:g id="OPTION">%s</xliff:g>\' is ingeschakeld"</string>
-    <string name="vpn_is_disabled" msgid="2013622485867806167">"\'<xliff:g id="OPTION">%s</xliff:g>\' is uitgeschakeld"</string>
     <string name="vpn_settings_title" msgid="7327468307909556719">"VPN-instellingen"</string>
     <string name="vpn_settings_summary" msgid="8849924181594963972">"VPN\'s (Virtual Private Networks) instellen en beheren"</string>
-    <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="trusted_credentials" msgid="4266945289534242402">"Vertrouwde id-gegevens"</string>
+    <string name="trusted_credentials_summary" msgid="6735221351155686632">"Vertrouwde CA-certificaten weergeven"</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>
-    <string name="privacy_settings_title" msgid="1987089301293213705">"Privacyinstellingen"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"Back-up maken en opnieuw instellen"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"Back-up maken en opnieuw instellen"</string>
     <string name="backup_section_title" msgid="8856083167469467588">"Back-up maken en terugzetten"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Persoonlijke gegevens"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Back-up maken van mijn gegevens"</string>
@@ -1396,7 +1369,7 @@
     <string name="background_data" msgid="5779592891375473817">"Achtergrondgegevens"</string>
     <string name="background_data_summary" msgid="3630389249212620467">"Onbeperkt gegevens synchroniseren, verzenden en ontvangen"</string>
     <string name="background_data_dialog_title" msgid="745974259246047425">"Let op"</string>
-    <string name="background_data_dialog_message" msgid="9155730118215371308">"Als u achtergrondgegevens uitschakelt, bespaart u acculading en wordt het gegevensverbruik verlaagd. Sommige toepassingen maken mogelijk nog steeds gebruik van de verbinding voor achtergrondgegevens."</string>
+    <string name="background_data_dialog_message" msgid="9155730118215371308">"Als u achtergrondgegevens uitschakelt, bespaart u acculading en wordt het gegevensverbruik verlaagd. Sommige apps maken mogelijk nog steeds gebruik van de verbinding voor achtergrondgegevens."</string>
     <string name="sync_automatically" msgid="7558810110682562376">"Automatische synchronisatie"</string>
     <string name="sync_automatically_summary" msgid="6662623174608419931">"Toepassingen kunnen gegevens automatisch synchroniseren"</string>
     <string name="header_manage_accounts" msgid="6869002423884539607">"Accounts beheren"</string>
@@ -1439,4 +1412,107 @@
     <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>
+    <!-- no translation found for debug_ui_category (9023948280291055349) -->
+    <skip />
+    <!-- no translation found for strict_mode (1938795874357830695) -->
+    <skip />
+    <!-- no translation found for strict_mode_summary (142834318897332338) -->
+    <skip />
+    <!-- no translation found for pointer_location (6084434787496938001) -->
+    <skip />
+    <!-- no translation found for pointer_location_summary (840819275172753713) -->
+    <skip />
+    <!-- no translation found for show_screen_updates (8282711794220426931) -->
+    <skip />
+    <!-- no translation found for show_screen_updates_summary (1716122382094924596) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage (2389212910758076024) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage_summary (2113341923988958266) -->
+    <skip />
+    <!-- no translation found for window_animation_scale_title (6162587588166114700) -->
+    <skip />
+    <!-- no translation found for transition_animation_scale_title (387527540523595875) -->
+    <skip />
+    <!-- no translation found for debug_applications_category (6221644998451283813) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities (3622005081180597749) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities_summary (3592221124808773368) -->
+    <skip />
+    <!-- no translation found for app_process_limit_title (4121324758038197598) -->
+    <skip />
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Datagebruik"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"Gegevensgebruikcyclus"</string>
+    <string name="data_usage_menu_split_4g" msgid="7417435609285381968">"4G-gebruik apart weergeven"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Wi-Fi-gebruik weergeven"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"Cyclus aanpassen..."</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Dag van maand voor opnieuw instellen van gegevensgebruikcyclus:"</string>
+    <string name="data_usage_disable_mobile_limit" msgid="289740911281022322">"Bij limiet mobiele gegevens uit"</string>
+    <string name="data_usage_disable_4g_limit" msgid="5808210773758699800">"Bij limiet 4G-gegevens uit"</string>
+    <string name="data_usage_disable_3g_limit" msgid="3856971004328238231">"Bij limiet 2G-/3G-gegevens uit"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_mobile" msgid="454140350007299045">"Mobiel"</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">"Mobiele gegevens"</string>
+    <string name="data_usage_enable_3g" msgid="6304006671869578254">"2G-/3G-gegevens"</string>
+    <string name="data_usage_enable_4g" msgid="3635854097335036738">"4G-gegevens"</string>
+    <string name="data_usage_app_settings" msgid="3727561362090820369">"Instellingen voor app weergeven"</string>
+    <string name="data_usage_app_restrict_background" msgid="8856643905291165256">"Gebruik gegevens beperken"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="1503361245973512092">"Alleen achtergrondgegevens van apps toestaan bij het gebruik van een ongelimiteerd netwerk"</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="8110736468987743260">"Achtergrondgegevens beperken"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="100001698378554777">"Deze functie kan een negatieve invloed hebben op apps die afhankelijk zijn van het gebruik van achtergrondgegevens."\n\n"In de instellingen van deze app kunt u wellicht betere functies voor gegevensgebruik vinden."</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Herzieningsdatum voor gebruikscyclus"</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Datum van elke maand:"</string>
+    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Ingesteld"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Gegevensgebruik beperken"</string>
+    <string name="data_usage_limit_dialog_mobile" msgid="7931094451923591578">"Uw mobiele gegevensverbinding wordt uitgeschakeld wanneer de opgegeven limiet is bereikt."\n\n"Om verdere kosten te voorkomen, kunt u een gereduceerde limiet gebruiken, aangezien kostenberekeningen door het apparaat en de provider kunnen verschillen."</string>
+    <string name="data_usage_limit_dialog_3g" msgid="5478553071420316963">"Uw 2G-/3G-gegevensverbinding wordt uitgeschakeld wanneer de opgegeven limiet is bereikt."\n\n"Om verdere kosten te voorkomen, kunt u een gereduceerde limiet gebruiken, aangezien kostenberekeningen door het apparaat en de provider kunnen verschillen."</string>
+    <string name="data_usage_limit_dialog_4g" msgid="6134008906742403777">"Uw 4G-gegevensverbinding wordt uitgeschakeld wanneer de opgegeven limiet is bereikt."\n\n"Om verdere kosten te voorkomen, kunt u een gereduceerde limiet gebruiken, aangezien kostenberekeningen door het apparaat en de provider kunnen verschillen."</string>
+    <string name="data_usage_disabled_dialog_3g_title" msgid="4221584306492812040">"2G-/3G-gegevens uitgeschakeld"</string>
+    <string name="data_usage_disabled_dialog_4g_title" msgid="715585612162185936">"4G-gegevens uitgeschakeld"</string>
+    <string name="data_usage_disabled_dialog_mobile_title" msgid="209516216265000221">"Mobiele gegevens uitgeschakeld"</string>
+    <string name="data_usage_disabled_dialog" msgid="2874031671067845964">"De opgegeven limiet voor gegevensgebruik is bereikt."\n\n"Aanvullend gegevensgebruik kan leiden tot providerkosten."</string>
+    <string name="data_usage_disabled_dialog_enable" msgid="2441219164620753329">"gegevens opnieuw inschakelen"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="32">"<xliff:g id="NUMBER">%1$s</xliff:g>"</font>" "<font size="12">"<xliff:g id="UNIT">%2$s</xliff:g>"</font>\n<font size="12">"waarschuwing"</font></string>
+    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Noodoproep"</string>
+    <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Terug naar gesprek"</string>
+    <string name="vpn_name" msgid="4689699885361002297">"Naam"</string>
+    <string name="vpn_type" msgid="5435733139514388070">"Type"</string>
+    <string name="vpn_server" msgid="2123096727287421913">"Serveradres"</string>
+    <string name="vpn_mppe" msgid="6639001940500288972">"PPP-encryptie (MPPE)"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"L2TP-geheim"</string>
+    <string name="vpn_ipsec_identifier" msgid="4098175859460006296">"IPSec-id"</string>
+    <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Van tevoren gedeelde IPSec-sleutel"</string>
+    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"IPSec-gebruikerscertificaat"</string>
+    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"CA-certificaat voor IPSec"</string>
+    <!-- no translation found for vpn_search_domains (5391995501541199624) -->
+    <skip />
+    <!-- no translation found for vpn_routes (8556236801755260073) -->
+    <skip />
+    <string name="vpn_username" msgid="1863901629860867849">"Gebruikersnaam"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Wachtwoord"</string>
+    <!-- no translation found for vpn_save_login (6350322456427484881) -->
+    <skip />
+    <!-- no translation found for vpn_not_used (9094191054524660891) -->
+    <skip />
+    <string name="vpn_no_ca_cert" msgid="7820884983947090538">"(server niet verifiëren)"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"Annuleren"</string>
+    <string name="vpn_save" msgid="4233484051644764510">"Opslaan"</string>
+    <string name="vpn_connect" msgid="8469608541746132301">"Verbinding maken"</string>
+    <string name="vpn_edit" msgid="1111459297288136079">"VPN-netwerk bewerken"</string>
+    <string name="vpn_connect_to" msgid="7328758950427515753">"Verbinding maken met <xliff:g id="NETWORK">%s</xliff:g>"</string>
+    <string name="vpn_title" msgid="7982620762043790565">"VPN-instellingen"</string>
+    <string name="vpn_create" msgid="8966010925994175306">"VPN-netwerk toevoegen"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"Netwerk bewerken"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"Netwerk verwijderen"</string>
+    <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Systeem"</string>
+    <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Gebruiker"</string>
+    <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Uitschakelen"</string>
+    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Inschakelen"</string>
+    <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Verwijderen"</string>
+    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Het CA-certificaat voor het systeem inschakelen?"</string>
+    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Het CA-certificaat voor het systeem uitschakelen?"</string>
+    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"CA-certificaat van gebruiker permanent verwijderen?"</string>
 </resources>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index 2e70088..f89fe08 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>
@@ -214,4 +240,36 @@
     <item msgid="3878793616631049349">"Użyj sprawdzania HDCP tylko w przypadku treści chronionych DRM"</item>
     <item msgid="45075631231212732">"Zawsze używaj sprawdzania HDCP"</item>
   </string-array>
+    <!-- no translation found for window_animation_scale_entries:0 (8134156599370824081) -->
+    <!-- no translation found for window_animation_scale_entries:1 (6624864048416710414) -->
+    <!-- no translation found for window_animation_scale_entries:2 (2219332261255416635) -->
+    <!-- no translation found for window_animation_scale_entries:3 (3544428804137048509) -->
+    <!-- no translation found for window_animation_scale_entries:4 (3110710404225974514) -->
+    <!-- no translation found for window_animation_scale_entries:5 (4402738611528318731) -->
+    <!-- no translation found for window_animation_scale_entries:6 (6189539267968330656) -->
+    <!-- no translation found for transition_animation_scale_entries:0 (8464255836173039442) -->
+    <!-- no translation found for transition_animation_scale_entries:1 (3375781541913316411) -->
+    <!-- no translation found for transition_animation_scale_entries:2 (1991041427801869945) -->
+    <!-- no translation found for transition_animation_scale_entries:3 (4012689927622382874) -->
+    <!-- no translation found for transition_animation_scale_entries:4 (3289156759925947169) -->
+    <!-- no translation found for transition_animation_scale_entries:5 (7705857441213621835) -->
+    <!-- no translation found for transition_animation_scale_entries:6 (6660750935954853365) -->
+    <!-- no translation found for app_process_limit_entries:0 (6799596560242275471) -->
+    <!-- no translation found for app_process_limit_entries:1 (2412794376818632575) -->
+    <!-- no translation found for app_process_limit_entries:2 (1578904888612645001) -->
+    <!-- no translation found for app_process_limit_entries:3 (8819235336299873577) -->
+  <string-array name="vpn_types_long">
+    <item msgid="2732002039459078847">"Sieć VPN wykorzystująca protokół PPTP"</item>
+    <item msgid="3799752201662127867">"Sieć VPN wykorzystująca protokół L2TP/IPSec z kluczami wspólnymi"</item>
+    <item msgid="4725504331295252103">"Sieć VPN wykorzystująca protokół L2TP/IPSec z certyfikatami"</item>
+    <item msgid="7526551163264034377">"Sieć VPN wykorzystująca protokół IPSec z kluczami wspólnymi i uwierzytelnianiem Xauth"</item>
+    <item msgid="8064740940687465039">"Sieć VPN wykorzystująca protokół IPSec z certyfikatami i uwierzytelnianiem Xauth"</item>
+    <item msgid="4946199982372391490">"Sieć VPN wykorzystująca protokół IPSec z certyfikatami i uwierzytelnianiem hybrydowym"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:0 (8621078286418985762) -->
+    <!-- no translation found for vpn_states:1 (6692305604213080515) -->
+    <!-- no translation found for vpn_states:2 (8001704909356800092) -->
+    <!-- no translation found for vpn_states:3 (4039737283841672166) -->
+    <!-- no translation found for vpn_states:4 (4042143101664725090) -->
+    <!-- no translation found for vpn_states:5 (2690164254699635531) -->
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index c8dbd64..59a071f 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -19,6 +19,10 @@
     <string name="yes" msgid="4676390750360727396">"Tak"</string>
     <string name="no" msgid="6731231425810196216">"Nie"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Nieznany"</string>
+    <string name="header_category_wireless_networks" msgid="4944823405420438623">"SIECI ZWYKŁE I BEZPRZEWODOWE"</string>
+    <string name="header_category_device" msgid="5781174212691167553">"URZĄDZENIE"</string>
+    <string name="header_category_personal" msgid="6225932173498802187">"OSOBISTE"</string>
+    <string name="header_category_system" msgid="2073558547468647128">"SYSTEM"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Włącz radio"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Wyłącz radio"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Wyświetl książkę adresową na karcie SIM"</string>
@@ -111,7 +115,11 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Parowanie..."</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"Powiązany, ale nie połączony"</string>
     <string name="bluetooth_device" msgid="6873461446424952003">"zestaw głośnomówiący/słuchawkowy"</string>
-    <string name="progress_scanning" msgid="3760897655335759141">"Przeszukiwanie"</string>
+    <!-- outdated translation 3760897655335759141 -->     <string name="progress_scanning" msgid="192587958424295789">"Przeszukiwanie"</string>
+    <!-- no translation found for progress_tap_to_pair (4192342336107106334) -->
+    <skip />
+    <!-- no translation found for bluetooth_no_devices_found (2412462335116297668) -->
+    <skip />
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Żądanie parowania Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Żądanie parowania"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Wybierz, aby sparować z urządzeniem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
@@ -130,6 +138,9 @@
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Aplikacja w telefonie prosi o pozwolenie na włączenie modułu Bluetooth i ustawienie telefonu jako wykrywalnego przez inne urządzenia. Czy chcesz na to zezwolić?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Trwa włączanie modułu Bluetooth..."</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Połącz automatycznie"</string>
+    <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Żądanie nawiązania połączenia Bluetooth"</string>
+    <string name="bluetooth_connection_notif_message" msgid="1833221950512058309">"Dotknij, aby nawiązać połączenie z urządzeniem „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”."</string>
+    <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Czy chcesz nawiązać połączenie z urządzeniem „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Ustawienia daty i godziny"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00 (po południu)"</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
@@ -235,7 +246,7 @@
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Wyłącz wszystkie połączenia bezprzewodowe"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"Wyłączanie połączeń bezprzewodowych..."</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"Włączanie połączeń bezprzewodowych..."</string>
-    <string name="radio_controls_title" msgid="5868688473587168882">"Sieci zwykłe i bezprzewodowe"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Więcej..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Sieci zwykłe i bezprzewodowe"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"Zarządzaj połączeniami Wi-Fi i Bluetooth, trybem samolotowym, sieciami komórkowymi i VPN."</string>
     <string name="roaming" msgid="3596055926335478572">"Dane w roamingu"</string>
@@ -271,8 +282,8 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Informacje o właścicielu"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="2382525043173672857">"Wprowadź tekst do wyświetlenia na ekranie blokady"</string>
-    <string name="security_settings_title" msgid="5168491784222013179">"Lokalizacja i zabezpieczenia"</string>
-    <string name="location_security_settings_title" msgid="4624434296446625554">"Ustawienia lokalizacji i zabezpieczeń"</string>
+    <string name="location_settings_title" msgid="8935806698251432196">"Usługi lokalizacyjne"</string>
+    <string name="security_settings_title" msgid="7945465324818485460">"Zabezpieczenia"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Ustaw funkcję Moja lokalizacja, odblokowywanie ekranu, blokadę karty SIM, blokadę magazynu danych logowania."</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Ustaw funkcję Moja lokalizacja, odblokowywanie ekranu, blokadę magazynu danych uwierzytelniania"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Hasła"</string>
@@ -316,7 +327,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>
@@ -375,8 +386,8 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Wyświetl lub dezaktywuj administratorów urządzenia"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Włącz Bluetooth"</string>
-    <string name="bluetooth_settings" msgid="2725796451253089609">"Ustawienia Bluetooth"</string>
-    <string name="bluetooth_settings_title" msgid="2824020086246268296">"Ustawienia Bluetooth"</string>
+    <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
+    <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Zarządzaj połączeniami, ustaw nazwę urządzenia i możliwość wykrycia"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Prośba o utworzenie powiązania Bluetooth"</string>
     <string name="bluetooth_enter_pin_msg" msgid="1499285355129256289">\n"Wprowadź kod PIN, aby sparować z urządzeniem „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”. (Wypróbuj 0000 lub 1234). Konieczne może być wprowadzenie tego samego kodu PIN na urządzeniu Bluetooth."</string>
@@ -394,7 +405,10 @@
     <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Powiązanie odrzucone przez urządzenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"Wystąpił problem podczas łączenia z urządzeniem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Wyszukaj urządzenia"</string>
-    <string name="bluetooth_preference_find_nearby_title" msgid="5087410003465463318">"Znajdź urządzenia w pobliżu"</string>
+    <!-- no translation found for bluetooth_search_for_devices (5957007154213560390) -->
+    <skip />
+    <!-- no translation found for bluetooth_searching_for_devices (9203739709307871727) -->
+    <skip />
     <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"Ustawienia urządzenia"</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Powiązane urządzenia"</string>
     <string name="bluetooth_preference_found_devices" msgid="3133019331974936204">"Znalezione urządzenia"</string>
@@ -404,6 +418,10 @@
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Rozłącz parę"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Rozłącz i anuluj parowanie"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Opcje…"</string>
+    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Zaawansowane"</string>
+    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth – zaawansowane"</string>
+    <string name="bluetooth_advanced_settings_label" msgid="8659717781212434173">"Bluetooth – zaawansowane"</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="3631028334811113629">"Włącz Bluetooth, aby zobaczyć dostępne urządzenia"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Połącz z siecią…"</string>
     <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"Multimedia"</string>
     <string name="bluetooth_profile_headset" msgid="81844079120986198">"Zestaw głośnomówiący"</string>
@@ -445,27 +463,31 @@
     <string name="nfc_toggle_error" msgid="2233172102497535522">"Wystąpił błąd."</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Włącz Wi-Fi"</string>
-    <string name="wifi_settings" msgid="4746946030627213196">"Ustawienia Wi-Fi"</string>
+    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="2810363951104753710">"Ustawienia Wi-Fi"</string>
+    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Konfiguruj punkty dostępowe sieci bezprzewodowej i zarządzaj nimi"</string>
-    <string name="wifi_starting" msgid="6710266609710860129">"Włączanie..."</string>
-    <string name="wifi_stopping" msgid="5952909472548218348">"Wyłączanie..."</string>
+    <string name="wifi_starting" msgid="7732330327758522943">"Włączanie Wi-Fi..."</string>
+    <string name="wifi_stopping" msgid="244864762599017659">"Wyłączanie Wi-Fi..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"Błąd"</string>
     <string name="wifi_in_airplane_mode" msgid="7618393787965366655">"W trybie samolotowym"</string>
     <string name="wifi_fail_to_scan" msgid="6194542252808587669">"Nie można skanować w poszukiwaniu sieci"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Powiadomienie o sieci"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Powiadom mnie, gdy będę w zasięgu otwartej sieci"</string>
+    <string name="wifi_enable_watchdog_service" msgid="4723544454066601706">"Sprawdzanie połączeń Wi-Fi"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="8687400936839455926">"Wykrywaj i kontroluj potencjalne problemy z połączeniami sieciowymi"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Zasady rozłączania Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Określ, kiedy przełączyć Wi-Fi na komórkowe połączenie danych"</string>
     <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" msgid="6234851776910938957">"Dodaj sieć"</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>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Połącz z siecią"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Zapomnij sieć"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modyfikuj sieć"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="3682507011071029311">"Włącz Wi-Fi, aby wyświetlić dostępne sieci"</string>
     <string name="wifi_network_setup" msgid="7974851890019344870">"Konfiguracja sieci"</string>
     <string name="wifi_wps_pin" msgid="5471842298708321115">"Wpisz kod PIN z punktu dostępu"</string>
     <string name="wifi_wps_setup_title" msgid="150518971269252336">"Konfiguracja WPS"</string>
@@ -501,13 +523,13 @@
     <string name="wifi_save" msgid="3331121567988522826">"Zapisz"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Anuluj"</string>
     <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"Wykryto inną sesję WPS. Spróbuj ponownie za kilka minut."</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Zaawansowane"</string>
+    <!-- outdated translation 5419052271935350999 -->     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Zaawansowane"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Pasmo częstotliwości sieci Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Określ używany zakres częstotliwości"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Wystąpił problem podczas ustawiania częstotliwości."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Adres MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Adres IP"</string>
-    <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"Ustawienia IP"</string>
+    <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Ustawienia adresu IP"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Zapisz"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Anuluj"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Wprowadź prawidłowy adres IP."</string>
@@ -525,7 +547,7 @@
     <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"Przenośny punkt Wi-Fi <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Punkt dostępu Android"</string>
     <string name="sound_settings_title" msgid="8735891486683305886">"Dźwięk"</string>
-    <string name="display_settings_title" msgid="2378894265964357591">"Ekran"</string>
+    <string name="display_settings_title" msgid="1708697328627382561">"Wyświetlacz"</string>
     <string name="sound_settings" msgid="5007659014828162881">"Ustawienia dźwięku"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Tryb cichy"</string>
     <string name="silent_mode_summary" msgid="3309650676072917899">"Wycisz wszystkie dźwięki z wyjątkiem multimediów i alarmów"</string>
@@ -598,7 +620,18 @@
     <string name="brightness_summary" msgid="838917350127550703">"Dostosuj jasność ekranu"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Wygaszanie"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Ekran wyłączy się automatycznie po upływie <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Tapeta"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Sny Androida"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Wygaszacze ekranu i inna aktywność podczas bezczynności"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Wybrany sen"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Włączenie wygaszacza"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> bezczynności"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Nigdy"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Wypróbuj"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatyczna jasność"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Rozmiar czcionki"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Ogólny rozmiar czcionek"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Wybierz rozmiar czcionki"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Ustawienia blokady karty SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Ustaw blokadę SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Blokada karty SIM"</string>
@@ -643,8 +676,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>
@@ -696,6 +730,16 @@
     <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"Karta SD zostanie odłączona."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Odinstalowywanie"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Odinstalowywanie w toku"</string>
+    <!-- no translation found for storage_menu_usb (1580545228584324704) -->
+    <skip />
+    <!-- no translation found for storage_title_usb (5775322159427546546) -->
+    <skip />
+    <!-- no translation found for usb_label_mtp (4157227401755543412) -->
+    <skip />
+    <!-- no translation found for usb_label_ptp (7417254019489575819) -->
+    <skip />
+    <!-- no translation found for usb_label_installer_cd (7438467574756086977) -->
+    <skip />
     <string name="battery_status_title" msgid="9159414319574976203">"Stan baterii"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Poziom naładowania baterii"</string>
     <string name="apn_settings" msgid="3743170484827528406">"Nazwy APN"</string>
@@ -806,6 +850,8 @@
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"Nie można powiązać więcej niż <xliff:g id="MAXCONNECTION">%1$d</xliff:g> urządzeń"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Powiązanie z urządzeniem <xliff:g id="DEVICE_NAME">%1$s</xliff:g> zostanie anulowane."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Pomoc"</string>
+    <string name="wireless_category_general" msgid="2973810407987118067">"Ogólne"</string>
+    <string name="wireless_category_mobile_networks" msgid="1254629216798424288">"Sieci komórkowe"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Sieci komórkowe"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Ustaw opcje roamingu, sieci, nazw APN"</string>
     <string name="location_title" msgid="1029961368397484576">"Moja lokalizacja"</string>
@@ -883,7 +929,7 @@
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Zabezpieczanie tabletu"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Zabezpieczanie telefonu"</string>
     <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"Chroń tablet przed nieautoryzowanym użyciem przez utworzenie osobistego wzoru odblokowania ekranu. Na następnym ekranie połącz dotknięciami co najmniej cztery kropki w dowolnej kolejności."\n\n"Gotów? Dotknij opcji „Dalej”."</string>
-    <string name="lock_intro_message" product="default" msgid="9100785646737118042"><font size="17">"Chroń swój telefon przed niepowołanym użyciem, ustawiając blokadę ekranu. "\n<font height="17">\n</font><b>"1"</b>"  Na następnym ekranie zobaczysz, jak narysować przykładowy wzorzec. "\n<font height="17">\n</font><b>"2"</b>"  Jak tylko będziesz gotów, narysuj własny wzorzec blokady ekranu. Wypróbuj różne wzorce, łącząc co najmniej cztery kropki. "\n<font height="17">\n</font><b>"3"</b>"  Ponownie narysuj swój wzorzec, aby go potwierdzić. "\n<font height="17">\n</font><b>"Wszystko gotowe? Kliknij „Dalej”"</b>". "\n<font height="3">\n</font>"Aby pozostawić telefon bez blokady, kliknij „Anuluj”."</font></string>
+    <!-- outdated translation 3692151094288835065 -->     <string name="lock_intro_message" product="default" msgid="5796785892741212873">"Chroń tablet przed nieautoryzowanym użyciem przez utworzenie osobistego wzoru odblokowania ekranu. Na następnym ekranie połącz dotknięciami co najmniej cztery kropki w dowolnej kolejności."\n\n"Gotów? Dotknij opcji „Dalej”."</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Zarządzaj aplikacjami"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Zarządzaj zainstalowanymi aplikacjami lub usuwaj je"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Aplikacje"</string>
@@ -893,6 +939,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>
@@ -905,9 +953,10 @@
     <string name="force_stop" msgid="7435006169872876756">"Wymuś zatrzymanie"</string>
     <string name="total_size_label" msgid="1048676419552557254">"Razem"</string>
     <string name="application_size_label" msgid="5055196275624686382">"Aplikacja"</string>
+    <string name="external_code_size_label" msgid="3459343140355961335">"Aplikacja w pamięci USB"</string>
     <string name="data_size_label" msgid="8679376373625710107">"Dane"</string>
-    <string name="external_size_label" product="nosdcard" msgid="4465530017830945766">"Nośnik USB"</string>
-    <string name="external_size_label" product="default" msgid="2107155737635944440">"Karta SD"</string>
+    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Dane w pamięci USB"</string>
+    <string name="external_data_size_label" product="default" msgid="626414192825329708">"Karta SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Odinstaluj"</string>
     <string name="disable_text" msgid="6544054052049395202">"Wyłącz"</string>
     <string name="enable_text" msgid="9217362512327828987">"Włącz"</string>
@@ -1026,7 +1075,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 +1085,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>
@@ -1066,7 +1117,7 @@
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Ustawienia klawiatury ekranowej"</string>
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Klawiatura fizyczna"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Ustawienia klawiatury fizycznej"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Dla programistów"</string>
+    <string name="development_settings_title" msgid="215179176067683667">"Opcje programistyczne"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"Ustaw opcje związane z programowaniem aplikacji"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Debugowanie USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Tryb debugowania, gdy podłączone jest USB"</string>
@@ -1091,14 +1142,14 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Ułatwienia dostępu"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Ustawienia ułatwień dostępu"</string>
     <string name="accessibility_settings_summary" msgid="8185181964847149507">"Zarządzaj opcjami ułatwień dostępu"</string>
-    <string name="toggle_accessibility_title" msgid="650839277066574497">"Ułatwienia dostępu"</string>
+    <string name="toggle_large_text_title" msgid="42259643359869436">"Duży tekst"</string>
     <string name="accessibility_services_category" msgid="8127851026323672607">"Usługi ułatwień dostępu"</string>
+    <string name="toggle_accessibility_title" msgid="7338739354952553958">"Zezwól na ułatwienia dostępu"</string>
     <string name="no_accessibility_services_summary" msgid="694578333333808159">"Brak zainstalowanych usług ułatwień dostępu."</string>
     <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Ta usługa ułatwień dostępu może gromadzić cały wpisywany tekst, w tym dane osobiste w postaci numerów kart kredytowych, ale z wyłączeniem haseł. Może również zapisywać w dzienniku działania w interfejsie użytkownika. Usługa pochodzi z aplikacji <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Czy skorzystać z tej usługi ułatwień dostępu?"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Czy wyłączyć ułatwienia dostępu?"</string>
     <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"Nie znaleziono aplikacji związanych z ułatwieniami dostępu"</string>
     <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"Nie zainstalowano żadnych aplikacji związanych z ułatwieniami dostępu."\n\n"Z usługi Android Market możesz pobrać czytnik ekranowy dla tego urządzenia."\n\n"Aby zainstalować czytnik ekranowy, kliknij przycisk OK."</string>
-    <string name="accessibility_script_injection_category" msgid="8649951751131431904">"Skrypty ułatwień dostępu"</string>
     <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"Pobierz skrypty ułatwień dostępu"</string>
     <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"Pozwala aplikacjom pobierać od Google skrypty ułatwień dostępu"</string>
     <string name="accessibility_script_injection_security_warning" product="tablet" msgid="1113600871264359828">"Niektóre aplikacje mogą za pośrednictwem Google pobierać do tabletu skrypty, dzięki którym ich zawartość jest łatwiej dostępna. Czy na pewno chcesz zezwolić Google na instalowanie w tablecie skryptów ułatwień dostępu?"</string>
@@ -1106,10 +1157,11 @@
     <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>
-    <string name="power_usage_summary_title" msgid="5180282911164282324">"Użycie baterii"</string>
+    <string name="power_usage_summary_title" msgid="7190304207330319919">"Bateria"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Gdzie wykorzystywana jest bateria"</string>
     <string name="power_usage_not_available" msgid="3583407442633768046">"Brak danych o zużyciu baterii"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Użycie baterii od odłączenia"</string>
@@ -1218,6 +1270,8 @@
     <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>
+    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Ustawienia mechanizmu"</string>
+    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Ustawienia mechanizmu <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
     <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>
@@ -1228,114 +1282,33 @@
     <string name="gadget_title" msgid="7455548605888590466">"Zarządzanie energią"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Aktualizowanie ustawień Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Aktualizowanie ustawień Bluetooth"</string>
-    <string name="vpn_settings_activity_title" msgid="7276864950701612579">"Ustawienia sieci VPN"</string>
-    <string name="vpn_connect_to" msgid="2541409082892684362">"Połącz z siecią <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpn_username_colon" msgid="7854930370861306247">"Nazwa użytkownika:"</string>
-    <string name="vpn_password_colon" msgid="5716278710848606626">"Hasło:"</string>
-    <string name="vpn_a_username" msgid="6664733641993968692">"nazwa użytkownika"</string>
-    <string name="vpn_a_password" msgid="1537213632501483753">"hasło"</string>
-    <string name="vpn_save_username" msgid="1408415289165970790">"Zapamiętaj nazwę użytkownika"</string>
-    <string name="vpn_connect_button" msgid="1699007212602470655">"Połącz"</string>
-    <string name="vpn_yes_button" msgid="8034531001149843119">"Tak"</string>
-    <string name="vpn_no_button" msgid="7620339571187119107">"Nie"</string>
-    <string name="vpn_back_button" msgid="192036339792734970">"Wstecz"</string>
-    <string name="vpn_mistake_button" msgid="1683383660912491270">"Nie"</string>
-    <string name="vpn_menu_done" msgid="93528279226907926">"Zapisz"</string>
-    <string name="vpn_menu_cancel" msgid="7234451214611202868">"Anuluj"</string>
-    <string name="vpn_menu_revert" msgid="4407762442281467659">"Przywróć"</string>
-    <string name="vpn_menu_connect" msgid="1089399414463784218">"Połącz z siecią"</string>
-    <string name="vpn_menu_disconnect" msgid="8254492450022562235">"Rozłącz z siecią"</string>
-    <string name="vpn_menu_edit" msgid="4526245173583195618">"Edytuj sieć"</string>
-    <string name="vpn_menu_delete" msgid="3326527392609513129">"Usuń sieć"</string>
-    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"Musisz wprowadzić wartość <xliff:g id="CODE">%s</xliff:g>."</string>
-    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"Musisz wybrać opcję <xliff:g id="OPTION">%s</xliff:g>."</string>
-    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"Nazwa sieci VPN „<xliff:g id="NAME">%s</xliff:g>” już istnieje. Wybierz inną nazwę."</string>
-    <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"Czy na pewno chcesz usunąć tę sieć VPN?"</string>
-    <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"Czy na pewno nie chcesz utworzyć tego profilu?"</string>
-    <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"Czy na pewno chcesz odrzucić zmiany wprowadzone w tym profilu?"</string>
-    <string name="vpn_confirm_reconnect" msgid="5748535476278674296">"Nie można nawiązać połączenia z siecią. Czy chcesz spróbować ponownie?"</string>
-    <string name="vpn_reconnect_from_lost" msgid="2442844155623372118">"Połączenie zostało utracone. Czy chcesz ponownie nawiązać połączenie?"</string>
-    <string name="vpn_unknown_server_dialog_msg" msgid="3080742299823671319">"Nie można rozpoznać nazwy serwera. Czy chcesz sprawdzić ustawienie nazwy serwera?"</string>
-    <string name="vpn_challenge_error_dialog_msg" msgid="6174901754230038601">"Błąd wezwania. Czy chcesz sprawdzić ustawienie klucza tajnego?"</string>
-    <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"W tej konfiguracji połączenia VPN brakuje co najmniej jednego klucza tajnego. Czy chcesz sprawdzić ustawienie klucza tajnego?"</string>
-    <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"Wprowadzono nieprawidłową nazwę użytkownika lub hasło. Czy chcesz spróbować ponownie?"</string>
-    <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"Serwer przerwał połączenie. Wprowadzona nazwa użytkownika lub hasło mogą być niepoprawne. Czy chcesz spróbować jeszcze raz?"</string>
-    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"Serwer przerwał połączenie. Istnieje możliwość, że używana zapora sieciowa uniemożliwia nawiązanie połączenia z serwerem. Czy chcesz spróbować ponownie?"</string>
-    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"Negocjowanie połączenia z serwerem nie powiodło się. Serwer może nie akceptować wybranej opcji szyfrowania. Czy chcesz sprawdzić ustawienie szyfrowania?"</string>
-    <string name="vpn_type_title" msgid="6392933604218676224">"Dodaj sieć VPN"</string>
-    <string name="vpn_add_new_vpn" msgid="5438260689052714550">"Dodaj sieć VPN"</string>
-    <string name="vpn_details_title" msgid="418806440938510331">"Szczegóły sieci VPN"</string>
-    <string name="vpn_edit_title_add" msgid="2121313217989682890">"Dodaj sieć VPN <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"Szczegóły profilu <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpns" msgid="3148141862835492816">"Sieci VPN"</string>
-    <string name="vpn_connecting" msgid="8039521381692090116">"Łączenie..."</string>
-    <string name="vpn_disconnecting" msgid="7748050200708257066">"Rozłączanie..."</string>
-    <string name="vpn_connected" msgid="7641723116362845781">"Połączone"</string>
-    <string name="vpn_connect_hint" msgid="7442898962925875181">"Połącz z siecią"</string>
-    <string name="vpn_name" msgid="1550918148476193076">"Nazwa sieci VPN"</string>
-    <string name="vpn_a_name" msgid="8445736942405283509">"nazwa sieci VPN"</string>
-    <string name="vpn_profile_added" msgid="9061017910337129840">"Dodano profil „<xliff:g id="NAME">%s</xliff:g>”"</string>
-    <string name="vpn_profile_replaced" msgid="587435576816273815">"Wprowadzanie zmian w profilu „<xliff:g id="NAME">%s</xliff:g>”"</string>
-    <string name="vpn_user_certificate_title" msgid="6812545893924071742">"Ustaw certyfikat użytkownika"</string>
-    <string name="vpn_user_certificate" msgid="949322691686938888">"Certyfikat użytkownika"</string>
-    <string name="vpn_a_user_certificate" msgid="8943983437956898649">"certyfikat użytkownika"</string>
-    <string name="vpn_ca_certificate_title" msgid="7846466160795589985">"Ustaw certyfikat UC"</string>
-    <string name="vpn_ca_certificate" msgid="465085144064264742">"Certyfikat urzędu certyfikacji (UC)"</string>
-    <string name="vpn_a_ca_certificate" msgid="3374242520974884295">"certyfikat UC"</string>
-    <string name="vpn_l2tp_secret_string_title" msgid="5039677186748940987">"Ustaw element tajny L2TP"</string>
-    <string name="vpn_l2tp_secret" msgid="529359749677142076">"Element tajny L2TP"</string>
-    <string name="vpn_a_l2tp_secret" msgid="6612042930810981845">"element tajny L2TP"</string>
-    <string name="vpn_pptp_encryption_title" msgid="2236795167467896499">"szyfrowanie"</string>
-    <string name="vpn_pptp_encryption" msgid="2602329949737259686">"Szyfrowanie PPTP"</string>
-    <string name="vpn_ipsec_presharedkey_title" msgid="2184060087690539175">"Ustaw klucz wstępny IPSec"</string>
-    <string name="vpn_ipsec_presharedkey" msgid="5434316521616673741">"Klucz wstępny IPSec"</string>
-    <string name="vpn_a_ipsec_presharedkey" msgid="1255301923217898418">"klucz wstępny IPSec"</string>
-    <string name="vpn_vpn_server_title" msgid="8897005887420358913">"Ustaw serwer sieci VPN"</string>
-    <string name="vpn_vpn_server" msgid="1141754908824209260">"Serwer sieci VPN"</string>
-    <string name="vpn_a_vpn_server" msgid="5960906152125045853">"serwer sieci VPN"</string>
-    <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"Nazwa serwera sieci VPN"</string>
-    <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"Domeny wyszukiwania DNS"</string>
-    <string name="vpn_dns_search_list" msgid="4230034234026605360">"Domeny wyszukiwania DNS"</string>
-    <string name="vpn_field_is_set" msgid="7137320847812992243">"Wartość <xliff:g id="VALUE">%s</xliff:g> jest ustawiona"</string>
-    <string name="vpn_field_not_set" msgid="2972519243515893804">"Wartość <xliff:g id="VALUE">%s</xliff:g> nie została ustawiona"</string>
-    <string name="vpn_field_not_set_optional" msgid="8840557698252556791">"Wartość <xliff:g id="VALUE">%s</xliff:g> (opcjonalna) nie jest ustawiona"</string>
-    <string name="vpn_enable_field" msgid="3700967675854517191">"Włącz opcję <xliff:g id="OPTION">%s</xliff:g>"</string>
-    <string name="vpn_disable_field" msgid="6905658811179634005">"Wyłącz opcję <xliff:g id="OPTION">%s</xliff:g>"</string>
-    <string name="vpn_is_enabled" msgid="1266304230417098877">"Opcja <xliff:g id="OPTION">%s</xliff:g> jest włączona"</string>
-    <string name="vpn_is_disabled" msgid="2013622485867806167">"Opcja <xliff:g id="OPTION">%s</xliff:g> jest wyłączona"</string>
     <string name="vpn_settings_title" msgid="7327468307909556719">"Ustawienia sieci VPN"</string>
     <string name="vpn_settings_summary" msgid="8849924181594963972">"Konfiguruj wirtualne sieci prywatne (VPN) i zarządzaj nimi"</string>
-    <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="trusted_credentials" msgid="4266945289534242402">"Zaufane dane uwierzytelniające"</string>
+    <string name="trusted_credentials_summary" msgid="6735221351155686632">"Wyświetlanie zaufanych certyfikatów CA"</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>
-    <string name="privacy_settings_title" msgid="1987089301293213705">"Ustawienia danych"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"Kopia zapasowa i zresetowanie"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"Kopia zapasowa i zresetowanie"</string>
     <string name="backup_section_title" msgid="8856083167469467588">"Tworzenie i przywracanie kopii zapasowej"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Dane osobiste"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Utwórz kopię zapasową moich danych"</string>
@@ -1439,4 +1412,107 @@
     <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>
+    <!-- no translation found for debug_ui_category (9023948280291055349) -->
+    <skip />
+    <!-- no translation found for strict_mode (1938795874357830695) -->
+    <skip />
+    <!-- no translation found for strict_mode_summary (142834318897332338) -->
+    <skip />
+    <!-- no translation found for pointer_location (6084434787496938001) -->
+    <skip />
+    <!-- no translation found for pointer_location_summary (840819275172753713) -->
+    <skip />
+    <!-- no translation found for show_screen_updates (8282711794220426931) -->
+    <skip />
+    <!-- no translation found for show_screen_updates_summary (1716122382094924596) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage (2389212910758076024) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage_summary (2113341923988958266) -->
+    <skip />
+    <!-- no translation found for window_animation_scale_title (6162587588166114700) -->
+    <skip />
+    <!-- no translation found for transition_animation_scale_title (387527540523595875) -->
+    <skip />
+    <!-- no translation found for debug_applications_category (6221644998451283813) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities (3622005081180597749) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities_summary (3592221124808773368) -->
+    <skip />
+    <!-- no translation found for app_process_limit_title (4121324758038197598) -->
+    <skip />
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Użycie danych"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"Cykl transmisji danych"</string>
+    <string name="data_usage_menu_split_4g" msgid="7417435609285381968">"Wydziel transmisję danych 4G"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Pokaż wykorzystanie sieci Wi-Fi"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"Zmień cykl"</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Resetowanie cyklu transmisji danych – dzień miesiąca:"</string>
+    <string name="data_usage_disable_mobile_limit" msgid="289740911281022322">"Wył. transm. komórkową przy limicie"</string>
+    <string name="data_usage_disable_4g_limit" msgid="5808210773758699800">"Wył. transm. 4G przy limicie"</string>
+    <string name="data_usage_disable_3g_limit" msgid="3856971004328238231">"Wył. transm. 2G/3G przy limicie"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_mobile" msgid="454140350007299045">"Komórkowa"</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">"Komórkowa transmisja danych"</string>
+    <string name="data_usage_enable_3g" msgid="6304006671869578254">"Transmisja danych 2G/3G"</string>
+    <string name="data_usage_enable_4g" msgid="3635854097335036738">"Transmisja danych 4G"</string>
+    <string name="data_usage_app_settings" msgid="3727561362090820369">"Wyświetl ustawienia aplikacji"</string>
+    <string name="data_usage_app_restrict_background" msgid="8856643905291165256">"Ogranicz transmisję danych w tle"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="1503361245973512092">"Zezwalaj na transmisję danych w tle tylko w sieci bez ograniczeń"</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="8110736468987743260">"Ograniczanie transmisji danych w tle"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="100001698378554777">"Ta funkcja może negatywnie wpływać na aplikacje, których działanie zależy od transmisji danych w tle."\n\n"Bardziej odpowiednie opcje sterujące transmisją danych można znaleźć w ustawieniach określonej aplikacji."</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Data resetowania cyklu transmisji danych"</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Data w każdym miesiącu:"</string>
+    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Zapisz"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Ograniczanie transmisji danych"</string>
+    <string name="data_usage_limit_dialog_mobile" msgid="7931094451923591578">"Połączenie komórkowej transmisji danych zostanie wyłączone po osiągnięciu określonego limitu."\n\n"Aby uniknąć dodatkowych opłat, rozważ wprowadzenie niższego limitu, ponieważ metody pomiaru w urządzeniu i systemie operatora mogą się różnić."</string>
+    <string name="data_usage_limit_dialog_3g" msgid="5478553071420316963">"Połączenie transmisji danych 2G/3G zostanie wyłączone po osiągnięciu określonego limitu."\n\n"Aby uniknąć dodatkowych opłat, rozważ wprowadzenie niższego limitu, ponieważ metody pomiaru w urządzeniu i systemie operatora mogą się różnić."</string>
+    <string name="data_usage_limit_dialog_4g" msgid="6134008906742403777">"Połączenie transmisji danych 4G zostanie wyłączone po osiągnięciu określonego limitu."\n\n"Aby uniknąć dodatkowych opłat, rozważ wprowadzenie niższego limitu, ponieważ metody pomiaru w urządzeniu i systemie operatora mogą się różnić."</string>
+    <string name="data_usage_disabled_dialog_3g_title" msgid="4221584306492812040">"Wyłączono transmisję danych 2G/3G"</string>
+    <string name="data_usage_disabled_dialog_4g_title" msgid="715585612162185936">"Wyłączono transmisję danych 4G"</string>
+    <string name="data_usage_disabled_dialog_mobile_title" msgid="209516216265000221">"Wyłączono komórkową transmisję danych"</string>
+    <string name="data_usage_disabled_dialog" msgid="2874031671067845964">"Osiągnięto określony limit transmisji danych."\n\n"Operator może pobierać opłaty za przesyłanie dodatkowych danych."</string>
+    <string name="data_usage_disabled_dialog_enable" msgid="2441219164620753329">"Włącz transmisję danych"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="32">"<xliff:g id="NUMBER">%1$s</xliff:g>"</font><font size="12">"<xliff:g id="UNIT">%2$s</xliff:g>"</font>\n<font size="12">"ostrzeżenie"</font></string>
+    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Połączenie alarmowe"</string>
+    <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Powrót do połączenia"</string>
+    <string name="vpn_name" msgid="4689699885361002297">"Nazwa"</string>
+    <string name="vpn_type" msgid="5435733139514388070">"Typ"</string>
+    <string name="vpn_server" msgid="2123096727287421913">"Adres serwera"</string>
+    <string name="vpn_mppe" msgid="6639001940500288972">"Szyfrowanie PPP (MPPE)"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"Element tajny L2TP"</string>
+    <string name="vpn_ipsec_identifier" msgid="4098175859460006296">"Identyfikator IPSec"</string>
+    <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Klucz wspólny IPSec"</string>
+    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"Certyfikat użytkownika IPSec"</string>
+    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"Certyfikat CA IPSec"</string>
+    <!-- no translation found for vpn_search_domains (5391995501541199624) -->
+    <skip />
+    <!-- no translation found for vpn_routes (8556236801755260073) -->
+    <skip />
+    <string name="vpn_username" msgid="1863901629860867849">"Nazwa użytkownika"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Hasło"</string>
+    <!-- no translation found for vpn_save_login (6350322456427484881) -->
+    <skip />
+    <!-- no translation found for vpn_not_used (9094191054524660891) -->
+    <skip />
+    <string name="vpn_no_ca_cert" msgid="7820884983947090538">"(nie weryfikuj serwera)"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"Anuluj"</string>
+    <string name="vpn_save" msgid="4233484051644764510">"Zapisz"</string>
+    <string name="vpn_connect" msgid="8469608541746132301">"Połącz"</string>
+    <string name="vpn_edit" msgid="1111459297288136079">"Edytuj sieć VPN"</string>
+    <string name="vpn_connect_to" msgid="7328758950427515753">"Połącz z siecią <xliff:g id="NETWORK">%s</xliff:g>"</string>
+    <string name="vpn_title" msgid="7982620762043790565">"Ustawienia sieci VPN"</string>
+    <string name="vpn_create" msgid="8966010925994175306">"Dodaj sieć VPN"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"Edytuj sieć"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"Usuń sieć"</string>
+    <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"System"</string>
+    <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Użytkownik"</string>
+    <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Wyłącz"</string>
+    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Włącz"</string>
+    <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Usuń"</string>
+    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Włączyć systemowy certyfikat CA?"</string>
+    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Wyłączyć systemowy certyfikat CA?"</string>
+    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Trwale usunąć certyfikat CA użytkownika?"</string>
 </resources>
diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml
index 396f112..8a6caff 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>
@@ -214,4 +240,36 @@
     <item msgid="3878793616631049349">"Utilizar a verificação HDCP para conteúdo DRM apenas"</item>
     <item msgid="45075631231212732">"Utilizar sempre a verificação HDCP"</item>
   </string-array>
+    <!-- no translation found for window_animation_scale_entries:0 (8134156599370824081) -->
+    <!-- no translation found for window_animation_scale_entries:1 (6624864048416710414) -->
+    <!-- no translation found for window_animation_scale_entries:2 (2219332261255416635) -->
+    <!-- no translation found for window_animation_scale_entries:3 (3544428804137048509) -->
+    <!-- no translation found for window_animation_scale_entries:4 (3110710404225974514) -->
+    <!-- no translation found for window_animation_scale_entries:5 (4402738611528318731) -->
+    <!-- no translation found for window_animation_scale_entries:6 (6189539267968330656) -->
+    <!-- no translation found for transition_animation_scale_entries:0 (8464255836173039442) -->
+    <!-- no translation found for transition_animation_scale_entries:1 (3375781541913316411) -->
+    <!-- no translation found for transition_animation_scale_entries:2 (1991041427801869945) -->
+    <!-- no translation found for transition_animation_scale_entries:3 (4012689927622382874) -->
+    <!-- no translation found for transition_animation_scale_entries:4 (3289156759925947169) -->
+    <!-- no translation found for transition_animation_scale_entries:5 (7705857441213621835) -->
+    <!-- no translation found for transition_animation_scale_entries:6 (6660750935954853365) -->
+    <!-- no translation found for app_process_limit_entries:0 (6799596560242275471) -->
+    <!-- no translation found for app_process_limit_entries:1 (2412794376818632575) -->
+    <!-- no translation found for app_process_limit_entries:2 (1578904888612645001) -->
+    <!-- no translation found for app_process_limit_entries:3 (8819235336299873577) -->
+  <string-array name="vpn_types_long">
+    <item msgid="2732002039459078847">"VPN PPTP"</item>
+    <item msgid="3799752201662127867">"VPN L2TP/IPSec com chaves pré-partilhadas"</item>
+    <item msgid="4725504331295252103">"VPN L2TP/IPSec com certificados"</item>
+    <item msgid="7526551163264034377">"VPN IPSec com chaves pré-partilhadas e autenticação Xauth"</item>
+    <item msgid="8064740940687465039">"VPN IPSec com certificados e autenticação Xauth"</item>
+    <item msgid="4946199982372391490">"VPN IPSec com certificados e autenticação híbrida"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:0 (8621078286418985762) -->
+    <!-- no translation found for vpn_states:1 (6692305604213080515) -->
+    <!-- no translation found for vpn_states:2 (8001704909356800092) -->
+    <!-- no translation found for vpn_states:3 (4039737283841672166) -->
+    <!-- no translation found for vpn_states:4 (4042143101664725090) -->
+    <!-- no translation found for vpn_states:5 (2690164254699635531) -->
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 41a7cdd..5023c0c 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -19,6 +19,10 @@
     <string name="yes" msgid="4676390750360727396">"Sim"</string>
     <string name="no" msgid="6731231425810196216">"Não"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Desconhecido"</string>
+    <string name="header_category_wireless_networks" msgid="4944823405420438623">"REDES SEM FIOS E OUTRAS"</string>
+    <string name="header_category_device" msgid="5781174212691167553">"DISPOSITIVO"</string>
+    <string name="header_category_personal" msgid="6225932173498802187">"PESSOAL"</string>
+    <string name="header_category_system" msgid="2073558547468647128">"SISTEMA"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Ligar rádio"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Desligar rádio"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Ver livro de endereços do SIM"</string>
@@ -111,7 +115,11 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"A emparelhar..."</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"Emparelhado mas não ligado"</string>
     <string name="bluetooth_device" msgid="6873461446424952003">"mãos-livres/auricular"</string>
-    <string name="progress_scanning" msgid="3760897655335759141">"A procurar"</string>
+    <!-- outdated translation 3760897655335759141 -->     <string name="progress_scanning" msgid="192587958424295789">"A procurar"</string>
+    <!-- no translation found for progress_tap_to_pair (4192342336107106334) -->
+    <skip />
+    <!-- no translation found for bluetooth_no_devices_found (2412462335116297668) -->
+    <skip />
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Pedido de emparelhamento de Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Pedido de emparelhamento"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Seleccionar emparelhamento com <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
@@ -130,6 +138,9 @@
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Uma aplicação do telefone está a solicitar autorização para activar o Bluetooth e para que o seu telefone seja detectável por outros dispositivos. Pretende fazê-lo?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"A ligar Bluetooth..."</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Ligação automática"</string>
+    <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Pedido de ligação Bluetooth"</string>
+    <string name="bluetooth_connection_notif_message" msgid="1833221950512058309">"Toque para se ligar a \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\""</string>
+    <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Pretende ligar-se a \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Definições de data e hora"</string>
     <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>
@@ -235,7 +246,7 @@
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Desactivar todas as ligações sem fios"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"A desactivar ligações sem fios..."</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"A activar ligações sem fios…"</string>
-    <string name="radio_controls_title" msgid="5868688473587168882">"Sem fios e redes"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Mais..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Redes sem fios e outras"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"Gerir Wi-Fi, Bluetooth, modo de avião, redes móveis e VPNs"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming de dados"</string>
@@ -271,8 +282,8 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Info do proprietário"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="2382525043173672857">"Introduza o texto a ser apresentado no ecrã de bloqueio"</string>
-    <string name="security_settings_title" msgid="5168491784222013179">"Localização e segurança"</string>
-    <string name="location_security_settings_title" msgid="4624434296446625554">"Definições de localização e segurança"</string>
+    <string name="location_settings_title" msgid="8935806698251432196">"Serviços de localização"</string>
+    <string name="security_settings_title" msgid="7945465324818485460">"Segurança"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Definir A minha localização, desbloqueio do ecrã, bloqueio do cartão SIM, bloqueio do armazenamento de credenciais"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Definir O meu local, desbloqueio do ecrã, bloqueio do armazenamento de credenciais"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Palavras-passe"</string>
@@ -316,7 +327,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>
@@ -375,8 +386,8 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Ver ou desactivar administradores do aparelho"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Activar Bluetooth"</string>
-    <string name="bluetooth_settings" msgid="2725796451253089609">"Definições de Bluetooth"</string>
-    <string name="bluetooth_settings_title" msgid="2824020086246268296">"Definições de Bluetooth"</string>
+    <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
+    <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Gerir ligações, definir nome e detectabilidade do dispositivo"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Pedido de emparelhamento de Bluetooth"</string>
     <string name="bluetooth_enter_pin_msg" msgid="1499285355129256289">\n"Introduza o PIN para emparelhar com “<xliff:g id="DEVICE_NAME">%1$s</xliff:g>” (experimente 0000 ou 1234). Poderá ser necessário introduzir o mesmo PIN no aparelho Bluetooth."</string>
@@ -394,7 +405,10 @@
     <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Emparelhamento rejeitado por <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"Ocorreu um problema ao ligar a <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Procurar dispositivos"</string>
-    <string name="bluetooth_preference_find_nearby_title" msgid="5087410003465463318">"Encontrar disp. próximos"</string>
+    <!-- no translation found for bluetooth_search_for_devices (5957007154213560390) -->
+    <skip />
+    <!-- no translation found for bluetooth_searching_for_devices (9203739709307871727) -->
+    <skip />
     <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"Definições do dispositivo"</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Dispositivos emparelhados"</string>
     <string name="bluetooth_preference_found_devices" msgid="3133019331974936204">"Dispositivos encontrados"</string>
@@ -404,6 +418,10 @@
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Desemparelhar"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Desligar e desemparelhar"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Opções..."</string>
+    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Avançadas"</string>
+    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth Avançado"</string>
+    <string name="bluetooth_advanced_settings_label" msgid="8659717781212434173">"Bluetooth Avançado"</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="3631028334811113629">"Ligar bluetooth para ver dispositivos disponíveis"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Ligar a..."</string>
     <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"Multimédia"</string>
     <string name="bluetooth_profile_headset" msgid="81844079120986198">"Mãos-livres"</string>
@@ -445,27 +463,31 @@
     <string name="nfc_toggle_error" msgid="2233172102497535522">"Ocorreu um erro."</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Activar Wi-Fi"</string>
-    <string name="wifi_settings" msgid="4746946030627213196">"Definições de Wi-Fi"</string>
+    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="2810363951104753710">"Definições de Wi-Fi"</string>
+    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Configurar e gerir pontos de acesso sem fios"</string>
-    <string name="wifi_starting" msgid="6710266609710860129">"A activar..."</string>
-    <string name="wifi_stopping" msgid="5952909472548218348">"A desactivar..."</string>
+    <string name="wifi_starting" msgid="7732330327758522943">"A ativar Wi-Fi..."</string>
+    <string name="wifi_stopping" msgid="244864762599017659">"A desligar Wi-Fi..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"Erro"</string>
     <string name="wifi_in_airplane_mode" msgid="7618393787965366655">"No modo de avião"</string>
     <string name="wifi_fail_to_scan" msgid="6194542252808587669">"Não é possível procurar redes"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Notificação de rede"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Notificar-me quando estiver disponível uma rede aberta"</string>
+    <string name="wifi_enable_watchdog_service" msgid="4723544454066601706">"Verificações de Conetividade Wi-Fi"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="8687400936839455926">"Detetar e gerir potenciais problemas de conetividade de rede"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Política de desligar Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Especificar quando mudar de Wi-Fi para dados móveis"</string>
     <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" msgid="6234851776910938957">"Adicionar rede"</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>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Ligar a uma rede"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Esquecer rede"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modificar rede"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="3682507011071029311">"Ligar Wi-Fi para ver as redes disponíveis"</string>
     <string name="wifi_network_setup" msgid="7974851890019344870">"Configuração de rede"</string>
     <string name="wifi_wps_pin" msgid="5471842298708321115">"Inserir PIN a partir de ponto de acesso"</string>
     <string name="wifi_wps_setup_title" msgid="150518971269252336">"Configuração do WPS"</string>
@@ -501,13 +523,13 @@
     <string name="wifi_save" msgid="3331121567988522826">"Guardar"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Cancelar"</string>
     <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"Foi detectada outra sessão do WPS. Repita dentro de alguns minutos"</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Avançadas"</string>
+    <!-- outdated translation 5419052271935350999 -->     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Avançadas"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Banda de frequência Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Especifique o intervalo de frequência de operação"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Problema ao definir a banda de frequência."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Endereço MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Endereço IP"</string>
-    <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"Definições de IP"</string>
+    <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Definições de IP"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Guardar"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Cancelar"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Introduza um endereço IP válido."</string>
@@ -525,7 +547,7 @@
     <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"Hotspot Wi-Fi portátil <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="sound_settings_title" msgid="8735891486683305886">"Som"</string>
-    <string name="display_settings_title" msgid="2378894265964357591">"Ecrã"</string>
+    <string name="display_settings_title" msgid="1708697328627382561">"Visor"</string>
     <string name="sound_settings" msgid="5007659014828162881">"Definições de som"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Modo silencioso"</string>
     <string name="silent_mode_summary" msgid="3309650676072917899">"Silenciar todos os sons, excepto multimédia e alarmes"</string>
@@ -598,7 +620,18 @@
     <string name="brightness_summary" msgid="838917350127550703">"Ajustar o brilho do ecrã"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Tempo limite"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"O ecrã desliga automaticamente após <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Imagem de fundo"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Sonhos Android"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Proteções de ecrã e outras diversões ociosas"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Sonho selecionado"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Quando ativar"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"Após <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inativo"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Nunca"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Experimente!"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brilho automático"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Tamanho do tipo de letra"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Tamanho global dos tipos de letra"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Selecionar tamanho do tipo de letra"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Definições de bloqueio do cartão SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Configurar bloqueio do cartão SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Bloqueio do cartão SIM"</string>
@@ -643,8 +676,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>
@@ -696,6 +730,16 @@
     <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"O cartão SD será desmontado."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"A desmontar"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Desmontagem em curso"</string>
+    <!-- no translation found for storage_menu_usb (1580545228584324704) -->
+    <skip />
+    <!-- no translation found for storage_title_usb (5775322159427546546) -->
+    <skip />
+    <!-- no translation found for usb_label_mtp (4157227401755543412) -->
+    <skip />
+    <!-- no translation found for usb_label_ptp (7417254019489575819) -->
+    <skip />
+    <!-- no translation found for usb_label_installer_cd (7438467574756086977) -->
+    <skip />
     <string name="battery_status_title" msgid="9159414319574976203">"Estado da bateria"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Nível da bateria"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNs"</string>
@@ -806,6 +850,8 @@
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"Não é possível ligar mais de <xliff:g id="MAXCONNECTION">%1$d</xliff:g> dispositivos"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será desligado."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ajuda"</string>
+    <string name="wireless_category_general" msgid="2973810407987118067">"Geral"</string>
+    <string name="wireless_category_mobile_networks" msgid="1254629216798424288">"Redes móveis"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Redes móveis"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Definir opções de roaming, redes, APNs"</string>
     <string name="location_title" msgid="1029961368397484576">"A minha localização"</string>
@@ -883,7 +929,7 @@
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Manter a segurança do tablet"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Manter o telefone seguro"</string>
     <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"Proteja o seu tablet de utilização não autorizada, criando uma sequência pessoal de desbloqueio do ecrã. Utilize o dedo para ligar os pontos por qualquer ordem no ecrã seguinte. Deve ligar pelo menos quatro pontos."\n\n"Está pronto para começar? Toque em \"Seguinte\"."</string>
-    <string name="lock_intro_message" product="default" msgid="9100785646737118042"><font size="17">"Proteja o seu telefone de utilização não autorizada, criando um padrão pessoal de desbloqueio do ecrã. "\n<font height="17">\n</font><b>"1"</b>"  No ecrã seguinte, observe enquanto é desenhado um padrão exemplificativo. "\n<font height="17">\n</font><b>"2"</b>"  Quando estiver pronto, desenhe o seu padrão pessoal de desbloqueio. Experimente diferentes padrões, mas ligue, pelo menos, quatro pontos. "\n<font height="17">\n</font><b>"3"</b>"  Redesenhe o seu padrão para confirmar. "\n<font height="17">\n</font><b>"Está pronto para começar? Toque em “Seguinte”"</b>". "\n<font height="3">\n</font>"Para deixar o seu telefone sem protecção, toque em “Cancelar”."</font></string>
+    <!-- outdated translation 3692151094288835065 -->     <string name="lock_intro_message" product="default" msgid="5796785892741212873">"Proteja o seu tablet de utilização não autorizada, criando uma sequência pessoal de desbloqueio do ecrã. Utilize o dedo para ligar os pontos por qualquer ordem no ecrã seguinte. Deve ligar pelo menos quatro pontos."\n\n"Está pronto para começar? Toque em \"Seguinte\"."</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Gerir aplicações"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Gerir e remover aplicações instaladas"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Aplicações"</string>
@@ -893,6 +939,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>
@@ -905,9 +953,10 @@
     <string name="force_stop" msgid="7435006169872876756">"Forçar paragem"</string>
     <string name="total_size_label" msgid="1048676419552557254">"Total"</string>
     <string name="application_size_label" msgid="5055196275624686382">"Aplicação"</string>
+    <string name="external_code_size_label" msgid="3459343140355961335">"Aplicação de armazenamento USB"</string>
     <string name="data_size_label" msgid="8679376373625710107">"Dados"</string>
-    <string name="external_size_label" product="nosdcard" msgid="4465530017830945766">"Armazenamento USB"</string>
-    <string name="external_size_label" product="default" msgid="2107155737635944440">"Cartão SD"</string>
+    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Dados de armazenamento USB"</string>
+    <string name="external_data_size_label" product="default" msgid="626414192825329708">"Cartão SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Desinstalar"</string>
     <string name="disable_text" msgid="6544054052049395202">"Desactivar"</string>
     <string name="enable_text" msgid="9217362512327828987">"Activar"</string>
@@ -1026,7 +1075,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 +1085,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>
@@ -1066,7 +1117,7 @@
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Definições do teclado no ecrã"</string>
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Teclado físico"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Definições do teclado físico"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Desenvolvimento"</string>
+    <string name="development_settings_title" msgid="215179176067683667">"Opções de programador"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"Definir opções de desenvolvimento da aplicação"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Depuração USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Modo de depuração com USB ligado"</string>
@@ -1091,14 +1142,14 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Acessibilidade"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Definições de acessibilidade"</string>
     <string name="accessibility_settings_summary" msgid="8185181964847149507">"Gerir opções de acessibilidade"</string>
-    <string name="toggle_accessibility_title" msgid="650839277066574497">"Acessibilidade"</string>
+    <string name="toggle_large_text_title" msgid="42259643359869436">"Texto grande"</string>
     <string name="accessibility_services_category" msgid="8127851026323672607">"Serviços de acessibilidade"</string>
+    <string name="toggle_accessibility_title" msgid="7338739354952553958">"Permitir serviços de acessibilidade"</string>
     <string name="no_accessibility_services_summary" msgid="694578333333808159">"Nenhum serviço de acessibilidade instalado."</string>
     <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Este serviço de acessibilidade pode captar todo o texto que escrever, incluindo dados pessoais e números de cartões de crédito, com excepção de palavras-passe. Também pode registar as interacções com a interface do utilizador. O serviço é fornecido com a aplicação <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Utilizar este serviço de acessibilidade?"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Desactivar acessibilidade?"</string>
     <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"Não foram encontradas aplicações relacionadas com acessibilidade"</string>
     <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"Não tem nenhuma aplicação relacionada com acessibilidade instalada."\n\n"Pode transferir um leitor de ecrã para o aparelho a partir do Android Market."\n\n"Clique em OK para instalar o leitor de ecrã."</string>
-    <string name="accessibility_script_injection_category" msgid="8649951751131431904">"Scripts de acessibilidade"</string>
     <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"Transferir scripts de acessibilidade"</string>
     <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"Permitir que as aplicações transfiram scripts de acess. do Google"</string>
     <string name="accessibility_script_injection_security_warning" product="tablet" msgid="1113600871264359828">"Para que o seu conteúdo seja mais acessível, algumas aplicações podem solicitar ao Google que transfira scripts para o tablet. Tem a certeza de que pretende permitir que o Google instale scripts de acessibilidade no seu tablet?"</string>
@@ -1106,10 +1157,11 @@
     <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>
-    <string name="power_usage_summary_title" msgid="5180282911164282324">"Utilização da bateria"</string>
+    <string name="power_usage_summary_title" msgid="7190304207330319919">"Bateria"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"O que tem estado a utilizar a bateria"</string>
     <string name="power_usage_not_available" msgid="3583407442633768046">"Dados ut. da bateria indispon."</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Bateria utilizada desde que foi desligado"</string>
@@ -1218,6 +1270,8 @@
     <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>
+    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Definições do motor"</string>
+    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Definições do <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
     <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>
@@ -1228,114 +1282,33 @@
     <string name="gadget_title" msgid="7455548605888590466">"Controlo de Energia"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Actualizar definição de Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Actualizar a definição do Bluetooth"</string>
-    <string name="vpn_settings_activity_title" msgid="7276864950701612579">"Definições da VPN"</string>
-    <string name="vpn_connect_to" msgid="2541409082892684362">"Ligar a <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpn_username_colon" msgid="7854930370861306247">"Nome de utilizador:"</string>
-    <string name="vpn_password_colon" msgid="5716278710848606626">"Palavra-passe:"</string>
-    <string name="vpn_a_username" msgid="6664733641993968692">"um nome de utilizador"</string>
-    <string name="vpn_a_password" msgid="1537213632501483753">"uma palavra-passe"</string>
-    <string name="vpn_save_username" msgid="1408415289165970790">"Memorizar nome de utilizador"</string>
-    <string name="vpn_connect_button" msgid="1699007212602470655">"Ligar"</string>
-    <string name="vpn_yes_button" msgid="8034531001149843119">"Sim"</string>
-    <string name="vpn_no_button" msgid="7620339571187119107">"Não"</string>
-    <string name="vpn_back_button" msgid="192036339792734970">"Anterior"</string>
-    <string name="vpn_mistake_button" msgid="1683383660912491270">"Não"</string>
-    <string name="vpn_menu_done" msgid="93528279226907926">"Guardar"</string>
-    <string name="vpn_menu_cancel" msgid="7234451214611202868">"Cancelar"</string>
-    <string name="vpn_menu_revert" msgid="4407762442281467659">"Reverter"</string>
-    <string name="vpn_menu_connect" msgid="1089399414463784218">"Ligar a uma rede"</string>
-    <string name="vpn_menu_disconnect" msgid="8254492450022562235">"Desligado da rede"</string>
-    <string name="vpn_menu_edit" msgid="4526245173583195618">"Editar rede"</string>
-    <string name="vpn_menu_delete" msgid="3326527392609513129">"Eliminar rede"</string>
-    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"Tem de introduzir <xliff:g id="CODE">%s</xliff:g>."</string>
-    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"É necessário seleccionar <xliff:g id="OPTION">%s</xliff:g>."</string>
-    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"O nome VPN \"<xliff:g id="NAME">%s</xliff:g>\" já existe. Introduza outro nome."</string>
-    <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"Tem a certeza de que pretende eliminar esta VPN?"</string>
-    <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"Tem a certeza de que não pretende criar este perfil?"</string>
-    <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"Tem a certeza de que pretende rejeitar as alterações efectuadas a este perfil?"</string>
-    <string name="vpn_confirm_reconnect" msgid="5748535476278674296">"Não foi possível estabelecer ligação à rede. Pretende tentar novamente?"</string>
-    <string name="vpn_reconnect_from_lost" msgid="2442844155623372118">"Ligação perdida. Pretende ligar novamente?"</string>
-    <string name="vpn_unknown_server_dialog_msg" msgid="3080742299823671319">"Não é possível resolver o nome do servidor. Pretende verificar a definição do nome do servidor?"</string>
-    <string name="vpn_challenge_error_dialog_msg" msgid="6174901754230038601">"Erro de chamada. Pretende verificar a definição secreta?"</string>
-    <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"Falta um ou vários segredos nesta configuração de VPN. Pretende verificar a definição de segredo?"</string>
-    <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"O nome de utilizador ou a palavra-passe que introduziu estão incorrectos. Pretende tentar novamente?"</string>
-    <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"O servidor desligou. O nome de utilizador ou a palavra-passe que introduziu podem estar incorrectos. Pretende tentar novamente?"</string>
-    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"Servidor bloqueado. É possível que esteja protegido por uma firewall que impede a ligação ao servidor. Deseja tentar novamente?"</string>
-    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"A negociação do servidor falhou. O servidor não pode concordar com a sua opção de encriptação. Deseja confirmar a sua definição de encriptação?"</string>
-    <string name="vpn_type_title" msgid="6392933604218676224">"Adicionar VPN"</string>
-    <string name="vpn_add_new_vpn" msgid="5438260689052714550">"Adicionar VPN"</string>
-    <string name="vpn_details_title" msgid="418806440938510331">"Detalhes da VPN"</string>
-    <string name="vpn_edit_title_add" msgid="2121313217989682890">"Adicionar VPN <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"Detalhes de <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpns" msgid="3148141862835492816">"VPNs"</string>
-    <string name="vpn_connecting" msgid="8039521381692090116">"A ligar..."</string>
-    <string name="vpn_disconnecting" msgid="7748050200708257066">"A desligar..."</string>
-    <string name="vpn_connected" msgid="7641723116362845781">"Ligado"</string>
-    <string name="vpn_connect_hint" msgid="7442898962925875181">"Ligar a uma rede"</string>
-    <string name="vpn_name" msgid="1550918148476193076">"Nome de VPN"</string>
-    <string name="vpn_a_name" msgid="8445736942405283509">"um nome de VPN"</string>
-    <string name="vpn_profile_added" msgid="9061017910337129840">"\"<xliff:g id="NAME">%s</xliff:g>\" foi adicionado"</string>
-    <string name="vpn_profile_replaced" msgid="587435576816273815">"Foram efectuadas alterações a \"<xliff:g id="NAME">%s</xliff:g>\""</string>
-    <string name="vpn_user_certificate_title" msgid="6812545893924071742">"Definir certificado do utilizador"</string>
-    <string name="vpn_user_certificate" msgid="949322691686938888">"Certificado do utilizador"</string>
-    <string name="vpn_a_user_certificate" msgid="8943983437956898649">"um certificado de utilizador"</string>
-    <string name="vpn_ca_certificate_title" msgid="7846466160795589985">"Definir certificado CA"</string>
-    <string name="vpn_ca_certificate" msgid="465085144064264742">"Certificado de autoridade de certificação (CA)"</string>
-    <string name="vpn_a_ca_certificate" msgid="3374242520974884295">"um certificado CA"</string>
-    <string name="vpn_l2tp_secret_string_title" msgid="5039677186748940987">"Definir segredo L2TP"</string>
-    <string name="vpn_l2tp_secret" msgid="529359749677142076">"segredo L2TP"</string>
-    <string name="vpn_a_l2tp_secret" msgid="6612042930810981845">"um segredo L2TP"</string>
-    <string name="vpn_pptp_encryption_title" msgid="2236795167467896499">"encriptação"</string>
-    <string name="vpn_pptp_encryption" msgid="2602329949737259686">"Encriptação PPTP"</string>
-    <string name="vpn_ipsec_presharedkey_title" msgid="2184060087690539175">"Definir chave IPSec pré-partilhada"</string>
-    <string name="vpn_ipsec_presharedkey" msgid="5434316521616673741">"chave IPSec pré-partilhada"</string>
-    <string name="vpn_a_ipsec_presharedkey" msgid="1255301923217898418">"uma chave IPSec pré-partilhada"</string>
-    <string name="vpn_vpn_server_title" msgid="8897005887420358913">"Definir servidor VPN"</string>
-    <string name="vpn_vpn_server" msgid="1141754908824209260">"servidor VPN"</string>
-    <string name="vpn_a_vpn_server" msgid="5960906152125045853">"um servidor VPN"</string>
-    <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"nome do servidor VPN"</string>
-    <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"Domínios de pesquisa DNS"</string>
-    <string name="vpn_dns_search_list" msgid="4230034234026605360">"Domínios de pesquisa DNS"</string>
-    <string name="vpn_field_is_set" msgid="7137320847812992243">"<xliff:g id="VALUE">%s</xliff:g> está definido"</string>
-    <string name="vpn_field_not_set" msgid="2972519243515893804">"<xliff:g id="VALUE">%s</xliff:g> não definido"</string>
-    <string name="vpn_field_not_set_optional" msgid="8840557698252556791">"<xliff:g id="VALUE">%s</xliff:g> não definido (opcional)"</string>
-    <string name="vpn_enable_field" msgid="3700967675854517191">"Activar <xliff:g id="OPTION">%s</xliff:g>"</string>
-    <string name="vpn_disable_field" msgid="6905658811179634005">"Desactivar <xliff:g id="OPTION">%s</xliff:g>"</string>
-    <string name="vpn_is_enabled" msgid="1266304230417098877">"<xliff:g id="OPTION">%s</xliff:g> está activado"</string>
-    <string name="vpn_is_disabled" msgid="2013622485867806167">"<xliff:g id="OPTION">%s</xliff:g> está desactivado"</string>
     <string name="vpn_settings_title" msgid="7327468307909556719">"Definições VPN"</string>
     <string name="vpn_settings_summary" msgid="8849924181594963972">"Configurar e gerir VPNs (Redes Privadas Virtuais)"</string>
-    <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="trusted_credentials" msgid="4266945289534242402">"Credenciais fiáveis"</string>
+    <string name="trusted_credentials_summary" msgid="6735221351155686632">"Mostrar certificados da AC fiáveis"</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>
-    <string name="privacy_settings_title" msgid="1987089301293213705">"Definições de privacidade"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"Cópia de segurança e reposição"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"Cópia de segurança e reposição"</string>
     <string name="backup_section_title" msgid="8856083167469467588">"Cópia de segurança e restauro"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Dados pessoais"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Fazer uma cópia de segurança dos meus dados"</string>
@@ -1446,4 +1419,107 @@
     <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>
+    <!-- no translation found for debug_ui_category (9023948280291055349) -->
+    <skip />
+    <!-- no translation found for strict_mode (1938795874357830695) -->
+    <skip />
+    <!-- no translation found for strict_mode_summary (142834318897332338) -->
+    <skip />
+    <!-- no translation found for pointer_location (6084434787496938001) -->
+    <skip />
+    <!-- no translation found for pointer_location_summary (840819275172753713) -->
+    <skip />
+    <!-- no translation found for show_screen_updates (8282711794220426931) -->
+    <skip />
+    <!-- no translation found for show_screen_updates_summary (1716122382094924596) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage (2389212910758076024) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage_summary (2113341923988958266) -->
+    <skip />
+    <!-- no translation found for window_animation_scale_title (6162587588166114700) -->
+    <skip />
+    <!-- no translation found for transition_animation_scale_title (387527540523595875) -->
+    <skip />
+    <!-- no translation found for debug_applications_category (6221644998451283813) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities (3622005081180597749) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities_summary (3592221124808773368) -->
+    <skip />
+    <!-- no translation found for app_process_limit_title (4121324758038197598) -->
+    <skip />
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Utilização de dados"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"Ciclo de utiliz. de dados"</string>
+    <string name="data_usage_menu_split_4g" msgid="7417435609285381968">"Separar utilização de 4G"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Mostrar utilização de Wi-Fi"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"Alterar ciclo..."</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Dia do mês para repor o ciclo de utilização de dados:"</string>
+    <string name="data_usage_disable_mobile_limit" msgid="289740911281022322">"Desativar dados móveis no limite"</string>
+    <string name="data_usage_disable_4g_limit" msgid="5808210773758699800">"Desativar dados 4G no limite"</string>
+    <string name="data_usage_disable_3g_limit" msgid="3856971004328238231">"Desativar dados 2G-3G no limite"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_mobile" msgid="454140350007299045">"Telemóvel"</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">"Dados móveis"</string>
+    <string name="data_usage_enable_3g" msgid="6304006671869578254">"Dados 2G-3G"</string>
+    <string name="data_usage_enable_4g" msgid="3635854097335036738">"Dados 4G"</string>
+    <string name="data_usage_app_settings" msgid="3727561362090820369">"Ver as definições da aplicação"</string>
+    <string name="data_usage_app_restrict_background" msgid="8856643905291165256">"Rest. util. dados em seg. plano"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="1503361245973512092">"Apenas permitir dados em segundo plano de aplicações ao utilizar uma rede ilimitada"</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="8110736468987743260">"Restringir dados em segundo plano"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="100001698378554777">"Esta funcionalidade pode influenciar negativamente aplicações que dependam da utilização de dados em segundo plano."\n\n"Poderá encontrar controlos de utilização de dados mais adequados nas definições desta aplicação."</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Data de reposição de ciclo de utilização"</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Data de cada mês:"</string>
+    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Definir"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Limitar utilização de dados"</string>
+    <string name="data_usage_limit_dialog_mobile" msgid="7931094451923591578">"A ligação de dados móveis será desativada quando o limite indicado for atingido."\n\n"Para evitar cobranças adicionais, considere utilizar um limite mais reduzido, uma vez que os métodos de contabilização do aparelho e do operador poderão ser diferentes."</string>
+    <string name="data_usage_limit_dialog_3g" msgid="5478553071420316963">"A ligação de dados 2G-3G será desativada quando o limite indicado for atingido."\n\n"Para evitar cobranças adicionais, considere utilizar um limite mais reduzido, uma vez que os métodos de contabilização do aparelho e do operador poderão ser diferentes."</string>
+    <string name="data_usage_limit_dialog_4g" msgid="6134008906742403777">"A ligação de dados 4G será desativada quando o limite indicado for atingido."\n\n"Para evitar cobranças adicionais, considere utilizar um limite mais reduzido, uma vez que os métodos de contabilização do aparelho e do operador poderão ser diferentes."</string>
+    <string name="data_usage_disabled_dialog_3g_title" msgid="4221584306492812040">"Os dados 2G-3G estão desativados"</string>
+    <string name="data_usage_disabled_dialog_4g_title" msgid="715585612162185936">"Os dados 4G estão desativados"</string>
+    <string name="data_usage_disabled_dialog_mobile_title" msgid="209516216265000221">"Os dados móveis estão desativados"</string>
+    <string name="data_usage_disabled_dialog" msgid="2874031671067845964">"O limite de utilização de dados especificado foi atingido."\n\n"A utilização de dados adicionais poderá estar sujeita a tarifas por parte do operador."</string>
+    <string name="data_usage_disabled_dialog_enable" msgid="2441219164620753329">"Reativar dados"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="32">"<xliff:g id="NUMBER">%1$s</xliff:g>"</font><font size="12">"<xliff:g id="UNIT">%2$s</xliff:g>"</font>\n<font size="12">"aviso"</font></string>
+    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Chamada de emergência"</string>
+    <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Regressar à chamada"</string>
+    <string name="vpn_name" msgid="4689699885361002297">"Nome"</string>
+    <string name="vpn_type" msgid="5435733139514388070">"Tipo"</string>
+    <string name="vpn_server" msgid="2123096727287421913">"Endereço do servidor"</string>
+    <string name="vpn_mppe" msgid="6639001940500288972">"Encriptação PPP (MPPE)"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"segredo L2TP"</string>
+    <string name="vpn_ipsec_identifier" msgid="4098175859460006296">"Identificador IPSec"</string>
+    <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Chave IPSec pré-partilhada"</string>
+    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"Certificado do utilizador IPSec"</string>
+    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"Certificado da AC IPSec"</string>
+    <!-- no translation found for vpn_search_domains (5391995501541199624) -->
+    <skip />
+    <!-- no translation found for vpn_routes (8556236801755260073) -->
+    <skip />
+    <string name="vpn_username" msgid="1863901629860867849">"Nome de utilizador"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Palavra-passe"</string>
+    <!-- no translation found for vpn_save_login (6350322456427484881) -->
+    <skip />
+    <!-- no translation found for vpn_not_used (9094191054524660891) -->
+    <skip />
+    <string name="vpn_no_ca_cert" msgid="7820884983947090538">"(não verificar servidor)"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"Cancelar"</string>
+    <string name="vpn_save" msgid="4233484051644764510">"Guardar"</string>
+    <string name="vpn_connect" msgid="8469608541746132301">"Ligar"</string>
+    <string name="vpn_edit" msgid="1111459297288136079">"Editar rede VPN"</string>
+    <string name="vpn_connect_to" msgid="7328758950427515753">"Ligar a <xliff:g id="NETWORK">%s</xliff:g>"</string>
+    <string name="vpn_title" msgid="7982620762043790565">"Definições da VPN"</string>
+    <string name="vpn_create" msgid="8966010925994175306">"Adicionar rede VPN"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"Editar rede"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"Eliminar rede"</string>
+    <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Sistema"</string>
+    <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Utilizador"</string>
+    <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Desativar"</string>
+    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Ativar"</string>
+    <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Remover"</string>
+    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Ativar o certificado da AC do sistema?"</string>
+    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Desativar o certificado da AC do sistema?"</string>
+    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Remover permanentemente o certificado de utilizador da AC?"</string>
 </resources>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index ab0c62d..b9ceefc 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>
@@ -214,4 +240,36 @@
     <item msgid="3878793616631049349">"Usar a verificação HDCP somente para conteúdo DRM"</item>
     <item msgid="45075631231212732">"Sempre usar a verificação HDCP"</item>
   </string-array>
+    <!-- no translation found for window_animation_scale_entries:0 (8134156599370824081) -->
+    <!-- no translation found for window_animation_scale_entries:1 (6624864048416710414) -->
+    <!-- no translation found for window_animation_scale_entries:2 (2219332261255416635) -->
+    <!-- no translation found for window_animation_scale_entries:3 (3544428804137048509) -->
+    <!-- no translation found for window_animation_scale_entries:4 (3110710404225974514) -->
+    <!-- no translation found for window_animation_scale_entries:5 (4402738611528318731) -->
+    <!-- no translation found for window_animation_scale_entries:6 (6189539267968330656) -->
+    <!-- no translation found for transition_animation_scale_entries:0 (8464255836173039442) -->
+    <!-- no translation found for transition_animation_scale_entries:1 (3375781541913316411) -->
+    <!-- no translation found for transition_animation_scale_entries:2 (1991041427801869945) -->
+    <!-- no translation found for transition_animation_scale_entries:3 (4012689927622382874) -->
+    <!-- no translation found for transition_animation_scale_entries:4 (3289156759925947169) -->
+    <!-- no translation found for transition_animation_scale_entries:5 (7705857441213621835) -->
+    <!-- no translation found for transition_animation_scale_entries:6 (6660750935954853365) -->
+    <!-- no translation found for app_process_limit_entries:0 (6799596560242275471) -->
+    <!-- no translation found for app_process_limit_entries:1 (2412794376818632575) -->
+    <!-- no translation found for app_process_limit_entries:2 (1578904888612645001) -->
+    <!-- no translation found for app_process_limit_entries:3 (8819235336299873577) -->
+  <string-array name="vpn_types_long">
+    <item msgid="2732002039459078847">"VPN PPTP"</item>
+    <item msgid="3799752201662127867">"L2TP/IPSec VPN com chaves pré-compartilhadas"</item>
+    <item msgid="4725504331295252103">"VPN L2TP/IPSec com certificados"</item>
+    <item msgid="7526551163264034377">"VPN IPSec com chaves pré-compartilhadas e autenticação Xauth"</item>
+    <item msgid="8064740940687465039">"VPN IPSec com autenticação de certificados e Xauth"</item>
+    <item msgid="4946199982372391490">"VPN IPSec com certificados e autenticação híbrida"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:0 (8621078286418985762) -->
+    <!-- no translation found for vpn_states:1 (6692305604213080515) -->
+    <!-- no translation found for vpn_states:2 (8001704909356800092) -->
+    <!-- no translation found for vpn_states:3 (4039737283841672166) -->
+    <!-- no translation found for vpn_states:4 (4042143101664725090) -->
+    <!-- no translation found for vpn_states:5 (2690164254699635531) -->
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 42b3e39..e26a313 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -19,6 +19,10 @@
     <string name="yes" msgid="4676390750360727396">"Sim"</string>
     <string name="no" msgid="6731231425810196216">"Não"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Desconhecido"</string>
+    <string name="header_category_wireless_networks" msgid="4944823405420438623">"REDES SEM FIO E OUTRAS"</string>
+    <string name="header_category_device" msgid="5781174212691167553">"DISPOSITIVO"</string>
+    <string name="header_category_personal" msgid="6225932173498802187">"PESSOAL"</string>
+    <string name="header_category_system" msgid="2073558547468647128">"SISTEMA"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Ativar o rádio"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Desativar o rádio"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Visualizar o catálogo de endereços do SIM"</string>
@@ -66,9 +70,9 @@
     <string name="battery_info_temperature_label" msgid="1968383098818648037">"Temperatura da bateria:"</string>
     <string name="battery_info_temperature_units" msgid="9098950587249987550">"° C"</string>
     <string name="battery_info_uptime" msgid="5548545143573527992">"Tempo desde a inicialização:"</string>
-    <string name="battery_info_awake_battery" msgid="2557725975486185849">"Tempo de ativação da bateria:"</string>
-    <string name="battery_info_awake_plugged" msgid="176716874713478188">"Tempo de ativação durante o carregamento:"</string>
-    <string name="battery_info_screen_on" msgid="376277447175613889">"Tempo de ativação da tela:"</string>
+    <string name="battery_info_awake_battery" msgid="2557725975486185849">"Tempo ativo da bateria:"</string>
+    <string name="battery_info_awake_plugged" msgid="176716874713478188">"Tempo ativo ao carregar:"</string>
+    <string name="battery_info_screen_on" msgid="376277447175613889">"Tempo ativo da tela:"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"Desconhecido"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Carregando"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(CA)"</string>
@@ -111,7 +115,11 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Pareando…"</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"Pareado, mas não conectado"</string>
     <string name="bluetooth_device" msgid="6873461446424952003">"viva-voz/fone de ouvido"</string>
-    <string name="progress_scanning" msgid="3760897655335759141">"Procurando"</string>
+    <!-- outdated translation 3760897655335759141 -->     <string name="progress_scanning" msgid="192587958424295789">"Procurando"</string>
+    <!-- no translation found for progress_tap_to_pair (4192342336107106334) -->
+    <skip />
+    <!-- no translation found for bluetooth_no_devices_found (2412462335116297668) -->
+    <skip />
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Solicitação de pareamento Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Solicitação de pareamento"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Selecione para parear <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
@@ -130,6 +138,9 @@
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Um aplicativo em seu telefone está solicitando permissão para ativar o Bluetooth e tornar o seu telefone detectável por outros dispositivos. Deseja fazer isso?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Ativando Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Conexão automática"</string>
+    <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Solicitação de conexão Bluetooth"</string>
+    <string name="bluetooth_connection_notif_message" msgid="1833221950512058309">"Toque para conectar-se ao \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\""</string>
+    <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Deseja conectar-se ao \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Configurações de data e hora"</string>
     <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>
@@ -235,7 +246,7 @@
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Desativar todas as conexões sem fio"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"Desativando as conexões sem fio…"</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"Ativando conexões sem fio…"</string>
-    <string name="radio_controls_title" msgid="5868688473587168882">"Redes sem fio e outras"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Mais..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Redes sem fio e outras"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"Gerenciar rede Wi-Fi, Bluetooth, modo avião, redes e VPNs"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming de dados"</string>
@@ -271,8 +282,8 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Info do proprietário"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="2382525043173672857">"Digite o texto a ser exibido na tela de bloqueio"</string>
-    <string name="security_settings_title" msgid="5168491784222013179">"Local e segurança"</string>
-    <string name="location_security_settings_title" msgid="4624434296446625554">"Configurações de local e segurança"</string>
+    <string name="location_settings_title" msgid="8935806698251432196">"Serviços de local"</string>
+    <string name="security_settings_title" msgid="7945465324818485460">"Segurança"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Definir Meu local, desbloqueio de tela, bloqueio do SIM e do armazenamento de credenciais"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Definir o Meu local, o desbloqueio de tela, o bloqueio do armazenamento de credenciais"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Senhas"</string>
@@ -316,7 +327,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>
@@ -375,8 +386,8 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Visualizar ou desativar administradores do dispositivo"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Ativar Bluetooth"</string>
-    <string name="bluetooth_settings" msgid="2725796451253089609">"Conf. de Bluetooth"</string>
-    <string name="bluetooth_settings_title" msgid="2824020086246268296">"Conf. de Bluetooth"</string>
+    <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
+    <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Gerenciar conexões, definir o nome e detecção do dispositivo"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Solicitação de pareamento Bluetooth"</string>
     <string name="bluetooth_enter_pin_msg" msgid="1499285355129256289">\n"Digitar PIN para emparelhar com \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". (Tente 0000 ou 1234.) Pode ser necessário digitar o mesmo PIN no dispositivo do Bluetooth."</string>
@@ -394,7 +405,10 @@
     <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Emparelhamento rejeitado por <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"Houve um problema na conexão com <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Procurar dispositivos"</string>
-    <string name="bluetooth_preference_find_nearby_title" msgid="5087410003465463318">"Encontrar dispositivos próximos"</string>
+    <!-- no translation found for bluetooth_search_for_devices (5957007154213560390) -->
+    <skip />
+    <!-- no translation found for bluetooth_searching_for_devices (9203739709307871727) -->
+    <skip />
     <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"Configurações do aparelho"</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Dispositivos pareados"</string>
     <string name="bluetooth_preference_found_devices" msgid="3133019331974936204">"Dispositivos encontrados"</string>
@@ -404,6 +418,10 @@
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Cancelar pareamento"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Desconectar e cancelar pareamento"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Opções…"</string>
+    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Avançado"</string>
+    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth avançado"</string>
+    <string name="bluetooth_advanced_settings_label" msgid="8659717781212434173">"Bluetooth avançado"</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="3631028334811113629">"Ativar Bluetooth p/ ver dispositivos disponíveis"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Conectar-se a..."</string>
     <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"Mídia"</string>
     <string name="bluetooth_profile_headset" msgid="81844079120986198">"Viva-voz"</string>
@@ -445,27 +463,31 @@
     <string name="nfc_toggle_error" msgid="2233172102497535522">"Ocorreu um erro."</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Ativar Wi-Fi"</string>
-    <string name="wifi_settings" msgid="4746946030627213196">"Configurações de Wi-Fi"</string>
+    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="2810363951104753710">"Configurações de Wi-Fi"</string>
+    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Configurar e gerenciar pontos de acesso sem fio"</string>
-    <string name="wifi_starting" msgid="6710266609710860129">"Ativando…"</string>
-    <string name="wifi_stopping" msgid="5952909472548218348">"Desativando…"</string>
+    <string name="wifi_starting" msgid="7732330327758522943">"Ativando Wi-Fi..."</string>
+    <string name="wifi_stopping" msgid="244864762599017659">"Desativando Wi-Fi..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"Erro"</string>
     <string name="wifi_in_airplane_mode" msgid="7618393787965366655">"No modo para avião"</string>
     <string name="wifi_fail_to_scan" msgid="6194542252808587669">"Não é possível verificar a existência de redes"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Notificação de rede"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Receber notificação quando uma rede aberta estiver disponível"</string>
+    <string name="wifi_enable_watchdog_service" msgid="4723544454066601706">"Verificações de conectividade Wi-Fi"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="8687400936839455926">"Detectar e controlar problemas potenciais de conectividade de rede"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Política de desconexão de Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Especificar quando alternar de Wi-Fi para dados móveis"</string>
     <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" msgid="6234851776910938957">"Adicionar rede"</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>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Conectar-se à rede"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Esquecer a rede"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modificar rede"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="3682507011071029311">"Ativar Wi-Fi p/ ver redes disponíveis"</string>
     <string name="wifi_network_setup" msgid="7974851890019344870">"Configuração da rede"</string>
     <string name="wifi_wps_pin" msgid="5471842298708321115">"Inserir o pin do ponto de acesso"</string>
     <string name="wifi_wps_setup_title" msgid="150518971269252336">"Configuração do WPS"</string>
@@ -501,13 +523,13 @@
     <string name="wifi_save" msgid="3331121567988522826">"Salvar"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Cancelar"</string>
     <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"Outra sessão do WPS detectada, tente novamente em alguns minutos"</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Avançado"</string>
+    <!-- outdated translation 5419052271935350999 -->     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Avançado"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Banda de frequência Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Especifique a faixa de frequência da operação"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Houve um erro ao configurar a banda de frequência."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Endereço MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Endereço IP"</string>
-    <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"Configurações de IP"</string>
+    <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Configurações de IP"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Salvar"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Cancelar"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Digite um endereço IP válido."</string>
@@ -525,7 +547,7 @@
     <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"Ponto de acesso Wi-Fi portátil <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Ponto de acesso Android"</string>
     <string name="sound_settings_title" msgid="8735891486683305886">"Som"</string>
-    <string name="display_settings_title" msgid="2378894265964357591">"Tela"</string>
+    <string name="display_settings_title" msgid="1708697328627382561">"Tela"</string>
     <string name="sound_settings" msgid="5007659014828162881">"Configurações de som"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Modo silencioso"</string>
     <string name="silent_mode_summary" msgid="3309650676072917899">"Silenciar todos os sons, exceto a mídia e os alarmes."</string>
@@ -598,7 +620,18 @@
     <string name="brightness_summary" msgid="838917350127550703">"Ajustar o brilho da tela"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Tempo limite"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"A tela é automaticamente desativada após <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Plano de fundo"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android Dreams"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Protetores de tela e outras distrações"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Sonho selecionado"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Quando ativar"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"Após <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inativo"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Nunca"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Experimente!"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brilho automático"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Tamanho da fonte"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Tamanho total das fontes"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Selecionar o tamanho da fonte"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Bloqueio do SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Conf. bloqueio do SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Bloqueio do cartão SIM"</string>
@@ -643,8 +676,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>
@@ -656,7 +690,7 @@
     <string name="status_serial_number" msgid="2257111183374628137">"Número de série"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Não disponível"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Tempo de atividade"</string>
-    <string name="status_awake_time" msgid="2393949909051183652">"Tempo de ativação"</string>
+    <string name="status_awake_time" msgid="2393949909051183652">"Tempo ativo"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Armazenamento interno"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Armaz. USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"Cartão SD"</string>
@@ -696,6 +730,16 @@
     <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"O cartão SD será desconectado."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Desconectando"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Desconexão em andamento"</string>
+    <!-- no translation found for storage_menu_usb (1580545228584324704) -->
+    <skip />
+    <!-- no translation found for storage_title_usb (5775322159427546546) -->
+    <skip />
+    <!-- no translation found for usb_label_mtp (4157227401755543412) -->
+    <skip />
+    <!-- no translation found for usb_label_ptp (7417254019489575819) -->
+    <skip />
+    <!-- no translation found for usb_label_installer_cd (7438467574756086977) -->
+    <skip />
     <string name="battery_status_title" msgid="9159414319574976203">"Status da bateria"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Nível da bateria"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNs"</string>
@@ -806,6 +850,8 @@
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"Não é possível vincular a mais de <xliff:g id="MAXCONNECTION">%1$d</xliff:g> dispositivos"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será vinculado."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ajuda"</string>
+    <string name="wireless_category_general" msgid="2973810407987118067">"Geral"</string>
+    <string name="wireless_category_mobile_networks" msgid="1254629216798424288">"Redes móveis"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Redes móveis"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Definir opções para roaming, redes, APNs"</string>
     <string name="location_title" msgid="1029961368397484576">"Meu Local"</string>
@@ -883,7 +929,7 @@
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Como proteger seu tablet"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Proteção do seu telefone"</string>
     <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"Proteja seu tablet contra o uso não autorizado criando um padrão de desbloqueio de tela pessoal. Use os dedos para ligar os pontos em qualquer ordem na próxima tela. Você deve conectar pelo menos quatro pontos. "\n\n"Pronto para começar? Toque em \"Próximo\"."</string>
-    <string name="lock_intro_message" product="default" msgid="9100785646737118042"><font size="17">"Proteja o seu telefone contra o uso não autorizado criando um padrão de desbloqueio de tela personalizado. "\n<font height="17">\n</font><b>"1"</b>"  Na próxima tela, observe enquanto um exemplo de padrão é desenhado. "\n<font height="17">\n</font><b>"2"</b>"  Quando estiver pronto, desenhe o seu próprio padrão de desbloqueio pessoal. Experimente padrões diferentes, mas conecte no mínimo quatro pontos. "\n<font height="17">\n</font><b>"3"</b>"  Desenhe novamente o seu padrão para confirmar. "\n<font height="17">\n</font><b>"Pronto para começar? Toque em “Avançar”"</b>". "\n<font height="3">\n</font>"Para deixar o seu telefone sem proteção, toque em “Cancelar”."</font></string>
+    <!-- outdated translation 3692151094288835065 -->     <string name="lock_intro_message" product="default" msgid="5796785892741212873">"Proteja seu tablet contra o uso não autorizado criando um padrão de desbloqueio de tela pessoal. Use os dedos para ligar os pontos em qualquer ordem na próxima tela. Você deve conectar pelo menos quatro pontos. "\n\n"Pronto para começar? Toque em \"Próximo\"."</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Gerenciar aplicativos"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Gerenciar e remover aplicativos instalados"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Aplicativos"</string>
@@ -893,6 +939,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>
@@ -905,9 +953,10 @@
     <string name="force_stop" msgid="7435006169872876756">"Forçar parada"</string>
     <string name="total_size_label" msgid="1048676419552557254">"Total"</string>
     <string name="application_size_label" msgid="5055196275624686382">"Aplicativo"</string>
+    <string name="external_code_size_label" msgid="3459343140355961335">"Aplicativo de armazenamento USB"</string>
     <string name="data_size_label" msgid="8679376373625710107">"Dados"</string>
-    <string name="external_size_label" product="nosdcard" msgid="4465530017830945766">"Armazenamento USB"</string>
-    <string name="external_size_label" product="default" msgid="2107155737635944440">"Cartão SD"</string>
+    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Dados de armazenamento USB"</string>
+    <string name="external_data_size_label" product="default" msgid="626414192825329708">"Cartão SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Desinstalar"</string>
     <string name="disable_text" msgid="6544054052049395202">"Desativar"</string>
     <string name="enable_text" msgid="9217362512327828987">"Ativar"</string>
@@ -1026,7 +1075,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 +1085,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>
@@ -1066,7 +1117,7 @@
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Configurações do teclado virtual"</string>
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Teclado físico"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Configurações de teclado físico"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Desenvolvimento"</string>
+    <string name="development_settings_title" msgid="215179176067683667">"Opções do desenvolvedor"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"Define as opções para o desenvolvimento do aplicativo"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Depuração USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Modo de depuração quando o USB estiver conectado"</string>
@@ -1091,14 +1142,14 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Acessibilidade"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Configurações de acessibilidade"</string>
     <string name="accessibility_settings_summary" msgid="8185181964847149507">"Gerenciar opções de acessibilidade"</string>
-    <string name="toggle_accessibility_title" msgid="650839277066574497">"Acessibilidade"</string>
+    <string name="toggle_large_text_title" msgid="42259643359869436">"Texto grande"</string>
     <string name="accessibility_services_category" msgid="8127851026323672607">"Serviços de acessibilidade"</string>
+    <string name="toggle_accessibility_title" msgid="7338739354952553958">"Permitir serviços de acessibilidade"</string>
     <string name="no_accessibility_services_summary" msgid="694578333333808159">"Nenhum serviço de acessibilidade instalado."</string>
     <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Este serviço de acessibilidade pode coletar todo o texto que você digitar, incluindo dados pessoais e números de cartão de crédito, menos senhas. Ele também pode registrar as interações da interface do usuário. Ele é proveniente do aplicativo <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Usar este serviço de acessibilidade?"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Desativar acessibilidade?"</string>
     <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"Nenhum aplicativo relacionado à acessibilidade encontrado."</string>
     <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"Você não tem nenhum aplicativo relacionado à acessibilidade instalado."\n\n"Você pode fazer o download de um leitor de tela para o seu aparelho no Android Market."\n\n"Clique em OK para instalar o leitor de tela."</string>
-    <string name="accessibility_script_injection_category" msgid="8649951751131431904">"Scripts de acessibilidade"</string>
     <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"Download de scripts de acessibilidade"</string>
     <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"Permitir download de scripts de acess. do Google pelo aplicativo"</string>
     <string name="accessibility_script_injection_security_warning" product="tablet" msgid="1113600871264359828">"Alguns aplicativos podem pedir ao Google para fazer o download de scripts para o seu tablet para tornar o conteúdo mais acessível. Tem certeza de que deseja permitir que o Google instale scripts de acessibilidade no seu tablet?"</string>
@@ -1106,10 +1157,11 @@
     <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>
-    <string name="power_usage_summary_title" msgid="5180282911164282324">"Uso da bateria"</string>
+    <string name="power_usage_summary_title" msgid="7190304207330319919">"Bateria"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"O que está consumindo a bateria"</string>
     <string name="power_usage_not_available" msgid="3583407442633768046">"Dados bateria não disponíveis"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Uso da bateria desde a desconexão do aparelho"</string>
@@ -1124,9 +1176,9 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Sinal da rede móvel"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="awake" msgid="387122265874485088">"Tempo de ativação do aparelho"</string>
-    <string name="wifi_on_time" msgid="6310209835617490616">"Tempo de ativação da rede Wi-Fi"</string>
-    <string name="bluetooth_on_time" msgid="6157799524996162271">"Tempo de ativação da rede Wi-Fi"</string>
+    <string name="awake" msgid="387122265874485088">"Tempo ativo do aparelho"</string>
+    <string name="wifi_on_time" msgid="6310209835617490616">"Tempo ativo da rede Wi-Fi"</string>
+    <string name="bluetooth_on_time" msgid="6157799524996162271">"Tempo ativo da rede 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">"Detalhes do histórico"</string>
     <string name="details_title" msgid="3792801565213935385">"Detalhes de uso"</string>
@@ -1218,6 +1270,8 @@
     <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>
+    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Configurações do mecanismo"</string>
+    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Configurações para <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
     <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>
@@ -1228,118 +1282,37 @@
     <string name="gadget_title" msgid="7455548605888590466">"Controle de energia"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Atualizando configuração Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Atualizando configuração Bluetooth"</string>
-    <string name="vpn_settings_activity_title" msgid="7276864950701612579">"Configurações de VPN"</string>
-    <string name="vpn_connect_to" msgid="2541409082892684362">"Conectar-se a <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpn_username_colon" msgid="7854930370861306247">"Nome de usuário:"</string>
-    <string name="vpn_password_colon" msgid="5716278710848606626">"Senha:"</string>
-    <string name="vpn_a_username" msgid="6664733641993968692">"um nome de usuário"</string>
-    <string name="vpn_a_password" msgid="1537213632501483753">"uma senha"</string>
-    <string name="vpn_save_username" msgid="1408415289165970790">"Lembrar nome de usuário"</string>
-    <string name="vpn_connect_button" msgid="1699007212602470655">"Conectar"</string>
-    <string name="vpn_yes_button" msgid="8034531001149843119">"Sim"</string>
-    <string name="vpn_no_button" msgid="7620339571187119107">"Não"</string>
-    <string name="vpn_back_button" msgid="192036339792734970">"Voltar"</string>
-    <string name="vpn_mistake_button" msgid="1683383660912491270">"Não"</string>
-    <string name="vpn_menu_done" msgid="93528279226907926">"Salvar"</string>
-    <string name="vpn_menu_cancel" msgid="7234451214611202868">"Cancelar"</string>
-    <string name="vpn_menu_revert" msgid="4407762442281467659">"Reverter"</string>
-    <string name="vpn_menu_connect" msgid="1089399414463784218">"Conectar-se à rede"</string>
-    <string name="vpn_menu_disconnect" msgid="8254492450022562235">"Desconectar da rede"</string>
-    <string name="vpn_menu_edit" msgid="4526245173583195618">"Editar rede"</string>
-    <string name="vpn_menu_delete" msgid="3326527392609513129">"Excluir rede"</string>
-    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"Insira <xliff:g id="CODE">%s</xliff:g>."</string>
-    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"Selecione <xliff:g id="OPTION">%s</xliff:g>."</string>
-    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"O nome de VPN \'<xliff:g id="NAME">%s</xliff:g>\' já existe. Procure outro nome."</string>
-    <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"Tem certeza de que deseja excluir esta VPN?"</string>
-    <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"Tem certeza de que não deseja criar esse perfil?"</string>
-    <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"Tem certeza de que deseja descartar as alterações feitas nesse perfil?"</string>
-    <string name="vpn_confirm_reconnect" msgid="5748535476278674296">"Não é possível se conectar à rede. Deseja tentar novamente?"</string>
-    <string name="vpn_reconnect_from_lost" msgid="2442844155623372118">"Conexão perdida. Deseja conectar novamente?"</string>
-    <string name="vpn_unknown_server_dialog_msg" msgid="3080742299823671319">"O nome do servidor não pode ser solucionado. Deseja verificar sua configuração de nome de servidor?"</string>
-    <string name="vpn_challenge_error_dialog_msg" msgid="6174901754230038601">"Erro de desafio. Deseja verificar sua configuração de pergunta secreta?"</string>
-    <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"Um ou mais segredos estão faltando nessa configuração de VPN. Deseja verificar sua configuração de pergunta secreta?"</string>
-    <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"O nome de usuário ou a senha inserida está incorreta. Deseja tentar novamente?"</string>
-    <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"Servidor desligado. O nome de usuário ou a senha inserida talvez esteja incorreta. Deseja tentar novamente?"</string>
-    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"Servidor desconectado. Talvez você esteja atrás de um firewall que impede a conexão com o servidor. Deseja tentar novamente?"</string>
-    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"Falha na negociação do servidor. Provavelmente o servidor não concorde com a sua opção de criptografia. Deseja verificar a sua configuração de criptografia?"</string>
-    <string name="vpn_type_title" msgid="6392933604218676224">"Adicionar VPN"</string>
-    <string name="vpn_add_new_vpn" msgid="5438260689052714550">"Adicionar VPN"</string>
-    <string name="vpn_details_title" msgid="418806440938510331">"Detalhes de VPN"</string>
-    <string name="vpn_edit_title_add" msgid="2121313217989682890">"Adicionar VPN <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"Detalhes de <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpns" msgid="3148141862835492816">"VPNs"</string>
-    <string name="vpn_connecting" msgid="8039521381692090116">"Conectando..."</string>
-    <string name="vpn_disconnecting" msgid="7748050200708257066">"Desconectando..."</string>
-    <string name="vpn_connected" msgid="7641723116362845781">"Conectado"</string>
-    <string name="vpn_connect_hint" msgid="7442898962925875181">"Conectar-se à rede"</string>
-    <string name="vpn_name" msgid="1550918148476193076">"Nome da VPN"</string>
-    <string name="vpn_a_name" msgid="8445736942405283509">"um nome da VPN"</string>
-    <string name="vpn_profile_added" msgid="9061017910337129840">"\'<xliff:g id="NAME">%s</xliff:g>\' foi adicionado"</string>
-    <string name="vpn_profile_replaced" msgid="587435576816273815">"Foram feitas alterações em \'<xliff:g id="NAME">%s</xliff:g>\'"</string>
-    <string name="vpn_user_certificate_title" msgid="6812545893924071742">"Definir certif. do usuário"</string>
-    <string name="vpn_user_certificate" msgid="949322691686938888">"Certificado do usuário"</string>
-    <string name="vpn_a_user_certificate" msgid="8943983437956898649">"um certificado do usuário"</string>
-    <string name="vpn_ca_certificate_title" msgid="7846466160795589985">"Definir certificado de CA"</string>
-    <string name="vpn_ca_certificate" msgid="465085144064264742">"Certificado da autoridade de certificação (CA)"</string>
-    <string name="vpn_a_ca_certificate" msgid="3374242520974884295">"um certificado de CA"</string>
-    <string name="vpn_l2tp_secret_string_title" msgid="5039677186748940987">"Definir segredo L2TP"</string>
-    <string name="vpn_l2tp_secret" msgid="529359749677142076">"Segredo L2TP"</string>
-    <string name="vpn_a_l2tp_secret" msgid="6612042930810981845">"um segredo L2TP"</string>
-    <string name="vpn_pptp_encryption_title" msgid="2236795167467896499">"criptografia"</string>
-    <string name="vpn_pptp_encryption" msgid="2602329949737259686">"Criptografia PPTP"</string>
-    <string name="vpn_ipsec_presharedkey_title" msgid="2184060087690539175">"Definir chave IPSec"</string>
-    <string name="vpn_ipsec_presharedkey" msgid="5434316521616673741">"Chave pré-compartilhada IPSec"</string>
-    <string name="vpn_a_ipsec_presharedkey" msgid="1255301923217898418">"uma chave pré-compartilhada IPSec"</string>
-    <string name="vpn_vpn_server_title" msgid="8897005887420358913">"Definir servidor da VPN"</string>
-    <string name="vpn_vpn_server" msgid="1141754908824209260">"Servidor da VPN"</string>
-    <string name="vpn_a_vpn_server" msgid="5960906152125045853">"um servidor da VPN"</string>
-    <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"Nome do servidor da VPN"</string>
-    <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"Domínios pesquisa DNS"</string>
-    <string name="vpn_dns_search_list" msgid="4230034234026605360">"Domínios pesquisa DNS"</string>
-    <string name="vpn_field_is_set" msgid="7137320847812992243">"<xliff:g id="VALUE">%s</xliff:g> foi definido"</string>
-    <string name="vpn_field_not_set" msgid="2972519243515893804">"<xliff:g id="VALUE">%s</xliff:g> não definido"</string>
-    <string name="vpn_field_not_set_optional" msgid="8840557698252556791">"<xliff:g id="VALUE">%s</xliff:g> não definido (opcional)"</string>
-    <string name="vpn_enable_field" msgid="3700967675854517191">"Ativar <xliff:g id="OPTION">%s</xliff:g>"</string>
-    <string name="vpn_disable_field" msgid="6905658811179634005">"Desativar <xliff:g id="OPTION">%s</xliff:g>"</string>
-    <string name="vpn_is_enabled" msgid="1266304230417098877">"<xliff:g id="OPTION">%s</xliff:g> foi ativado"</string>
-    <string name="vpn_is_disabled" msgid="2013622485867806167">"<xliff:g id="OPTION">%s</xliff:g> foi desativado"</string>
     <string name="vpn_settings_title" msgid="7327468307909556719">"Configurações de VPN"</string>
     <string name="vpn_settings_summary" msgid="8849924181594963972">"Configurar e gerenciar VPNs (Redes privadas virtuais)"</string>
-    <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="trusted_credentials" msgid="4266945289534242402">"Credenciais confiáveis"</string>
+    <string name="trusted_credentials_summary" msgid="6735221351155686632">"Mostrar certificados CA de confiança"</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>
-    <string name="privacy_settings_title" msgid="1987089301293213705">"Configurações de privacidade"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"Fazer backup e redefinir"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"Fazer backup e redefinir"</string>
     <string name="backup_section_title" msgid="8856083167469467588">"Backup e restauração"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Dados pessoais"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Fazer backup"</string>
-    <string name="backup_data_summary" msgid="6515285107793232815">"Dados de aplicativos de backup, senhas da rede Wi-Fi e outras configurações nos servidores do Google"</string>
+    <string name="backup_data_summary" msgid="6515285107793232815">"Fazer backup de dados de aplicativos, senhas da rede Wi-Fi e outras configurações nos servidores do Google"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Conta de backup"</string>
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Nenhuma conta está armazenando o backup dos dados"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Restauração automática"</string>
@@ -1439,4 +1412,107 @@
     <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>
+    <!-- no translation found for debug_ui_category (9023948280291055349) -->
+    <skip />
+    <!-- no translation found for strict_mode (1938795874357830695) -->
+    <skip />
+    <!-- no translation found for strict_mode_summary (142834318897332338) -->
+    <skip />
+    <!-- no translation found for pointer_location (6084434787496938001) -->
+    <skip />
+    <!-- no translation found for pointer_location_summary (840819275172753713) -->
+    <skip />
+    <!-- no translation found for show_screen_updates (8282711794220426931) -->
+    <skip />
+    <!-- no translation found for show_screen_updates_summary (1716122382094924596) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage (2389212910758076024) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage_summary (2113341923988958266) -->
+    <skip />
+    <!-- no translation found for window_animation_scale_title (6162587588166114700) -->
+    <skip />
+    <!-- no translation found for transition_animation_scale_title (387527540523595875) -->
+    <skip />
+    <!-- no translation found for debug_applications_category (6221644998451283813) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities (3622005081180597749) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities_summary (3592221124808773368) -->
+    <skip />
+    <!-- no translation found for app_process_limit_title (4121324758038197598) -->
+    <skip />
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Uso de dados"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"Ciclo do uso de dados"</string>
+    <string name="data_usage_menu_split_4g" msgid="7417435609285381968">"Separar uso dos dados 4G"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Mostrar uso do Wi-Fi"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"Alterar ciclo..."</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Dia do mês para redefinir o ciclo de uso dos dados:"</string>
+    <string name="data_usage_disable_mobile_limit" msgid="289740911281022322">"Desativar dados móveis no limite"</string>
+    <string name="data_usage_disable_4g_limit" msgid="5808210773758699800">"Desativar dados 4G no limite"</string>
+    <string name="data_usage_disable_3g_limit" msgid="3856971004328238231">"Desativar dados 2G-3G no limite"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_mobile" msgid="454140350007299045">"Móvel"</string>
+    <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
+    <string name="data_usage_tab_3g" msgid="6092169523081538718">"2G e 3G"</string>
+    <string name="data_usage_enable_mobile" msgid="986782622560157977">"Dados móveis"</string>
+    <string name="data_usage_enable_3g" msgid="6304006671869578254">"Dados 2G e 3G"</string>
+    <string name="data_usage_enable_4g" msgid="3635854097335036738">"Dados 4G"</string>
+    <string name="data_usage_app_settings" msgid="3727561362090820369">"Ver configurações do aplicativo"</string>
+    <string name="data_usage_app_restrict_background" msgid="8856643905291165256">"Restr. uso de dados de seg. plano"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="1503361245973512092">"Só permitir dados de segundo plano do aplic. ao usar rede ilim."</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="8110736468987743260">"Restringindo dados de segundo plano"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="100001698378554777">"Este recurso pode ter um impacto negativo nos aplicativos que dependem do uso de dados de segundo plano."\n\n"Controles mais adequados do uso de dados podem ser encontrados nas configurações deste aplicativo."</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Data de redefinição do ciclo de uso"</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Data de cada mês:"</string>
+    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Definidas"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Limitando uso de dados"</string>
+    <string name="data_usage_limit_dialog_mobile" msgid="7931094451923591578">"Sua conexão de dados móveis será desativada quando o limite especificado for alcançado."\n\n"Para evitar cobranças adicionais, utilize um limite reduzido, pois os métodos de cálculo do dispositivo e da operadora podem variar."</string>
+    <string name="data_usage_limit_dialog_3g" msgid="5478553071420316963">"Sua conexão de dados 2G-3G será desativada quando o limite especificado for alcançado."\n\n"Para evitar cobranças adicionais, utilize um limite reduzido, pois os métodos de cálculo do dispositivo e da operadora podem variar."</string>
+    <string name="data_usage_limit_dialog_4g" msgid="6134008906742403777">"Sua conexão de dados 4G será desativada quando o limite especificado for alcançado."\n\n"Para evitar cobranças adicionais, utilize um limite reduzido, pois os métodos de cálculo do dispositivo e da operadora podem variar."</string>
+    <string name="data_usage_disabled_dialog_3g_title" msgid="4221584306492812040">"Dados 2G e 3G desativados"</string>
+    <string name="data_usage_disabled_dialog_4g_title" msgid="715585612162185936">"Dados 4G desativados"</string>
+    <string name="data_usage_disabled_dialog_mobile_title" msgid="209516216265000221">"Dados móveis desativados"</string>
+    <string name="data_usage_disabled_dialog" msgid="2874031671067845964">"O limite de uso de dados especificado foi alcançado."\n\n"O uso de dados adicionais poderá gerar cobranças da operadora."</string>
+    <string name="data_usage_disabled_dialog_enable" msgid="2441219164620753329">"Reativar dados"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="32">"<xliff:g id="NUMBER">%1$s</xliff:g>"</font>" "<font size="12">"<xliff:g id="UNIT">%2$s</xliff:g>"</font>\n<font size="12">"aviso"</font></string>
+    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Chamada de emergência"</string>
+    <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Retornar à chamada"</string>
+    <string name="vpn_name" msgid="4689699885361002297">"Nome"</string>
+    <string name="vpn_type" msgid="5435733139514388070">"Tipo"</string>
+    <string name="vpn_server" msgid="2123096727287421913">"Endereço do servidor:"</string>
+    <string name="vpn_mppe" msgid="6639001940500288972">"criptografia PPP (MPPE)"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"Segredo L2TP"</string>
+    <string name="vpn_ipsec_identifier" msgid="4098175859460006296">"Identificador IPSec"</string>
+    <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Chave pré-compartilhada IPSec"</string>
+    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"Certificado de usuário IPSec"</string>
+    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"Certificado CA IPSec"</string>
+    <!-- no translation found for vpn_search_domains (5391995501541199624) -->
+    <skip />
+    <!-- no translation found for vpn_routes (8556236801755260073) -->
+    <skip />
+    <string name="vpn_username" msgid="1863901629860867849">"Nome de usuário"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Senha"</string>
+    <!-- no translation found for vpn_save_login (6350322456427484881) -->
+    <skip />
+    <!-- no translation found for vpn_not_used (9094191054524660891) -->
+    <skip />
+    <string name="vpn_no_ca_cert" msgid="7820884983947090538">"(não verificar servidor)"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"Cancelar"</string>
+    <string name="vpn_save" msgid="4233484051644764510">"Salvar"</string>
+    <string name="vpn_connect" msgid="8469608541746132301">"Conectar"</string>
+    <string name="vpn_edit" msgid="1111459297288136079">"Editar rede de VPN"</string>
+    <string name="vpn_connect_to" msgid="7328758950427515753">"Conectar-se à <xliff:g id="NETWORK">%s</xliff:g>"</string>
+    <string name="vpn_title" msgid="7982620762043790565">"Configurações de VPN"</string>
+    <string name="vpn_create" msgid="8966010925994175306">"Adicionar rede VPN"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"Editar rede"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"Excluir rede"</string>
+    <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Sistema"</string>
+    <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Usuário"</string>
+    <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Desativar"</string>
+    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Ativar"</string>
+    <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Remover"</string>
+    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Ativar o certificado CA do sistema?"</string>
+    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Desativar o certificado CA do sistema?"</string>
+    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Remover permanentemente o certificado CA do usuário?"</string>
 </resources>
diff --git a/res/values-rm/arrays.xml b/res/values-rm/arrays.xml
index 9761244..2a11552 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>
@@ -186,4 +208,34 @@
     <!-- 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) -->
+    <!-- no translation found for window_animation_scale_entries:0 (8134156599370824081) -->
+    <!-- no translation found for window_animation_scale_entries:1 (6624864048416710414) -->
+    <!-- no translation found for window_animation_scale_entries:2 (2219332261255416635) -->
+    <!-- no translation found for window_animation_scale_entries:3 (3544428804137048509) -->
+    <!-- no translation found for window_animation_scale_entries:4 (3110710404225974514) -->
+    <!-- no translation found for window_animation_scale_entries:5 (4402738611528318731) -->
+    <!-- no translation found for window_animation_scale_entries:6 (6189539267968330656) -->
+    <!-- no translation found for transition_animation_scale_entries:0 (8464255836173039442) -->
+    <!-- no translation found for transition_animation_scale_entries:1 (3375781541913316411) -->
+    <!-- no translation found for transition_animation_scale_entries:2 (1991041427801869945) -->
+    <!-- no translation found for transition_animation_scale_entries:3 (4012689927622382874) -->
+    <!-- no translation found for transition_animation_scale_entries:4 (3289156759925947169) -->
+    <!-- no translation found for transition_animation_scale_entries:5 (7705857441213621835) -->
+    <!-- no translation found for transition_animation_scale_entries:6 (6660750935954853365) -->
+    <!-- no translation found for app_process_limit_entries:0 (6799596560242275471) -->
+    <!-- no translation found for app_process_limit_entries:1 (2412794376818632575) -->
+    <!-- no translation found for app_process_limit_entries:2 (1578904888612645001) -->
+    <!-- no translation found for app_process_limit_entries:3 (8819235336299873577) -->
+    <!-- no translation found for vpn_types_long:0 (2732002039459078847) -->
+    <!-- no translation found for vpn_types_long:1 (3799752201662127867) -->
+    <!-- no translation found for vpn_types_long:2 (4725504331295252103) -->
+    <!-- no translation found for vpn_types_long:3 (7526551163264034377) -->
+    <!-- no translation found for vpn_types_long:4 (8064740940687465039) -->
+    <!-- no translation found for vpn_types_long:5 (4946199982372391490) -->
+    <!-- no translation found for vpn_states:0 (8621078286418985762) -->
+    <!-- no translation found for vpn_states:1 (6692305604213080515) -->
+    <!-- no translation found for vpn_states:2 (8001704909356800092) -->
+    <!-- no translation found for vpn_states:3 (4039737283841672166) -->
+    <!-- no translation found for vpn_states:4 (4042143101664725090) -->
+    <!-- no translation found for vpn_states:5 (2690164254699635531) -->
 </resources>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index d5dd85a..36b3390 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -19,6 +19,14 @@
     <string name="yes" msgid="4676390750360727396">"Gea"</string>
     <string name="no" msgid="6731231425810196216">"Na"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Nunenconuschent"</string>
+    <!-- no translation found for header_category_wireless_networks (4944823405420438623) -->
+    <skip />
+    <!-- no translation found for header_category_device (5781174212691167553) -->
+    <skip />
+    <!-- no translation found for header_category_personal (6225932173498802187) -->
+    <skip />
+    <!-- no translation found for header_category_system (2073558547468647128) -->
+    <skip />
     <string name="turn_on_radio" msgid="8706561489788373676">"Activar il signal radio"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Deactivar la connexiun radiofonica"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Mussar il cudeschet d\'adressas da la carta SIM"</string>
@@ -115,7 +123,11 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Associar…"</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"\"Associà, ma betg connectà\""</string>
     <string name="bluetooth_device" msgid="6873461446424952003">"mauns libers/uregliers"</string>
-    <string name="progress_scanning" msgid="3760897655335759141">"Tschertgar…"</string>
+    <!-- outdated translation 3760897655335759141 -->     <string name="progress_scanning" msgid="192587958424295789">"Tschertgar…"</string>
+    <!-- no translation found for progress_tap_to_pair (4192342336107106334) -->
+    <skip />
+    <!-- no translation found for bluetooth_no_devices_found (2412462335116297668) -->
+    <skip />
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Dumonda d\'associaziun bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Dumonda d\'associaziun"</string>
     <!-- no translation found for bluetooth_notif_message (618099089987569242) -->
@@ -144,6 +156,12 @@
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Bluetooth vegn activà…"</string>
     <!-- no translation found for bluetooth_auto_connect (8013003320667198460) -->
     <skip />
+    <!-- no translation found for bluetooth_connection_permission_request (4747918249032890077) -->
+    <skip />
+    <!-- no translation found for bluetooth_connection_notif_message (1833221950512058309) -->
+    <skip />
+    <!-- no translation found for bluetooth_connection_dialog_text (8455427559949998023) -->
+    <skip />
     <string name="date_and_time" msgid="4114084177056654663">"Parameters da data e da temp"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00:00"</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00:00"</string>
@@ -254,7 +272,7 @@
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Deactivar tut las connexiuns senza fil"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"Deactivar connexiuns senza fil…"</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"Activaziun da las connexiuns senza fil…"</string>
-    <string name="radio_controls_title" msgid="5868688473587168882">"Senza fil &amp; raits"</string>
+    <!-- outdated translation 8356991079873437337 -->     <string name="radio_controls_title" msgid="6889937359495515769">"Connexiuns senza fil"</string>
     <!-- outdated translation 149274247949769551 -->     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Parameters da rait e wireless"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"\"Configurar WLAN, bluetooth, il modus d\'aviun, las raits mobilas e VPN \""</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming da datas"</string>
@@ -301,8 +319,9 @@
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <!-- no translation found for owner_info_settings_edit_text_hint (2382525043173672857) -->
     <skip />
-    <string name="security_settings_title" msgid="5168491784222013179">"Lieu e segirezza"</string>
-    <string name="location_security_settings_title" msgid="4624434296446625554">"Parameters da segirezza e localisaziun"</string>
+    <!-- no translation found for location_settings_title (8935806698251432196) -->
+    <skip />
+    <!-- outdated translation 4918904614964215087 -->     <string name="security_settings_title" msgid="7945465324818485460">"Segirezza &amp; lieu"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"\"Definir ils parameters da Mia posiziun, da la debloccada dal visur, da la bloccada da la carta SIM e da la bloccada da la memoria da las infurmaziuns d\'annunzia\""</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"\"Definir mia posiziun, debloccar il visur, bloccar la memoria dad infurmaziuns d\'annunzia\""</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Pleds-clav"</string>
@@ -374,7 +393,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) -->
@@ -442,8 +461,8 @@
     <!-- outdated translation 915390201809231575 -->     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Agiuntar u allontanar administraturs dad apparats"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Activar Bluetooth"</string>
-    <string name="bluetooth_settings" msgid="2725796451253089609">"Parameters bluetooth"</string>
-    <string name="bluetooth_settings_title" msgid="2824020086246268296">"Parameters Bluetooth"</string>
+    <!-- outdated translation 2725796451253089609 -->     <string name="bluetooth_settings" msgid="1810521656168174329">"Parameters bluetooth"</string>
+    <!-- outdated translation 2824020086246268296 -->     <string name="bluetooth_settings_title" msgid="1908745291161353016">"Parameters Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"\"Administrar las connexiuns, configurar il num e l\'identificaziun da l\'apparat\""</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Dumonda d\'associaziun bluetooth"</string>
     <!-- no translation found for bluetooth_enter_pin_msg (1499285355129256289) -->
@@ -464,7 +483,9 @@
     <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ha refusà l\'associaziun."</string>
     <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"Ina errur è cumparida durant l\'emprova da connectar cun <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Tschertgar apparats"</string>
-    <!-- no translation found for bluetooth_preference_find_nearby_title (5087410003465463318) -->
+    <!-- no translation found for bluetooth_search_for_devices (5957007154213560390) -->
+    <skip />
+    <!-- no translation found for bluetooth_searching_for_devices (9203739709307871727) -->
     <skip />
     <!-- no translation found for bluetooth_preference_device_settings (907776049862799122) -->
     <skip />
@@ -478,6 +499,14 @@
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Deactivar l\'associaziun"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Deconnectar e deactivar l\'associaziun"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Opziuns…"</string>
+    <!-- no translation found for bluetooth_menu_advanced (8572178316357220524) -->
+    <skip />
+    <!-- no translation found for bluetooth_advanced_titlebar (2142159726881547669) -->
+    <skip />
+    <!-- no translation found for bluetooth_advanced_settings_label (8659717781212434173) -->
+    <skip />
+    <!-- no translation found for bluetooth_empty_list_bluetooth_off (3631028334811113629) -->
+    <skip />
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Connectar cun…"</string>
     <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"Multimedia"</string>
     <!-- outdated translation 1874975688666658946 -->     <string name="bluetooth_profile_headset" msgid="81844079120986198">"Telefon"</string>
@@ -535,28 +564,36 @@
     <skip />
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"WLAN"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Activar WLAN"</string>
-    <string name="wifi_settings" msgid="4746946030627213196">"Parameters WLAN"</string>
+    <!-- outdated translation 4746946030627213196 -->     <string name="wifi_settings" msgid="1277428034634973011">"Parameters WLAN"</string>
     <string name="wifi_settings_category" msgid="2810363951104753710">"Parameters WLAN"</string>
+    <!-- no translation found for wifi_settings_title (4351120897298124250) -->
+    <skip />
     <string name="wifi_settings_summary" msgid="668767638556052820">"Configurar &amp; administrar ils puncts d\'access WLAN"</string>
-    <string name="wifi_starting" msgid="6710266609710860129">"Activaziun…"</string>
-    <string name="wifi_stopping" msgid="5952909472548218348">"Deactivar…"</string>
+    <!-- outdated translation 6710266609710860129 -->     <string name="wifi_starting" msgid="7732330327758522943">"Activaziun…"</string>
+    <!-- outdated translation 5952909472548218348 -->     <string name="wifi_stopping" msgid="244864762599017659">"Deactivar…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Errur"</string>
     <string name="wifi_in_airplane_mode" msgid="7618393787965366655">"En il modus d\'aviun"</string>
     <string name="wifi_fail_to_scan" msgid="6194542252808587669">"Impussibel da tschertgar las raits."</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Avis da rait"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"M\'avisar sch\'ina rait averta è disponibla"</string>
+    <!-- no translation found for wifi_enable_watchdog_service (4723544454066601706) -->
+    <skip />
+    <!-- no translation found for wifi_enable_watchdog_service_summary (8687400936839455926) -->
+    <skip />
     <!-- outdated translation 1367731352485585528 -->     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Directiva da standby WLAN"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Definir cura ch\'i duai vegnir midà da WLAN sin la rait da telefon"</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">"Cun endrizzar ina directiva da standby è cumparì in problem."</string>
-    <string name="wifi_add_network" msgid="1671334951296205616">"Agiuntar ina rait WLAN"</string>
+    <!-- outdated translation 1671334951296205616 -->     <string name="wifi_add_network" msgid="6234851776910938957">"Agiuntar ina rait WLAN"</string>
     <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>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Connectar cun la rait"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Allontanar la rait"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Midar la rait"</string>
+    <!-- no translation found for wifi_empty_list_wifi_off (3682507011071029311) -->
+    <skip />
     <!-- no translation found for wifi_network_setup (7974851890019344870) -->
     <skip />
     <!-- no translation found for wifi_wps_pin (5471842298708321115) -->
@@ -602,7 +639,7 @@
     <string name="wifi_cancel" msgid="6763568902542968964">"Interrumper"</string>
     <!-- no translation found for wifi_wps_overlap_error (6820987241637459748) -->
     <skip />
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Avanzà"</string>
+    <!-- outdated translation 5419052271935350999 -->     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Avanzà"</string>
     <!-- no translation found for wifi_setting_frequency_band_title (7493768705046080060) -->
     <skip />
     <!-- no translation found for wifi_setting_frequency_band_summary (3250740757118009784) -->
@@ -611,7 +648,8 @@
     <skip />
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Adressa MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Adressa IP"</string>
-    <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"Parameters IP"</string>
+    <!-- no translation found for wifi_advanced_settings_label (3654366894867838338) -->
+    <skip />
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Memorisar"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Interrumper"</string>
     <!-- no translation found for wifi_ip_settings_invalid_ip_address (6387653152103405443) -->
@@ -634,7 +672,7 @@
     <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"Punct d\'access WLAN mobil <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="sound_settings_title" msgid="8735891486683305886">"Tun"</string>
-    <!-- outdated translation 1708697328627382561 -->     <string name="display_settings_title" msgid="2378894265964357591">"Visur"</string>
+    <string name="display_settings_title" msgid="1708697328627382561">"Visur"</string>
     <string name="sound_settings" msgid="5007659014828162881">"Parameters da tun"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Modus silenzius"</string>
     <string name="silent_mode_summary" msgid="3309650676072917899">"\"Nagin tun, danor per medias e svegliarin\""</string>
@@ -708,7 +746,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 +813,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>
@@ -814,6 +876,16 @@
     <!-- outdated translation 3213378327712151498 -->     <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"La carta SD vegn demontada. Dai in tgit al champ dad avis per vesair il status."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Deconnectar…"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Separaziun…"</string>
+    <!-- no translation found for storage_menu_usb (1580545228584324704) -->
+    <skip />
+    <!-- no translation found for storage_title_usb (5775322159427546546) -->
+    <skip />
+    <!-- no translation found for usb_label_mtp (4157227401755543412) -->
+    <skip />
+    <!-- no translation found for usb_label_ptp (7417254019489575819) -->
+    <skip />
+    <!-- no translation found for usb_label_installer_cd (7438467574756086977) -->
+    <skip />
     <string name="battery_status_title" msgid="9159414319574976203">"Status da l\'accu"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Nivel da l\'accu"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -938,6 +1010,10 @@
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"Tethering cun dapli che <xliff:g id="MAXCONNECTION">%1$d</xliff:g> apparats n\'è betg pussaivel"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> vegn deconnectà dal tethering."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Agid"</string>
+    <!-- no translation found for wireless_category_general (2973810407987118067) -->
+    <skip />
+    <!-- no translation found for wireless_category_mobile_networks (1254629216798424288) -->
+    <skip />
     <string name="network_settings_title" msgid="7967552516440151852">"Raits mobilas"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"\"Definir las opziuns da roaming, raits, APNs\""</string>
     <string name="location_title" msgid="1029961368397484576">"Mes lieu"</string>
@@ -1025,7 +1101,10 @@
     <skip />
     <!-- no translation found for lock_intro_message (3692151094288835065) -->
     <skip />
-    <string name="lock_intro_message" product="default" msgid="9100785646737118042">"\""<font size="17">"Protegi Voss telefon cunter l\'utilisaziun nunautorisada cun crear in schema persunal per debloccar il visur. "\n<font height="17">\n</font><b>"1"</b>"  Il suandant visur As mussa in exempel d\'in schema. "\n<font height="17">\n</font><b>"2"</b>"  Suenter pudais Vus dissegnar Voss agen schema da debloccaziun. Vus pudais empruvar pliras cumbinaziuns, ma connectai almain quatter puncts in cun l\'auter. "\n<font height="17">\n</font><b>"3"</b>"  Repeti Voss schema per confermar la tscherna. "\n<font height="17">\n</font><b>"Per entschaiver, smatgai sin \"\"Enavant\"\""</b>". "\n<font height="3">\n</font>"Sche Vus na vulais betg activar la protecziun, smatgai sin \"\"Interrumper\"\"."</font>"\""</string>
+    <!-- unknown placeholder TAG_FONT_0 in lock_intro_message -->
+    <skip />
+    <!-- no translation found for lock_intro_message (5796785892741212873) -->
+    <skip />
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Administrar las applicaziuns"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Administrar ed allontanar applicaziuns installadas"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Applicaziuns"</string>
@@ -1035,6 +1114,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>
@@ -1048,10 +1131,12 @@
     <string name="force_stop" msgid="7435006169872876756">"Sfurzar da terminar"</string>
     <string name="total_size_label" msgid="1048676419552557254">"Totalmain"</string>
     <string name="application_size_label" msgid="5055196275624686382">"Applicaziun"</string>
-    <string name="data_size_label" msgid="8679376373625710107">"Datas"</string>
-    <!-- no translation found for external_size_label (4465530017830945766) -->
+    <!-- no translation found for external_code_size_label (3459343140355961335) -->
     <skip />
-    <!-- no translation found for external_size_label (2107155737635944440) -->
+    <string name="data_size_label" msgid="8679376373625710107">"Datas"</string>
+    <!-- no translation found for external_data_size_label (7533821466482000453) -->
+    <skip />
+    <!-- no translation found for external_data_size_label (626414192825329708) -->
     <skip />
     <string name="uninstall_text" msgid="3644892466144802466">"Deinstallar"</string>
     <string name="disable_text" msgid="6544054052049395202">"Deactivar"</string>
@@ -1191,7 +1276,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 +1288,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>
@@ -1241,7 +1331,7 @@
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Parameters da la tastatura dal visur"</string>
     <!-- outdated translation 8169889453770863227 -->     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Tastatura da l\'apparat"</string>
     <!-- outdated translation 6404687907454621637 -->     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Parameters da la tastatura integrada"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Svilup"</string>
+    <!-- outdated translation 6719732334835420989 -->     <string name="development_settings_title" msgid="215179176067683667">"Svilup"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"Definir las opziuns per il svilup d\'applicaziuns"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Debugar USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Modus da debugar sch\'in apparat periferic USB è connectà"</string>
@@ -1266,15 +1356,15 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Agids d\'access"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Parameters da l\'agid d\'access"</string>
     <string name="accessibility_settings_summary" msgid="8185181964847149507">"Administrar las opziuns dals agids d\'access"</string>
-    <string name="toggle_accessibility_title" msgid="650839277066574497">"Agids d\'access"</string>
+    <!-- no translation found for toggle_large_text_title (42259643359869436) -->
+    <skip />
     <string name="accessibility_services_category" msgid="8127851026323672607">"Servetschs d\'agid d\'access"</string>
+    <!-- outdated translation 650839277066574497 -->     <string name="toggle_accessibility_title" msgid="7338739354952553958">"Agids d\'access"</string>
     <string name="no_accessibility_services_summary" msgid="694578333333808159">"Nagins agids d\'access installads"</string>
     <string name="accessibility_service_security_warning" msgid="4066258132331302670">"\"Quest agid d\'access po rimnar l\'entir text che Vus endatais, inclus Vossas datas persunalas sco numers da cartas da credit, dentant nagins pleds-clav. El po era protocollar Vossas interacziuns cun l\'interfatscha d\'utilisader. Questa metoda deriva da l\'applicaziun <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Vulais Vus utilisar quest agid d\'access?\""</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Deactivar ils agids d\'endataziun?"</string>
     <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"Chattà nagina applicaziun dad agids d\'access"</string>
     <!-- outdated translation 2450056749545404807 -->     <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"Nagina applicaziun d\'agids d\'access è installada."\n\n"Vus pudais telechargiar in screen reader da l\'Android Market per Voss apparat."\n\n"Cliccai sin «OK» per installar il screen reader."</string>
-    <!-- no translation found for accessibility_script_injection_category (8649951751131431904) -->
-    <skip />
     <!-- no translation found for accessibility_script_injection_enabled (6927896081016611012) -->
     <skip />
     <!-- no translation found for accessibility_script_injection_enabled_summary (3629525134901617621) -->
@@ -1286,13 +1376,15 @@
     <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) -->
     <skip />
     <!-- no translation found for long_press_timeout_selector_summary (2261114502740278996) -->
     <skip />
-    <string name="power_usage_summary_title" msgid="5180282911164282324">"Consum dad accu"</string>
+    <!-- outdated translation 5180282911164282324 -->     <string name="power_usage_summary_title" msgid="7190304207330319919">"Consum dad accu"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Consumaders da l\'accu"</string>
     <!-- no translation found for power_usage_not_available (3583407442633768046) -->
     <skip />
@@ -1404,6 +1496,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>
@@ -1414,90 +1510,10 @@
     <string name="gadget_title" msgid="7455548605888590466">"Controlla d\'energia"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Actualisar ils parameters WLAN"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Actualisaziun dals parameters bluetooth"</string>
-    <string name="vpn_settings_activity_title" msgid="7276864950701612579">"Parameters da VPN"</string>
-    <string name="vpn_connect_to" msgid="2541409082892684362">"Connectar cun <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpn_username_colon" msgid="7854930370861306247">"Num d\'utilisader:"</string>
-    <string name="vpn_password_colon" msgid="5716278710848606626">"Pled-clav:"</string>
-    <string name="vpn_a_username" msgid="6664733641993968692">"in num d\'utilisader"</string>
-    <string name="vpn_a_password" msgid="1537213632501483753">"in pled-clav"</string>
-    <string name="vpn_save_username" msgid="1408415289165970790">"Memorisar il num d\'utilisader"</string>
-    <string name="vpn_connect_button" msgid="1699007212602470655">"Connectar"</string>
-    <string name="vpn_yes_button" msgid="8034531001149843119">"Gea"</string>
-    <string name="vpn_no_button" msgid="7620339571187119107">"Na"</string>
-    <string name="vpn_back_button" msgid="192036339792734970">"Enavos"</string>
-    <string name="vpn_mistake_button" msgid="1683383660912491270">"Na"</string>
-    <string name="vpn_menu_done" msgid="93528279226907926">"Memorisar"</string>
-    <string name="vpn_menu_cancel" msgid="7234451214611202868">"Interrumper"</string>
-    <string name="vpn_menu_revert" msgid="4407762442281467659">"Reinizialisar"</string>
-    <string name="vpn_menu_connect" msgid="1089399414463784218">"Connectar cun la rait"</string>
-    <string name="vpn_menu_disconnect" msgid="8254492450022562235">"Deconnectar da la rait"</string>
-    <string name="vpn_menu_edit" msgid="4526245173583195618">"Modifitgar la rait"</string>
-    <string name="vpn_menu_delete" msgid="3326527392609513129">"Stizzar ina rait"</string>
-    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"\"Vus stuais endatar \"\"<xliff:g id="CODE">%s</xliff:g>\"\".\""</string>
-    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"Tschernì  <xliff:g id="OPTION">%s</xliff:g>."</string>
-    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"Il num VPN «<xliff:g id="NAME">%s</xliff:g>» exista gia. Tscherni in auter num."</string>
-    <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"Vulais Vus propi stizzar questa VPN?"</string>
-    <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"Na vulais Vus propi betg crear quest profil?"</string>
-    <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"Vulais Vus propi sbittar las modificaziuns da quest profil?"</string>
-    <string name="vpn_confirm_reconnect" msgid="5748535476278674296">"Impussibel da connectar cun la rait. Vulais Vus anc empruvar ina giada?"</string>
-    <string name="vpn_reconnect_from_lost" msgid="2442844155623372118">"Interrut la connexiun. Vulais Vus stabilir danovamain la connexiun?"</string>
-    <string name="vpn_unknown_server_dialog_msg" msgid="3080742299823671319">"Impussibel da resolver il num da server. Vulais Vus controllar il parameter dal num dal server?"</string>
-    <string name="vpn_challenge_error_dialog_msg" msgid="6174901754230038601">"Errur da verificaziun. Vulais Vus ussa controllar Voss parameters da secrets?"</string>
-    <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"Ina u pliras infurmaziuns secretas paran da mancar en questa configuraziun VPN. Vulais Vus controllar Vossas infurmaziuns secretas?"</string>
-    <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"Il num d\'utilisader u il pled-clav endatà n\'è betg correct. Empruvar anc ina giada?"</string>
-    <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"Il server ha in problem. Probablamain èn il num d\'utilisader u il pled-clav endatà nuncorrect. Vulais Vus anc empruvar ina giada?"</string>
-    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"Il server na reagescha betg. Eventualmain sa chattais Vus davos ina firewall che impedescha la connexiun cun il server. Vulais Vus empruvar anc ina giada?"</string>
-    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"La negoziaziun cun il server n\'è betg reussida. Il server n\'è forsa betg cumpatibel cun Vossa opziun da criptaziun. Vulais Vus controllar il parameter da criptaziun?"</string>
-    <string name="vpn_type_title" msgid="6392933604218676224">"Agiuntar in VPN"</string>
-    <string name="vpn_add_new_vpn" msgid="5438260689052714550">"Agiuntar VPN"</string>
-    <!-- no translation found for vpn_details_title (418806440938510331) -->
-    <skip />
-    <string name="vpn_edit_title_add" msgid="2121313217989682890">"Agiuntar il VPN «<xliff:g id="NAME">%s</xliff:g>»"</string>
-    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"Detagls davart <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpns" msgid="3148141862835492816">"VPN"</string>
-    <string name="vpn_connecting" msgid="8039521381692090116">"Connectar…"</string>
-    <string name="vpn_disconnecting" msgid="7748050200708257066">"Deconnectar…"</string>
-    <string name="vpn_connected" msgid="7641723116362845781">"Connectà"</string>
-    <string name="vpn_connect_hint" msgid="7442898962925875181">"Connectar cun la rait"</string>
-    <string name="vpn_name" msgid="1550918148476193076">"Num VPN"</string>
-    <string name="vpn_a_name" msgid="8445736942405283509">"in num VPN"</string>
-    <string name="vpn_profile_added" msgid="9061017910337129840">"«<xliff:g id="NAME">%s</xliff:g>» è vegnì agiuntà"</string>
-    <string name="vpn_profile_replaced" msgid="587435576816273815">"Modificaziuns applitgadas a «<xliff:g id="NAME">%s</xliff:g>»"</string>
-    <string name="vpn_user_certificate_title" msgid="6812545893924071742">"Definir il certificat utilisader"</string>
-    <string name="vpn_user_certificate" msgid="949322691686938888">"Certificat utilisader"</string>
-    <string name="vpn_a_user_certificate" msgid="8943983437956898649">"in certificat utilisader"</string>
-    <string name="vpn_ca_certificate_title" msgid="7846466160795589985">"Definir il certificat CA"</string>
-    <string name="vpn_ca_certificate" msgid="465085144064264742">"Certificat dal post da certificaziun (CA)"</string>
-    <string name="vpn_a_ca_certificate" msgid="3374242520974884295">"in certificat CA"</string>
-    <string name="vpn_l2tp_secret_string_title" msgid="5039677186748940987">"Definir la clav L2TP"</string>
-    <string name="vpn_l2tp_secret" msgid="529359749677142076">"Clav L2TP"</string>
-    <string name="vpn_a_l2tp_secret" msgid="6612042930810981845">"ina clav L2TP"</string>
-    <string name="vpn_pptp_encryption_title" msgid="2236795167467896499">"criptaziun"</string>
-    <string name="vpn_pptp_encryption" msgid="2602329949737259686">"Criptadi PPTP"</string>
-    <string name="vpn_ipsec_presharedkey_title" msgid="2184060087690539175">"Definir la clav IPSec preinstallada"</string>
-    <string name="vpn_ipsec_presharedkey" msgid="5434316521616673741">"Clav preinstallada IPSec"</string>
-    <string name="vpn_a_ipsec_presharedkey" msgid="1255301923217898418">"ina clav IPSec preinstallada"</string>
-    <string name="vpn_vpn_server_title" msgid="8897005887420358913">"Definir il server VPN"</string>
-    <string name="vpn_vpn_server" msgid="1141754908824209260">"Server VPN"</string>
-    <string name="vpn_a_vpn_server" msgid="5960906152125045853">"in server VPN"</string>
-    <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"Num da server VPN"</string>
-    <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"Domenas da tschertga DNS"</string>
-    <string name="vpn_dns_search_list" msgid="4230034234026605360">"Domenas da tschertga DNS"</string>
-    <string name="vpn_field_is_set" msgid="7137320847812992243">"<xliff:g id="VALUE">%s</xliff:g> è definì."</string>
-    <string name="vpn_field_not_set" msgid="2972519243515893804">"Betg definì <xliff:g id="VALUE">%s</xliff:g>"</string>
-    <string name="vpn_field_not_set_optional" msgid="8840557698252556791">"\"Valur \"\"<xliff:g id="VALUE">%s</xliff:g>\"\" betg definida (facultativ)\""</string>
-    <string name="vpn_enable_field" msgid="3700967675854517191">"\"Activar «<xliff:g id="OPTION">%s</xliff:g>»"</string>
-    <string name="vpn_disable_field" msgid="6905658811179634005">"\"Deactivar \"\"<xliff:g id="OPTION">%s</xliff:g>\"\"\""</string>
-    <string name="vpn_is_enabled" msgid="1266304230417098877">"<xliff:g id="OPTION">%s</xliff:g> è activà."</string>
-    <string name="vpn_is_disabled" msgid="2013622485867806167">"L\'opziun «<xliff:g id="OPTION">%s</xliff:g>» è deactivada."</string>
     <string name="vpn_settings_title" msgid="7327468307909556719">"Parameters da VPN"</string>
     <string name="vpn_settings_summary" msgid="8849924181594963972">"Configurar ed administrar las raits privatas virtualas (VPN)"</string>
-    <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(betg midà)"</string>
-    <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,30 +1522,31 @@
     <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>
+    <!-- no translation found for trusted_credentials (4266945289534242402) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_summary (6735221351155686632) -->
+    <skip />
     <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>
-    <string name="privacy_settings_title" msgid="1987089301293213705">"Parameters da la protecziun da datas"</string>
+    <!-- outdated translation 9206631214140954954 -->     <string name="privacy_settings" msgid="5446972770562918934">"Protecziun da datas"</string>
+    <!-- outdated translation 1987089301293213705 -->     <string name="privacy_settings_title" msgid="4856282165773594890">"Parameters da la protecziun da datas"</string>
     <string name="backup_section_title" msgid="8856083167469467588">"Copias da segirezza e restauraziun"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Datas persunalas"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Far copias da segirezza da mias datas"</string>
@@ -1711,4 +1728,168 @@
     <skip />
     <!-- no translation found for hdcp_checking_dialog_title (5141305530923283) -->
     <skip />
+    <!-- no translation found for debug_ui_category (9023948280291055349) -->
+    <skip />
+    <!-- no translation found for strict_mode (1938795874357830695) -->
+    <skip />
+    <!-- no translation found for strict_mode_summary (142834318897332338) -->
+    <skip />
+    <!-- no translation found for pointer_location (6084434787496938001) -->
+    <skip />
+    <!-- no translation found for pointer_location_summary (840819275172753713) -->
+    <skip />
+    <!-- no translation found for show_screen_updates (8282711794220426931) -->
+    <skip />
+    <!-- no translation found for show_screen_updates_summary (1716122382094924596) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage (2389212910758076024) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage_summary (2113341923988958266) -->
+    <skip />
+    <!-- no translation found for window_animation_scale_title (6162587588166114700) -->
+    <skip />
+    <!-- no translation found for transition_animation_scale_title (387527540523595875) -->
+    <skip />
+    <!-- no translation found for debug_applications_category (6221644998451283813) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities (3622005081180597749) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities_summary (3592221124808773368) -->
+    <skip />
+    <!-- no translation found for app_process_limit_title (4121324758038197598) -->
+    <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 (8821760330497941117) -->
+    <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 (2441219164620753329) -->
+    <skip />
+    <!-- no translation found for data_usage_sweep_warning (6387081852568846982) -->
+    <skip />
+    <!-- no translation found for cryptkeeper_emergency_call (198578731586097145) -->
+    <skip />
+    <!-- no translation found for cryptkeeper_return_to_call (5613717339452772491) -->
+    <skip />
+    <!-- outdated translation 1550918148476193076 -->     <string name="vpn_name" msgid="4689699885361002297">"Num VPN"</string>
+    <!-- no translation found for vpn_type (5435733139514388070) -->
+    <skip />
+    <!-- no translation found for vpn_server (2123096727287421913) -->
+    <skip />
+    <!-- no translation found for vpn_mppe (6639001940500288972) -->
+    <skip />
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"Clav L2TP"</string>
+    <!-- no translation found for vpn_ipsec_identifier (4098175859460006296) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_secret (4526453255704888704) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_user_cert (6880651510020187230) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_ca_cert (91338213449148229) -->
+    <skip />
+    <!-- no translation found for vpn_search_domains (5391995501541199624) -->
+    <skip />
+    <!-- no translation found for vpn_routes (8556236801755260073) -->
+    <skip />
+    <!-- no translation found for vpn_username (1863901629860867849) -->
+    <skip />
+    <!-- no translation found for vpn_password (6756043647233596772) -->
+    <skip />
+    <!-- no translation found for vpn_save_login (6350322456427484881) -->
+    <skip />
+    <!-- no translation found for vpn_not_used (9094191054524660891) -->
+    <skip />
+    <!-- no translation found for vpn_no_ca_cert (7820884983947090538) -->
+    <skip />
+    <!-- no translation found for vpn_cancel (1979937976123659332) -->
+    <skip />
+    <!-- no translation found for vpn_save (4233484051644764510) -->
+    <skip />
+    <!-- no translation found for vpn_connect (8469608541746132301) -->
+    <skip />
+    <!-- no translation found for vpn_edit (1111459297288136079) -->
+    <skip />
+    <!-- no translation found for vpn_connect_to (7328758950427515753) -->
+    <skip />
+    <!-- no translation found for vpn_title (7982620762043790565) -->
+    <skip />
+    <!-- no translation found for vpn_create (8966010925994175306) -->
+    <skip />
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"Modifitgar la rait"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"Stizzar ina rait"</string>
+    <!-- no translation found for trusted_credentials_system_tab (3984284264816924534) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_user_tab (2244732111398939475) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_disable_label (3864493185845818506) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_enable_label (2498444573635146913) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_remove_label (3633691709300260836) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_enable_confirmation (83215982842660869) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_disable_confirmation (8199697813361646792) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_remove_confirmation (443561923016852941) -->
+    <skip />
 </resources>
diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
index a501017..8c53833 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>
@@ -214,4 +240,36 @@
     <item msgid="3878793616631049349">"Utilizaţi verificarea HDCP numai pentru conţinut DRM"</item>
     <item msgid="45075631231212732">"Utilizaţi întotdeauna verificarea HDCP"</item>
   </string-array>
+    <!-- no translation found for window_animation_scale_entries:0 (8134156599370824081) -->
+    <!-- no translation found for window_animation_scale_entries:1 (6624864048416710414) -->
+    <!-- no translation found for window_animation_scale_entries:2 (2219332261255416635) -->
+    <!-- no translation found for window_animation_scale_entries:3 (3544428804137048509) -->
+    <!-- no translation found for window_animation_scale_entries:4 (3110710404225974514) -->
+    <!-- no translation found for window_animation_scale_entries:5 (4402738611528318731) -->
+    <!-- no translation found for window_animation_scale_entries:6 (6189539267968330656) -->
+    <!-- no translation found for transition_animation_scale_entries:0 (8464255836173039442) -->
+    <!-- no translation found for transition_animation_scale_entries:1 (3375781541913316411) -->
+    <!-- no translation found for transition_animation_scale_entries:2 (1991041427801869945) -->
+    <!-- no translation found for transition_animation_scale_entries:3 (4012689927622382874) -->
+    <!-- no translation found for transition_animation_scale_entries:4 (3289156759925947169) -->
+    <!-- no translation found for transition_animation_scale_entries:5 (7705857441213621835) -->
+    <!-- no translation found for transition_animation_scale_entries:6 (6660750935954853365) -->
+    <!-- no translation found for app_process_limit_entries:0 (6799596560242275471) -->
+    <!-- no translation found for app_process_limit_entries:1 (2412794376818632575) -->
+    <!-- no translation found for app_process_limit_entries:2 (1578904888612645001) -->
+    <!-- no translation found for app_process_limit_entries:3 (8819235336299873577) -->
+  <string-array name="vpn_types_long">
+    <item msgid="2732002039459078847">"PPTP VPN"</item>
+    <item msgid="3799752201662127867">"L2TP/IPSec VPN cu chei predistribuite"</item>
+    <item msgid="4725504331295252103">"L2TP/IPSec VPN cu certificate"</item>
+    <item msgid="7526551163264034377">"IPSec VPN cu chei predistribuite şi autentificare Xauth"</item>
+    <item msgid="8064740940687465039">"IPSec VPN cu certificate şi autentificare Xauth"</item>
+    <item msgid="4946199982372391490">"IPSec VPN cu certificate şi autentificare hibridă"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:0 (8621078286418985762) -->
+    <!-- no translation found for vpn_states:1 (6692305604213080515) -->
+    <!-- no translation found for vpn_states:2 (8001704909356800092) -->
+    <!-- no translation found for vpn_states:3 (4039737283841672166) -->
+    <!-- no translation found for vpn_states:4 (4042143101664725090) -->
+    <!-- no translation found for vpn_states:5 (2690164254699635531) -->
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 41f36a4..7b848e8 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -19,6 +19,10 @@
     <string name="yes" msgid="4676390750360727396">"Da"</string>
     <string name="no" msgid="6731231425810196216">"Nu"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Necunoscută"</string>
+    <string name="header_category_wireless_networks" msgid="4944823405420438623">"WIRELESS ŞI REŢELE"</string>
+    <string name="header_category_device" msgid="5781174212691167553">"DISPOZITIV"</string>
+    <string name="header_category_personal" msgid="6225932173498802187">"PERSONAL"</string>
+    <string name="header_category_system" msgid="2073558547468647128">"SISTEM"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Porniţi radioul"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Opriţi radioul"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Afişaţi agenda de pe SIM"</string>
@@ -111,7 +115,11 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"În curs de împerechere..."</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"Asociat, dar neconectat"</string>
     <string name="bluetooth_device" msgid="6873461446424952003">"handsfree/cască"</string>
-    <string name="progress_scanning" msgid="3760897655335759141">"În curs de scanare"</string>
+    <!-- outdated translation 3760897655335759141 -->     <string name="progress_scanning" msgid="192587958424295789">"În curs de scanare"</string>
+    <!-- no translation found for progress_tap_to_pair (4192342336107106334) -->
+    <skip />
+    <!-- no translation found for bluetooth_no_devices_found (2412462335116297668) -->
+    <skip />
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Solicitare de împerechere prin Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Solicitare de împerechere"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Selectaţi împerecherea cu <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
@@ -130,6 +138,9 @@
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"O aplicaţie de pe telefonul dvs. solicită permisiunea de a activa Bluetooth şi de a seta telefonul pentru a fi detectabil de alte dispozitive. Acordaţi permisiunea?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Se activează Bluetooth..."</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Conectare automată"</string>
+    <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Solicitare de conectare Bluetooth"</string>
+    <string name="bluetooth_connection_notif_message" msgid="1833221950512058309">"Atingeţi pentru a vă conecta la „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”"</string>
+    <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Doriţi să vă conectaţi la „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Setări privind data şi ora"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"13:00"</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
@@ -235,7 +246,7 @@
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Dezactivaţi toate conexiunile wireless"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"Se dezactivează conexiunile wireless..."</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"Se activează conexiunile wireless..."</string>
-    <string name="radio_controls_title" msgid="5868688473587168882">"Reţele wireless"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Mai multe..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Wireless şi reţele"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"Gestionaţi reţelele Wi-Fi, funcţia Bluetooth, modul Avion, reţelele mobile şi reţelele VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming de date"</string>
@@ -271,8 +282,8 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Info. proprietar"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="2382525043173672857">"Introduceţi textul de afişat pe ecranul de blocare"</string>
-    <string name="security_settings_title" msgid="5168491784222013179">"Locaţie şi securitate"</string>
-    <string name="location_security_settings_title" msgid="4624434296446625554">"Setări privind locaţia şi siguranţa"</string>
+    <string name="location_settings_title" msgid="8935806698251432196">"Servicii de localizare"</string>
+    <string name="security_settings_title" msgid="7945465324818485460">"Securitate"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Setaţi Locaţia mea, deblocarea ecranului, blocarea cardului SIM, blocarea stocării acreditărilor"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Setaţi Locaţia mea, deblocarea ecranului, blocarea stocării acreditărilor"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Parole"</string>
@@ -316,7 +327,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>
@@ -375,8 +386,8 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Afişaţi sau dezactivaţi administratorii dispozitivului"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Activaţi funcţia Bluetooth"</string>
-    <string name="bluetooth_settings" msgid="2725796451253089609">"Setări Bluetooth"</string>
-    <string name="bluetooth_settings_title" msgid="2824020086246268296">"Setări Bluetooth"</string>
+    <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
+    <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Gestionaţi conexiunile, setaţi numele dispozitivului şi detectabilitatea acestuia"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Solicitare de împerechere prin Bluetooth"</string>
     <string name="bluetooth_enter_pin_msg" msgid="1499285355129256289">\n"Introduceţi codul PIN pentru împerecherea cu „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”. (Încercaţi 0000 sau 1234.) Ar putea fi necesar să introduceţi acelaşi PIN pe dispozitivul Bluetooth."</string>
@@ -394,7 +405,10 @@
     <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Împerechere respinsă de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"A apărut o problemă la conectarea la <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Scanaţi pentru a detecta dispozitive"</string>
-    <string name="bluetooth_preference_find_nearby_title" msgid="5087410003465463318">"Găsiţi dispozit. în apropiere"</string>
+    <!-- no translation found for bluetooth_search_for_devices (5957007154213560390) -->
+    <skip />
+    <!-- no translation found for bluetooth_searching_for_devices (9203739709307871727) -->
+    <skip />
     <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"Setările dispozitivului"</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Dispozitive împerecheate"</string>
     <string name="bluetooth_preference_found_devices" msgid="3133019331974936204">"Au fost găsite dispozitive"</string>
@@ -404,6 +418,10 @@
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Anulaţi împerecherea"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Deconectaţi şi anulaţi împerecherea"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Opţiuni…"</string>
+    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Avansate"</string>
+    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Setări Bluetooth avansate"</string>
+    <string name="bluetooth_advanced_settings_label" msgid="8659717781212434173">"Bluetooth avansat"</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="3631028334811113629">"Activaţi Bluetooth pt. a vedea dispozit. dispon."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Conectaţi-vă la..."</string>
     <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"Media"</string>
     <string name="bluetooth_profile_headset" msgid="81844079120986198">"Handsfree"</string>
@@ -445,27 +463,31 @@
     <string name="nfc_toggle_error" msgid="2233172102497535522">"A apărut o eroare."</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Activaţi Wi-Fi"</string>
-    <string name="wifi_settings" msgid="4746946030627213196">"Setări Wi-Fi"</string>
+    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="2810363951104753710">"Setări Wi-Fi"</string>
+    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Configuraţi şi gestionaţi punctele de acces wireless"</string>
-    <string name="wifi_starting" msgid="6710266609710860129">"Se activează..."</string>
-    <string name="wifi_stopping" msgid="5952909472548218348">"În curs de dezactivare..."</string>
+    <string name="wifi_starting" msgid="7732330327758522943">"Se activează Wi-Fi..."</string>
+    <string name="wifi_stopping" msgid="244864762599017659">"Se dezactivează Wi-Fi..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"Eroare"</string>
     <string name="wifi_in_airplane_mode" msgid="7618393787965366655">"În modul Avion"</string>
     <string name="wifi_fail_to_scan" msgid="6194542252808587669">"Imposibil de scanat pentru identificarea reţelelor"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Notificare de reţea"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Doresc să fiu notificat când este disponibilă o reţea deschisă"</string>
+    <string name="wifi_enable_watchdog_service" msgid="4723544454066601706">"Verificări de conectare Wi-Fi"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="8687400936839455926">"Detectaţi şi gestionaţi eventualele probleme de conectivitate în reţea"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Politica de deconectare Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Indicaţi când să se comute de la Wi-Fi la date mobile"</string>
     <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" msgid="6234851776910938957">"Adăugaţi o reţea"</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>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Conectaţi-vă la reţea"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Eliminaţi reţeaua"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modificaţi reţeaua"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="3682507011071029311">"Activaţi Wi-Fi pentru a vedea reţelele disponibile"</string>
     <string name="wifi_network_setup" msgid="7974851890019344870">"Configurare reţea"</string>
     <string name="wifi_wps_pin" msgid="5471842298708321115">"Introduceţi codul PIN de la punctul de acces"</string>
     <string name="wifi_wps_setup_title" msgid="150518971269252336">"Configurare WPS"</string>
@@ -501,13 +523,13 @@
     <string name="wifi_save" msgid="3331121567988522826">"Salvaţi"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Anulaţi"</string>
     <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"A fost detectată o altă sesiune WPS, încercaţi din nou peste câteva minute"</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Avansate"</string>
+    <!-- outdated translation 5419052271935350999 -->     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Avansate"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Bandă de frecvenţă Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Indicaţi intervalul de frecvenţă al operaţiei"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"A apărut o probl. la setarea benzii de frecvenţă."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Adresă MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Adresă IP"</string>
-    <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"Setări IP"</string>
+    <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Setări IP"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Salvaţi"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Anulaţi"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Introduceţi o adresă IP validă."</string>
@@ -525,7 +547,7 @@
     <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"Hotspot Wi-Fi portabil <xliff:g id="NETWORK_SSID">%1$s</xliff:g><xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="sound_settings_title" msgid="8735891486683305886">"Sunet"</string>
-    <string name="display_settings_title" msgid="2378894265964357591">"Monitorizaţi"</string>
+    <string name="display_settings_title" msgid="1708697328627382561">"Afişare"</string>
     <string name="sound_settings" msgid="5007659014828162881">"Setări de sunet"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Mod Silenţios"</string>
     <string name="silent_mode_summary" msgid="3309650676072917899">"Dezactivaţi toate sunetele, cu excepţia celor ale conţinutului media şi a alarmelor"</string>
@@ -598,7 +620,18 @@
     <string name="brightness_summary" msgid="838917350127550703">"Ajustaţi luminozitatea ecranului"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Timp limită"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Ecranul se dezactivează automat după <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Imagine de fundal"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Vise Android"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Screensavere şi alte elemente amuzante pentru modul inactiv"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Visul selectat"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Când se efectuează activarea"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"După <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactivitate"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Niciodată"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Încercaţi-l!"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Luminozitate automată"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Dimensiune font"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Dimensiunea generală a fonturilor"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Selectaţi dimensiunea fontului"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Setări de blocare a cardului SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Activaţi blocarea cardului SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Blocare card SIM"</string>
@@ -643,8 +676,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>
@@ -696,6 +730,16 @@
     <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"Cardul SD va fi demontat."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"În curs de demontare"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Demontare în curs"</string>
+    <!-- no translation found for storage_menu_usb (1580545228584324704) -->
+    <skip />
+    <!-- no translation found for storage_title_usb (5775322159427546546) -->
+    <skip />
+    <!-- no translation found for usb_label_mtp (4157227401755543412) -->
+    <skip />
+    <!-- no translation found for usb_label_ptp (7417254019489575819) -->
+    <skip />
+    <!-- no translation found for usb_label_installer_cd (7438467574756086977) -->
+    <skip />
     <string name="battery_status_title" msgid="9159414319574976203">"Stare baterie"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Nivelul bateriei"</string>
     <string name="apn_settings" msgid="3743170484827528406">"Nume APN"</string>
@@ -806,6 +850,8 @@
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"Nu vă puteţi conecta la mai mult de <xliff:g id="MAXCONNECTION">%1$d</xliff:g> dispoz."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> va fi deconectat."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ajutor"</string>
+    <string name="wireless_category_general" msgid="2973810407987118067">"General"</string>
+    <string name="wireless_category_mobile_networks" msgid="1254629216798424288">"Reţele mobile"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Reţele mobile"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Setaţi opţiuni pentru roaming, reţele, nume APN"</string>
     <string name="location_title" msgid="1029961368397484576">"Locaţia mea"</string>
@@ -883,7 +929,7 @@
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Securizarea tabletei"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Securizarea telefonului"</string>
     <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"Protejaţi tableta împotriva utilizării neautorizate, prin crearea unui model personal de deblocare a ecranului. Conectaţi cu degetul, în orice ordine doriţi, punctele de pe ecranul următor. Trebuie să conectaţi cel puţin patru puncte. "\n\n" Sunteţi gata să începeţi? Atingeţi „Înainte”."</string>
-    <string name="lock_intro_message" product="default" msgid="9100785646737118042"><font size="17">"Protejaţi telefonul de utilizare neautorizată prin crearea unui model personal pentru deblocarea ecranului. "\n<font height="17">\n</font><b>"1"</b>"  În următorul ecran, priviţi desenarea unui exemplu de model. "\n<font height="17">\n</font><b>"2"</b>"  La final, desenaţi propriul model personal pentru deblocare. Încercaţi diferite modele, dar conectaţi minimum patru puncte. "\n<font height="17">\n</font><b>"3"</b>"  Desenaţi din nou modelul pentru a-l confirma. "\n<font height="17">\n</font><b>"Sunteţi pregătit să începeţi? Atingeţi „Înainte”"</b>". "\n<font height="3">\n</font>"Pentru a lăsa telefonul neprotejat, atingeţi „Anulaţi”."</font></string>
+    <!-- outdated translation 3692151094288835065 -->     <string name="lock_intro_message" product="default" msgid="5796785892741212873">"Protejaţi tableta împotriva utilizării neautorizate, prin crearea unui model personal de deblocare a ecranului. Conectaţi cu degetul, în orice ordine doriţi, punctele de pe ecranul următor. Trebuie să conectaţi cel puţin patru puncte. "\n\n" Sunteţi gata să începeţi? Atingeţi „Înainte”."</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Gestionaţi aplicaţiile"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Gestionaţi şi eliminaţi aplicaţiile instalate"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Aplicaţii"</string>
@@ -893,6 +939,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>
@@ -905,9 +953,10 @@
     <string name="force_stop" msgid="7435006169872876756">"Opriţi forţat"</string>
     <string name="total_size_label" msgid="1048676419552557254">"Total"</string>
     <string name="application_size_label" msgid="5055196275624686382">"Aplicaţie"</string>
+    <string name="external_code_size_label" msgid="3459343140355961335">"Stocare aplicaţie pe USB"</string>
     <string name="data_size_label" msgid="8679376373625710107">"Date"</string>
-    <string name="external_size_label" product="nosdcard" msgid="4465530017830945766">"Stocare USB"</string>
-    <string name="external_size_label" product="default" msgid="2107155737635944440">"Card SD"</string>
+    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Stocare date pe USB"</string>
+    <string name="external_data_size_label" product="default" msgid="626414192825329708">"Card SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Dezinstalaţi"</string>
     <string name="disable_text" msgid="6544054052049395202">"Dezactivaţi"</string>
     <string name="enable_text" msgid="9217362512327828987">"Activaţi"</string>
@@ -1026,7 +1075,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 +1085,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>
@@ -1066,7 +1117,7 @@
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Setări pentru tastatura de pe ecran"</string>
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Tastatură fizică"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Setări pentru tastatura fizică"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Dezvoltare"</string>
+    <string name="development_settings_title" msgid="215179176067683667">"Opţiuni dezvoltator"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"Setaţi opţiuni pentru dezvoltarea aplicaţiilor"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Depanare USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Mod de depanare când este conectat USB"</string>
@@ -1091,14 +1142,14 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Accesibilitate"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Setări de accesibilitate"</string>
     <string name="accessibility_settings_summary" msgid="8185181964847149507">"Gestionaţi opţiunile de accesibilitate"</string>
-    <string name="toggle_accessibility_title" msgid="650839277066574497">"Accesibilitate"</string>
+    <string name="toggle_large_text_title" msgid="42259643359869436">"Text mare"</string>
     <string name="accessibility_services_category" msgid="8127851026323672607">"Servicii de accesibilitate"</string>
+    <string name="toggle_accessibility_title" msgid="7338739354952553958">"Permiteţi servicii de accesibilitate"</string>
     <string name="no_accessibility_services_summary" msgid="694578333333808159">"Nu este instalat niciun serviciu de accesibilitate."</string>
     <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Acest serviciu de accesibilitate poate culege în întregime textul introdus, inclusiv datele personale, numerele cărţilor de credit, dar nu şi parolele. Poate, de asemenea, să înregistreze interacţiunile cu interfaţa de utilizare. Aceasta provine de la aplicaţia <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Utilizaţi acest serviciu de accesibilitate?"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Dezactivaţi accesibilitatea?"</string>
     <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"Nu a fost găsită nicio aplicaţie legată de accesibilitate"</string>
     <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"Nu aveţi instalată nicio aplicaţie de accesibilitate."\n\n"Puteţi descărca un cititor de ecran pentru dispozitivul dvs. din Android Market."\n\n"Faceţi clic pe OK pentru a instala cititorul de ecran."</string>
-    <string name="accessibility_script_injection_category" msgid="8649951751131431904">"Scripturi accesibilitate"</string>
     <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"Descărcaţi scripturi de accesibilitate"</string>
     <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"Permiteţi aplic. să desc.scripturi de accesibilitate de la Google"</string>
     <string name="accessibility_script_injection_security_warning" product="tablet" msgid="1113600871264359828">"Unele aplicaţii pot solicita ca Google să descarce pe tableta dvs. scripturi care să faciliteze accesul la conţinutul acestora. Sigur doriţi să permiteţi Google să instaleze pe tableta dvs. scripturi care să îmbunătăţească accesibilitatea?"</string>
@@ -1106,10 +1157,11 @@
     <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>
-    <string name="power_usage_summary_title" msgid="5180282911164282324">"Utilizarea bateriei"</string>
+    <string name="power_usage_summary_title" msgid="7190304207330319919">"Acumulator"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Ce funcţii au utilizat bateria"</string>
     <string name="power_usage_not_available" msgid="3583407442633768046">"Date utiliz. bater. nedispon."</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Utilizarea bateriei de la deconectare"</string>
@@ -1218,6 +1270,8 @@
     <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>
+    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Setările motorului"</string>
+    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Setări pentru <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
     <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>
@@ -1228,114 +1282,33 @@
     <string name="gadget_title" msgid="7455548605888590466">"Comandă alimentare"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Se actualizează setarea Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Se actualizează setarea pentru Bluetooth"</string>
-    <string name="vpn_settings_activity_title" msgid="7276864950701612579">"Setări VPN"</string>
-    <string name="vpn_connect_to" msgid="2541409082892684362">"Conectaţi-vă la <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpn_username_colon" msgid="7854930370861306247">"Nume de utilizator:"</string>
-    <string name="vpn_password_colon" msgid="5716278710848606626">"Parolă:"</string>
-    <string name="vpn_a_username" msgid="6664733641993968692">"un nume de utilizator"</string>
-    <string name="vpn_a_password" msgid="1537213632501483753">"o parolă"</string>
-    <string name="vpn_save_username" msgid="1408415289165970790">"Doresc să se reţină numele de utilizator"</string>
-    <string name="vpn_connect_button" msgid="1699007212602470655">"Conectaţi-vă"</string>
-    <string name="vpn_yes_button" msgid="8034531001149843119">"Da"</string>
-    <string name="vpn_no_button" msgid="7620339571187119107">"Nu"</string>
-    <string name="vpn_back_button" msgid="192036339792734970">"Înapoi"</string>
-    <string name="vpn_mistake_button" msgid="1683383660912491270">"Nu"</string>
-    <string name="vpn_menu_done" msgid="93528279226907926">"Salvaţi"</string>
-    <string name="vpn_menu_cancel" msgid="7234451214611202868">"Anulaţi"</string>
-    <string name="vpn_menu_revert" msgid="4407762442281467659">"Reveniţi"</string>
-    <string name="vpn_menu_connect" msgid="1089399414463784218">"Conectaţi-vă la reţea"</string>
-    <string name="vpn_menu_disconnect" msgid="8254492450022562235">"Deconectaţi-vă de la reţea"</string>
-    <string name="vpn_menu_edit" msgid="4526245173583195618">"Modificaţi reţeaua"</string>
-    <string name="vpn_menu_delete" msgid="3326527392609513129">"Ştergeţi reţeaua"</string>
-    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"Trebuie să introduceţi <xliff:g id="CODE">%s</xliff:g>."</string>
-    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"Trebuie să selectaţi <xliff:g id="OPTION">%s</xliff:g>."</string>
-    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"Numele VPN „<xliff:g id="NAME">%s</xliff:g>” există deja. Găsiţi un alt nume."</string>
-    <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"Sigur doriţi să ştergeţi această reţea VPN?"</string>
-    <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"Sunteţi sigur că nu doriţi să creaţi acest profil?"</string>
-    <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"Sigur doriţi să renunţaţi la modificările aduse acestui profil?"</string>
-    <string name="vpn_confirm_reconnect" msgid="5748535476278674296">"Imposibil de conectat la reţea. Doriţi să încercaţi din nou?"</string>
-    <string name="vpn_reconnect_from_lost" msgid="2442844155623372118">"Conexiune pierdută. Doriţi să vă conectaţi din nou?"</string>
-    <string name="vpn_unknown_server_dialog_msg" msgid="3080742299823671319">"Numele serverului nu se poate rezolva. Doriţi să verificaţi setarea pentru numele serverului?"</string>
-    <string name="vpn_challenge_error_dialog_msg" msgid="6174901754230038601">"Eroare de provocare. Doriţi să verificaţi setarea pentru secrete?"</string>
-    <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"Unul sau mai multe secrete lipsesc din această configuraţie VPN. Doriţi să verificaţi setarea pentru secrete?"</string>
-    <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"Numele de utilizator sau parola introdusă este incorectă. Doriţi să încercaţi din nou?"</string>
-    <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"Serverul nu a putut fi accesat. Numele de utilizator sau parola introduse pot fi incorecte. Doriţi să încercaţi din nou?"</string>
-    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"Serverul nu a putut fi accesat. Este posibil să fiţi protejat(ă) printr-un firewall care vă împiedică să vă conectaţi la server. Doriţi să încercaţi din nou?"</string>
-    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"Negocierea serverului nu a reuşit. Este posibil ca serverul să nu accepte opţiunea dvs. de criptare. Doriţi să verificaţi setarea dvs. de criptare?"</string>
-    <string name="vpn_type_title" msgid="6392933604218676224">"Adăugaţi o reţea VPN"</string>
-    <string name="vpn_add_new_vpn" msgid="5438260689052714550">"Adăugaţi o reţea VPN"</string>
-    <string name="vpn_details_title" msgid="418806440938510331">"Detalii VPN"</string>
-    <string name="vpn_edit_title_add" msgid="2121313217989682890">"Adăugaţi VPN <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"Detalii despre <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpns" msgid="3148141862835492816">"Reţele VPN"</string>
-    <string name="vpn_connecting" msgid="8039521381692090116">"Se conectează..."</string>
-    <string name="vpn_disconnecting" msgid="7748050200708257066">"Se deconectează..."</string>
-    <string name="vpn_connected" msgid="7641723116362845781">"Conectat"</string>
-    <string name="vpn_connect_hint" msgid="7442898962925875181">"Conectaţi-vă la reţea"</string>
-    <string name="vpn_name" msgid="1550918148476193076">"Nume VPN"</string>
-    <string name="vpn_a_name" msgid="8445736942405283509">"un nume de VPN"</string>
-    <string name="vpn_profile_added" msgid="9061017910337129840">"„<xliff:g id="NAME">%s</xliff:g>” a fost adăugat"</string>
-    <string name="vpn_profile_replaced" msgid="587435576816273815">"Sunt aduse modificări pentru „<xliff:g id="NAME">%s</xliff:g>”"</string>
-    <string name="vpn_user_certificate_title" msgid="6812545893924071742">"Setaţi certificatul de utilizator"</string>
-    <string name="vpn_user_certificate" msgid="949322691686938888">"Certificat de utilizator"</string>
-    <string name="vpn_a_user_certificate" msgid="8943983437956898649">"un certificat de utilizator"</string>
-    <string name="vpn_ca_certificate_title" msgid="7846466160795589985">"Setaţi certificatul CA"</string>
-    <string name="vpn_ca_certificate" msgid="465085144064264742">"Certificat de autoritate (CA)"</string>
-    <string name="vpn_a_ca_certificate" msgid="3374242520974884295">"un certificat CA"</string>
-    <string name="vpn_l2tp_secret_string_title" msgid="5039677186748940987">"Setaţi secretul L2TP"</string>
-    <string name="vpn_l2tp_secret" msgid="529359749677142076">"Secret L2TP"</string>
-    <string name="vpn_a_l2tp_secret" msgid="6612042930810981845">"un secret L2TP"</string>
-    <string name="vpn_pptp_encryption_title" msgid="2236795167467896499">"criptare"</string>
-    <string name="vpn_pptp_encryption" msgid="2602329949737259686">"Criptare PPTP"</string>
-    <string name="vpn_ipsec_presharedkey_title" msgid="2184060087690539175">"Setaţi cheia prepartajată IPSec"</string>
-    <string name="vpn_ipsec_presharedkey" msgid="5434316521616673741">"Cheie prepartajată IPSec"</string>
-    <string name="vpn_a_ipsec_presharedkey" msgid="1255301923217898418">"o cheie prepartajată IPSec"</string>
-    <string name="vpn_vpn_server_title" msgid="8897005887420358913">"Setaţi serverul VPN"</string>
-    <string name="vpn_vpn_server" msgid="1141754908824209260">"Server VPN"</string>
-    <string name="vpn_a_vpn_server" msgid="5960906152125045853">"un server VPN"</string>
-    <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"Numele serverului VPN"</string>
-    <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"Domenii de căutare DNS"</string>
-    <string name="vpn_dns_search_list" msgid="4230034234026605360">"Domenii de căutare DNS"</string>
-    <string name="vpn_field_is_set" msgid="7137320847812992243">"<xliff:g id="VALUE">%s</xliff:g> este setată"</string>
-    <string name="vpn_field_not_set" msgid="2972519243515893804">"<xliff:g id="VALUE">%s</xliff:g> nesetat"</string>
-    <string name="vpn_field_not_set_optional" msgid="8840557698252556791">"<xliff:g id="VALUE">%s</xliff:g> nesetată (opţională)"</string>
-    <string name="vpn_enable_field" msgid="3700967675854517191">"Activaţi <xliff:g id="OPTION">%s</xliff:g>"</string>
-    <string name="vpn_disable_field" msgid="6905658811179634005">"Dezactivaţi <xliff:g id="OPTION">%s</xliff:g>"</string>
-    <string name="vpn_is_enabled" msgid="1266304230417098877">"<xliff:g id="OPTION">%s</xliff:g> este activat"</string>
-    <string name="vpn_is_disabled" msgid="2013622485867806167">"<xliff:g id="OPTION">%s</xliff:g> este dezactivat"</string>
     <string name="vpn_settings_title" msgid="7327468307909556719">"Setări VPN"</string>
     <string name="vpn_settings_summary" msgid="8849924181594963972">"Configuraţi şi gestionaţi reţele private virtuale (VPN)"</string>
-    <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="trusted_credentials" msgid="4266945289534242402">"Acreditări de încredere"</string>
+    <string name="trusted_credentials_summary" msgid="6735221351155686632">"Afişaţi certificatele CA de încredere"</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>
-    <string name="privacy_settings_title" msgid="1987089301293213705">"Setări privind confidenţialitatea"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"Creaţi o copie de rezervă şi resetaţi"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"Creaţi o copie de rezervă şi resetaţi"</string>
     <string name="backup_section_title" msgid="8856083167469467588">"Creaţi copie de rezervă şi restabiliţi"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Date personale"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Creaţi o copie de rezervă pentru datele dvs."</string>
@@ -1440,4 +1413,107 @@
     <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>
+    <!-- no translation found for debug_ui_category (9023948280291055349) -->
+    <skip />
+    <!-- no translation found for strict_mode (1938795874357830695) -->
+    <skip />
+    <!-- no translation found for strict_mode_summary (142834318897332338) -->
+    <skip />
+    <!-- no translation found for pointer_location (6084434787496938001) -->
+    <skip />
+    <!-- no translation found for pointer_location_summary (840819275172753713) -->
+    <skip />
+    <!-- no translation found for show_screen_updates (8282711794220426931) -->
+    <skip />
+    <!-- no translation found for show_screen_updates_summary (1716122382094924596) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage (2389212910758076024) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage_summary (2113341923988958266) -->
+    <skip />
+    <!-- no translation found for window_animation_scale_title (6162587588166114700) -->
+    <skip />
+    <!-- no translation found for transition_animation_scale_title (387527540523595875) -->
+    <skip />
+    <!-- no translation found for debug_applications_category (6221644998451283813) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities (3622005081180597749) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities_summary (3592221124808773368) -->
+    <skip />
+    <!-- no translation found for app_process_limit_title (4121324758038197598) -->
+    <skip />
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Rata de utilizare a datelor"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"Ciclul de util. a datelor"</string>
+    <string name="data_usage_menu_split_4g" msgid="7417435609285381968">"Divizaţi utilizarea 4G"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Afişaţi utilizarea Wi-Fi"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"Schimbaţi data ciclului..."</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Ziua din lună pentru resetarea ciclului de utilizare a datelor:"</string>
+    <string name="data_usage_disable_mobile_limit" msgid="289740911281022322">"Dezact. dat. mobile la at. lim."</string>
+    <string name="data_usage_disable_4g_limit" msgid="5808210773758699800">"Dezact. datele 4G la at. limit."</string>
+    <string name="data_usage_disable_3g_limit" msgid="3856971004328238231">"Dezact. datele 2G-3G la at. lim."</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">"Date mobile"</string>
+    <string name="data_usage_enable_3g" msgid="6304006671869578254">"Date 2G-3G"</string>
+    <string name="data_usage_enable_4g" msgid="3635854097335036738">"Date 4G"</string>
+    <string name="data_usage_app_settings" msgid="3727561362090820369">"Afişaţi setările aplicaţiei"</string>
+    <string name="data_usage_app_restrict_background" msgid="8856643905291165256">"Restr. utiliz. datelor de fundal"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="1503361245973512092">"Permit. dat. de fundal ale aplic. numai la utiliz. reţ. nelim."</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="8110736468987743260">"Restricţionarea datelor de fundal"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="100001698378554777">"Această funcţie poate avea un impact negativ asupra aplicaţiilor care depind de utilizarea datelor de fundal."\n\n"Comenzi mai adecvate privind utilizarea datelor pot fi găsite în setările acestei aplicaţii."</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Data de resetare a ciclului de utilizare"</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Data din fiecare lună:"</string>
+    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Setaţi"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Limitarea utilizării datelor"</string>
+    <string name="data_usage_limit_dialog_mobile" msgid="7931094451923591578">"Conexiunea de date mobile va fi dezactivată la atingerea limitei specificate."\n\n"Pentru a evita taxele pentru utilizare excesivă, luaţi în considerare folosirea unei limite reduse, deoarece metodele de calcul ale dispozitivului şi ale operatorului pot diferi."</string>
+    <string name="data_usage_limit_dialog_3g" msgid="5478553071420316963">"Conexiunea de date 2G-3G va fi dezactivată la atingerea limitei specificate."\n\n"Pentru a evita taxele pentru utilizare excesivă, luaţi în considerare folosirea unei limite reduse, deoarece metodele de calcul ale dispozitivului şi ale operatorului pot diferi."</string>
+    <string name="data_usage_limit_dialog_4g" msgid="6134008906742403777">"Conexiunea de date 4G va fi dezactivată la atingerea limitei specificate."\n\n"Pentru a evita taxele pentru utilizare excesivă, luaţi în considerare folosirea unei limite reduse, deoarece metodele de calcul ale dispozitivului şi ale operatorului pot diferi."</string>
+    <string name="data_usage_disabled_dialog_3g_title" msgid="4221584306492812040">"Datele 2G-3G au fost dezactivate"</string>
+    <string name="data_usage_disabled_dialog_4g_title" msgid="715585612162185936">"Datele 4G au fost dezactivate"</string>
+    <string name="data_usage_disabled_dialog_mobile_title" msgid="209516216265000221">"Datele mobile au fost dezactivate"</string>
+    <string name="data_usage_disabled_dialog" msgid="2874031671067845964">"A fost atinsă limita de utilizare a datelor specificată."\n\n"Utilizarea unor date suplimentare poate atrage costuri impuse de operator."</string>
+    <string name="data_usage_disabled_dialog_enable" msgid="2441219164620753329">"Reactivaţi datele"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="32">"<xliff:g id="NUMBER">%1$s</xliff:g>"</font>" "<font size="12">"<xliff:g id="UNIT">%2$s</xliff:g>"</font>\n<font size="12">"avertisment"</font></string>
+    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Apel de urgenţă"</string>
+    <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Reveniţi la apel"</string>
+    <string name="vpn_name" msgid="4689699885361002297">"Nume"</string>
+    <string name="vpn_type" msgid="5435733139514388070">"Tip"</string>
+    <string name="vpn_server" msgid="2123096727287421913">"Adresă server"</string>
+    <string name="vpn_mppe" msgid="6639001940500288972">"Criptare PPP (MPPE)"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"Secret L2TP"</string>
+    <string name="vpn_ipsec_identifier" msgid="4098175859460006296">"Identificator IPSec"</string>
+    <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Cheie IPSec predistribuită"</string>
+    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"Certificat de utilizator IPSec"</string>
+    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"Certificat CA IPSec"</string>
+    <!-- no translation found for vpn_search_domains (5391995501541199624) -->
+    <skip />
+    <!-- no translation found for vpn_routes (8556236801755260073) -->
+    <skip />
+    <string name="vpn_username" msgid="1863901629860867849">"Nume de utilizator"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Parolă"</string>
+    <!-- no translation found for vpn_save_login (6350322456427484881) -->
+    <skip />
+    <!-- no translation found for vpn_not_used (9094191054524660891) -->
+    <skip />
+    <string name="vpn_no_ca_cert" msgid="7820884983947090538">"(nu verificaţi serverul)"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"Anulaţi"</string>
+    <string name="vpn_save" msgid="4233484051644764510">"Salvaţi"</string>
+    <string name="vpn_connect" msgid="8469608541746132301">"Conectaţi"</string>
+    <string name="vpn_edit" msgid="1111459297288136079">"Editaţi reţeaua VPN"</string>
+    <string name="vpn_connect_to" msgid="7328758950427515753">"Conectaţi-vă la <xliff:g id="NETWORK">%s</xliff:g>"</string>
+    <string name="vpn_title" msgid="7982620762043790565">"Setări VPN"</string>
+    <string name="vpn_create" msgid="8966010925994175306">"Adăugaşi o reţea VPN"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"Modificaţi reţeaua"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"Ştergeţi reţeaua"</string>
+    <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Sistem"</string>
+    <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Utilizator"</string>
+    <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Dezactivaţi"</string>
+    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Activaţi"</string>
+    <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Eliminaţi"</string>
+    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Activaţi certificatul CA de sistem?"</string>
+    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Dezactivaţi certificatul CA de sistem?"</string>
+    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Eliminaţi definitiv certificatul de utilizator CA?"</string>
 </resources>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index f2316c8..72402b3 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>
@@ -214,4 +240,36 @@
     <item msgid="3878793616631049349">"Использовать проверку HDCP только для содержания DRM"</item>
     <item msgid="45075631231212732">"Всегда использовать проверку HDCP"</item>
   </string-array>
+    <!-- no translation found for window_animation_scale_entries:0 (8134156599370824081) -->
+    <!-- no translation found for window_animation_scale_entries:1 (6624864048416710414) -->
+    <!-- no translation found for window_animation_scale_entries:2 (2219332261255416635) -->
+    <!-- no translation found for window_animation_scale_entries:3 (3544428804137048509) -->
+    <!-- no translation found for window_animation_scale_entries:4 (3110710404225974514) -->
+    <!-- no translation found for window_animation_scale_entries:5 (4402738611528318731) -->
+    <!-- no translation found for window_animation_scale_entries:6 (6189539267968330656) -->
+    <!-- no translation found for transition_animation_scale_entries:0 (8464255836173039442) -->
+    <!-- no translation found for transition_animation_scale_entries:1 (3375781541913316411) -->
+    <!-- no translation found for transition_animation_scale_entries:2 (1991041427801869945) -->
+    <!-- no translation found for transition_animation_scale_entries:3 (4012689927622382874) -->
+    <!-- no translation found for transition_animation_scale_entries:4 (3289156759925947169) -->
+    <!-- no translation found for transition_animation_scale_entries:5 (7705857441213621835) -->
+    <!-- no translation found for transition_animation_scale_entries:6 (6660750935954853365) -->
+    <!-- no translation found for app_process_limit_entries:0 (6799596560242275471) -->
+    <!-- no translation found for app_process_limit_entries:1 (2412794376818632575) -->
+    <!-- no translation found for app_process_limit_entries:2 (1578904888612645001) -->
+    <!-- no translation found for app_process_limit_entries:3 (8819235336299873577) -->
+  <string-array name="vpn_types_long">
+    <item msgid="2732002039459078847">"VPN-соединение по протоколу PPTP"</item>
+    <item msgid="3799752201662127867">"VPN-соединение по протоколу L2TP/IPSec с общими ключами"</item>
+    <item msgid="4725504331295252103">"VPN-подключение по протоколу L2TP/IPSec с использованием сертификатов"</item>
+    <item msgid="7526551163264034377">"VPN-подключение IPSec с общими ключами и междоменной аутентификацией"</item>
+    <item msgid="8064740940687465039">"VPN-подключение IPSec с использованием сертификатов и междоменной аутентификации"</item>
+    <item msgid="4946199982372391490">"VPN-подключение IPSec с использованием сертификатов и комбинированной аутентификации"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:0 (8621078286418985762) -->
+    <!-- no translation found for vpn_states:1 (6692305604213080515) -->
+    <!-- no translation found for vpn_states:2 (8001704909356800092) -->
+    <!-- no translation found for vpn_states:3 (4039737283841672166) -->
+    <!-- no translation found for vpn_states:4 (4042143101664725090) -->
+    <!-- no translation found for vpn_states:5 (2690164254699635531) -->
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index c30ee7f..015cd11 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -19,6 +19,10 @@
     <string name="yes" msgid="4676390750360727396">"Да"</string>
     <string name="no" msgid="6731231425810196216">"Нет"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Неизвестно"</string>
+    <string name="header_category_wireless_networks" msgid="4944823405420438623">"БЕСПРОВОДНЫЕ СЕТИ"</string>
+    <string name="header_category_device" msgid="5781174212691167553">"УСТРОЙСТВО"</string>
+    <string name="header_category_personal" msgid="6225932173498802187">"ЛИЧНОЕ"</string>
+    <string name="header_category_system" msgid="2073558547468647128">"СИСТЕМА"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Включить радио"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Отключить радио"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Просмотреть адресную книгу на SIM-карте"</string>
@@ -111,7 +115,11 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Сопряжение..."</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"Сопряжено, но не подключено"</string>
     <string name="bluetooth_device" msgid="6873461446424952003">"гарнитура/наушники"</string>
-    <string name="progress_scanning" msgid="3760897655335759141">"Поиск"</string>
+    <!-- outdated translation 3760897655335759141 -->     <string name="progress_scanning" msgid="192587958424295789">"Поиск"</string>
+    <!-- no translation found for progress_tap_to_pair (4192342336107106334) -->
+    <skip />
+    <!-- no translation found for bluetooth_no_devices_found (2412462335116297668) -->
+    <skip />
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Запрос сопряжения Bluetooth"</string>
     <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>
@@ -130,6 +138,9 @@
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Приложение на телефоне запрашивает разрешение на включение режима постоянной видимости для других устройств с поддержкой Bluetooth. Разрешить?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Включается Bluetooth..."</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Автоматическое соединение"</string>
+    <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Запрос на подключение по каналу Bluetooth"</string>
+    <string name="bluetooth_connection_notif_message" msgid="1833221950512058309">"Нажмите, чтобы подключиться к устройству \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\""</string>
+    <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Подключиться к устройству \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Настройки даты и времени"</string>
     <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>
@@ -235,7 +246,7 @@
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Отключить все беспроводные соединения"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"Отключение беспроводных соединений..."</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"Включение беспроводных соединений..."</string>
-    <string name="radio_controls_title" msgid="5868688473587168882">"Беспроводные сети"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Ещё..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Беспроводные сети"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"Wi-Fi, Bluetooth, режим полета, мобильные сети и VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Интернет-роуминг"</string>
@@ -271,8 +282,8 @@
     <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">"Местоположение и защита"</string>
-    <string name="location_security_settings_title" msgid="4624434296446625554">"Местоположение и защита устройства"</string>
+    <string name="location_settings_title" msgid="8935806698251432196">"Службы геопозиционирования"</string>
+    <string name="security_settings_title" msgid="7945465324818485460">"Безопасность"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Настройка функции \"Мое местоположение\", разблокировка экрана и блокировка хранилища регистрационных данных"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Настройка функции \"Мое местоположение\", разблокировка экрана и блокировка хранилища регистрационных данных"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Пароли"</string>
@@ -316,7 +327,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>
@@ -375,8 +386,8 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Просмотрите или отключите администраторов устройств"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Включить Bluetooth"</string>
-    <string name="bluetooth_settings" msgid="2725796451253089609">"Настройки Bluetooth"</string>
-    <string name="bluetooth_settings_title" msgid="2824020086246268296">"Настройки Bluetooth"</string>
+    <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
+    <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Настройка подключений, видимости и имени устройства"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Запрос сопряжения Bluetooth"</string>
     <string name="bluetooth_enter_pin_msg" msgid="1499285355129256289">\n"Введите PIN-код для сопряжения с устройством <xliff:g id="DEVICE_NAME">%1$s</xliff:g> (попробуйте 0000 или 1234). Может понадобиться ввести этот же PIN-код на устройстве Bluetooth."</string>
@@ -394,7 +405,10 @@
     <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>
+    <!-- no translation found for bluetooth_search_for_devices (5957007154213560390) -->
+    <skip />
+    <!-- no translation found for bluetooth_searching_for_devices (9203739709307871727) -->
+    <skip />
     <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>
@@ -404,6 +418,10 @@
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Отменить сопряжение"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Отключить и отменить сопряжение"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Параметры..."</string>
+    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Расширенные"</string>
+    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Расш. настройки Bluetooth"</string>
+    <string name="bluetooth_advanced_settings_label" msgid="8659717781212434173">"Расш.настр.Bluetooth"</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="3631028334811113629">"Включите Bluetooth, чтобы увидеть доступные устройства"</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>
@@ -445,27 +463,31 @@
     <string name="nfc_toggle_error" msgid="2233172102497535522">"Произошла ошибка."</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Включить Wi-Fi"</string>
-    <string name="wifi_settings" msgid="4746946030627213196">"Настройки Wi-Fi"</string>
+    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="2810363951104753710">"Настройки Wi-Fi"</string>
+    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Настройка и управление точками доступа беспроводной сети"</string>
-    <string name="wifi_starting" msgid="6710266609710860129">"Включение..."</string>
-    <string name="wifi_stopping" msgid="5952909472548218348">"Отключение..."</string>
+    <string name="wifi_starting" msgid="7732330327758522943">"Включение Wi-Fi..."</string>
+    <string name="wifi_stopping" msgid="244864762599017659">"Отключение Wi-Fi..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"Ошибка"</string>
     <string name="wifi_in_airplane_mode" msgid="7618393787965366655">"В режиме полета"</string>
     <string name="wifi_fail_to_scan" msgid="6194542252808587669">"Не удалось выполнить поиск сети"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Уведомления о сетях"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Сообщать при обнаружении открытой сети"</string>
+    <string name="wifi_enable_watchdog_service" msgid="4723544454066601706">"Проверка подключения Wi-Fi"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="8687400936839455926">"Поиск и решение возможных проблем подключения к сети"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Правила отключения от сети Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"При каких условиях переключаться с Wi-Fi на сотовую сеть"</string>
     <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" msgid="6234851776910938957">"Добавить сеть"</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>
     <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_empty_list_wifi_off" msgid="3682507011071029311">"Включите Wi-Fi, чтобы увидеть доступные сети"</string>
     <string name="wifi_network_setup" msgid="7974851890019344870">"Настройка сети"</string>
     <string name="wifi_wps_pin" msgid="5471842298708321115">"Введите PIN-код точки доступа"</string>
     <string name="wifi_wps_setup_title" msgid="150518971269252336">"Настройки WPS"</string>
@@ -501,13 +523,13 @@
     <string name="wifi_save" msgid="3331121567988522826">"Сохранить"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Отмена"</string>
     <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"Запущен еще один сеанс WPS. Повторите попытку через несколько минут."</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Дополнительные функции"</string>
+    <!-- outdated translation 5419052271935350999 -->     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Дополнительные функции"</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>
-    <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"Настройки IP"</string>
+    <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Настройки IP"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Сохранить"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Отмена"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Введите действительный IP-адрес."</string>
@@ -525,7 +547,7 @@
     <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>"</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>
+    <string name="display_settings_title" msgid="1708697328627382561">"Экран"</string>
     <string name="sound_settings" msgid="5007659014828162881">"Настройки звука"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Режим без звука"</string>
     <string name="silent_mode_summary" msgid="3309650676072917899">"Отключить все звуки, кроме мультимедиа и будильника"</string>
@@ -598,7 +620,18 @@
     <string name="brightness_summary" msgid="838917350127550703">"Настроить яркость экрана"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Тайм-аут"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Экран отключится автоматически после <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Обои"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Экранные заставки"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Экранные заставки и другие настройки режима ожидания"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Выбранная заставка"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Время до активации"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"После простоя (<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>)"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Никогда"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Попробуйте!"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Автонастройка"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Размер шрифта"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Размер шрифтов"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Выберите размер шрифта"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Настройки блокировки SIM-карты"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Настроить блокировку"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Блокировка SIM-карты"</string>
@@ -643,8 +676,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>
@@ -696,6 +730,16 @@
     <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 storage_menu_usb (1580545228584324704) -->
+    <skip />
+    <!-- no translation found for storage_title_usb (5775322159427546546) -->
+    <skip />
+    <!-- no translation found for usb_label_mtp (4157227401755543412) -->
+    <skip />
+    <!-- no translation found for usb_label_ptp (7417254019489575819) -->
+    <skip />
+    <!-- no translation found for usb_label_installer_cd (7438467574756086977) -->
+    <skip />
     <string name="battery_status_title" msgid="9159414319574976203">"Состояние батареи"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Уровень заряда батареи"</string>
     <string name="apn_settings" msgid="3743170484827528406">"Точки доступа (APN)"</string>
@@ -806,6 +850,8 @@
     <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>
+    <string name="wireless_category_general" msgid="2973810407987118067">"Основные"</string>
+    <string name="wireless_category_mobile_networks" msgid="1254629216798424288">"Мобильные сети"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Мобильная сеть"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Настройка параметров роуминга, сетей и точек доступа (APN)"</string>
     <string name="location_title" msgid="1029961368397484576">"Мое местоположение"</string>
@@ -883,7 +929,7 @@
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Безопасность планшетного ПК"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Обеспечение безопасности телефона"</string>
     <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"Создайте графический ключ разблокировки экрана, и никто, кроме вас, не сможет воспользоваться вашим планшетом. Для этого соедините в произвольном порядке не менее четырех точек. "\n\n"Чтобы начать, нажмите \"Далее\"."</string>
-    <string name="lock_intro_message" product="default" msgid="9100785646737118042"><font size="17">"Защитите телефон от несанкционированного использования, создав собственный графический ключ разблокировки экрана. "\n<font height="17">\n</font><b>"1"</b>"  На следующем экране показан пример вычерчивания ключа. "\n<font height="17">\n</font><b>"3"</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>
+    <!-- outdated translation 3692151094288835065 -->     <string name="lock_intro_message" product="default" msgid="5796785892741212873">"Создайте графический ключ разблокировки экрана, и никто, кроме вас, не сможет воспользоваться вашим планшетом. Для этого соедините в произвольном порядке не менее четырех точек. "\n\n"Чтобы начать, нажмите \"Далее\"."</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Управление приложениями"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Управление установленными приложениями и их удаление"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Приложения"</string>
@@ -893,6 +939,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>
@@ -905,9 +953,10 @@
     <string name="force_stop" msgid="7435006169872876756">"Остановить"</string>
     <string name="total_size_label" msgid="1048676419552557254">"Всего"</string>
     <string name="application_size_label" msgid="5055196275624686382">"Приложение"</string>
+    <string name="external_code_size_label" msgid="3459343140355961335">"Приложение USB-накопителя"</string>
     <string name="data_size_label" msgid="8679376373625710107">"Данные"</string>
-    <string name="external_size_label" product="nosdcard" msgid="4465530017830945766">"USB-накопитель"</string>
-    <string name="external_size_label" product="default" msgid="2107155737635944440">"SD-карта"</string>
+    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Данные USB-накопителя"</string>
+    <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD-карта"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Удалить"</string>
     <string name="disable_text" msgid="6544054052049395202">"Отключить"</string>
     <string name="enable_text" msgid="9217362512327828987">"Включить"</string>
@@ -1026,7 +1075,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 +1085,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>
@@ -1066,7 +1117,7 @@
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Настройки экранной клавиатуры"</string>
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Физическая клавиатура"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Настройки физической клавиатуры"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Разработка"</string>
+    <string name="development_settings_title" msgid="215179176067683667">"Параметры разработчиков"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"Настройка параметров для разработки приложений"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Отладка по USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Включить режим отладки при подключении к компьютеру по USB"</string>
@@ -1091,14 +1142,14 @@
     <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="toggle_large_text_title" msgid="42259643359869436">"Большой текст"</string>
     <string name="accessibility_services_category" msgid="8127851026323672607">"Службы специальных возможностей"</string>
+    <string name="toggle_accessibility_title" msgid="7338739354952553958">"Разрешить службы специальных возможностей"</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 Маркета."\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">"Разрешить приложениям загружать скрипты доступности"</string>
     <string name="accessibility_script_injection_security_warning" product="tablet" msgid="1113600871264359828">"Некоторые приложения могут запрашивать у Google загрузку на планшетный ПК скриптов, чтобы сделать свое содержание более доступным. Вы хотите разрешить Google устанавливать эти скрипты на планшетный ПК?"</string>
@@ -1106,10 +1157,11 @@
     <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>
-    <string name="power_usage_summary_title" msgid="5180282911164282324">"Расход заряда батареи"</string>
+    <string name="power_usage_summary_title" msgid="7190304207330319919">"Батарея"</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>
@@ -1218,6 +1270,8 @@
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Настройки <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> вкл."</string>
     <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>: отключено"</string>
+    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Настройки синтеза"</string>
+    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Настройки <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"Языки и голос"</string>
     <string name="pico_installed" msgid="2452546687858267414">"Установлено"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"Не установлено"</string>
@@ -1228,114 +1282,33 @@
     <string name="gadget_title" msgid="7455548605888590466">"Управление питанием"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Обновление настроек Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Обновление настроек Bluetooth"</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">"Сертификат ЦС"</string>
-    <string name="vpn_ca_certificate" msgid="465085144064264742">"Сертификат центра сертификации"</string>
-    <string name="vpn_a_ca_certificate" msgid="3374242520974884295">"сертификат центра сертификации"</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">"Cервер 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">"Настройка и управление виртуальными частными сетями (VPN)"</string>
-    <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="trusted_credentials" msgid="4266945289534242402">"Надежные учетные данные"</string>
+    <string name="trusted_credentials_summary" msgid="6735221351155686632">"Показывать надежные сертификаты ЦС"</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>
-    <string name="privacy_settings_title" msgid="1987089301293213705">"Восстановление данных и настроек"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"Резервное копирование и сброс"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"Резервное копирование и сброс"</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>
@@ -1439,4 +1412,107 @@
     <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>
+    <!-- no translation found for debug_ui_category (9023948280291055349) -->
+    <skip />
+    <!-- no translation found for strict_mode (1938795874357830695) -->
+    <skip />
+    <!-- no translation found for strict_mode_summary (142834318897332338) -->
+    <skip />
+    <!-- no translation found for pointer_location (6084434787496938001) -->
+    <skip />
+    <!-- no translation found for pointer_location_summary (840819275172753713) -->
+    <skip />
+    <!-- no translation found for show_screen_updates (8282711794220426931) -->
+    <skip />
+    <!-- no translation found for show_screen_updates_summary (1716122382094924596) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage (2389212910758076024) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage_summary (2113341923988958266) -->
+    <skip />
+    <!-- no translation found for window_animation_scale_title (6162587588166114700) -->
+    <skip />
+    <!-- no translation found for transition_animation_scale_title (387527540523595875) -->
+    <skip />
+    <!-- no translation found for debug_applications_category (6221644998451283813) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities (3622005081180597749) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities_summary (3592221124808773368) -->
+    <skip />
+    <!-- no translation found for app_process_limit_title (4121324758038197598) -->
+    <skip />
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Передача данных"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"Цикл использования данных"</string>
+    <string name="data_usage_menu_split_4g" msgid="7417435609285381968">"Показать трафик по 4G отдельно"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Показать трафик Wi-Fi"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"Изменить цикл…"</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"День месяца, когда сбрасывается цикл использования данных:"</string>
+    <string name="data_usage_disable_mobile_limit" msgid="289740911281022322">"Откл. моб. Интернет при лимите"</string>
+    <string name="data_usage_disable_4g_limit" msgid="5808210773758699800">"Откл. передачу по 4G при лимите"</string>
+    <string name="data_usage_disable_3g_limit" msgid="3856971004328238231">"Откл. моб. Инт. 2G/3G при лимите"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_mobile" msgid="454140350007299045">"Мобильный"</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">"Мобильная передача данных"</string>
+    <string name="data_usage_enable_3g" msgid="6304006671869578254">"Передача данных по сетям 2G/3G"</string>
+    <string name="data_usage_enable_4g" msgid="3635854097335036738">"Передача данных 4G"</string>
+    <string name="data_usage_app_settings" msgid="3727561362090820369">"Настройки приложения"</string>
+    <string name="data_usage_app_restrict_background" msgid="8856643905291165256">"Ограничивать фоновый режим"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="1503361245973512092">"Использовать фоновый режим только при безлимитном подключении"</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="8110736468987743260">"Ограничение фонового режима"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="100001698378554777">"Эта функция может негативно повлиять на приложения, которые используют фоновый режим обмена данными."\n" "\n"Возможно, в настройках этого приложения есть более подходящие средства управления объемом трафика."</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Дата сброса цикла использования"</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Число каждого месяца:"</string>
+    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Сохранить"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Объем трафика ограничен"</string>
+    <string name="data_usage_limit_dialog_mobile" msgid="7931094451923591578">"По достижении лимита трафика передача данных по мобильной сети будет отключена."\n" "\n" Во избежание дополнительных расходов старайтесь не достигать этого лимита, так как оператор и ваше устройство могут по-разному учитывать трафик."</string>
+    <string name="data_usage_limit_dialog_3g" msgid="5478553071420316963">"По достижении лимита трафика передача данных по сетям 2G/3G будет отключена."\n\n"Во избежание дополнительных расходов старайтесь не достигать этого лимита, так как оператор и ваше устройство могут по-разному учитывать трафик."</string>
+    <string name="data_usage_limit_dialog_4g" msgid="6134008906742403777">"По достижении лимита трафика передача данных по сетям 4G будет отключена."\n\n"Во избежание дополнительных расходов старайтесь не достигать этого лимита, так как оператор и ваше устройство могут по-разному учитывать трафик."</string>
+    <string name="data_usage_disabled_dialog_3g_title" msgid="4221584306492812040">"Передача данных 2G/3G отключена"</string>
+    <string name="data_usage_disabled_dialog_4g_title" msgid="715585612162185936">"Передача данных 4G отключена"</string>
+    <string name="data_usage_disabled_dialog_mobile_title" msgid="209516216265000221">"Мобильный Интернет отключен"</string>
+    <string name="data_usage_disabled_dialog" msgid="2874031671067845964">"Достигнут лимит трафика."\n\n"За загрузку дополнительных данных оператор может взимать плату."</string>
+    <string name="data_usage_disabled_dialog_enable" msgid="2441219164620753329">"Восстановить подключение"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="12">"Внимание!"</font>\n<font size="32">"<xliff:g id="NUMBER">%1$s</xliff:g>"</font>" "<font size="12">"<xliff:g id="UNIT">%2$s</xliff:g>"</font></string>
+    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Вызов службы экстренной помощи"</string>
+    <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Вернуться к вызову"</string>
+    <string name="vpn_name" msgid="4689699885361002297">"Название сети"</string>
+    <string name="vpn_type" msgid="5435733139514388070">"Тип"</string>
+    <string name="vpn_server" msgid="2123096727287421913">"Адрес сервера"</string>
+    <string name="vpn_mppe" msgid="6639001940500288972">"Шифрование PPP (MPPE)"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"Ключ L2TP"</string>
+    <string name="vpn_ipsec_identifier" msgid="4098175859460006296">"Идентификатор IPSec"</string>
+    <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Общий ключ IPSec"</string>
+    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"Сертификат пользователя IPSec"</string>
+    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"Сертификат ЦС IPSec"</string>
+    <!-- no translation found for vpn_search_domains (5391995501541199624) -->
+    <skip />
+    <!-- no translation found for vpn_routes (8556236801755260073) -->
+    <skip />
+    <string name="vpn_username" msgid="1863901629860867849">"Имя пользователя"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Пароль"</string>
+    <!-- no translation found for vpn_save_login (6350322456427484881) -->
+    <skip />
+    <!-- no translation found for vpn_not_used (9094191054524660891) -->
+    <skip />
+    <string name="vpn_no_ca_cert" msgid="7820884983947090538">"(не проверять сервер)"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"Отмена"</string>
+    <string name="vpn_save" msgid="4233484051644764510">"Сохранить"</string>
+    <string name="vpn_connect" msgid="8469608541746132301">"Подключиться"</string>
+    <string name="vpn_edit" msgid="1111459297288136079">"Изменение сети VPN"</string>
+    <string name="vpn_connect_to" msgid="7328758950427515753">"Подключиться к сети <xliff:g id="NETWORK">%s</xliff:g>"</string>
+    <string name="vpn_title" msgid="7982620762043790565">"Настройки VPN"</string>
+    <string name="vpn_create" msgid="8966010925994175306">"Добавить сеть VPN"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"Изменить сеть"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"Удалить сеть"</string>
+    <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Система"</string>
+    <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Пользователь"</string>
+    <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Отключить"</string>
+    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Включить"</string>
+    <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Удалить"</string>
+    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Включить сертификат ЦС системы?"</string>
+    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Отключить сертификат ЦС системы?"</string>
+    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Полностью удалить сертификат ЦС пользователя?"</string>
 </resources>
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index 0c38bf1..5b9d4bf 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>
@@ -214,4 +240,36 @@
     <item msgid="3878793616631049349">"Použiť kontrolu HDCP len pre obsah DRM"</item>
     <item msgid="45075631231212732">"Vždy používať kontrolu HDCP"</item>
   </string-array>
+    <!-- no translation found for window_animation_scale_entries:0 (8134156599370824081) -->
+    <!-- no translation found for window_animation_scale_entries:1 (6624864048416710414) -->
+    <!-- no translation found for window_animation_scale_entries:2 (2219332261255416635) -->
+    <!-- no translation found for window_animation_scale_entries:3 (3544428804137048509) -->
+    <!-- no translation found for window_animation_scale_entries:4 (3110710404225974514) -->
+    <!-- no translation found for window_animation_scale_entries:5 (4402738611528318731) -->
+    <!-- no translation found for window_animation_scale_entries:6 (6189539267968330656) -->
+    <!-- no translation found for transition_animation_scale_entries:0 (8464255836173039442) -->
+    <!-- no translation found for transition_animation_scale_entries:1 (3375781541913316411) -->
+    <!-- no translation found for transition_animation_scale_entries:2 (1991041427801869945) -->
+    <!-- no translation found for transition_animation_scale_entries:3 (4012689927622382874) -->
+    <!-- no translation found for transition_animation_scale_entries:4 (3289156759925947169) -->
+    <!-- no translation found for transition_animation_scale_entries:5 (7705857441213621835) -->
+    <!-- no translation found for transition_animation_scale_entries:6 (6660750935954853365) -->
+    <!-- no translation found for app_process_limit_entries:0 (6799596560242275471) -->
+    <!-- no translation found for app_process_limit_entries:1 (2412794376818632575) -->
+    <!-- no translation found for app_process_limit_entries:2 (1578904888612645001) -->
+    <!-- no translation found for app_process_limit_entries:3 (8819235336299873577) -->
+  <string-array name="vpn_types_long">
+    <item msgid="2732002039459078847">"VPN s protokolom PPTP"</item>
+    <item msgid="3799752201662127867">"Sieť VPN založená na protokole L2TP/IPSec s predzdieľanými kľúčmi"</item>
+    <item msgid="4725504331295252103">"L2TP/IPSec VPN s certifikátmi"</item>
+    <item msgid="7526551163264034377">"IPSec VPN s predzdieľanými kľúčmi a overením Xauth"</item>
+    <item msgid="8064740940687465039">"IPSec VPN s certifikátmi a overením Xauth"</item>
+    <item msgid="4946199982372391490">"IPSec VPN s certifikátmi a hybridným overením"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:0 (8621078286418985762) -->
+    <!-- no translation found for vpn_states:1 (6692305604213080515) -->
+    <!-- no translation found for vpn_states:2 (8001704909356800092) -->
+    <!-- no translation found for vpn_states:3 (4039737283841672166) -->
+    <!-- no translation found for vpn_states:4 (4042143101664725090) -->
+    <!-- no translation found for vpn_states:5 (2690164254699635531) -->
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 832d648..1d498a9 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -19,6 +19,10 @@
     <string name="yes" msgid="4676390750360727396">"Áno"</string>
     <string name="no" msgid="6731231425810196216">"Nie"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Neznáme"</string>
+    <string name="header_category_wireless_networks" msgid="4944823405420438623">"BEZDRÔTOVÉ PRIPOJENIE A SIETE"</string>
+    <string name="header_category_device" msgid="5781174212691167553">"ZARIADENIE"</string>
+    <string name="header_category_personal" msgid="6225932173498802187">"OSOBNÉ"</string>
+    <string name="header_category_system" msgid="2073558547468647128">"SYSTÉM"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Zapnúť rádio"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Vypnúť rádio"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Zobraziť adresár karty SIM"</string>
@@ -111,7 +115,11 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Párovanie..."</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"Spárované, ale nepripojené"</string>
     <string name="bluetooth_device" msgid="6873461446424952003">"Náhlavná súprava alebo handsfree"</string>
-    <string name="progress_scanning" msgid="3760897655335759141">"Vyhľadávanie"</string>
+    <!-- outdated translation 3760897655335759141 -->     <string name="progress_scanning" msgid="192587958424295789">"Vyhľadávanie"</string>
+    <!-- no translation found for progress_tap_to_pair (4192342336107106334) -->
+    <skip />
+    <!-- no translation found for bluetooth_no_devices_found (2412462335116297668) -->
+    <skip />
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Žiadosť o párovanie zariadenia Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Žiadosť na párovanie"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Povoliť párovanie so zariadením<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
@@ -130,6 +138,9 @@
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Aplikácia v telefóne požaduje povolenie na zapnutie pripojenia Bluetooth a nastavenie telefónu do viditeľného režimu. Chcete udeliť toto povolenie?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Prebieha zapínanie rozhrania Bluetooth..."</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Automaticky pripojiť"</string>
+    <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Žiadosť o pripojenie zariadenia Bluetooth"</string>
+    <string name="bluetooth_connection_notif_message" msgid="1833221950512058309">"K zariadeniu „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“ sa pripojíte dotykom"</string>
+    <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Chcete sa pripojiť k zariadeniu „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Nastavenia dátumu a času"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"13:00"</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
@@ -235,7 +246,7 @@
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Vypne všetky bezdrôtové pripojenia"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"Prebieha zakazovanie bezdrôtových pripojení..."</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"Povoľovanie bezdrôtových pripojení..."</string>
-    <string name="radio_controls_title" msgid="5868688473587168882">"Bezdrôtové pripojenie a siete"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Viac..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Bezdrôtové pripojenie a siete"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"Spravovať Wi-Fi, Bluetooth, režim V lietadle, mobilné siete a siete VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Dátové služby pri roamingu"</string>
@@ -271,8 +282,8 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Info. o vlastníkovi"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="2382525043173672857">"Zadajte text, kt. sa zobrazí na uzamk. obrazovke"</string>
-    <string name="security_settings_title" msgid="5168491784222013179">"Poloha a zabezpečenie"</string>
-    <string name="location_security_settings_title" msgid="4624434296446625554">"Nastavenia polohy a zabezpečenia"</string>
+    <string name="location_settings_title" msgid="8935806698251432196">"Služby na zisťovanie polohy"</string>
+    <string name="security_settings_title" msgid="7945465324818485460">"Zabezpečenie"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Moja poloha, odomknutie obrazovky, zámok SIM, zámok ukladacieho priestoru poverení"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Nastavenie funkcie Moje poloha, odomknutie obrazovky a zamknutie ukladacieho priestoru poverení"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Heslá"</string>
@@ -316,7 +327,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>
@@ -375,8 +386,8 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Zobraziť alebo deaktivovať správcov zariadenia"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Zapnúť Bluetooth"</string>
-    <string name="bluetooth_settings" msgid="2725796451253089609">"Nastavenia Bluetooth"</string>
-    <string name="bluetooth_settings_title" msgid="2824020086246268296">"Nastavenia Bluetooth"</string>
+    <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
+    <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Správa pripojenia, nastavenie názvu zariadenia a viditeľnosti"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Žiadosť o párovanie zariadenia Bluetooth"</string>
     <string name="bluetooth_enter_pin_msg" msgid="1499285355129256289">\n"Párovanie so zariadením „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“ spustíte zadaním kódu PIN (skúste zadať kód 0000 alebo 1234). Možno bude potrebné zadať v zariadení Bluetooth rovnaký kód PIN."</string>
@@ -394,7 +405,10 @@
     <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Párovanie odmietnuté zariadením <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"Počas pripájania k zariadeniu <xliff:g id="DEVICE_NAME">%1$s</xliff:g> sa vyskytol problém."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Vyhľadať zariadenia"</string>
-    <string name="bluetooth_preference_find_nearby_title" msgid="5087410003465463318">"Nájsť zariadenia v okolí"</string>
+    <!-- no translation found for bluetooth_search_for_devices (5957007154213560390) -->
+    <skip />
+    <!-- no translation found for bluetooth_searching_for_devices (9203739709307871727) -->
+    <skip />
     <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"Nastavenie zariadenia"</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Párované zariadenia"</string>
     <string name="bluetooth_preference_found_devices" msgid="3133019331974936204">"Nájdené zariadenia"</string>
@@ -404,6 +418,10 @@
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Zrušiť párovanie"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Odpojiť a zrušiť párovanie"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Možnosti…"</string>
+    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Rozšírené"</string>
+    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Rozšírené nastavenia Bluetooth"</string>
+    <string name="bluetooth_advanced_settings_label" msgid="8659717781212434173">"Rozšírené nastav. BT"</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="3631028334811113629">"Dostupné zariadenia zobrazíte zapnutím Bluetooth"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Pripojiť k…"</string>
     <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"Médiá"</string>
     <string name="bluetooth_profile_headset" msgid="81844079120986198">"Handsfree"</string>
@@ -445,27 +463,31 @@
     <string name="nfc_toggle_error" msgid="2233172102497535522">"Vyskytla sa chyba."</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Zapnúť Wi-Fi"</string>
-    <string name="wifi_settings" msgid="4746946030627213196">"Nastavenia Wi-Fi"</string>
+    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="2810363951104753710">"Nastavenia Wi-Fi"</string>
+    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Umožňuje nastaviť a spravovať prístupové body bezdrôtovej siete"</string>
-    <string name="wifi_starting" msgid="6710266609710860129">"Prebieha zapínanie..."</string>
-    <string name="wifi_stopping" msgid="5952909472548218348">"Prebieha vypínanie..."</string>
+    <string name="wifi_starting" msgid="7732330327758522943">"Prebieha zapínanie siete Wi-Fi..."</string>
+    <string name="wifi_stopping" msgid="244864762599017659">"Prebieha vypínanie siete Wi-Fi..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"Chyba"</string>
     <string name="wifi_in_airplane_mode" msgid="7618393787965366655">"V režime V lietadle"</string>
     <string name="wifi_fail_to_scan" msgid="6194542252808587669">"Siete sa nedajú vyhľadávať"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Upozornenie na sieť"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Oznamovať dostupné nezabezpečené siete"</string>
+    <string name="wifi_enable_watchdog_service" msgid="4723544454066601706">"Kontrola pripojení WiFi"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="8687400936839455926">"Zistiť a riešiť prípadné problémy s pripojením k sieti"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Pravidlá odpojenia siete Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Určiť, kedy prepnúť zo siete Wi-Fi na mobilný prenos údajov"</string>
     <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" msgid="6234851776910938957">"Pridať sieť"</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>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Pripojiť k sieti"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Odstrániť záznam siete"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Upraviť sieť"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="3682507011071029311">"Dostupné siete zobrazíte zapnutím Wi-Fi"</string>
     <string name="wifi_network_setup" msgid="7974851890019344870">"Nastavenie siete"</string>
     <string name="wifi_wps_pin" msgid="5471842298708321115">"Zadajte kód PIN z prístupového bodu"</string>
     <string name="wifi_wps_setup_title" msgid="150518971269252336">"Nastavenie WPS"</string>
@@ -501,13 +523,13 @@
     <string name="wifi_save" msgid="3331121567988522826">"Uložiť"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Zrušiť"</string>
     <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"Bola rozpoznaná ďalšia relácia WPS, skúste to znova o niekoľko minút"</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Rozšírené"</string>
+    <!-- outdated translation 5419052271935350999 -->     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Rozšírené"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Frekvenčné pásmo Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Uveďte prevádzkový frekvenčný rozsah"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Pri nast. pravidiel frekv. pásma nastal problém."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Adresa MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Adresa IP"</string>
-    <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"Nastavenia adresy IP"</string>
+    <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Nastavenia adresy IP"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Uložiť"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Zrušiť"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Zadajte platnú adresu IP."</string>
@@ -525,7 +547,7 @@
     <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"Prenosný prístupový bod Wi-Fi <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="sound_settings_title" msgid="8735891486683305886">"Zvuk"</string>
-    <string name="display_settings_title" msgid="2378894265964357591">"Obrazovka"</string>
+    <string name="display_settings_title" msgid="1708697328627382561">"Zobraziť"</string>
     <string name="sound_settings" msgid="5007659014828162881">"Nastavenia zvuku"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Tichý režim"</string>
     <string name="silent_mode_summary" msgid="3309650676072917899">"Stlmiť všetky zvuky okrem médií a budíkov"</string>
@@ -598,7 +620,18 @@
     <string name="brightness_summary" msgid="838917350127550703">"Nastavenia jasu obrazovky"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Časový limit"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Obrazovka sa automaticky vypne po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Tapeta"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Sny Android"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Šetriče obrazovky a ďalšie akcie pri nečinnosti"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Vybratý sen"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Čas aktivácie"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"Po nečinnosti <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Nikdy"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Skúsiť"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatický jas"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Veľkosť písma"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Celková veľkosť písiem"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Vyberte veľkosť písma"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Nastavenia zámky karty SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Nastavenia zámky karty SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Zámka karty SIM"</string>
@@ -643,8 +676,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>
@@ -696,6 +730,16 @@
     <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"Karta SD bude odpojená."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Odpájanie"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Prebieha odpájanie"</string>
+    <!-- no translation found for storage_menu_usb (1580545228584324704) -->
+    <skip />
+    <!-- no translation found for storage_title_usb (5775322159427546546) -->
+    <skip />
+    <!-- no translation found for usb_label_mtp (4157227401755543412) -->
+    <skip />
+    <!-- no translation found for usb_label_ptp (7417254019489575819) -->
+    <skip />
+    <!-- no translation found for usb_label_installer_cd (7438467574756086977) -->
+    <skip />
     <string name="battery_status_title" msgid="9159414319574976203">"Stav batérie"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Stav batérie"</string>
     <string name="apn_settings" msgid="3743170484827528406">"Názvy prístupových bodov (APN)"</string>
@@ -806,6 +850,8 @@
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"Max. počet zariad. na zdieľ. dát. pripoj.: <xliff:g id="MAXCONNECTION">%1$d</xliff:g>"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Ukončí sa zdieľané dát. pripojenie zariad. <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Pomocník"</string>
+    <string name="wireless_category_general" msgid="2973810407987118067">"Všeobecné"</string>
+    <string name="wireless_category_mobile_networks" msgid="1254629216798424288">"Mobilné siete"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobilné siete"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Možnosti nastavenia roamingu, sietí a názvov prístupových bodov (APN)"</string>
     <string name="location_title" msgid="1029961368397484576">"Moja poloha"</string>
@@ -883,7 +929,7 @@
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Zabezpečenie vášho tabletu"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Zabezpečenie telefónu"</string>
     <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"Chráňte svoj tablet pred neoprávneným použitím vytvorením osobného vzoru na odomknutie obrazovky. Na ďalšej obrazovke pospájajte prstom body v ľubovoľnom poradí. Musíte spojiť aspoň štyri body. "\n\n"Ak ste pripravený/-á začať, dotknite sa tlačidla Ďalej."</string>
-    <string name="lock_intro_message" product="default" msgid="9100785646737118042"><font size="17">"Vytvorte si osobný bezpečnostný vzor a chráňte tak svoj telefón pred nepovoleným použitím. "\n<font height="17">\n</font><b>"1"</b>"  Čakajte, kým sa na ďalšom snímku nenakreslí príklad takého vzoru. "\n<font height="17">\n</font><b>"2"</b>"  Keď budete pripravení, nakreslite svoj osobný bezpečnostný vzor. Vyskúšajte viac vzorov, ale vždy spojte aspoň štyri bodky. "\n<font height="17">\n</font><b>"3"</b>"  Opakujte vzor a tým ho potvrďte. "\n<font height="17">\n</font><b>"Ste pripravení začať? Dotknite sa tlačidla „Ďalej“ "</b>". "\n<font height="3">\n</font>"Ak chcete ponechať telefón nechránený, dotknite sa tlačidla „Zrušiť“."</font></string>
+    <!-- outdated translation 3692151094288835065 -->     <string name="lock_intro_message" product="default" msgid="5796785892741212873">"Chráňte svoj tablet pred neoprávneným použitím vytvorením osobného vzoru na odomknutie obrazovky. Na ďalšej obrazovke pospájajte prstom body v ľubovoľnom poradí. Musíte spojiť aspoň štyri body. "\n\n"Ak ste pripravený/-á začať, dotknite sa tlačidla Ďalej."</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Správa aplikácií"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Správa a odstraňovanie nainštalovaných aplikácií"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Aplikácie"</string>
@@ -893,6 +939,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>
@@ -905,9 +953,10 @@
     <string name="force_stop" msgid="7435006169872876756">"Vynútiť zastavenie"</string>
     <string name="total_size_label" msgid="1048676419552557254">"Celkom"</string>
     <string name="application_size_label" msgid="5055196275624686382">"Aplikácia"</string>
+    <string name="external_code_size_label" msgid="3459343140355961335">"Aplikácia ukladací priestor USB"</string>
     <string name="data_size_label" msgid="8679376373625710107">"Údaje"</string>
-    <string name="external_size_label" product="nosdcard" msgid="4465530017830945766">"Ukladací priestor USB"</string>
-    <string name="external_size_label" product="default" msgid="2107155737635944440">"Karta SD"</string>
+    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Údaje ukladacieho priestoru USB"</string>
+    <string name="external_data_size_label" product="default" msgid="626414192825329708">"Karta SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Odinštalovať"</string>
     <string name="disable_text" msgid="6544054052049395202">"Zakázať"</string>
     <string name="enable_text" msgid="9217362512327828987">"Povoliť"</string>
@@ -1026,7 +1075,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 +1085,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>
@@ -1066,7 +1117,7 @@
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Nastavenia klávesnice na obrazovke"</string>
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Fyzická klávesnica"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Nastavenia fyzickej klávesnice"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Vývoj"</string>
+    <string name="development_settings_title" msgid="215179176067683667">"Možnosti pre vývojárov"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"Možnosti nastavenia vývoja aplikácií"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Ladenie USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Povoliť režim ladenia s pripojeným zariadením USB"</string>
@@ -1091,14 +1142,14 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Uľahčenie prístupu"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Nastavenia uľahčenia prístupu"</string>
     <string name="accessibility_settings_summary" msgid="8185181964847149507">"Možnosti správy uľahčenia prístupu"</string>
-    <string name="toggle_accessibility_title" msgid="650839277066574497">"Uľahčenie prístupu"</string>
+    <string name="toggle_large_text_title" msgid="42259643359869436">"Veľké písmo"</string>
     <string name="accessibility_services_category" msgid="8127851026323672607">"Služby uľahčenia prístupu"</string>
+    <string name="toggle_accessibility_title" msgid="7338739354952553958">"Povoliť služby uľahčenia prístupu"</string>
     <string name="no_accessibility_services_summary" msgid="694578333333808159">"Nie sú nainštalované žiadne služby uľahčenia prístupu."</string>
     <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Táto služba uľahčenia prístupu môže zhromažďovať všetok text, ktorý napíšete, vrátane osobných údajov a čísiel kreditných kariet (nie však heslá). Môže tiež ukladať interakcie s používateľským rozhraním. Služba je používaná aplikáciou <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Chcete použiť túto službu uľahčenia prístupu?"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Zakázať uľahčenie prístupu?"</string>
     <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"Nenašli sa žiadne aplikácie, týkajúce sa uľahčenia prístupu"</string>
     <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"Nie sú nainštalované žiadne aplikácie týkajúce sa uľahčenia prístupu."\n\n"Prostredníctvom služby Android Market môžete do svojho zariadenia prevziať čítačku obrazovky."\n\n"Kliknutím na tlačidlo OK čítačku obrazovky nainštalujete."</string>
-    <string name="accessibility_script_injection_category" msgid="8649951751131431904">"Skripty na uľahčenie prístupu"</string>
     <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"Skripty na uľahčenie prístupu"</string>
     <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"Povoliť aplikáciám preberať z Google skripty na uľahč. prístupu."</string>
     <string name="accessibility_script_injection_security_warning" product="tablet" msgid="1113600871264359828">"Niektoré aplikácie môžu požiadať službu Google o prevzatie skriptov do tabletu, čo uľahčí prístup k obsahu danej aplikácie. Naozaj chcete službe Google povoliť, aby do tabletu nainštalovala skripty na uľahčenie prístupu?"</string>
@@ -1106,10 +1157,11 @@
     <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>
-    <string name="power_usage_summary_title" msgid="5180282911164282324">"Využitie batérie"</string>
+    <string name="power_usage_summary_title" msgid="7190304207330319919">"Batéria"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Čo využíva batériu"</string>
     <string name="power_usage_not_available" msgid="3583407442633768046">"Údaje o spotrebe sú nedostup."</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Využitie batérie od odpojenia"</string>
@@ -1218,6 +1270,8 @@
     <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>
+    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Nastavenia nástroja"</string>
+    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Nastavenia pre nástroj <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
     <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>
@@ -1228,114 +1282,33 @@
     <string name="gadget_title" msgid="7455548605888590466">"Ovládanie napájania"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Prebieha aktualizácia nastavenia Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Prebieha aktualizácia nastavenia Bluetooth"</string>
-    <string name="vpn_settings_activity_title" msgid="7276864950701612579">"Nastavenia siete VPN"</string>
-    <string name="vpn_connect_to" msgid="2541409082892684362">"Pripojiť k sieti <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpn_username_colon" msgid="7854930370861306247">"Používateľské meno:"</string>
-    <string name="vpn_password_colon" msgid="5716278710848606626">"Heslo:"</string>
-    <string name="vpn_a_username" msgid="6664733641993968692">"používateľské meno"</string>
-    <string name="vpn_a_password" msgid="1537213632501483753">"heslo"</string>
-    <string name="vpn_save_username" msgid="1408415289165970790">"Zapamätať používateľské meno"</string>
-    <string name="vpn_connect_button" msgid="1699007212602470655">"Pripojiť"</string>
-    <string name="vpn_yes_button" msgid="8034531001149843119">"Áno"</string>
-    <string name="vpn_no_button" msgid="7620339571187119107">"Nie"</string>
-    <string name="vpn_back_button" msgid="192036339792734970">"Späť"</string>
-    <string name="vpn_mistake_button" msgid="1683383660912491270">"Nie"</string>
-    <string name="vpn_menu_done" msgid="93528279226907926">"Uložiť"</string>
-    <string name="vpn_menu_cancel" msgid="7234451214611202868">"Zrušiť"</string>
-    <string name="vpn_menu_revert" msgid="4407762442281467659">"Vrátiť"</string>
-    <string name="vpn_menu_connect" msgid="1089399414463784218">"Pripojiť k sieti"</string>
-    <string name="vpn_menu_disconnect" msgid="8254492450022562235">"Odpojiť od siete"</string>
-    <string name="vpn_menu_edit" msgid="4526245173583195618">"Upraviť sieť"</string>
-    <string name="vpn_menu_delete" msgid="3326527392609513129">"Odstrániť sieť"</string>
-    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"Musíte zadať <xliff:g id="CODE">%s</xliff:g>."</string>
-    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"Musíte vybrať možnosť <xliff:g id="OPTION">%s</xliff:g>."</string>
-    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"Názov siete VPN „<xliff:g id="NAME">%s</xliff:g>“ už existuje. Zvoľte iný názov."</string>
-    <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"Naozaj chcete odstrániť túto sieť VPN?"</string>
-    <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"Naozaj nechcete vytvoriť tento profil?"</string>
-    <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"Naozaj chcete zrušiť zmeny vykonané v tomto profile?"</string>
-    <string name="vpn_confirm_reconnect" msgid="5748535476278674296">"K sieti sa nedá pripojiť. Chcete to skúsiť znova?"</string>
-    <string name="vpn_reconnect_from_lost" msgid="2442844155623372118">"Pripojenie bolo prerušené. Chcete sa znova pripojiť?"</string>
-    <string name="vpn_unknown_server_dialog_msg" msgid="3080742299823671319">"Názov servera sa nepodarilo preložiť. Chcete skontrolovať nastavenia názvu servera?"</string>
-    <string name="vpn_challenge_error_dialog_msg" msgid="6174901754230038601">"Chyba odvolania. Chcete skontrolovať svoje tajné nastavenie?"</string>
-    <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"V konfigurácii tejto siete VPN chýba niekoľko tajných nastavení. Chcete skontrolovať svoje tajné nastavenie?"</string>
-    <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"Zadané používateľské meno alebo heslo je nesprávne. Chcete to skúsiť znova?"</string>
-    <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"Server ukončil spojenie. Zadané používateľské meno alebo heslo je možno nesprávne. Chcete to skúsiť znova?"</string>
-    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"Server zavesil. Je možné, že máte spustenú bránu firewall, ktorá bráni pripojeniu na server. Chcete to skúsiť znova?"</string>
-    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"Vyjednávanie so serverom bolo neúspešné. Server možno nedokáže pracovať s nastavenou možnosťou šifrovania. Chcete skontrolovať nastavenie šifrovania?"</string>
-    <string name="vpn_type_title" msgid="6392933604218676224">"Pridať sieť VPN"</string>
-    <string name="vpn_add_new_vpn" msgid="5438260689052714550">"Pridať sieť VPN"</string>
-    <string name="vpn_details_title" msgid="418806440938510331">"Podrobnosti siete VPN"</string>
-    <string name="vpn_edit_title_add" msgid="2121313217989682890">"Pridať sieť VPN <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"Podrobnosti pripojenia <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpns" msgid="3148141862835492816">"Siete VPN"</string>
-    <string name="vpn_connecting" msgid="8039521381692090116">"Prebieha pripájanie..."</string>
-    <string name="vpn_disconnecting" msgid="7748050200708257066">"Prebieha odpájanie..."</string>
-    <string name="vpn_connected" msgid="7641723116362845781">"Pripojené"</string>
-    <string name="vpn_connect_hint" msgid="7442898962925875181">"Pripojiť k sieti"</string>
-    <string name="vpn_name" msgid="1550918148476193076">"Názov siete VPN"</string>
-    <string name="vpn_a_name" msgid="8445736942405283509">"názov siete VPN"</string>
-    <string name="vpn_profile_added" msgid="9061017910337129840">"Položka „<xliff:g id="NAME">%s</xliff:g>“ je pridaná"</string>
-    <string name="vpn_profile_replaced" msgid="587435576816273815">"V profile <xliff:g id="NAME">%s</xliff:g> prebiehajú zmeny"</string>
-    <string name="vpn_user_certificate_title" msgid="6812545893924071742">"Nastaviť certifikát používateľa"</string>
-    <string name="vpn_user_certificate" msgid="949322691686938888">"Certifikát používateľa"</string>
-    <string name="vpn_a_user_certificate" msgid="8943983437956898649">"certifikát používateľa"</string>
-    <string name="vpn_ca_certificate_title" msgid="7846466160795589985">"Nastaviť certifikát CA"</string>
-    <string name="vpn_ca_certificate" msgid="465085144064264742">"Certifikát certifikačnej autority (CA)"</string>
-    <string name="vpn_a_ca_certificate" msgid="3374242520974884295">"certifikát CA"</string>
-    <string name="vpn_l2tp_secret_string_title" msgid="5039677186748940987">"Nastaviť tajný kľúč L2TP"</string>
-    <string name="vpn_l2tp_secret" msgid="529359749677142076">"Tajný kľúč L2TP"</string>
-    <string name="vpn_a_l2tp_secret" msgid="6612042930810981845">"tajný kľúč L2TP"</string>
-    <string name="vpn_pptp_encryption_title" msgid="2236795167467896499">"šifrovanie"</string>
-    <string name="vpn_pptp_encryption" msgid="2602329949737259686">"Šifrovanie PPTP"</string>
-    <string name="vpn_ipsec_presharedkey_title" msgid="2184060087690539175">"Nastaviť predzdieľaný kľúč IPSec"</string>
-    <string name="vpn_ipsec_presharedkey" msgid="5434316521616673741">"Predzdieľaný kľúč IPSec"</string>
-    <string name="vpn_a_ipsec_presharedkey" msgid="1255301923217898418">"predzdieľaný kľúč IPSec"</string>
-    <string name="vpn_vpn_server_title" msgid="8897005887420358913">"Nastaviť server siete VPN"</string>
-    <string name="vpn_vpn_server" msgid="1141754908824209260">"Server siete VPN"</string>
-    <string name="vpn_a_vpn_server" msgid="5960906152125045853">"server siete VPN"</string>
-    <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"Názov servera siete VPN"</string>
-    <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"Vyhľadávacie domény DNS"</string>
-    <string name="vpn_dns_search_list" msgid="4230034234026605360">"Vyhľadávacie domény DNS"</string>
-    <string name="vpn_field_is_set" msgid="7137320847812992243">"Hodnota <xliff:g id="VALUE">%s</xliff:g> je nastavená"</string>
-    <string name="vpn_field_not_set" msgid="2972519243515893804">"Hodnota <xliff:g id="VALUE">%s</xliff:g> nie je nastavená"</string>
-    <string name="vpn_field_not_set_optional" msgid="8840557698252556791">"Hodnota <xliff:g id="VALUE">%s</xliff:g> nie je nastavená (nepovinné)"</string>
-    <string name="vpn_enable_field" msgid="3700967675854517191">"Povoliť <xliff:g id="OPTION">%s</xliff:g>"</string>
-    <string name="vpn_disable_field" msgid="6905658811179634005">"Zakázať <xliff:g id="OPTION">%s</xliff:g>"</string>
-    <string name="vpn_is_enabled" msgid="1266304230417098877">"Možnosť <xliff:g id="OPTION">%s</xliff:g> je aktivovaná"</string>
-    <string name="vpn_is_disabled" msgid="2013622485867806167">"Nástroj <xliff:g id="OPTION">%s</xliff:g> je zakázaný"</string>
     <string name="vpn_settings_title" msgid="7327468307909556719">"Nastavenia siete VPN"</string>
     <string name="vpn_settings_summary" msgid="8849924181594963972">"Nastaviť a spravovať siete VPN"</string>
-    <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="trusted_credentials" msgid="4266945289534242402">"Dôveryhodné poverenia"</string>
+    <string name="trusted_credentials_summary" msgid="6735221351155686632">"Zobraziť dôveryhodné certifikáty CA"</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>
-    <string name="privacy_settings_title" msgid="1987089301293213705">"Nastavenie ochrany osobných údajov"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"Zálohovať a obnoviť"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"Zálohovať a obnoviť"</string>
     <string name="backup_section_title" msgid="8856083167469467588">"Zálohovanie a obnovenie"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Osobné údaje"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Zálohovať moje údaje"</string>
@@ -1440,4 +1413,107 @@
     <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>
+    <!-- no translation found for debug_ui_category (9023948280291055349) -->
+    <skip />
+    <!-- no translation found for strict_mode (1938795874357830695) -->
+    <skip />
+    <!-- no translation found for strict_mode_summary (142834318897332338) -->
+    <skip />
+    <!-- no translation found for pointer_location (6084434787496938001) -->
+    <skip />
+    <!-- no translation found for pointer_location_summary (840819275172753713) -->
+    <skip />
+    <!-- no translation found for show_screen_updates (8282711794220426931) -->
+    <skip />
+    <!-- no translation found for show_screen_updates_summary (1716122382094924596) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage (2389212910758076024) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage_summary (2113341923988958266) -->
+    <skip />
+    <!-- no translation found for window_animation_scale_title (6162587588166114700) -->
+    <skip />
+    <!-- no translation found for transition_animation_scale_title (387527540523595875) -->
+    <skip />
+    <!-- no translation found for debug_applications_category (6221644998451283813) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities (3622005081180597749) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities_summary (3592221124808773368) -->
+    <skip />
+    <!-- no translation found for app_process_limit_title (4121324758038197598) -->
+    <skip />
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Využitie dát"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"Cyklus počítania dát"</string>
+    <string name="data_usage_menu_split_4g" msgid="7417435609285381968">"Oddeliť dátové prenosy 4G"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Zobraziť využitie siete Wi-Fi"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"Zmeniť cyklus..."</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Deň v mesiaci, kedy sa má obnoviť počítanie dátových prenosov:"</string>
+    <string name="data_usage_disable_mobile_limit" msgid="289740911281022322">"Zakázať mob. prenosy po limite"</string>
+    <string name="data_usage_disable_4g_limit" msgid="5808210773758699800">"Zakázať limit pre dátové prenosy 4G"</string>
+    <string name="data_usage_disable_3g_limit" msgid="3856971004328238231">"Zakázať prenosy 2G a 3G po limite"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_mobile" msgid="454140350007299045">"Mobil"</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">"Mobilné dátové prenosy"</string>
+    <string name="data_usage_enable_3g" msgid="6304006671869578254">"Dátové prenosy 2G a 3G"</string>
+    <string name="data_usage_enable_4g" msgid="3635854097335036738">"Dátové prenosy 4G"</string>
+    <string name="data_usage_app_settings" msgid="3727561362090820369">"Zobraziť nastavenia aplikácie"</string>
+    <string name="data_usage_app_restrict_background" msgid="8856643905291165256">"Obmedziť dát. prenosy na pozadí"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="1503361245973512092">"Povoliť aplik. údaje na pozadí len pri pripoj. k neobmedz. sieti"</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="8110736468987743260">"Obmedziť dátové prenosy na pozadí"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="100001698378554777">"Táto funkcia môže nepriaznivo ovplyvniť aplikácie, ktoré sú závislé na prenose údajov na pozadí."\n\n"V nastaveniach týchto aplikácií nájdete vhodnejšie ovládacie prvky na obmedzenie množstva prenesených údajov."</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Dátum obnovenia cyklu sledovania prenesených dát"</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Dátum v každom mesiaci:"</string>
+    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Nastaviť"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Nastavuje sa obmedzenie dátových prenosov"</string>
+    <string name="data_usage_limit_dialog_mobile" msgid="7931094451923591578">"Po dosiahnutí stanoveného limitu bude vaše mobilné dátové pripojenie zakázané."\n\n"Ak sa chcete vyhnúť dodatočným poplatkom, zvážte použitie nižšieho limitu, pretože spôsob účtovania operátora môže byť iný ako spôsob účtovania zariadenia."</string>
+    <string name="data_usage_limit_dialog_3g" msgid="5478553071420316963">"Po dosiahnutí stanoveného limitu bude vaše dátové pripojenie 2G a 3G zakázané."\n\n"Ak sa chcete vyhnúť dodatočným poplatkom, zvážte použitie nižšieho limitu, pretože spôsob účtovania operátora môže byť iný ako spôsob účtovania zariadenia."</string>
+    <string name="data_usage_limit_dialog_4g" msgid="6134008906742403777">"Po dosiahnutí stanoveného limitu bude vaše dátové pripojenie 4G zakázané."\n\n"Ak sa chcete vyhnúť dodatočným poplatkom, zvážte použitie nižšieho limitu, pretože spôsob účtovania operátora môže byť iný ako spôsob účtovania zariadenia."</string>
+    <string name="data_usage_disabled_dialog_3g_title" msgid="4221584306492812040">"Dátové prenosy 2G a 3G zakázané"</string>
+    <string name="data_usage_disabled_dialog_4g_title" msgid="715585612162185936">"Dátové prenosy 4G sú zakázané"</string>
+    <string name="data_usage_disabled_dialog_mobile_title" msgid="209516216265000221">"Mobilné dátové prenosy zakázané"</string>
+    <string name="data_usage_disabled_dialog" msgid="2874031671067845964">"Dosiahli ste zadané obmedzenie dátových prenosov."\n\n"Za ďalšie používanie dátových prenosov vám operátor môže účtovať poplatky."</string>
+    <string name="data_usage_disabled_dialog_enable" msgid="2441219164620753329">"Znova povoliť dátové prenosy"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="32">"<xliff:g id="NUMBER">%1$s</xliff:g>"</font>" "<font size="12">"<xliff:g id="UNIT">%2$s</xliff:g>"</font>\n<font size="12">"upozornenie"</font></string>
+    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Tiesňové volanie"</string>
+    <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Späť na hovor"</string>
+    <string name="vpn_name" msgid="4689699885361002297">"Názov"</string>
+    <string name="vpn_type" msgid="5435733139514388070">"Typ"</string>
+    <string name="vpn_server" msgid="2123096727287421913">"Adresa servera"</string>
+    <string name="vpn_mppe" msgid="6639001940500288972">"Šifrovanie protokolu PPP (MPPE)"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"Tajný kľúč L2TP"</string>
+    <string name="vpn_ipsec_identifier" msgid="4098175859460006296">"Identifikátor protokolu IPSec"</string>
+    <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Predzdieľaný kľúč protokolu IPSec"</string>
+    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"Používateľský certifikát protokolu IPSec"</string>
+    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"Certifikát CA protokolu IPSec"</string>
+    <!-- no translation found for vpn_search_domains (5391995501541199624) -->
+    <skip />
+    <!-- no translation found for vpn_routes (8556236801755260073) -->
+    <skip />
+    <string name="vpn_username" msgid="1863901629860867849">"Používateľské meno"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Heslo"</string>
+    <!-- no translation found for vpn_save_login (6350322456427484881) -->
+    <skip />
+    <!-- no translation found for vpn_not_used (9094191054524660891) -->
+    <skip />
+    <string name="vpn_no_ca_cert" msgid="7820884983947090538">"(neoverovať server)"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"Zrušiť"</string>
+    <string name="vpn_save" msgid="4233484051644764510">"Uložiť"</string>
+    <string name="vpn_connect" msgid="8469608541746132301">"Pripojiť"</string>
+    <string name="vpn_edit" msgid="1111459297288136079">"Upraviť sieť VPN"</string>
+    <string name="vpn_connect_to" msgid="7328758950427515753">"Pripojiť k sieti <xliff:g id="NETWORK">%s</xliff:g>"</string>
+    <string name="vpn_title" msgid="7982620762043790565">"Nastavenia siete VPN"</string>
+    <string name="vpn_create" msgid="8966010925994175306">"Pridať sieť VPN"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"Upraviť sieť"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"Odstrániť sieť"</string>
+    <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Systém"</string>
+    <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Používateľ"</string>
+    <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Zakázať"</string>
+    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Povoliť"</string>
+    <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Odstrániť"</string>
+    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Povoliť systémový certifikát CA?"</string>
+    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Zakázať systémový certifikát CA?"</string>
+    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Natrvalo odstrániť používateľský certifikát CA?"</string>
 </resources>
diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
index bf49a63..615814c 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>
@@ -214,4 +240,36 @@
     <item msgid="3878793616631049349">"Preverjanje HDCP uporabi samo za vsebino DRM"</item>
     <item msgid="45075631231212732">"Vedno uporabi preverjanje HDCP"</item>
   </string-array>
+    <!-- no translation found for window_animation_scale_entries:0 (8134156599370824081) -->
+    <!-- no translation found for window_animation_scale_entries:1 (6624864048416710414) -->
+    <!-- no translation found for window_animation_scale_entries:2 (2219332261255416635) -->
+    <!-- no translation found for window_animation_scale_entries:3 (3544428804137048509) -->
+    <!-- no translation found for window_animation_scale_entries:4 (3110710404225974514) -->
+    <!-- no translation found for window_animation_scale_entries:5 (4402738611528318731) -->
+    <!-- no translation found for window_animation_scale_entries:6 (6189539267968330656) -->
+    <!-- no translation found for transition_animation_scale_entries:0 (8464255836173039442) -->
+    <!-- no translation found for transition_animation_scale_entries:1 (3375781541913316411) -->
+    <!-- no translation found for transition_animation_scale_entries:2 (1991041427801869945) -->
+    <!-- no translation found for transition_animation_scale_entries:3 (4012689927622382874) -->
+    <!-- no translation found for transition_animation_scale_entries:4 (3289156759925947169) -->
+    <!-- no translation found for transition_animation_scale_entries:5 (7705857441213621835) -->
+    <!-- no translation found for transition_animation_scale_entries:6 (6660750935954853365) -->
+    <!-- no translation found for app_process_limit_entries:0 (6799596560242275471) -->
+    <!-- no translation found for app_process_limit_entries:1 (2412794376818632575) -->
+    <!-- no translation found for app_process_limit_entries:2 (1578904888612645001) -->
+    <!-- no translation found for app_process_limit_entries:3 (8819235336299873577) -->
+  <string-array name="vpn_types_long">
+    <item msgid="2732002039459078847">"PPTP VPN"</item>
+    <item msgid="3799752201662127867">"L2TP/IPSec VPN s ključi v predhodni skupni rabi"</item>
+    <item msgid="4725504331295252103">"L2TP/IPSec VPN s potrdili"</item>
+    <item msgid="7526551163264034377">"IPSec VPN s ključi v predhodni skupni rabi in preverjanjem pristnosti Xauth"</item>
+    <item msgid="8064740940687465039">"IPSec VPN s potrdili in preverjanjem pristnosti Xauth"</item>
+    <item msgid="4946199982372391490">"IPSec VPN s potrdili in hibridnim preverjanjem pristnosti"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:0 (8621078286418985762) -->
+    <!-- no translation found for vpn_states:1 (6692305604213080515) -->
+    <!-- no translation found for vpn_states:2 (8001704909356800092) -->
+    <!-- no translation found for vpn_states:3 (4039737283841672166) -->
+    <!-- no translation found for vpn_states:4 (4042143101664725090) -->
+    <!-- no translation found for vpn_states:5 (2690164254699635531) -->
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 133e86e..f0e24b9 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -19,6 +19,10 @@
     <string name="yes" msgid="4676390750360727396">"Da"</string>
     <string name="no" msgid="6731231425810196216">"Ne"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Neznano"</string>
+    <string name="header_category_wireless_networks" msgid="4944823405420438623">"BREZŽIČNE IN OMREŽNE POVEZAVE"</string>
+    <string name="header_category_device" msgid="5781174212691167553">"NAPRAVA"</string>
+    <string name="header_category_personal" msgid="6225932173498802187">"OSEBNO"</string>
+    <string name="header_category_system" msgid="2073558547468647128">"SISTEM"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Vklopi radio"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Izklopi radio"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Prikaži imenik na kartici SIM"</string>
@@ -111,7 +115,11 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Seznanjanje ..."</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"Naprava je seznanjena, vendar ne povezana"</string>
     <string name="bluetooth_device" msgid="6873461446424952003">"prostoročno/slušalke"</string>
-    <string name="progress_scanning" msgid="3760897655335759141">"Iskanje"</string>
+    <!-- outdated translation 3760897655335759141 -->     <string name="progress_scanning" msgid="192587958424295789">"Iskanje"</string>
+    <!-- no translation found for progress_tap_to_pair (4192342336107106334) -->
+    <skip />
+    <!-- no translation found for bluetooth_no_devices_found (2412462335116297668) -->
+    <skip />
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Zahteva za seznanitev Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Zahteva za seznanitev"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Izberite, če želite seznanitev z napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
@@ -130,6 +138,9 @@
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Eden od programov v telefonu zahteva dovoljenje, da vklopi Bluetooth in omogoči vidnost telefona drugim napravam. Ali se strinjate s tem?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Vklop Bluetootha …"</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Samodejna povezava"</string>
+    <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Zahteva za povezavo Bluetooth"</string>
+    <string name="bluetooth_connection_notif_message" msgid="1833221950512058309">"Dotaknite se za povezavo z napravo »<xliff:g id="DEVICE_NAME">%1$s</xliff:g>«"</string>
+    <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Se želite povezati z napravo »<xliff:g id="DEVICE_NAME">%1$s</xliff:g>«?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Datum in nastavitve"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"13.00"</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13.00"</string>
@@ -235,7 +246,7 @@
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Onemogoči vse brezžične povezave"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"Onemogočanje brezžičnih povezav ..."</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"Omogočanje brezžičnih povezav ..."</string>
-    <string name="radio_controls_title" msgid="5868688473587168882">"Brezžična omrežja"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Več ..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Brezžično in omrežja"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"Upravljanje brezžičnih funkcij in funkcij Bluetooth, načina za letalo, mobilnih omrežij in omrežij VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Podatkovno gostovanje"</string>
@@ -271,8 +282,8 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Podatki o lastniku"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="2382525043173672857">"Vnesite besedilo za prikaz na zaslonu za zaklepanje"</string>
-    <string name="security_settings_title" msgid="5168491784222013179">"Lokacija in varnost"</string>
-    <string name="location_security_settings_title" msgid="4624434296446625554">"Lokacijske in varnostne nastavitve"</string>
+    <string name="location_settings_title" msgid="8935806698251432196">"Lokacijske storitve"</string>
+    <string name="security_settings_title" msgid="7945465324818485460">"Varnost"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Nastavi Mojo lokacijo, odklepanje zaslona, zaklepanje kartice SIM, zaklepanje shrambe poverilnic"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Nastavitev Moje lokacije, odklepanja zaslona, zaklepanja shrambe poverilnic"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Gesla"</string>
@@ -316,7 +327,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>
@@ -375,8 +386,8 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Ogled ali izklop skrbnikov naprave"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Vklopi Bluetooth"</string>
-    <string name="bluetooth_settings" msgid="2725796451253089609">"Nastavitve Bluetooth"</string>
-    <string name="bluetooth_settings_title" msgid="2824020086246268296">"Nastavitve Bluetooth"</string>
+    <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
+    <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Upravljanje povezav, nastavitev imena naprave in vidnosti"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Zahteva za seznanitev Bluetooth"</string>
     <string name="bluetooth_enter_pin_msg" msgid="1499285355129256289">\n"Vnesite PIN za seznanitev z napravo »<xliff:g id="DEVICE_NAME">%1$s</xliff:g>«. (Poskusite 0000 ali 1234.) Ta PIN boste morda morali vnesti tudi v napravi Bluetooth."</string>
@@ -394,7 +405,10 @@
     <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Naprava <xliff:g id="DEVICE_NAME">%1$s</xliff:g> je zavrnila seznanitev."</string>
     <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"Pri povezovanju z napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g> je prišlo do napake."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Išči naprave"</string>
-    <string name="bluetooth_preference_find_nearby_title" msgid="5087410003465463318">"Najdi naprave v bližini"</string>
+    <!-- no translation found for bluetooth_search_for_devices (5957007154213560390) -->
+    <skip />
+    <!-- no translation found for bluetooth_searching_for_devices (9203739709307871727) -->
+    <skip />
     <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"Nastavitve naprave"</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Povezane naprave"</string>
     <string name="bluetooth_preference_found_devices" msgid="3133019331974936204">"Najdene naprave"</string>
@@ -404,6 +418,10 @@
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Prekliči seznanitev"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Prekini povezavo in prekliči seznanitev"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Možnosti …"</string>
+    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Dodatno"</string>
+    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Dodatne nast. za Bluetooth"</string>
+    <string name="bluetooth_advanced_settings_label" msgid="8659717781212434173">"Dodatno – Bluetooth"</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="3631028334811113629">"Za ogled razpoložljivih naprav vklopite Bluetooth"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Vzpostavi povezavo z ..."</string>
     <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"Predstavnost"</string>
     <string name="bluetooth_profile_headset" msgid="81844079120986198">"Prostoročno"</string>
@@ -445,27 +463,31 @@
     <string name="nfc_toggle_error" msgid="2233172102497535522">"Prišlo je do napake."</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Brezžično"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Vklopi brezžični vmesnik"</string>
-    <string name="wifi_settings" msgid="4746946030627213196">"Brezžične nastavitve"</string>
+    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="2810363951104753710">"Brezžične nastavitve"</string>
+    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Nastavi in upravljaj brezžične dostopne točke"</string>
-    <string name="wifi_starting" msgid="6710266609710860129">"Vklapljanje ..."</string>
-    <string name="wifi_stopping" msgid="5952909472548218348">"Izklapljanje ..."</string>
+    <string name="wifi_starting" msgid="7732330327758522943">"Vklapljanje vmesnika za Wi-Fi ..."</string>
+    <string name="wifi_stopping" msgid="244864762599017659">"Izklapljanje vmesnika za Wi-Fi ..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"Napaka"</string>
     <string name="wifi_in_airplane_mode" msgid="7618393787965366655">"V načinu za letalo"</string>
     <string name="wifi_fail_to_scan" msgid="6194542252808587669">"Iskanje omrežij ni mogoče"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Obveščanje o omrežjih"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Obvesti me, ko bo na voljo odprto omrežje"</string>
+    <string name="wifi_enable_watchdog_service" msgid="4723544454066601706">"Preverjanja povezljivosti Wi-Fi"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="8687400936839455926">"Odkrivanje in reševanje morebitnih težav z omrežno povezavo"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Pravilnik o izklopu iz omrežja Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Navedite, kdaj preklopiti z brezžične na mobilno podatkovno storitev"</string>
     <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" msgid="6234851776910938957">"Dodaj omrežje"</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>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Vzpostavi povezavo z omrežjem"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Pozabi omrežje"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Spremeni omrežje"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="3682507011071029311">"Za ogled razpoložljivih omrežij vklopite Wi-Fi"</string>
     <string name="wifi_network_setup" msgid="7974851890019344870">"Namestitev omrežja"</string>
     <string name="wifi_wps_pin" msgid="5471842298708321115">"Vnesite PIN iz dostopne točke"</string>
     <string name="wifi_wps_setup_title" msgid="150518971269252336">"Nastavitev WPS"</string>
@@ -501,13 +523,13 @@
     <string name="wifi_save" msgid="3331121567988522826">"Shrani"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Prekliči"</string>
     <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"Zaznana je druga seja WPS, poskusite znova čez nekaj minut"</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Dodatno"</string>
+    <!-- outdated translation 5419052271935350999 -->     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Dodatno"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Frekvenčni pas za Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Določite frekvenčni obseg delovanja"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Težava pri nastavitvi frekvenčnega pasu."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Naslov MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Naslov IP"</string>
-    <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"Nastavitve IP"</string>
+    <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Nastavitve nasl. IP"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Shrani"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Prekliči"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Vnesite veljaven naslov IP."</string>
@@ -525,7 +547,7 @@
     <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> prenosna brezžična dostopna točka"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="sound_settings_title" msgid="8735891486683305886">"Zvok"</string>
-    <string name="display_settings_title" msgid="2378894265964357591">"Zaslon"</string>
+    <string name="display_settings_title" msgid="1708697328627382561">"Zaslon"</string>
     <string name="sound_settings" msgid="5007659014828162881">"Zvočne nastavitve"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Tihi način"</string>
     <string name="silent_mode_summary" msgid="3309650676072917899">"Utišaj vse zvoke razen predstavnosti in opozoril"</string>
@@ -598,7 +620,18 @@
     <string name="brightness_summary" msgid="838917350127550703">"Prilagoditev svetlosti zaslona"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Časovna omejitev"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Zaslon se samodejno izklopi po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Ozadje"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Androidne sanje"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Ohranjevalniki zaslona in druge vrste zabave za prosti čas"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Izbrane sanje"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Kdaj aktivirati"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"Po obdobju nedejavnosti: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Nikoli"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Preskusite"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Samodejna svetlost"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Velikost pisave"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Skupna velikost pisav"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Izbira velikosti pisave"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Nastavitve zaklepanja kartice SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Nastavi zaklepanje kartice SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Zaklepanje kartice SIM"</string>
@@ -643,8 +676,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>
@@ -696,6 +730,16 @@
     <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"Kartica SD bo izpeta."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Izpenjanje"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Izpenjanje poteka"</string>
+    <!-- no translation found for storage_menu_usb (1580545228584324704) -->
+    <skip />
+    <!-- no translation found for storage_title_usb (5775322159427546546) -->
+    <skip />
+    <!-- no translation found for usb_label_mtp (4157227401755543412) -->
+    <skip />
+    <!-- no translation found for usb_label_ptp (7417254019489575819) -->
+    <skip />
+    <!-- no translation found for usb_label_installer_cd (7438467574756086977) -->
+    <skip />
     <string name="battery_status_title" msgid="9159414319574976203">"Stanje baterije"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Raven napolnjenosti baterije"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN-ji"</string>
@@ -806,6 +850,8 @@
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"Int. povez. ni mogoča z več kot <xliff:g id="MAXCONNECTION">%1$d</xliff:g> napr."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Internetna povezava z napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bo prekinjena."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Pomoč"</string>
+    <string name="wireless_category_general" msgid="2973810407987118067">"Splošno"</string>
+    <string name="wireless_category_mobile_networks" msgid="1254629216798424288">"Mobilna omrežja"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobilna omrežja"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Nastavi možnosti za gostovanje, omrežja, APN-je"</string>
     <string name="location_title" msgid="1029961368397484576">"Moja lokacija"</string>
@@ -883,7 +929,7 @@
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Varnost tabličnega računalnika"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Zaščita telefona"</string>
     <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"Zaščitite tablični računalnik pred nepooblaščeno uporabo tako, da ustvarite vzorec za odklepanje zaslona. Na naslednjem zaslonu s prstom v poljubnem vrstnem redu povežite pike. Povezati morate vsaj štiri pike. "\n\n"Ste pripravljeni?Dotaknite se možnosti »Naprej«."</string>
-    <string name="lock_intro_message" product="default" msgid="9100785646737118042"><font size="17">"Zaščitite telefon pred nepooblaščeno uporabo tako, da ustvarite osebni vzorec za odklepanje zaslona. "\n<font height="17">\n</font><b>"1"</b>"  Na naslednjem zaslonu si oglejte risanje primera vzorca. "\n<font height="17">\n</font><b>"2"</b>"  Ko boste pripravljeni, narišite lastni vzorec za odklepanje. Preizkusite različne vzorce, vendar povežite vsaj 4 točke. "\n<font height="17">\n</font><b>"3"</b>"  Nato znova narišite vzorec, da ga potrdite. "\n<font height="17">\n</font><b>"Ste pripravljeni? Dotaknite se možnosti »Naprej«"</b>". "\n<font height="3">\n</font>"Če telefona nočete zaščititi, se dotaknite možnosti »Prekliči«."</font></string>
+    <!-- outdated translation 3692151094288835065 -->     <string name="lock_intro_message" product="default" msgid="5796785892741212873">"Zaščitite tablični računalnik pred nepooblaščeno uporabo tako, da ustvarite vzorec za odklepanje zaslona. Na naslednjem zaslonu s prstom v poljubnem vrstnem redu povežite pike. Povezati morate vsaj štiri pike. "\n\n"Ste pripravljeni?Dotaknite se možnosti »Naprej«."</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Upravljanje programov"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Upravljajte in odstranite nameščene programe"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Programi"</string>
@@ -893,6 +939,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>
@@ -905,9 +953,10 @@
     <string name="force_stop" msgid="7435006169872876756">"Prisilna ustavitev"</string>
     <string name="total_size_label" msgid="1048676419552557254">"Skupaj"</string>
     <string name="application_size_label" msgid="5055196275624686382">"Program"</string>
+    <string name="external_code_size_label" msgid="3459343140355961335">"Program na pogonu USB"</string>
     <string name="data_size_label" msgid="8679376373625710107">"Podatki"</string>
-    <string name="external_size_label" product="nosdcard" msgid="4465530017830945766">"Pomnilnik USB"</string>
-    <string name="external_size_label" product="default" msgid="2107155737635944440">"Kartica SD"</string>
+    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Podatki na pogonu USB"</string>
+    <string name="external_data_size_label" product="default" msgid="626414192825329708">"Kartica SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Odstrani"</string>
     <string name="disable_text" msgid="6544054052049395202">"Onemogoči"</string>
     <string name="enable_text" msgid="9217362512327828987">"Omogoči"</string>
@@ -1026,7 +1075,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 +1085,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>
@@ -1066,7 +1117,7 @@
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Nastavitve zaslonske tipkovnice"</string>
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Fizična tipkovnica"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Nastavitve fizične tipkovnice"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Razvoj"</string>
+    <string name="development_settings_title" msgid="215179176067683667">"Možnosti za razvijalce"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"Nastavi možnosti za razvoj programa"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Odpravljanje težav s povezavo USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Način za odpravljanje težav, ko je vzpostavljena povezava USB"</string>
@@ -1091,14 +1142,14 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Pripomočki za ljudi s posebnimi potrebami"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Nastavitve pripomočkov za ljudi s posebnimi potrebami"</string>
     <string name="accessibility_settings_summary" msgid="8185181964847149507">"Upravljaj možnosti storitev za ljudi s posebnimi potrebami"</string>
-    <string name="toggle_accessibility_title" msgid="650839277066574497">"Pripomočki za ljudi s posebnimi potrebami"</string>
+    <string name="toggle_large_text_title" msgid="42259643359869436">"Veliko besedilo"</string>
     <string name="accessibility_services_category" msgid="8127851026323672607">"Storitve za ljudi s posebnimi potrebami"</string>
+    <string name="toggle_accessibility_title" msgid="7338739354952553958">"Dovoli prip. za osebe s pos. potrebami"</string>
     <string name="no_accessibility_services_summary" msgid="694578333333808159">"Ni nameščenih storitev za ljudi s posebnimi potrebami."</string>
     <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Ta storitev za ljudi s posebnimi potrebami bo morda lahko zbirala besedilo, ki ga boste vtipkali, vključno z osebnimi podatki in številkami kreditnih kartic, razen gesel. Morda bo tudi zapisovala vaše interakcije z uporabniškim vmesnikom. Omogoča jo program <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Ali želite uporabiti to storitev za ljudi s posebnimi potrebami?"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Ali želite onemogočiti pripomočke za ljudi s posebnimi potrebami?"</string>
     <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"Najden ni bil noben program za ljudi s posebnimi potrebami"</string>
     <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"Nameščenih nimate nobenih programov za ljudi s posebnimi potrebami."\n\n"Iz tržnice Android Market lahko prenesete bralnik zaslona za vašo napravo."\n\n"Kliknite »V redu«, če želite namestiti bralnik zaslona."</string>
-    <string name="accessibility_script_injection_category" msgid="8649951751131431904">"Skripti za poseb. potrebe"</string>
     <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"Prenos skriptov za ljudi s poseb. potreb."</string>
     <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"Dovoli prenos skriptov za ljudi s posebnimi potrebami iz Googla"</string>
     <string name="accessibility_script_injection_security_warning" product="tablet" msgid="1113600871264359828">"Za nekatere programe lahko Google prenese v tablični računalnik skripte za ljudi s posebnimi potrebami. Ste prepričani, da želite dovoliti Googlu nameščanje skriptov za ljudi s posebnimi potrebami v tablični računalnik?"</string>
@@ -1106,10 +1157,11 @@
     <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>
-    <string name="power_usage_summary_title" msgid="5180282911164282324">"Uporaba baterije"</string>
+    <string name="power_usage_summary_title" msgid="7190304207330319919">"Baterija"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Kaj porablja energijo baterije"</string>
     <string name="power_usage_not_available" msgid="3583407442633768046">"Podatki o uporabi baterije niso na voljo"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Uporaba baterije po odklopu"</string>
@@ -1218,6 +1270,8 @@
     <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>
+    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Nastavitve mehanizma"</string>
+    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Nastavitve za <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
     <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>
@@ -1228,114 +1282,33 @@
     <string name="gadget_title" msgid="7455548605888590466">"Nadzor porabe"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Posodabljanje brezžične nastavitve"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Posodabljanje nastavitev Bluetooth"</string>
-    <string name="vpn_settings_activity_title" msgid="7276864950701612579">"Nastavitve VPN"</string>
-    <string name="vpn_connect_to" msgid="2541409082892684362">"Vzpostavi povezavo z omrežjem <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpn_username_colon" msgid="7854930370861306247">"Uporabniško ime:"</string>
-    <string name="vpn_password_colon" msgid="5716278710848606626">"Geslo:"</string>
-    <string name="vpn_a_username" msgid="6664733641993968692">"uporabniško ime"</string>
-    <string name="vpn_a_password" msgid="1537213632501483753">"geslo"</string>
-    <string name="vpn_save_username" msgid="1408415289165970790">"Zapomni si uporabniško ime"</string>
-    <string name="vpn_connect_button" msgid="1699007212602470655">"Vzpostavi povezavo"</string>
-    <string name="vpn_yes_button" msgid="8034531001149843119">"Da"</string>
-    <string name="vpn_no_button" msgid="7620339571187119107">"Ne"</string>
-    <string name="vpn_back_button" msgid="192036339792734970">"Nazaj"</string>
-    <string name="vpn_mistake_button" msgid="1683383660912491270">"Ne"</string>
-    <string name="vpn_menu_done" msgid="93528279226907926">"Shrani"</string>
-    <string name="vpn_menu_cancel" msgid="7234451214611202868">"Prekliči"</string>
-    <string name="vpn_menu_revert" msgid="4407762442281467659">"Povrni"</string>
-    <string name="vpn_menu_connect" msgid="1089399414463784218">"Vzpostavi povezavo z omrežjem"</string>
-    <string name="vpn_menu_disconnect" msgid="8254492450022562235">"Prekini povezavo z omrežjem"</string>
-    <string name="vpn_menu_edit" msgid="4526245173583195618">"Uredi omrežje"</string>
-    <string name="vpn_menu_delete" msgid="3326527392609513129">"Izbriši omrežje"</string>
-    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"Vnesti morate <xliff:g id="CODE">%s</xliff:g>."</string>
-    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"Izbrati morate <xliff:g id="OPTION">%s</xliff:g>."</string>
-    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"Ime omrežja VPN »<xliff:g id="NAME">%s</xliff:g>« že obstaja. Poiščite drugo ime."</string>
-    <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"Ali ste prepričani, da želite izbrisati to omrežje VPN?"</string>
-    <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"Ali ste prepričani, da tega profila ne želite ustvariti?"</string>
-    <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"Ali ste prepričani, da želite zavreči spremembe tega profila?"</string>
-    <string name="vpn_confirm_reconnect" msgid="5748535476278674296">"Povezave z omrežjem ni mogoče vzpostaviti. Ali želite poskusiti znova?"</string>
-    <string name="vpn_reconnect_from_lost" msgid="2442844155623372118">"Povezava se je prekinila. Ali jo želite znova vzpostaviti?"</string>
-    <string name="vpn_unknown_server_dialog_msg" msgid="3080742299823671319">"Imena strežnika ni mogoče razrešiti. Ali želite preveriti nastavitev imena strežnika?"</string>
-    <string name="vpn_challenge_error_dialog_msg" msgid="6174901754230038601">"Napaka pri pozivu. Ali želite preveriti nastavitev skrivnosti?"</string>
-    <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"V tej konfiguraciji VPN manjka vsaj ena skrivnost. Ali želite preveriti nastavitev skrivnosti?"</string>
-    <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"Uporabniško ime ali geslo, ki ste ga vnesli, ni pravilno. Ali želite poskusiti znova?"</string>
-    <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"Strežnik je prekinil povezavo. Uporabniško ime ali geslo, ki ste ju vnesli, sta morda napačna. Ali želite poskusiti znova?"</string>
-    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"Strežnik je prekinil povezavo. Morda uporabljate požarni zid, ki vam preprečuje povezavo s strežnikom. Ali želite poskusiti znova?"</string>
-    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"Pogajanje s strežnikom ni uspelo. Strežnik morda ne sprejme vaše možnosti šifriranja. Ali želite preveriti nastavitev šifriranja?"</string>
-    <string name="vpn_type_title" msgid="6392933604218676224">"Dodaj omrežje VPN"</string>
-    <string name="vpn_add_new_vpn" msgid="5438260689052714550">"Dodaj omrežje VPN"</string>
-    <string name="vpn_details_title" msgid="418806440938510331">"Podrobnosti o navideznem zasebnem omrežju"</string>
-    <string name="vpn_edit_title_add" msgid="2121313217989682890">"Dodaj profil VPN <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"Podrobnosti profila <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpns" msgid="3148141862835492816">"Omrežja VPN"</string>
-    <string name="vpn_connecting" msgid="8039521381692090116">"Vzpostavljanje povezave ..."</string>
-    <string name="vpn_disconnecting" msgid="7748050200708257066">"Prekinjanje povezave ..."</string>
-    <string name="vpn_connected" msgid="7641723116362845781">"Povezava je vzpostavljena"</string>
-    <string name="vpn_connect_hint" msgid="7442898962925875181">"Vzpostavi povezavo z omrežjem"</string>
-    <string name="vpn_name" msgid="1550918148476193076">"Ime omrežja VPN"</string>
-    <string name="vpn_a_name" msgid="8445736942405283509">"ime omrežja VPN"</string>
-    <string name="vpn_profile_added" msgid="9061017910337129840">"Profil »<xliff:g id="NAME">%s</xliff:g>« je dodan"</string>
-    <string name="vpn_profile_replaced" msgid="587435576816273815">"Profil »<xliff:g id="NAME">%s</xliff:g>« je spremenjen"</string>
-    <string name="vpn_user_certificate_title" msgid="6812545893924071742">"Nastavi uporabniško potrdilo"</string>
-    <string name="vpn_user_certificate" msgid="949322691686938888">"Uporabniško potrdilo"</string>
-    <string name="vpn_a_user_certificate" msgid="8943983437956898649">"uporabniško potrdilo"</string>
-    <string name="vpn_ca_certificate_title" msgid="7846466160795589985">"Nastavi overjeno potrdilo"</string>
-    <string name="vpn_ca_certificate" msgid="465085144064264742">"Overjeno potrdilo"</string>
-    <string name="vpn_a_ca_certificate" msgid="3374242520974884295">"overjeno potrdilo"</string>
-    <string name="vpn_l2tp_secret_string_title" msgid="5039677186748940987">"Nastavi skrivnost L2TP"</string>
-    <string name="vpn_l2tp_secret" msgid="529359749677142076">"Skrivnost L2TP"</string>
-    <string name="vpn_a_l2tp_secret" msgid="6612042930810981845">"skrivnost L2TP"</string>
-    <string name="vpn_pptp_encryption_title" msgid="2236795167467896499">"šifriranje"</string>
-    <string name="vpn_pptp_encryption" msgid="2602329949737259686">"Šifriranje PPTP"</string>
-    <string name="vpn_ipsec_presharedkey_title" msgid="2184060087690539175">"Nastavi ključ v predhodni skupni rabi IPSec"</string>
-    <string name="vpn_ipsec_presharedkey" msgid="5434316521616673741">"Ključ v predhodni skupni rabi IPSec"</string>
-    <string name="vpn_a_ipsec_presharedkey" msgid="1255301923217898418">"ključ v predhodni skupni rabi IPSec"</string>
-    <string name="vpn_vpn_server_title" msgid="8897005887420358913">"Nastavi strežnik VPN"</string>
-    <string name="vpn_vpn_server" msgid="1141754908824209260">"Strežnik VPN"</string>
-    <string name="vpn_a_vpn_server" msgid="5960906152125045853">"strežnik VPN"</string>
-    <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"Ime strežnika VPN"</string>
-    <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"Domene za iskanje DNS"</string>
-    <string name="vpn_dns_search_list" msgid="4230034234026605360">"Domene za iskanje DNS"</string>
-    <string name="vpn_field_is_set" msgid="7137320847812992243">"Vrednost <xliff:g id="VALUE">%s</xliff:g> je nastavljena"</string>
-    <string name="vpn_field_not_set" msgid="2972519243515893804">"Vrednost <xliff:g id="VALUE">%s</xliff:g> ni nastavljena"</string>
-    <string name="vpn_field_not_set_optional" msgid="8840557698252556791">"Vrednost <xliff:g id="VALUE">%s</xliff:g> ni nastavljena (izbirno)"</string>
-    <string name="vpn_enable_field" msgid="3700967675854517191">"Omogoči <xliff:g id="OPTION">%s</xliff:g>"</string>
-    <string name="vpn_disable_field" msgid="6905658811179634005">"Onemogoči <xliff:g id="OPTION">%s</xliff:g>"</string>
-    <string name="vpn_is_enabled" msgid="1266304230417098877">"<xliff:g id="OPTION">%s</xliff:g> je omogočeno"</string>
-    <string name="vpn_is_disabled" msgid="2013622485867806167">"<xliff:g id="OPTION">%s</xliff:g> je onemogočeno"</string>
     <string name="vpn_settings_title" msgid="7327468307909556719">"Nastavitve VPN"</string>
     <string name="vpn_settings_summary" msgid="8849924181594963972">"Nastavitev in upravljanje navideznih zasebnih omrežij (VPN)"</string>
-    <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="trusted_credentials" msgid="4266945289534242402">"Preverjene poverilnice"</string>
+    <string name="trusted_credentials_summary" msgid="6735221351155686632">"Prikaži preverjena 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>
-    <string name="privacy_settings_title" msgid="1987089301293213705">"Nastavitve zasebnosti"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"Izdelaj varnostno kopijo in ponastavi"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"Izdelaj varnostno kopijo in ponastavi"</string>
     <string name="backup_section_title" msgid="8856083167469467588">"Varnostno kopiranje in obnavljanje"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Osebni podatki"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Varnostno kopiraj moje podatke"</string>
@@ -1440,4 +1413,107 @@
     <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>
+    <!-- no translation found for debug_ui_category (9023948280291055349) -->
+    <skip />
+    <!-- no translation found for strict_mode (1938795874357830695) -->
+    <skip />
+    <!-- no translation found for strict_mode_summary (142834318897332338) -->
+    <skip />
+    <!-- no translation found for pointer_location (6084434787496938001) -->
+    <skip />
+    <!-- no translation found for pointer_location_summary (840819275172753713) -->
+    <skip />
+    <!-- no translation found for show_screen_updates (8282711794220426931) -->
+    <skip />
+    <!-- no translation found for show_screen_updates_summary (1716122382094924596) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage (2389212910758076024) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage_summary (2113341923988958266) -->
+    <skip />
+    <!-- no translation found for window_animation_scale_title (6162587588166114700) -->
+    <skip />
+    <!-- no translation found for transition_animation_scale_title (387527540523595875) -->
+    <skip />
+    <!-- no translation found for debug_applications_category (6221644998451283813) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities (3622005081180597749) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities_summary (3592221124808773368) -->
+    <skip />
+    <!-- no translation found for app_process_limit_title (4121324758038197598) -->
+    <skip />
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Podatkovni promet"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"Cikel porabe podatkov"</string>
+    <string name="data_usage_menu_split_4g" msgid="7417435609285381968">"Ločena poraba 4G"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Pokaži uporabo Wi-Fi"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"Spremeni cikel ..."</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Dan za ponastavitev cikla porabe podatkov:"</string>
+    <string name="data_usage_disable_mobile_limit" msgid="289740911281022322">"Onemogoči ob doseženi omejitvi"</string>
+    <string name="data_usage_disable_4g_limit" msgid="5808210773758699800">"Onem. podatke 4G ob omejitvi"</string>
+    <string name="data_usage_disable_3g_limit" msgid="3856971004328238231">"Onem. podatke 2G-3G ob omejitvi"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_mobile" msgid="454140350007299045">"Mobilni"</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">"Mobilni podatki"</string>
+    <string name="data_usage_enable_3g" msgid="6304006671869578254">"Podatki 2G-3G"</string>
+    <string name="data_usage_enable_4g" msgid="3635854097335036738">"Podatki 4G"</string>
+    <string name="data_usage_app_settings" msgid="3727561362090820369">"Ogled nastavitev programa"</string>
+    <string name="data_usage_app_restrict_background" msgid="8856643905291165256">"Omejitev porabe podatkov ozadja"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="1503361245973512092">"Porabo podatkov ozadja dovoli samo pri uporabi neomejenega omrežja"</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="8110736468987743260">"Omejevanje podatkov ozadja"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="100001698378554777">"Ta funkcija lahko negativno vpliva na programe, ki so odvisni od porabe podatkov ozadja."\n\n"Ustreznejše kontrolnike porabe podatkov najdete v nastavitvah programa."</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Datum ponastavitve cikla porabe"</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Datum vsakega meseca:"</string>
+    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Nastavi"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Omejitev porabe podatkov"</string>
+    <string name="data_usage_limit_dialog_mobile" msgid="7931094451923591578">"Mobilna podatkovna povezava bo onemogočena ob doseženi omejitvi."\n\n"Če ne želite imeti stroškov zaradi dodatne porabe, zmanjšajte omejitev, saj se lahko načina obračunavanja v napravi in pri operaterju razlikujeta."</string>
+    <string name="data_usage_limit_dialog_3g" msgid="5478553071420316963">"Podatkovna povezava 2G-3G bo onemogočena ob doseženi omejitvi."\n\n"Če ne želite imeti stroškov zaradi dodatne porabe, zmanjšajte omejitev, saj se lahko načina obračunavanja v napravi in pri operaterju razlikujeta."</string>
+    <string name="data_usage_limit_dialog_4g" msgid="6134008906742403777">"Podatkovna povezava 4G bo onemogočena ob doseženi omejitvi."\n\n"Če ne želite imeti stroškov zaradi dodatne porabe, zmanjšajte omejitev, saj se lahko načina obračunavanja v napravi in pri operaterju razlikujeta."</string>
+    <string name="data_usage_disabled_dialog_3g_title" msgid="4221584306492812040">"Podatki 2G-3G so onemogočeni"</string>
+    <string name="data_usage_disabled_dialog_4g_title" msgid="715585612162185936">"Podatki 4G so onemogočeni"</string>
+    <string name="data_usage_disabled_dialog_mobile_title" msgid="209516216265000221">"Mobilni podatki so onemogočeni"</string>
+    <string name="data_usage_disabled_dialog" msgid="2874031671067845964">"Dosežena je določena omejitev porabe podatkov."\n\n"Dodatno porabo podatkov vam lahko operater zaračuna."</string>
+    <string name="data_usage_disabled_dialog_enable" msgid="2441219164620753329">"Znova omogoči podatke"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="32">"<xliff:g id="NUMBER">%1$s</xliff:g>"</font><font size="12">" <xliff:g id="UNIT">%2$s</xliff:g>"</font>\n<font size="12">"opozorilo"</font></string>
+    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Klic v sili"</string>
+    <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Nazaj na klic"</string>
+    <string name="vpn_name" msgid="4689699885361002297">"Ime"</string>
+    <string name="vpn_type" msgid="5435733139514388070">"Vrsta"</string>
+    <string name="vpn_server" msgid="2123096727287421913">"Naslov strežnika"</string>
+    <string name="vpn_mppe" msgid="6639001940500288972">"Šifriranje PPP (MPPE)"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"Skrivnost L2TP"</string>
+    <string name="vpn_ipsec_identifier" msgid="4098175859460006296">"Identifikator IPSec"</string>
+    <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Ključ v predhodni skupni rabi IPSec"</string>
+    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"Uporabniško potrdilo IPSec"</string>
+    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"Overjeno potrdilo IPSec"</string>
+    <!-- no translation found for vpn_search_domains (5391995501541199624) -->
+    <skip />
+    <!-- no translation found for vpn_routes (8556236801755260073) -->
+    <skip />
+    <string name="vpn_username" msgid="1863901629860867849">"Uporabniško ime"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Geslo"</string>
+    <!-- no translation found for vpn_save_login (6350322456427484881) -->
+    <skip />
+    <!-- no translation found for vpn_not_used (9094191054524660891) -->
+    <skip />
+    <string name="vpn_no_ca_cert" msgid="7820884983947090538">"(Ne preveri strežnika)"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"Prekliči"</string>
+    <string name="vpn_save" msgid="4233484051644764510">"Shrani"</string>
+    <string name="vpn_connect" msgid="8469608541746132301">"Vzpostavi povezavo"</string>
+    <string name="vpn_edit" msgid="1111459297288136079">"Uredi omrežje VPN"</string>
+    <string name="vpn_connect_to" msgid="7328758950427515753">"Vzpostavi povezavo z omrežjem <xliff:g id="NETWORK">%s</xliff:g>"</string>
+    <string name="vpn_title" msgid="7982620762043790565">"Nastavitve VPN"</string>
+    <string name="vpn_create" msgid="8966010925994175306">"Dodaj omrežje VPN"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"Uredi omrežje"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"Izbriši omrežje"</string>
+    <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Sistemska"</string>
+    <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Uporabnik"</string>
+    <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Onemogoči"</string>
+    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Omogoči"</string>
+    <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Odstrani"</string>
+    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Želite omogočiti sistemsko overjeno potrdilo?"</string>
+    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Želite onemogočiti sistemsko overjeno potrdilo?"</string>
+    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Želite trajno odstraniti uporabniško overjeno potrdilo?"</string>
 </resources>
diff --git a/res/values-sr/arrays.xml b/res/values-sr/arrays.xml
index 0a8c493..3686fc5 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>
@@ -214,4 +240,36 @@
     <item msgid="3878793616631049349">"Користи HDCP проверу само за DRM садржај"</item>
     <item msgid="45075631231212732">"Увек користи HDCP проверу"</item>
   </string-array>
+    <!-- no translation found for window_animation_scale_entries:0 (8134156599370824081) -->
+    <!-- no translation found for window_animation_scale_entries:1 (6624864048416710414) -->
+    <!-- no translation found for window_animation_scale_entries:2 (2219332261255416635) -->
+    <!-- no translation found for window_animation_scale_entries:3 (3544428804137048509) -->
+    <!-- no translation found for window_animation_scale_entries:4 (3110710404225974514) -->
+    <!-- no translation found for window_animation_scale_entries:5 (4402738611528318731) -->
+    <!-- no translation found for window_animation_scale_entries:6 (6189539267968330656) -->
+    <!-- no translation found for transition_animation_scale_entries:0 (8464255836173039442) -->
+    <!-- no translation found for transition_animation_scale_entries:1 (3375781541913316411) -->
+    <!-- no translation found for transition_animation_scale_entries:2 (1991041427801869945) -->
+    <!-- no translation found for transition_animation_scale_entries:3 (4012689927622382874) -->
+    <!-- no translation found for transition_animation_scale_entries:4 (3289156759925947169) -->
+    <!-- no translation found for transition_animation_scale_entries:5 (7705857441213621835) -->
+    <!-- no translation found for transition_animation_scale_entries:6 (6660750935954853365) -->
+    <!-- no translation found for app_process_limit_entries:0 (6799596560242275471) -->
+    <!-- no translation found for app_process_limit_entries:1 (2412794376818632575) -->
+    <!-- no translation found for app_process_limit_entries:2 (1578904888612645001) -->
+    <!-- no translation found for app_process_limit_entries:3 (8819235336299873577) -->
+  <string-array name="vpn_types_long">
+    <item msgid="2732002039459078847">"PPTP VPN"</item>
+    <item msgid="3799752201662127867">"L2TP/IPSec VPN са унапред дељеним кључевима"</item>
+    <item msgid="4725504331295252103">"L2TP/IPSec VPN са сертификатима"</item>
+    <item msgid="7526551163264034377">"IPSec VPN са унапред дељеним кључевима и Xauth потврдом аутентичности"</item>
+    <item msgid="8064740940687465039">"IPSec VPN са сертификатима и Xauth потврдом аутентичности"</item>
+    <item msgid="4946199982372391490">"IPSec VPN са сертификатима и хибридном потврдом аутентичности"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:0 (8621078286418985762) -->
+    <!-- no translation found for vpn_states:1 (6692305604213080515) -->
+    <!-- no translation found for vpn_states:2 (8001704909356800092) -->
+    <!-- no translation found for vpn_states:3 (4039737283841672166) -->
+    <!-- no translation found for vpn_states:4 (4042143101664725090) -->
+    <!-- no translation found for vpn_states:5 (2690164254699635531) -->
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 069a4a2..adeb35e 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -19,6 +19,10 @@
     <string name="yes" msgid="4676390750360727396">"Да"</string>
     <string name="no" msgid="6731231425810196216">"Не"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Непознато"</string>
+    <string name="header_category_wireless_networks" msgid="4944823405420438623">"БЕЖИЧНА ВЕЗА И МРЕЖЕ"</string>
+    <string name="header_category_device" msgid="5781174212691167553">"УРЕЂАЈ"</string>
+    <string name="header_category_personal" msgid="6225932173498802187">"ЛИЧНО"</string>
+    <string name="header_category_system" msgid="2073558547468647128">"СИСТЕМ"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Укључи радио"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Искључи радио"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Прикажи SIM адресар"</string>
@@ -111,7 +115,11 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Упаривање..."</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"Упаривање, али веза је прекинута"</string>
     <string name="bluetooth_device" msgid="6873461446424952003">"хандсфри/слушалице"</string>
-    <string name="progress_scanning" msgid="3760897655335759141">"Скенирање"</string>
+    <!-- outdated translation 3760897655335759141 -->     <string name="progress_scanning" msgid="192587958424295789">"Скенирање"</string>
+    <!-- no translation found for progress_tap_to_pair (4192342336107106334) -->
+    <skip />
+    <!-- no translation found for bluetooth_no_devices_found (2412462335116297668) -->
+    <skip />
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Захтев за Bluetooth упаривање"</string>
     <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>
@@ -130,6 +138,9 @@
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Апликација на телефону захтева дозволу да укључи Bluetooth и телефон учини видљивим за друге уређаје. Желите ли да то урадите?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Укључивање Bluetooth-а…"</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Аутоматско повезивање"</string>
+    <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Захтев за Bluetooth повезивање"</string>
+    <string name="bluetooth_connection_notif_message" msgid="1833221950512058309">"Додирните да бисте се повезали са уређајем „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“"</string>
+    <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Да ли желите да се повежете са уређајем „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Подешавања датума и времена"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"13:00"</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
@@ -235,7 +246,7 @@
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Онемогућавање свих бежичних веза"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"Онемогућавање бежичних веза..."</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"Омогућавање бежичних веза..."</string>
-    <string name="radio_controls_title" msgid="5868688473587168882">"Бежично и мреже"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Још…"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Бежична веза и мреже"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"Управљање Wi-Fi мрежом, Bluetooth-ом, режимом рада у авиону, мобилним мрежама и VPN-ом"</string>
     <string name="roaming" msgid="3596055926335478572">"Пренос података у ромингу"</string>
@@ -271,8 +282,8 @@
     <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">"Локација и безбедност"</string>
-    <string name="location_security_settings_title" msgid="4624434296446625554">"Подешавања локације и безбедности"</string>
+    <string name="location_settings_title" msgid="8935806698251432196">"Услуге локације"</string>
+    <string name="security_settings_title" msgid="7945465324818485460">"Безбедност"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Подешавање Моје локације, откључавања екрана, закључавања SIM картице и закључавања акредитива складишта"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Подешавање Моје локације, откључавања екрана, закључавања складишта акредитива"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Лозинке"</string>
@@ -316,7 +327,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>
@@ -375,8 +386,8 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Преглед или деактивирање администратора уређаја"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Укључи Bluetooth"</string>
-    <string name="bluetooth_settings" msgid="2725796451253089609">"Подешавања за Bluetooth"</string>
-    <string name="bluetooth_settings_title" msgid="2824020086246268296">"Подешавања за Bluetooth"</string>
+    <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
+    <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Управљање везама, подешавање назива и видљивости уређаја"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Захтев за Bluetooth упаривање"</string>
     <string name="bluetooth_enter_pin_msg" msgid="1499285355129256289">\n"Унесите PIN да бисте се упарили са уређајем „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“. (Покушајте са 0000 или 1234.) Можда ћете морати да унесете исти PIN на Bluetooth уређају."</string>
@@ -394,7 +405,10 @@
     <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>
+    <!-- no translation found for bluetooth_search_for_devices (5957007154213560390) -->
+    <skip />
+    <!-- no translation found for bluetooth_searching_for_devices (9203739709307871727) -->
+    <skip />
     <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>
@@ -404,6 +418,10 @@
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Опозови упаривање"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Прекини везу и упаривање"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Опције…"</string>
+    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Напредна подешавања"</string>
+    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Напредни Bluetooth"</string>
+    <string name="bluetooth_advanced_settings_label" msgid="8659717781212434173">"Напредни Bluetooth"</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="3631028334811113629">"Укључите bluetooth да бисте видели доступне уређ."</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>
@@ -445,27 +463,31 @@
     <string name="nfc_toggle_error" msgid="2233172102497535522">"Дошло је до грешке."</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Укључивање Wi-Fi мреже"</string>
-    <string name="wifi_settings" msgid="4746946030627213196">"Wi-Fi подешавања"</string>
+    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="2810363951104753710">"Wi-Fi подешавања"</string>
+    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Подешавање и управљање бежичним приступним тачкама"</string>
-    <string name="wifi_starting" msgid="6710266609710860129">"Укључивање..."</string>
-    <string name="wifi_stopping" msgid="5952909472548218348">"Искључивање…"</string>
+    <string name="wifi_starting" msgid="7732330327758522943">"Укључивање Wi-Fi мреже..."</string>
+    <string name="wifi_stopping" msgid="244864762599017659">"Искључивање Wi-Fi мреже…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Грешка"</string>
     <string name="wifi_in_airplane_mode" msgid="7618393787965366655">"У режиму рада у авиону"</string>
     <string name="wifi_fail_to_scan" msgid="6194542252808587669">"Није могуће скенирати мреже"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Обавештење мреже"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Обавести ме када је отворена мрежа доступна"</string>
+    <string name="wifi_enable_watchdog_service" msgid="4723544454066601706">"Провере могућности повезивања са Wi-Fi мрежом"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="8687400936839455926">"Откриј потенцијалне проблеме са повезивањем са мрежом и управљај њима"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Смернице за прекид везе са Wi-Fi мрежом"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Одређивање времена пребацивања са Wi-Fi мреже на мобилну мрежу података"</string>
     <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" msgid="6234851776910938957">"Додај мрежу"</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>
     <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_empty_list_wifi_off" msgid="3682507011071029311">"Укључите wifi да бисте видели доступне мреже"</string>
     <string name="wifi_network_setup" msgid="7974851890019344870">"Подешавање мреже"</string>
     <string name="wifi_wps_pin" msgid="5471842298708321115">"Унесите PIN са приступне тачке"</string>
     <string name="wifi_wps_setup_title" msgid="150518971269252336">"Подешавање WPS-а"</string>
@@ -501,13 +523,13 @@
     <string name="wifi_save" msgid="3331121567988522826">"Сачувај"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Откажи"</string>
     <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"Откривена је још једна WPS сесија, покушајте поново за неколико минута"</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Напредно"</string>
+    <!-- outdated translation 5419052271935350999 -->     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Напредно"</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>
-    <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"IP подешавања"</string>
+    <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP подешавања"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Сачувај"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Откажи"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Унесите важећу IP адресу."</string>
@@ -525,7 +547,7 @@
     <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">"AndroidHotspot"</string>
     <string name="sound_settings_title" msgid="8735891486683305886">"Звук"</string>
-    <string name="display_settings_title" msgid="2378894265964357591">"Екран"</string>
+    <string name="display_settings_title" msgid="1708697328627382561">"Приказ"</string>
     <string name="sound_settings" msgid="5007659014828162881">"Подешавања звука"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Нечујни режим"</string>
     <string name="silent_mode_summary" msgid="3309650676072917899">"Искључивање свих звукова осим звукова медија и аларма"</string>
@@ -598,7 +620,18 @@
     <string name="brightness_summary" msgid="838917350127550703">"Прилагођавање осветљености екрана"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Време чекања"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Екран се аутоматски искључује након <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Позадина"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android Dreams"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Чувари екрана и други начини за прекид неактивности"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Selected dream"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Када да се активира"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"Након <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> стања неактивности"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Никад"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Испробај!"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Аутоматски ниво осветљености"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Величина фонта"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Општа величина фонтова"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Избор величине фонта"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Подешавања закључавања SIM картице"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Подешавање закључавања SIM картице"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Закључавање SIM картице"</string>
@@ -643,8 +676,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>
@@ -696,6 +730,16 @@
     <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 storage_menu_usb (1580545228584324704) -->
+    <skip />
+    <!-- no translation found for storage_title_usb (5775322159427546546) -->
+    <skip />
+    <!-- no translation found for usb_label_mtp (4157227401755543412) -->
+    <skip />
+    <!-- no translation found for usb_label_ptp (7417254019489575819) -->
+    <skip />
+    <!-- no translation found for usb_label_installer_cd (7438467574756086977) -->
+    <skip />
     <string name="battery_status_title" msgid="9159414319574976203">"Статус батерије"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Ниво батерије"</string>
     <string name="apn_settings" msgid="3743170484827528406">"Називи приступних тачака"</string>
@@ -806,6 +850,8 @@
     <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>
+    <string name="wireless_category_general" msgid="2973810407987118067">"Опште"</string>
+    <string name="wireless_category_mobile_networks" msgid="1254629216798424288">"Мобилне мреже"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Мобилне мреже"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Подешавање опција за роминг, мреже и називе приступних тачака"</string>
     <string name="location_title" msgid="1029961368397484576">"Мојa локацијa"</string>
@@ -883,7 +929,7 @@
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Обезбеђивање таблета"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Обезбеђивање телефона"</string>
     <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"Заштитите таблет од неовлашћене употребе тако што ћете направити лични шаблон за откључавање екрана. На следећем екрану повежите тачке прстом у било ком редоследу. Морате да повежете најмање четири тачке. "\n\n"Спремни сте да почнете? Додирните „Следеће“."</string>
-    <string name="lock_intro_message" product="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>
+    <!-- outdated translation 3692151094288835065 -->     <string name="lock_intro_message" product="default" msgid="5796785892741212873">"Заштитите таблет од неовлашћене употребе тако што ћете направити лични шаблон за откључавање екрана. На следећем екрану повежите тачке прстом у било ком редоследу. Морате да повежете најмање четири тачке. "\n\n"Спремни сте да почнете? Додирните „Следеће“."</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Управљање апликацијама"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Управљање и уклањање инсталираних апликација"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Апликације"</string>
@@ -893,6 +939,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>
@@ -905,9 +953,10 @@
     <string name="force_stop" msgid="7435006169872876756">"Принудно заустави"</string>
     <string name="total_size_label" msgid="1048676419552557254">"Укупно"</string>
     <string name="application_size_label" msgid="5055196275624686382">"Апликација"</string>
+    <string name="external_code_size_label" msgid="3459343140355961335">"Апликација USB меморије"</string>
     <string name="data_size_label" msgid="8679376373625710107">"Подаци"</string>
-    <string name="external_size_label" product="nosdcard" msgid="4465530017830945766">"USB меморија"</string>
-    <string name="external_size_label" product="default" msgid="2107155737635944440">"SD картица"</string>
+    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Подаци о USB меморији"</string>
+    <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD картица"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Деинсталирај"</string>
     <string name="disable_text" msgid="6544054052049395202">"Онемогући"</string>
     <string name="enable_text" msgid="9217362512327828987">"Омогући"</string>
@@ -1026,7 +1075,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 +1085,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>
@@ -1066,7 +1117,7 @@
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Подешавања тастатуре на екрану"</string>
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Физичка тастатура"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Подешавања физичке тастатуре"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Програмирање"</string>
+    <string name="development_settings_title" msgid="215179176067683667">"Опције за програмера"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"Подешавање опција за развој апликације"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Отклањање USB грешака"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Режим отклањања грешака када је USB повезан"</string>
@@ -1091,14 +1142,14 @@
     <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="toggle_large_text_title" msgid="42259643359869436">"Велики текст"</string>
     <string name="accessibility_services_category" msgid="8127851026323672607">"Услуге приступачности"</string>
+    <string name="toggle_accessibility_title" msgid="7338739354952553958">"Омогући услуге за доступност"</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>
@@ -1106,10 +1157,11 @@
     <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>
-    <string name="power_usage_summary_title" msgid="5180282911164282324">"Коришћење батерије"</string>
+    <string name="power_usage_summary_title" msgid="7190304207330319919">"Батерија"</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>
@@ -1218,6 +1270,8 @@
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> подешавања"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> је омогућено"</string>
     <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> је онемогућено"</string>
+    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Подешавања машине"</string>
+    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Подешавања за <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"Језици и гласови"</string>
     <string name="pico_installed" msgid="2452546687858267414">"Инсталирано"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"Није инсталирано"</string>
@@ -1228,114 +1282,33 @@
     <string name="gadget_title" msgid="7455548605888590466">"Контрола напајања"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Ажурирање Wi-Fi подешавања"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Ажурирање Bluetooth подешавања"</string>
-    <string name="vpn_settings_activity_title" msgid="7276864950701612579">"Подешавања VPN-а"</string>
-    <string name="vpn_connect_to" msgid="2541409082892684362">"Повезивање сa мрежом <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">"Грешка Challenge протокола. Желите ли да проверите тајна подешавања?"</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">"Додавање VPN мреже <xliff:g id="NAME">%s</xliff:g>"</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">"Подешавање и управљање виртуелним приватним мрежама (VPN)"</string>
-    <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="trusted_credentials" msgid="4266945289534242402">"Поуздани акредитиви"</string>
+    <string name="trusted_credentials_summary" msgid="6735221351155686632">"Прикажи поуздане CA сертификате"</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>
-    <string name="privacy_settings_title" msgid="1987089301293213705">"Подешавања приватности"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"Прављење резервне копије и враћање на почетне вредности"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"Прављење резервне копије и враћање на почетне вредности"</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>
@@ -1440,4 +1413,107 @@
     <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>
+    <!-- no translation found for debug_ui_category (9023948280291055349) -->
+    <skip />
+    <!-- no translation found for strict_mode (1938795874357830695) -->
+    <skip />
+    <!-- no translation found for strict_mode_summary (142834318897332338) -->
+    <skip />
+    <!-- no translation found for pointer_location (6084434787496938001) -->
+    <skip />
+    <!-- no translation found for pointer_location_summary (840819275172753713) -->
+    <skip />
+    <!-- no translation found for show_screen_updates (8282711794220426931) -->
+    <skip />
+    <!-- no translation found for show_screen_updates_summary (1716122382094924596) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage (2389212910758076024) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage_summary (2113341923988958266) -->
+    <skip />
+    <!-- no translation found for window_animation_scale_title (6162587588166114700) -->
+    <skip />
+    <!-- no translation found for transition_animation_scale_title (387527540523595875) -->
+    <skip />
+    <!-- no translation found for debug_applications_category (6221644998451283813) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities (3622005081180597749) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities_summary (3592221124808773368) -->
+    <skip />
+    <!-- no translation found for app_process_limit_title (4121324758038197598) -->
+    <skip />
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Коришћење података"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"Циклус потрошње података"</string>
+    <string name="data_usage_menu_split_4g" msgid="7417435609285381968">"Одвоји потрошњу 4G података"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Прикажи потрошњу Wi-Fi података"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"Промена циклуса..."</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Дан у месецу када се поново поставља циклус потрошње података:"</string>
+    <string name="data_usage_disable_mobile_limit" msgid="289740911281022322">"Онемогући податке по ограничењу"</string>
+    <string name="data_usage_disable_4g_limit" msgid="5808210773758699800">"Онемогући 4G подат. по ограничењу"</string>
+    <string name="data_usage_disable_3g_limit" msgid="3856971004328238231">"Онем. 2G-3G податке по огранич."</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_mobile" msgid="454140350007299045">"Мобилни"</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">"Подаци мобилне мреже"</string>
+    <string name="data_usage_enable_3g" msgid="6304006671869578254">"2G-3G подаци"</string>
+    <string name="data_usage_enable_4g" msgid="3635854097335036738">"4G подаци"</string>
+    <string name="data_usage_app_settings" msgid="3727561362090820369">"Прикажи подешавања апликације"</string>
+    <string name="data_usage_app_restrict_background" msgid="8856643905291165256">"Ограничи потрошњу позадинских података"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="1503361245973512092">"Дозволи само позад. податке аплик. када се користи неогр. мрежа"</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="8110736468987743260">"Ограничавање позадинских података"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="100001698378554777">"Ова функција може негативно да утиче на апликације које зависе од коришћења позадинских података."\n\n"Одговарајуће контроле за коришћење података могу да се пронађу у подешавањима ове апликације."</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Датум враћања циклуса потрошње на почетне вредности"</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Датум сваког месеца:"</string>
+    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Подеси"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Ограничавање потрошње података"</string>
+    <string name="data_usage_limit_dialog_mobile" msgid="7931094451923591578">"Веза за размену мобилних података биће онемогућена када се достигне наведено ограничење."\n\n"Да бисте избегли додатне трошкове, размислите да користите мање ограничење јер се методи обрачуна разликују у зависности од уређаја и оператера."</string>
+    <string name="data_usage_limit_dialog_3g" msgid="5478553071420316963">"Веза за размену 2G-3G података биће онемогућена када се достигне наведено ограничење."\n\n"Да бисте избегли додатне трошкове, размислите да користите мање ограничење јер се методи обрачуна разликују у зависности од уређаја и оператера."</string>
+    <string name="data_usage_limit_dialog_4g" msgid="6134008906742403777">"Веза за размену 4G података биће онемогућена када се достигне наведено ограничење."\n\n"Да бисте избегли додатне трошкове, размислите да користите мање ограничење јер се методи обрачуна разликују у зависности од уређаја и оператера."</string>
+    <string name="data_usage_disabled_dialog_3g_title" msgid="4221584306492812040">"Коришћење 2G-3G података је онемогућено"</string>
+    <string name="data_usage_disabled_dialog_4g_title" msgid="715585612162185936">"4G подаци су онемогућени"</string>
+    <string name="data_usage_disabled_dialog_mobile_title" msgid="209516216265000221">"Подаци мобилне мреже су онемогућени"</string>
+    <string name="data_usage_disabled_dialog" msgid="2874031671067845964">"Достигнуто је наведено ограничење потрошње података."\n\n"Мобилни оператер може додатно да наплати потрошњу података."</string>
+    <string name="data_usage_disabled_dialog_enable" msgid="2441219164620753329">"Поново омогући податке"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="32">"<xliff:g id="NUMBER">%1$s</xliff:g>"</font>" "<font size="12">"<xliff:g id="UNIT">%2$s</xliff:g>"</font>\n<font size="12">"упозорење"</font></string>
+    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Хитни позив"</string>
+    <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Назад на позив"</string>
+    <string name="vpn_name" msgid="4689699885361002297">"Назив"</string>
+    <string name="vpn_type" msgid="5435733139514388070">"Тип"</string>
+    <string name="vpn_server" msgid="2123096727287421913">"Адреса сервера"</string>
+    <string name="vpn_mppe" msgid="6639001940500288972">"PPP шифровање (MPPE)"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"Тајни L2TP"</string>
+    <string name="vpn_ipsec_identifier" msgid="4098175859460006296">"IPSec идентификатор"</string>
+    <string name="vpn_ipsec_secret" msgid="4526453255704888704">"IPSec унапред дељени кључ"</string>
+    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"IPSec сертификат корисника"</string>
+    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec CA сертификат"</string>
+    <!-- no translation found for vpn_search_domains (5391995501541199624) -->
+    <skip />
+    <!-- no translation found for vpn_routes (8556236801755260073) -->
+    <skip />
+    <string name="vpn_username" msgid="1863901629860867849">"Корисничко име"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Лозинка"</string>
+    <!-- no translation found for vpn_save_login (6350322456427484881) -->
+    <skip />
+    <!-- no translation found for vpn_not_used (9094191054524660891) -->
+    <skip />
+    <string name="vpn_no_ca_cert" msgid="7820884983947090538">"(не верификуј сервер)"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"Откажи"</string>
+    <string name="vpn_save" msgid="4233484051644764510">"Сачувај"</string>
+    <string name="vpn_connect" msgid="8469608541746132301">"Повежи"</string>
+    <string name="vpn_edit" msgid="1111459297288136079">"Измена VPN мреже"</string>
+    <string name="vpn_connect_to" msgid="7328758950427515753">"Повезивање са мрежом <xliff:g id="NETWORK">%s</xliff:g>"</string>
+    <string name="vpn_title" msgid="7982620762043790565">"Подешавања VPN-а"</string>
+    <string name="vpn_create" msgid="8966010925994175306">"Додавање VPN мреже"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"Измена мреже"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"Избриши мрежу"</string>
+    <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Систем"</string>
+    <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Корисник"</string>
+    <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Онемогући"</string>
+    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Омогући"</string>
+    <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Уклони"</string>
+    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Желите ли да омогућите систем CA сертификата?"</string>
+    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Желите ли да онемогућите систем CA сертификата?"</string>
+    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Желите да трајно уклоните CA сертификат корисника?"</string>
 </resources>
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
index cc8b24c..c389592 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>
@@ -214,4 +240,36 @@
     <item msgid="3878793616631049349">"Använd bara HDCP-kontroll för DRM-innehåll"</item>
     <item msgid="45075631231212732">"Använd alltid HDCP-kontroll"</item>
   </string-array>
+    <!-- no translation found for window_animation_scale_entries:0 (8134156599370824081) -->
+    <!-- no translation found for window_animation_scale_entries:1 (6624864048416710414) -->
+    <!-- no translation found for window_animation_scale_entries:2 (2219332261255416635) -->
+    <!-- no translation found for window_animation_scale_entries:3 (3544428804137048509) -->
+    <!-- no translation found for window_animation_scale_entries:4 (3110710404225974514) -->
+    <!-- no translation found for window_animation_scale_entries:5 (4402738611528318731) -->
+    <!-- no translation found for window_animation_scale_entries:6 (6189539267968330656) -->
+    <!-- no translation found for transition_animation_scale_entries:0 (8464255836173039442) -->
+    <!-- no translation found for transition_animation_scale_entries:1 (3375781541913316411) -->
+    <!-- no translation found for transition_animation_scale_entries:2 (1991041427801869945) -->
+    <!-- no translation found for transition_animation_scale_entries:3 (4012689927622382874) -->
+    <!-- no translation found for transition_animation_scale_entries:4 (3289156759925947169) -->
+    <!-- no translation found for transition_animation_scale_entries:5 (7705857441213621835) -->
+    <!-- no translation found for transition_animation_scale_entries:6 (6660750935954853365) -->
+    <!-- no translation found for app_process_limit_entries:0 (6799596560242275471) -->
+    <!-- no translation found for app_process_limit_entries:1 (2412794376818632575) -->
+    <!-- no translation found for app_process_limit_entries:2 (1578904888612645001) -->
+    <!-- no translation found for app_process_limit_entries:3 (8819235336299873577) -->
+  <string-array name="vpn_types_long">
+    <item msgid="2732002039459078847">"PPTP-VPN"</item>
+    <item msgid="3799752201662127867">"L2TP-/IPSec-VPN med nycklar som delats i förväg"</item>
+    <item msgid="4725504331295252103">"L2TP-/IPSec-VPN med certifikat"</item>
+    <item msgid="7526551163264034377">"IPSec-VPN med nycklar som delats i förväg och Xauth-autentisering"</item>
+    <item msgid="8064740940687465039">"IPSec-VPN med certifikat och Xauth-autentisering"</item>
+    <item msgid="4946199982372391490">"IPSec-VPN med certifikat och dubbel autentisering"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:0 (8621078286418985762) -->
+    <!-- no translation found for vpn_states:1 (6692305604213080515) -->
+    <!-- no translation found for vpn_states:2 (8001704909356800092) -->
+    <!-- no translation found for vpn_states:3 (4039737283841672166) -->
+    <!-- no translation found for vpn_states:4 (4042143101664725090) -->
+    <!-- no translation found for vpn_states:5 (2690164254699635531) -->
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index f718658..c95346e 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -19,6 +19,10 @@
     <string name="yes" msgid="4676390750360727396">"Ja"</string>
     <string name="no" msgid="6731231425810196216">"Nej"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Okänd"</string>
+    <string name="header_category_wireless_networks" msgid="4944823405420438623">"TRÅDLÖST OCH NÄTVERK"</string>
+    <string name="header_category_device" msgid="5781174212691167553">"UTRUSTNING"</string>
+    <string name="header_category_personal" msgid="6225932173498802187">"PERSONLIGT"</string>
+    <string name="header_category_system" msgid="2073558547468647128">"SYSTEM"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Sätt på radio"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Stäng av radio"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Visa SIM-adressbok"</string>
@@ -111,7 +115,11 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Parkoppling…"</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"Parkopplad men inte ansluten"</string>
     <string name="bluetooth_device" msgid="6873461446424952003">"handsfree/headset"</string>
-    <string name="progress_scanning" msgid="3760897655335759141">"Skannar"</string>
+    <!-- outdated translation 3760897655335759141 -->     <string name="progress_scanning" msgid="192587958424295789">"Skannar"</string>
+    <!-- no translation found for progress_tap_to_pair (4192342336107106334) -->
+    <skip />
+    <!-- no translation found for bluetooth_no_devices_found (2412462335116297668) -->
+    <skip />
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Begäran om parkoppling för Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Begäran om parkoppling"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Välj att parkoppla med <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
@@ -130,6 +138,9 @@
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"En app begär tillåtelse att aktivera Bluetooth och göra telefonen synlig för andra enheter. Vill du tillåta det?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Aktiverar Bluetooth …"</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Anslut automatiskt"</string>
+    <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Begäran om Bluetooth-anslutning"</string>
+    <string name="bluetooth_connection_notif_message" msgid="1833221950512058309">"Tryck här för att ansluta till <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Vill du ansluta till <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Inställningar för datum och tid"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"Kl. 13:00"</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
@@ -235,7 +246,7 @@
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Inaktivera alla trådlösa anslutningar"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"Inaktiverar trådlösa anslutningar…"</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"Aktivera trådlösa anslutningar..."</string>
-    <string name="radio_controls_title" msgid="5868688473587168882">"Trådlöst och nätverk"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Mer..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Trådlöst och nätverk"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"Hantera Wi-Fi, Bluetooth, flygplansläge, mobila nätverk och VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Dataroaming"</string>
@@ -271,8 +282,8 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Ägaruppgifter"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="2382525043173672857">"Ange text som ska visas på den låsta skärmen"</string>
-    <string name="security_settings_title" msgid="5168491784222013179">"Plats och säkerhet"</string>
-    <string name="location_security_settings_title" msgid="4624434296446625554">"Inställningar för plats och säkerhet"</string>
+    <string name="location_settings_title" msgid="8935806698251432196">"Platstjänster"</string>
+    <string name="security_settings_title" msgid="7945465324818485460">"Säkerhet"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Ställ in Min plats, skärmupplåsning, lås för SIM-kort och lås för uppgiftslagring"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Ställ in Min plats, skärmupplåsning, lås för uppgiftslagring"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Lösenord"</string>
@@ -316,7 +327,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>
@@ -375,8 +386,8 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Visa eller inaktivera enhetsadministratörer"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Aktivera Bluetooth"</string>
-    <string name="bluetooth_settings" msgid="2725796451253089609">"Bluetooth-inställningar"</string>
-    <string name="bluetooth_settings_title" msgid="2824020086246268296">"Bluetooth-inställningar"</string>
+    <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
+    <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Hantera anslutningar, ange inställningar för enhetens namn och synlighet"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Begäran om Bluetooth-parkoppling"</string>
     <string name="bluetooth_enter_pin_msg" msgid="1499285355129256289">\n"Ange PIN-kod för parkoppling med \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" (testa 0000 eller 1234). Du kan behöva ange samma kod på Bluetooth-enheten."</string>
@@ -394,7 +405,10 @@
     <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Parkoppling avvisad av <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"Det gick inte att ansluta till <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Sök efter enheter"</string>
-    <string name="bluetooth_preference_find_nearby_title" msgid="5087410003465463318">"Sök efter enheter i närheten"</string>
+    <!-- no translation found for bluetooth_search_for_devices (5957007154213560390) -->
+    <skip />
+    <!-- no translation found for bluetooth_searching_for_devices (9203739709307871727) -->
+    <skip />
     <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"Enhetsinställningar"</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Parkopplade enheter"</string>
     <string name="bluetooth_preference_found_devices" msgid="3133019331974936204">"Hittade enheter"</string>
@@ -404,6 +418,10 @@
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Ta bort parkoppling"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Koppla ifrån och ta bort parkoppling"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Alternativ..."</string>
+    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Avancerat"</string>
+    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Avancerad Bluetooth"</string>
+    <string name="bluetooth_advanced_settings_label" msgid="8659717781212434173">"Avancerad Bluetooth"</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="3631028334811113629">"Aktivera Bluetooth och visa tillgängliga enheter"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Anslut till…"</string>
     <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"Media"</string>
     <string name="bluetooth_profile_headset" msgid="81844079120986198">"Handsfree"</string>
@@ -445,27 +463,31 @@
     <string name="nfc_toggle_error" msgid="2233172102497535522">"Ett fel inträffade."</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Aktivera Wi-Fi"</string>
-    <string name="wifi_settings" msgid="4746946030627213196">"Wi-Fi-inställningar"</string>
+    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="2810363951104753710">"Wi-Fi-inställningar"</string>
+    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Ställ in och hantera trådlösa åtkomstpunkter"</string>
-    <string name="wifi_starting" msgid="6710266609710860129">"Aktiverar…"</string>
-    <string name="wifi_stopping" msgid="5952909472548218348">"Stänger av…"</string>
+    <string name="wifi_starting" msgid="7732330327758522943">"Aktiverar Wi-Fi..."</string>
+    <string name="wifi_stopping" msgid="244864762599017659">"Inaktiverar Wi-Fi..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"Fel"</string>
     <string name="wifi_in_airplane_mode" msgid="7618393787965366655">"I flygplansläge"</string>
     <string name="wifi_fail_to_scan" msgid="6194542252808587669">"Det går inte att söka efter nätverk"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Nätverksmeddelande"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Meddela mig när ett öppet nätverk är tillgängligt"</string>
+    <string name="wifi_enable_watchdog_service" msgid="4723544454066601706">"Kontroll av Wi-Fi-anslutning"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="8687400936839455926">"Identifiera och hantera eventuella problem med nätverksanslutningen"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Wi-Fi-bortkopplingspolicy"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Ange när du vill växla från Wi-Fi till mobildata"</string>
     <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" msgid="6234851776910938957">"Lägg till 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>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Anslut till nätverk"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Glöm nätverk"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Ändra nätverk"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="3682507011071029311">"Aktivera Wi-Fi och visa tillgängliga nätverk"</string>
     <string name="wifi_network_setup" msgid="7974851890019344870">"Nätverkskonfiguration"</string>
     <string name="wifi_wps_pin" msgid="5471842298708321115">"Ange PIN från åtkomstpunkten"</string>
     <string name="wifi_wps_setup_title" msgid="150518971269252336">"WPS-konfiguration"</string>
@@ -501,13 +523,13 @@
     <string name="wifi_save" msgid="3331121567988522826">"Spara"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Avbryt"</string>
     <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"En annan WPS-session upptäcktes, försök igen om några minuter"</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Avancerad"</string>
+    <!-- outdated translation 5419052271935350999 -->     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Avancerad"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi-frekvensband"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Ange driftområde för frekvens"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Ett problem uppstod när frekvensband ställdes in."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Mac-adress"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP-adress"</string>
-    <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"IP-inställningar"</string>
+    <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP-inställningar"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Spara"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Avbryt"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Ange en giltig IP-adress."</string>
@@ -525,7 +547,7 @@
     <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> mobil Wi-Fi-surfpunkt"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="sound_settings_title" msgid="8735891486683305886">"Ljud"</string>
-    <string name="display_settings_title" msgid="2378894265964357591">"Skärm"</string>
+    <string name="display_settings_title" msgid="1708697328627382561">"Skärm"</string>
     <string name="sound_settings" msgid="5007659014828162881">"Ljudinställningar"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Tyst läge"</string>
     <string name="silent_mode_summary" msgid="3309650676072917899">"Tysta ned alla ljud utom media och alarm"</string>
@@ -598,7 +620,18 @@
     <string name="brightness_summary" msgid="838917350127550703">"Ändra skärmens ljusstyrka"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Tidsgräns"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Skärmen stängs av automatiskt efter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Bakgrund"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android-drömmar"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Skärmsläckare och andra funktioner vid inaktivitet"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Vald dröm"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Tidsgräns för skärmsläckare"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"Efter att ha varit inaktiv i <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Aldrig"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Testa den!"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatisk ljusstyrka"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Teckenstorlek"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Övergripande teckenstorlek"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Välj teckenstorlek"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Låsinställningar för SIM-kort"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Ställ in lås för SIM-kort"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Lås för SIM-kort"</string>
@@ -643,8 +676,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>
@@ -696,6 +730,16 @@
     <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"Delad lagringsenhet monteras bort."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Monterar bort"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Monterar bort"</string>
+    <!-- no translation found for storage_menu_usb (1580545228584324704) -->
+    <skip />
+    <!-- no translation found for storage_title_usb (5775322159427546546) -->
+    <skip />
+    <!-- no translation found for usb_label_mtp (4157227401755543412) -->
+    <skip />
+    <!-- no translation found for usb_label_ptp (7417254019489575819) -->
+    <skip />
+    <!-- no translation found for usb_label_installer_cd (7438467574756086977) -->
+    <skip />
     <string name="battery_status_title" msgid="9159414319574976203">"Batteristatus"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Batterinivå"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN:er"</string>
@@ -806,6 +850,8 @@
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"Det går inte att dela med mer än <xliff:g id="MAXCONNECTION">%1$d</xliff:g> enheter"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kopplas från."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Hjälp"</string>
+    <string name="wireless_category_general" msgid="2973810407987118067">"Allmänt"</string>
+    <string name="wireless_category_mobile_networks" msgid="1254629216798424288">"Mobila nätverk"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobila nätverk"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Ställ in alternativ för roaming, nätverk, APN:er"</string>
     <string name="location_title" msgid="1029961368397484576">"Min plats"</string>
@@ -883,7 +929,7 @@
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Skydda din pekdator"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Skydda din telefon"</string>
     <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"Skydda pekdatorn från obehörig användning genom att skapa ett personligt grafiskt lösenord. Anslut prickarna med fingret i valfri ordning på nästa sida. Du måste ansluta minst fyra punkter. "\n" "\n"Tryck på Nästa när du är redo att sätta igång."</string>
-    <string name="lock_intro_message" product="default" msgid="9100785646737118042"><font size="17">"Skydda din telefon från obehörig användning genom att skapa ett personligt grafiskt lösenord på skärmen. "\n<font height="17">\n</font>"1"<b></b>"  Se hur ett grafiskt lösenord ritas på nästa skärm. "\n<font height="17">\n</font><b>"2"</b>" Rita ditt eget grafiska lösenord. Experimentera med olika grafiska lösenord men anslut minst fyra punkter. "\n<font height="17">\n</font><b>"3"</b>"  Rita ditt grafiska lösenord igen för att bekräfta. "\n<font height="17">\n</font><b>" Är du redo att börja? Tryck på Nästa"</b>". "\n<font height="3">\n</font>"Tryck på Avbryt om du vill lämna telefonen oskyddad."</font></string>
+    <!-- outdated translation 3692151094288835065 -->     <string name="lock_intro_message" product="default" msgid="5796785892741212873">"Skydda pekdatorn från obehörig användning genom att skapa ett personligt grafiskt lösenord. Anslut prickarna med fingret i valfri ordning på nästa sida. Du måste ansluta minst fyra punkter. "\n" "\n"Tryck på Nästa när du är redo att sätta igång."</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Hantera appar"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Hantera och ta bort installerade appar"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Appar"</string>
@@ -893,6 +939,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>
@@ -905,9 +953,10 @@
     <string name="force_stop" msgid="7435006169872876756">"Tvingad avslutning"</string>
     <string name="total_size_label" msgid="1048676419552557254">"Totalt"</string>
     <string name="application_size_label" msgid="5055196275624686382">"App"</string>
+    <string name="external_code_size_label" msgid="3459343140355961335">"Appens data på USB-lagringsenhet"</string>
     <string name="data_size_label" msgid="8679376373625710107">"Data"</string>
-    <string name="external_size_label" product="nosdcard" msgid="4465530017830945766">"USB-lagring"</string>
-    <string name="external_size_label" product="default" msgid="2107155737635944440">"SD-kort"</string>
+    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Data på USB-lagringsenhet"</string>
+    <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD-kort"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Avinstallera"</string>
     <string name="disable_text" msgid="6544054052049395202">"Inaktivera"</string>
     <string name="enable_text" msgid="9217362512327828987">"Aktivera"</string>
@@ -1026,7 +1075,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 +1085,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>
@@ -1066,7 +1117,7 @@
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Inställningar för tangentbordet på skärmen"</string>
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Fysiskt tangentbord"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Inställningar för fysiskt tangentbord"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Utveckling"</string>
+    <string name="development_settings_title" msgid="215179176067683667">"Utvecklaralternativ"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"Ange alternativ för programutveckling"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB-felsökning"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Felsökningsläge när USB har anslutits"</string>
@@ -1091,14 +1142,14 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Tillgänglighet"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Tillgänglighetsinställningar"</string>
     <string name="accessibility_settings_summary" msgid="8185181964847149507">"Hantera tillgänglighetsalternativ"</string>
-    <string name="toggle_accessibility_title" msgid="650839277066574497">"Tillgänglighet"</string>
+    <string name="toggle_large_text_title" msgid="42259643359869436">"Stor text"</string>
     <string name="accessibility_services_category" msgid="8127851026323672607">"Tjänster för tillgänglighet"</string>
+    <string name="toggle_accessibility_title" msgid="7338739354952553958">"Tillåt tillgänglighetstjänster"</string>
     <string name="no_accessibility_services_summary" msgid="694578333333808159">"Inga installerade tillgänglighetstjänster."</string>
     <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Tillgänglighetstjänsten kan samla in all text du skriver, inklusive personliga uppgifter som kreditkortsnummer, men inte lösenord. Den kan även logga din kommunikation med användargränssnittet. Den kommer från programmet <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Vill du aktivera tillgänglighetstjänsten?"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Vill du inaktivera tillgänglighet?"</string>
     <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"Hittade inga tillgänglighetsrelaterade appar"</string>
     <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"Du har inga tillgänglighetsrelaterade appar installerade."\n\n"Du kan hämta en skärmläsare för enheten från Android Market."\n\n"Klicka på OK om du vill installera skärmläsaren."</string>
-    <string name="accessibility_script_injection_category" msgid="8649951751131431904">"Tillgänglighetsskript"</string>
     <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"Hämta tillgänglighetsskript"</string>
     <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"Tillåt att appar hämtar tillgänglighetsskript från Google"</string>
     <string name="accessibility_script_injection_security_warning" product="tablet" msgid="1113600871264359828">"I vissa program hämtas skript från Google till pekdatorn så att innehållet blir mer tillgängligt. Tillåter du att Google installerar tillgänglighetsskript i pekdatorn?"</string>
@@ -1106,10 +1157,11 @@
     <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>
-    <string name="power_usage_summary_title" msgid="5180282911164282324">"Batteriförbrukning"</string>
+    <string name="power_usage_summary_title" msgid="7190304207330319919">"Batteri"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Appar som har förbrukat batteriet"</string>
     <string name="power_usage_not_available" msgid="3583407442633768046">"Batterinfo ej tillgänglig"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Batteriförbrukning sedan bortkoppling"</string>
@@ -1218,6 +1270,8 @@
     <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>
+    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Inställningar för motor"</string>
+    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Inställningar för <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
     <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>
@@ -1228,114 +1282,33 @@
     <string name="gadget_title" msgid="7455548605888590466">"Strömkontroll"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Uppdaterar Wi-Fi-inställningar"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Uppdatera Bluetooth-inställningar"</string>
-    <string name="vpn_settings_activity_title" msgid="7276864950701612579">"VPN-inställningar"</string>
-    <string name="vpn_connect_to" msgid="2541409082892684362">"Anslut till <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpn_username_colon" msgid="7854930370861306247">"Användarnamn:"</string>
-    <string name="vpn_password_colon" msgid="5716278710848606626">"Lösenord:"</string>
-    <string name="vpn_a_username" msgid="6664733641993968692">"ett användarnamn"</string>
-    <string name="vpn_a_password" msgid="1537213632501483753">"ett lösenord"</string>
-    <string name="vpn_save_username" msgid="1408415289165970790">"Kom ihåg användarnamnet"</string>
-    <string name="vpn_connect_button" msgid="1699007212602470655">"Anslut"</string>
-    <string name="vpn_yes_button" msgid="8034531001149843119">"Ja"</string>
-    <string name="vpn_no_button" msgid="7620339571187119107">"Nej"</string>
-    <string name="vpn_back_button" msgid="192036339792734970">"Tillbaka"</string>
-    <string name="vpn_mistake_button" msgid="1683383660912491270">"Nej"</string>
-    <string name="vpn_menu_done" msgid="93528279226907926">"Spara"</string>
-    <string name="vpn_menu_cancel" msgid="7234451214611202868">"Avbryt"</string>
-    <string name="vpn_menu_revert" msgid="4407762442281467659">"Tillbaka"</string>
-    <string name="vpn_menu_connect" msgid="1089399414463784218">"Anslut till nätverk"</string>
-    <string name="vpn_menu_disconnect" msgid="8254492450022562235">"Koppla ifrån nätverket"</string>
-    <string name="vpn_menu_edit" msgid="4526245173583195618">"Redigera nätverk"</string>
-    <string name="vpn_menu_delete" msgid="3326527392609513129">"Ta bort nätverk"</string>
-    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"Du måste ange <xliff:g id="CODE">%s</xliff:g>."</string>
-    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"Du måste välja <xliff:g id="OPTION">%s</xliff:g>."</string>
-    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"VPN-namnet <xliff:g id="NAME">%s</xliff:g> finns redan. Använd ett annat namn."</string>
-    <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"Vill du ta bort detta VPN?"</string>
-    <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"Vill du inte skapa den här profilen?"</string>
-    <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"Vill du ignorera ändringarna som gjorts i profilen?"</string>
-    <string name="vpn_confirm_reconnect" msgid="5748535476278674296">"Det går inte att ansluta till nätverket. Vill du försöka igen?"</string>
-    <string name="vpn_reconnect_from_lost" msgid="2442844155623372118">"Anslutningen avbröts. Vill du ansluta igen?"</string>
-    <string name="vpn_unknown_server_dialog_msg" msgid="3080742299823671319">"Servernamnet kunde inte matchas. Vill du kontrollera inställningarna för servernamn?"</string>
-    <string name="vpn_challenge_error_dialog_msg" msgid="6174901754230038601">"Fel vid anrop. Vill du kontrollera hemlighetsinställningen?"</string>
-    <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"Det saknas en eller flera hemligheter i VPN-konfigurationen. Vill du kontrollera hemlighetsinställningen?"</string>
-    <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"Användarnamnet eller lösenordet som du angav var felaktigt. Vill du försöka igen?"</string>
-    <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"Servern kopplade ifrån. Du kanske angav fel användarnamn eller lösenord. Vill du försöka igen?"</string>
-    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"Servern avbröt kommunikationen. Du kanske befinner dig bakom en brandvägg som förhindrar att du ansluter till servern. Vill du försöka igen?"</string>
-    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"Serveranslutningen misslyckades. Servern kanske inte accepterar ditt krypteringsval. Vill du kontrollera krypteringsinställningen?"</string>
-    <string name="vpn_type_title" msgid="6392933604218676224">"Lägg till VPN"</string>
-    <string name="vpn_add_new_vpn" msgid="5438260689052714550">"Lägg till VPN"</string>
-    <string name="vpn_details_title" msgid="418806440938510331">"VPN-information"</string>
-    <string name="vpn_edit_title_add" msgid="2121313217989682890">"Lägg till <xliff:g id="NAME">%s</xliff:g> VPN"</string>
-    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"Information om <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpns" msgid="3148141862835492816">"VPN"</string>
-    <string name="vpn_connecting" msgid="8039521381692090116">"Ansluter..."</string>
-    <string name="vpn_disconnecting" msgid="7748050200708257066">"Kopplar ifrån..."</string>
-    <string name="vpn_connected" msgid="7641723116362845781">"Ansluten"</string>
-    <string name="vpn_connect_hint" msgid="7442898962925875181">"Anslut till nätverk"</string>
-    <string name="vpn_name" msgid="1550918148476193076">"VPN-namn"</string>
-    <string name="vpn_a_name" msgid="8445736942405283509">"ett VPN-namn"</string>
-    <string name="vpn_profile_added" msgid="9061017910337129840">"\"<xliff:g id="NAME">%s</xliff:g>\" har lagts till"</string>
-    <string name="vpn_profile_replaced" msgid="587435576816273815">"Ändringar har gjorts i \"<xliff:g id="NAME">%s</xliff:g>\""</string>
-    <string name="vpn_user_certificate_title" msgid="6812545893924071742">"Ange användarcertifikat"</string>
-    <string name="vpn_user_certificate" msgid="949322691686938888">"Användarcertifikat"</string>
-    <string name="vpn_a_user_certificate" msgid="8943983437956898649">"ett användarcertifikat"</string>
-    <string name="vpn_ca_certificate_title" msgid="7846466160795589985">"Ange CA-certifikat"</string>
-    <string name="vpn_ca_certificate" msgid="465085144064264742">"Certifikat från certifikatutfärdare"</string>
-    <string name="vpn_a_ca_certificate" msgid="3374242520974884295">"ett CA-certifikat"</string>
-    <string name="vpn_l2tp_secret_string_title" msgid="5039677186748940987">"Ange L2TP-hemlighet"</string>
-    <string name="vpn_l2tp_secret" msgid="529359749677142076">"L2TP-hemlighet"</string>
-    <string name="vpn_a_l2tp_secret" msgid="6612042930810981845">"en L2TP-hemlighet"</string>
-    <string name="vpn_pptp_encryption_title" msgid="2236795167467896499">"kryptering"</string>
-    <string name="vpn_pptp_encryption" msgid="2602329949737259686">"PPTP-kryptering"</string>
-    <string name="vpn_ipsec_presharedkey_title" msgid="2184060087690539175">"Ange i förväg delad IPSec-nyckel"</string>
-    <string name="vpn_ipsec_presharedkey" msgid="5434316521616673741">"I förväg delad IPSec-nyckel"</string>
-    <string name="vpn_a_ipsec_presharedkey" msgid="1255301923217898418">"en i förväg delad IPsec-nyckel"</string>
-    <string name="vpn_vpn_server_title" msgid="8897005887420358913">"Ange VPN-server"</string>
-    <string name="vpn_vpn_server" msgid="1141754908824209260">"VPN-server"</string>
-    <string name="vpn_a_vpn_server" msgid="5960906152125045853">"en VPN-server"</string>
-    <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"VPN-serverns namn"</string>
-    <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"DNS-sökdomäner"</string>
-    <string name="vpn_dns_search_list" msgid="4230034234026605360">"DNS-sökdomäner"</string>
-    <string name="vpn_field_is_set" msgid="7137320847812992243">"<xliff:g id="VALUE">%s</xliff:g> har angetts"</string>
-    <string name="vpn_field_not_set" msgid="2972519243515893804">"<xliff:g id="VALUE">%s</xliff:g> ej angivet"</string>
-    <string name="vpn_field_not_set_optional" msgid="8840557698252556791">"<xliff:g id="VALUE">%s</xliff:g> har inte angetts (valfritt)"</string>
-    <string name="vpn_enable_field" msgid="3700967675854517191">"Aktivera <xliff:g id="OPTION">%s</xliff:g>"</string>
-    <string name="vpn_disable_field" msgid="6905658811179634005">"Inaktivera <xliff:g id="OPTION">%s</xliff:g>"</string>
-    <string name="vpn_is_enabled" msgid="1266304230417098877">"<xliff:g id="OPTION">%s</xliff:g> är aktiverad"</string>
-    <string name="vpn_is_disabled" msgid="2013622485867806167">"<xliff:g id="OPTION">%s</xliff:g> är inaktiverat"</string>
     <string name="vpn_settings_title" msgid="7327468307909556719">"VPN-inställningar"</string>
     <string name="vpn_settings_summary" msgid="8849924181594963972">"Konfigurera och hantera virtuella privata nätverk (VPN)"</string>
-    <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="trusted_credentials" msgid="4266945289534242402">"Tillförlitlig autentisering"</string>
+    <string name="trusted_credentials_summary" msgid="6735221351155686632">"Visa tillförlitliga CA-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>
-    <string name="privacy_settings_title" msgid="1987089301293213705">"Sekretessinställningar"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"Säkerhetskopiering och återställning"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"Säkerhetskopiering och återställning"</string>
     <string name="backup_section_title" msgid="8856083167469467588">"Säkerhetskopiera och återställ"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Personliga data"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Säkerhetskopiera mina data"</string>
@@ -1446,4 +1419,107 @@
     <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>
+    <!-- no translation found for debug_ui_category (9023948280291055349) -->
+    <skip />
+    <!-- no translation found for strict_mode (1938795874357830695) -->
+    <skip />
+    <!-- no translation found for strict_mode_summary (142834318897332338) -->
+    <skip />
+    <!-- no translation found for pointer_location (6084434787496938001) -->
+    <skip />
+    <!-- no translation found for pointer_location_summary (840819275172753713) -->
+    <skip />
+    <!-- no translation found for show_screen_updates (8282711794220426931) -->
+    <skip />
+    <!-- no translation found for show_screen_updates_summary (1716122382094924596) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage (2389212910758076024) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage_summary (2113341923988958266) -->
+    <skip />
+    <!-- no translation found for window_animation_scale_title (6162587588166114700) -->
+    <skip />
+    <!-- no translation found for transition_animation_scale_title (387527540523595875) -->
+    <skip />
+    <!-- no translation found for debug_applications_category (6221644998451283813) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities (3622005081180597749) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities_summary (3592221124808773368) -->
+    <skip />
+    <!-- no translation found for app_process_limit_title (4121324758038197598) -->
+    <skip />
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Dataanvändning"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"Dataanvändningscykel"</string>
+    <string name="data_usage_menu_split_4g" msgid="7417435609285381968">"Visa 4G-användning separat"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Visa Wi-Fi-användning"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"Ändra cykel…"</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Dag i månaden för att återställa dataanvändningscykeln:"</string>
+    <string name="data_usage_disable_mobile_limit" msgid="289740911281022322">"Inaktivera mobildata vid gräns"</string>
+    <string name="data_usage_disable_4g_limit" msgid="5808210773758699800">"Inaktivera 4G-data vid gräns"</string>
+    <string name="data_usage_disable_3g_limit" msgid="3856971004328238231">"Inaktivera 2G-3G-data vid gräns"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_mobile" msgid="454140350007299045">"Mobilt"</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">"Mobildata"</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">"Visa inställningarna för appen"</string>
+    <string name="data_usage_app_restrict_background" msgid="8856643905291165256">"Begränsa använd bakgrundsdata"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="1503361245973512092">"Tillåt endast användning av bakgrundsdata via obegränsat nätverk"</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="8110736468987743260">"Begränsa bakgrundsdata"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="100001698378554777">"Denna funktion kan inverka negativt på appar som använder bakgrundsdata. "\n\n"I appens inställningar hittar du mer lämpliga kontroller för dataanvändning."</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Återställningsdag för användningscykel"</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Datum i varje månad:"</string>
+    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Ställ in"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Begränsa dataanvändningen"</string>
+    <string name="data_usage_limit_dialog_mobile" msgid="7931094451923591578">"Din mobildataanslutning inaktiveras när den angivna gränsen nås."\n\n"Om du vill undvika kostnader för ytterligare användning bör du ange en reducerad gräns, eftersom enheter och operatörer kan använda olika beräkningsmodeller."</string>
+    <string name="data_usage_limit_dialog_3g" msgid="5478553071420316963">"Din dataanslutning via 2G-3G inaktiveras när den angivna gränsen nås."\n\n"Om du vill undvika kostnader för ytterligare användning bör du ange en reducerad gräns, eftersom enheter och operatörer kan använda olika beräkningsmodeller."</string>
+    <string name="data_usage_limit_dialog_4g" msgid="6134008906742403777">"Din dataanslutning via 4G inaktiveras när den angivna gränsen nås."\n\n"Om du vill undvika kostnader för ytterligare användning bör du ange en reducerad gräns, eftersom enheter och operatörer kan använda olika beräkningsmodeller."</string>
+    <string name="data_usage_disabled_dialog_3g_title" msgid="4221584306492812040">"Data via 2G-3G har inaktiverats"</string>
+    <string name="data_usage_disabled_dialog_4g_title" msgid="715585612162185936">"Data via 4G har inaktiverats"</string>
+    <string name="data_usage_disabled_dialog_mobile_title" msgid="209516216265000221">"Mobildata har inaktiverats"</string>
+    <string name="data_usage_disabled_dialog" msgid="2874031671067845964">"Den angivna gränsen för dataanvändning har nåtts."\n" "\n"Ytterligare dataanvändning kan medföra operatörsavgifter."</string>
+    <string name="data_usage_disabled_dialog_enable" msgid="2441219164620753329">"återaktivera data"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="32">"<xliff:g id="NUMBER">%1$s</xliff:g>"</font>" "<font size="12">"<xliff:g id="UNIT">%2$s</xliff:g>"</font>\n<font size="12">"varning"</font></string>
+    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Nödsamtal"</string>
+    <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Tillbaka till samtal"</string>
+    <string name="vpn_name" msgid="4689699885361002297">"Namn"</string>
+    <string name="vpn_type" msgid="5435733139514388070">"Typ"</string>
+    <string name="vpn_server" msgid="2123096727287421913">"Serveradress"</string>
+    <string name="vpn_mppe" msgid="6639001940500288972">"PPP-kryptering (MPPE)"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"L2TP-hemlighet"</string>
+    <string name="vpn_ipsec_identifier" msgid="4098175859460006296">"IPSec-identifierare"</string>
+    <string name="vpn_ipsec_secret" msgid="4526453255704888704">"I förväg delad IPSec-nyckel"</string>
+    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"IPSec-användarcertifikat"</string>
+    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec CA-certifikat"</string>
+    <!-- no translation found for vpn_search_domains (5391995501541199624) -->
+    <skip />
+    <!-- no translation found for vpn_routes (8556236801755260073) -->
+    <skip />
+    <string name="vpn_username" msgid="1863901629860867849">"Användarnamn"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Lösenord"</string>
+    <!-- no translation found for vpn_save_login (6350322456427484881) -->
+    <skip />
+    <!-- no translation found for vpn_not_used (9094191054524660891) -->
+    <skip />
+    <string name="vpn_no_ca_cert" msgid="7820884983947090538">"(kontrollera inte servern)"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"Avbryt"</string>
+    <string name="vpn_save" msgid="4233484051644764510">"Spara"</string>
+    <string name="vpn_connect" msgid="8469608541746132301">"Anslut"</string>
+    <string name="vpn_edit" msgid="1111459297288136079">"Redigera VPN-nätverket"</string>
+    <string name="vpn_connect_to" msgid="7328758950427515753">"Anslut till <xliff:g id="NETWORK">%s</xliff:g>"</string>
+    <string name="vpn_title" msgid="7982620762043790565">"VPN-inställningar"</string>
+    <string name="vpn_create" msgid="8966010925994175306">"Lägg till VPN-nätverk"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"Redigera nätverk"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"Ta bort nätverk"</string>
+    <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"System"</string>
+    <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Användare"</string>
+    <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Inaktivera"</string>
+    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Aktivera"</string>
+    <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Ta bort"</string>
+    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Vill du att systemets CA-certifikat ska aktiveras?"</string>
+    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Vill du att systemets CA-certifikat ska inaktiveras?"</string>
+    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Vill du att användarens CA-certifikat ska tas bort permanent?"</string>
 </resources>
diff --git a/res/xml/vpn_type.xml b/res/values-sw-nokeys/strings.xml
similarity index 61%
copy from res/xml/vpn_type.xml
copy to res/values-sw-nokeys/strings.xml
index fbc7822..9814e24 100644
--- a/res/xml/vpn_type.xml
+++ b/res/values-sw-nokeys/strings.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
+<?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.
@@ -12,10 +12,9 @@
      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"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
-        android:title="@string/vpn_type_title">
-
-</PreferenceScreen>   
+<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..ab61924
--- /dev/null
+++ b/res/values-sw/arrays.xml
@@ -0,0 +1,259 @@
+<?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) -->
+    <!-- no translation found for window_animation_scale_entries:0 (8134156599370824081) -->
+    <!-- no translation found for window_animation_scale_entries:1 (6624864048416710414) -->
+    <!-- no translation found for window_animation_scale_entries:2 (2219332261255416635) -->
+    <!-- no translation found for window_animation_scale_entries:3 (3544428804137048509) -->
+    <!-- no translation found for window_animation_scale_entries:4 (3110710404225974514) -->
+    <!-- no translation found for window_animation_scale_entries:5 (4402738611528318731) -->
+    <!-- no translation found for window_animation_scale_entries:6 (6189539267968330656) -->
+    <!-- no translation found for transition_animation_scale_entries:0 (8464255836173039442) -->
+    <!-- no translation found for transition_animation_scale_entries:1 (3375781541913316411) -->
+    <!-- no translation found for transition_animation_scale_entries:2 (1991041427801869945) -->
+    <!-- no translation found for transition_animation_scale_entries:3 (4012689927622382874) -->
+    <!-- no translation found for transition_animation_scale_entries:4 (3289156759925947169) -->
+    <!-- no translation found for transition_animation_scale_entries:5 (7705857441213621835) -->
+    <!-- no translation found for transition_animation_scale_entries:6 (6660750935954853365) -->
+    <!-- no translation found for app_process_limit_entries:0 (6799596560242275471) -->
+    <!-- no translation found for app_process_limit_entries:1 (2412794376818632575) -->
+    <!-- no translation found for app_process_limit_entries:2 (1578904888612645001) -->
+    <!-- no translation found for app_process_limit_entries:3 (8819235336299873577) -->
+    <!-- no translation found for vpn_types_long:0 (2732002039459078847) -->
+    <!-- no translation found for vpn_types_long:1 (3799752201662127867) -->
+    <!-- no translation found for vpn_types_long:2 (4725504331295252103) -->
+    <!-- no translation found for vpn_types_long:3 (7526551163264034377) -->
+    <!-- no translation found for vpn_types_long:4 (8064740940687465039) -->
+    <!-- no translation found for vpn_types_long:5 (4946199982372391490) -->
+    <!-- no translation found for vpn_states:0 (8621078286418985762) -->
+    <!-- no translation found for vpn_states:1 (6692305604213080515) -->
+    <!-- no translation found for vpn_states:2 (8001704909356800092) -->
+    <!-- no translation found for vpn_states:3 (4039737283841672166) -->
+    <!-- no translation found for vpn_states:4 (4042143101664725090) -->
+    <!-- no translation found for vpn_states:5 (2690164254699635531) -->
+</resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
new file mode 100644
index 0000000..60ec5d4
--- /dev/null
+++ b/res/values-sw/strings.xml
@@ -0,0 +1,2060 @@
+<?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 header_category_wireless_networks (4944823405420438623) -->
+    <skip />
+    <!-- no translation found for header_category_device (5781174212691167553) -->
+    <skip />
+    <!-- no translation found for header_category_personal (6225932173498802187) -->
+    <skip />
+    <!-- no translation found for header_category_system (2073558547468647128) -->
+    <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 (192587958424295789) -->
+    <skip />
+    <!-- no translation found for progress_tap_to_pair (4192342336107106334) -->
+    <skip />
+    <!-- no translation found for bluetooth_no_devices_found (2412462335116297668) -->
+    <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 bluetooth_connection_permission_request (4747918249032890077) -->
+    <skip />
+    <!-- no translation found for bluetooth_connection_notif_message (1833221950512058309) -->
+    <skip />
+    <!-- no translation found for bluetooth_connection_dialog_text (8455427559949998023) -->
+    <skip />
+    <!-- no translation found for date_and_time (4114084177056654663) -->
+    <skip />
+    <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00 mchana"</string>
+    <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
+    <!-- no translation found for choose_timezone (7762866468013985022) -->
+    <skip />
+    <string name="normal_date_format" msgid="1982904221918374153">"Kawaida (<xliff:g id="DATE">%s</xliff:g>)"</string>
+    <!-- no translation found for display_preview_label (1127597250917274792) -->
+    <skip />
+    <!-- no translation found for display_font_size_label (8941851418397475389) -->
+    <skip />
+    <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
+    <skip />
+    <string name="intent_sender_sendbroadcast_text" msgid="1415735148895872715">"Tuma <xliff:g id="BROADCAST">broadcast</xliff:g>"</string>
+    <string name="intent_sender_action_label" msgid="616458370005452389">"<xliff:g id="ACTION">Action</xliff:g>:"</string>
+    <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Anzisha <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
+    <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
+    <string name="intent_sender_account_label" msgid="465210404475603404">"Akaunti:"</string>
+    <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 />
+    <!-- unknown quoting pattern: original -1, translation 1 -->
+    <!-- outdated translation 5868688473587168882 -->     <string name="radio_controls_title" msgid="6889937359495515769">"Isiyotumia waya &amp;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>
+    <!-- no translation found for location_settings_title (8935806698251432196) -->
+    <skip />
+    <!-- outdated translation 5168491784222013179 -->     <string name="security_settings_title" msgid="7945465324818485460">"Mahali na 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 (1810521656168174329) -->
+    <skip />
+    <!-- no translation found for bluetooth_settings_title (1908745291161353016) -->
+    <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>
+    <!-- no translation found for bluetooth_search_for_devices (5957007154213560390) -->
+    <skip />
+    <!-- no translation found for bluetooth_searching_for_devices (9203739709307871727) -->
+    <skip />
+    <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>
+    <!-- no translation found for bluetooth_menu_advanced (8572178316357220524) -->
+    <skip />
+    <!-- no translation found for bluetooth_advanced_titlebar (2142159726881547669) -->
+    <skip />
+    <!-- no translation found for bluetooth_advanced_settings_label (8659717781212434173) -->
+    <skip />
+    <!-- no translation found for bluetooth_empty_list_bluetooth_off (3631028334811113629) -->
+    <skip />
+    <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 (1277428034634973011) -->
+    <skip />
+    <!-- no translation found for wifi_settings_category (2810363951104753710) -->
+    <skip />
+    <!-- no translation found for wifi_settings_title (4351120897298124250) -->
+    <skip />
+    <!-- no translation found for wifi_settings_summary (668767638556052820) -->
+    <skip />
+    <!-- no translation found for wifi_starting (7732330327758522943) -->
+    <skip />
+    <!-- no translation found for wifi_stopping (244864762599017659) -->
+    <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 />
+    <!-- no translation found for wifi_enable_watchdog_service (4723544454066601706) -->
+    <skip />
+    <!-- no translation found for wifi_enable_watchdog_service_summary (8687400936839455926) -->
+    <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>
+    <!-- outdated translation 1671334951296205616 -->     <string name="wifi_add_network" msgid="6234851776910938957">"Ongeza mtandao wa Wi-Fi"</string>
+    <!-- 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>
+    <!-- no translation found for wifi_empty_list_wifi_off (3682507011071029311) -->
+    <skip />
+    <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 />
+    <!-- outdated translation 5419052271935350999 -->     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"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_advanced_settings_label (3654366894867838338) -->
+    <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="1708697328627382561">"Onyesha"</string>
+    <!-- no translation found for sound_settings (5007659014828162881) -->
+    <skip />
+    <!-- no translation found for silent_mode_title (3181479108593217704) -->
+    <skip />
+    <string name="silent_mode_summary" msgid="3309650676072917899">"Nyamazisha sauti zote isipokuwa kengele za midia &amp;"</string>
+    <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"Sauti zote isipokuwa za njia ya mawasiliano zimenyamazishwa"</string>
+    <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 storage_menu_usb (1580545228584324704) -->
+    <skip />
+    <!-- no translation found for storage_title_usb (5775322159427546546) -->
+    <skip />
+    <!-- no translation found for usb_label_mtp (4157227401755543412) -->
+    <skip />
+    <!-- no translation found for usb_label_ptp (7417254019489575819) -->
+    <skip />
+    <!-- no translation found for usb_label_installer_cd (7438467574756086977) -->
+    <skip />
+    <!-- no translation found for battery_status_title (9159414319574976203) -->
+    <skip />
+    <!-- no translation found for battery_level_title (2965679202786873272) -->
+    <skip />
+    <!-- no translation found for apn_settings (3743170484827528406) -->
+    <skip />
+    <!-- no translation found for apn_edit (1354715499708424718) -->
+    <skip />
+    <!-- no translation found for apn_not_set (7422262558097875757) -->
+    <skip />
+    <!-- no translation found for apn_name (4115580098369824123) -->
+    <skip />
+    <!-- no translation found for apn_apn (2479425126733513353) -->
+    <skip />
+    <!-- no translation found for apn_http_proxy (1826885957243696354) -->
+    <skip />
+    <!-- no translation found for apn_http_port (3763259523984976226) -->
+    <skip />
+    <!-- no translation found for apn_user (455637547356117761) -->
+    <skip />
+    <!-- no translation found for apn_password (5412301994998250968) -->
+    <skip />
+    <!-- no translation found for apn_server (2436185314756372858) -->
+    <skip />
+    <!-- no translation found for apn_mmsc (3670124402105585737) -->
+    <skip />
+    <!-- no translation found for apn_mms_proxy (5374082621073999275) -->
+    <skip />
+    <!-- no translation found for apn_mms_port (4074188088199243040) -->
+    <skip />
+    <!-- no translation found for apn_mcc (4258628382260674636) -->
+    <skip />
+    <!-- no translation found for apn_mnc (8629374076888809874) -->
+    <skip />
+    <string name="apn_auth_type" msgid="6167205395676037015">"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 wireless_category_general (2973810407987118067) -->
+    <skip />
+    <!-- no translation found for wireless_category_mobile_networks (1254629216798424288) -->
+    <skip />
+    <!-- no translation found for network_settings_title (7967552516440151852) -->
+    <skip />
+    <!-- no translation found for network_settings_summary (5149750850846813553) -->
+    <skip />
+    <string name="location_title" msgid="1029961368397484576">"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>
+    <!-- outdated translation 3692151094288835065 -->     <string name="lock_intro_message" product="default" msgid="5796785892741212873">"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>
+    <!-- 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 external_code_size_label (3459343140355961335) -->
+    <skip />
+    <!-- no translation found for data_size_label (8679376373625710107) -->
+    <skip />
+    <!-- no translation found for external_data_size_label (7533821466482000453) -->
+    <skip />
+    <!-- no translation found for external_data_size_label (626414192825329708) -->
+    <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 (215179176067683667) -->
+    <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>
+    <!-- no translation found for toggle_large_text_title (42259643359869436) -->
+    <skip />
+    <string name="accessibility_services_category" msgid="8127851026323672607">"Huduma za ufikiaji"</string>
+    <!-- outdated translation 650839277066574497 -->     <string name="toggle_accessibility_title" msgid="7338739354952553958">"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_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 />
+    <!-- outdated translation 5180282911164282324 -->     <string name="power_usage_summary_title" msgid="7190304207330319919">"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_title" msgid="7327468307909556719">"Mipangilio ya VPN"</string>
+    <string name="vpn_settings_summary" msgid="8849924181594963972">"Sanidi na udhibiti Mitandao Isiobayana ya Siri (VPN)"</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>
+    <!-- no translation found for trusted_credentials (4266945289534242402) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_summary (6735221351155686632) -->
+    <skip />
+    <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>
+    <!-- outdated translation 9206631214140954954 -->     <string name="privacy_settings" msgid="5446972770562918934">"Faragha"</string>
+    <!-- outdated translation 1987089301293213705 -->     <string name="privacy_settings_title" msgid="4856282165773594890">"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 debug_ui_category (9023948280291055349) -->
+    <skip />
+    <!-- no translation found for strict_mode (1938795874357830695) -->
+    <skip />
+    <!-- no translation found for strict_mode_summary (142834318897332338) -->
+    <skip />
+    <!-- no translation found for pointer_location (6084434787496938001) -->
+    <skip />
+    <!-- no translation found for pointer_location_summary (840819275172753713) -->
+    <skip />
+    <!-- no translation found for show_screen_updates (8282711794220426931) -->
+    <skip />
+    <!-- no translation found for show_screen_updates_summary (1716122382094924596) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage (2389212910758076024) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage_summary (2113341923988958266) -->
+    <skip />
+    <!-- no translation found for window_animation_scale_title (6162587588166114700) -->
+    <skip />
+    <!-- no translation found for transition_animation_scale_title (387527540523595875) -->
+    <skip />
+    <!-- no translation found for debug_applications_category (6221644998451283813) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities (3622005081180597749) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities_summary (3592221124808773368) -->
+    <skip />
+    <!-- no translation found for app_process_limit_title (4121324758038197598) -->
+    <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 (8821760330497941117) -->
+    <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 (2441219164620753329) -->
+    <skip />
+    <!-- no translation found for data_usage_sweep_warning (6387081852568846982) -->
+    <skip />
+    <!-- no translation found for cryptkeeper_emergency_call (198578731586097145) -->
+    <skip />
+    <!-- no translation found for cryptkeeper_return_to_call (5613717339452772491) -->
+    <skip />
+    <!-- outdated translation 1550918148476193076 -->     <string name="vpn_name" msgid="4689699885361002297">"Jina la VPN"</string>
+    <!-- no translation found for vpn_type (5435733139514388070) -->
+    <skip />
+    <!-- no translation found for vpn_server (2123096727287421913) -->
+    <skip />
+    <!-- no translation found for vpn_mppe (6639001940500288972) -->
+    <skip />
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"Siri ya L2TP"</string>
+    <!-- no translation found for vpn_ipsec_identifier (4098175859460006296) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_secret (4526453255704888704) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_user_cert (6880651510020187230) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_ca_cert (91338213449148229) -->
+    <skip />
+    <!-- no translation found for vpn_search_domains (5391995501541199624) -->
+    <skip />
+    <!-- no translation found for vpn_routes (8556236801755260073) -->
+    <skip />
+    <!-- no translation found for vpn_username (1863901629860867849) -->
+    <skip />
+    <!-- no translation found for vpn_password (6756043647233596772) -->
+    <skip />
+    <!-- no translation found for vpn_save_login (6350322456427484881) -->
+    <skip />
+    <!-- no translation found for vpn_not_used (9094191054524660891) -->
+    <skip />
+    <!-- no translation found for vpn_no_ca_cert (7820884983947090538) -->
+    <skip />
+    <!-- no translation found for vpn_cancel (1979937976123659332) -->
+    <skip />
+    <!-- no translation found for vpn_save (4233484051644764510) -->
+    <skip />
+    <!-- no translation found for vpn_connect (8469608541746132301) -->
+    <skip />
+    <!-- no translation found for vpn_edit (1111459297288136079) -->
+    <skip />
+    <!-- no translation found for vpn_connect_to (7328758950427515753) -->
+    <skip />
+    <!-- no translation found for vpn_title (7982620762043790565) -->
+    <skip />
+    <!-- no translation found for vpn_create (8966010925994175306) -->
+    <skip />
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"Hariri mtandao"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"Futa mtandao"</string>
+    <!-- no translation found for trusted_credentials_system_tab (3984284264816924534) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_user_tab (2244732111398939475) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_disable_label (3864493185845818506) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_enable_label (2498444573635146913) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_remove_label (3633691709300260836) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_enable_confirmation (83215982842660869) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_disable_confirmation (8199697813361646792) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_remove_confirmation (443561923016852941) -->
+    <skip />
+</resources>
diff --git a/res/values-sw600dp-land/dimens.xml b/res/values-sw600dp-land/dimens.xml
index 9bd2336..994d4bb 100755
--- a/res/values-sw600dp-land/dimens.xml
+++ b/res/values-sw600dp-land/dimens.xml
@@ -16,4 +16,6 @@
 
 <resources>
     <dimen name="screen_margin_sides">128dip</dimen>
+    <dimen name="screen_margin_top">72dip</dimen>
+    <dimen name="screen_margin_bottom">48dip</dimen>
 </resources>
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index bc9f18d..9469a99 100755
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -18,4 +18,10 @@
     <dimen name="screen_margin_sides">40dip</dimen>
     <dimen name="datetime_margin_top">40dip</dimen>
     <dimen name="datetime_margin_bottom">40dip</dimen>
+    <dimen name="app_icon_size">72dip</dimen>
+    <dimen name="screen_margin_top">48dip</dimen>
+    <dimen name="screen_margin_bottom">48dip</dimen>
+    <dimen name="title_height">48dip</dimen>
+    <dimen name="content_margin_left">16dip</dimen>
+    <dimen name="description_margin_top">26dip</dimen>
 </resources>
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
index 1e99e45..3403f3e 100644
--- a/res/values-sw600dp/styles.xml
+++ b/res/values-sw600dp/styles.xml
@@ -58,4 +58,22 @@
         <item name="android:textSize">20sp</item>
     </style>
 
+    <style name="AccessibilityTutorialTitle" parent="@android:style/TextAppearance.Large">
+        <item name="android:textColor">@color/title_color</item>
+    </style>
+
+    <style name="AccessibilityTutorialButton">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:minWidth">208dip</item>
+        <item name="android:layout_height">48dip</item>
+        <item name="android:paddingTop">0dip</item>
+        <item name="android:paddingLeft">0dip</item>
+        <item name="android:paddingRight">0dip</item>
+        <item name="android:paddingBottom">0dip</item>
+        <item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
+        <item name="android:textSize">20dip</item>
+    </style>
+
+    <style name="AccessibilityTutorialBodyTextPrimary" parent="@android:style/TextAppearance.Medium">
+    </style>
 </resources>
diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml
index ae51eef..3219e47 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>
@@ -214,4 +240,36 @@
     <item msgid="3878793616631049349">"ใช้การตรวจสอบ HDCP สำหรับเนื้อหา DRM เท่านั้น"</item>
     <item msgid="45075631231212732">"ใช้การตรวจสอบ HDCP เสมอ"</item>
   </string-array>
+    <!-- no translation found for window_animation_scale_entries:0 (8134156599370824081) -->
+    <!-- no translation found for window_animation_scale_entries:1 (6624864048416710414) -->
+    <!-- no translation found for window_animation_scale_entries:2 (2219332261255416635) -->
+    <!-- no translation found for window_animation_scale_entries:3 (3544428804137048509) -->
+    <!-- no translation found for window_animation_scale_entries:4 (3110710404225974514) -->
+    <!-- no translation found for window_animation_scale_entries:5 (4402738611528318731) -->
+    <!-- no translation found for window_animation_scale_entries:6 (6189539267968330656) -->
+    <!-- no translation found for transition_animation_scale_entries:0 (8464255836173039442) -->
+    <!-- no translation found for transition_animation_scale_entries:1 (3375781541913316411) -->
+    <!-- no translation found for transition_animation_scale_entries:2 (1991041427801869945) -->
+    <!-- no translation found for transition_animation_scale_entries:3 (4012689927622382874) -->
+    <!-- no translation found for transition_animation_scale_entries:4 (3289156759925947169) -->
+    <!-- no translation found for transition_animation_scale_entries:5 (7705857441213621835) -->
+    <!-- no translation found for transition_animation_scale_entries:6 (6660750935954853365) -->
+    <!-- no translation found for app_process_limit_entries:0 (6799596560242275471) -->
+    <!-- no translation found for app_process_limit_entries:1 (2412794376818632575) -->
+    <!-- no translation found for app_process_limit_entries:2 (1578904888612645001) -->
+    <!-- no translation found for app_process_limit_entries:3 (8819235336299873577) -->
+  <string-array name="vpn_types_long">
+    <item msgid="2732002039459078847">"PPTP VPN"</item>
+    <item msgid="3799752201662127867">"L2TP/IPSec VPN พร้อมด้วยคีย์ที่แบ่งปันไว้ล่วงหน้า"</item>
+    <item msgid="4725504331295252103">"L2TP/IPSec VPN พร้อมด้วยใบรับรอง"</item>
+    <item msgid="7526551163264034377">"IPSec VPN พร้อมด้วยคีย์ที่แบ่งปันไว้ล่วงหน้าและการตรวจสอบสิทธิ์ Xauth"</item>
+    <item msgid="8064740940687465039">"IPSec VPN พร้อมด้วยใบรับรองและการตรวจสอบสิทธิ์ Xauth"</item>
+    <item msgid="4946199982372391490">"IPSec VPN พร้อมด้วยใบรับรองและการตรวจสอบสิทธิ์แบบผสม"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:0 (8621078286418985762) -->
+    <!-- no translation found for vpn_states:1 (6692305604213080515) -->
+    <!-- no translation found for vpn_states:2 (8001704909356800092) -->
+    <!-- no translation found for vpn_states:3 (4039737283841672166) -->
+    <!-- no translation found for vpn_states:4 (4042143101664725090) -->
+    <!-- no translation found for vpn_states:5 (2690164254699635531) -->
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index a8ed94b..c678ef8 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -19,6 +19,10 @@
     <string name="yes" msgid="4676390750360727396">"ใช่"</string>
     <string name="no" msgid="6731231425810196216">"ไม่"</string>
     <string name="device_info_default" msgid="7847265875578739287">"ไม่ทราบ"</string>
+    <string name="header_category_wireless_networks" msgid="4944823405420438623">"ระบบไร้สายและเครือข่าย"</string>
+    <string name="header_category_device" msgid="5781174212691167553">"อุปกรณ์"</string>
+    <string name="header_category_personal" msgid="6225932173498802187">"ส่วนบุคคล"</string>
+    <string name="header_category_system" msgid="2073558547468647128">"ระบบ"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"เปิดวิทยุ"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"ปิดวิทยุ"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"ดูสมุดที่อยู่ของซิม"</string>
@@ -111,7 +115,11 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"กำลังกำหนดค่าอุปกรณ์ให้ตรงกัน..."</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"กำหนดค่าอุปกรณ์ให้ตรงกันแต่ไม่เชื่อมต่อ"</string>
     <string name="bluetooth_device" msgid="6873461446424952003">"แฮนด์ฟรี/ชุดหูฟัง"</string>
-    <string name="progress_scanning" msgid="3760897655335759141">"กำลังสแกน"</string>
+    <!-- outdated translation 3760897655335759141 -->     <string name="progress_scanning" msgid="192587958424295789">"กำลังสแกน"</string>
+    <!-- no translation found for progress_tap_to_pair (4192342336107106334) -->
+    <skip />
+    <!-- no translation found for bluetooth_no_devices_found (2412462335116297668) -->
+    <skip />
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"คำขอกำหนดค่าอุปกรณ์ให้ตรงกันทางบลูทูธ"</string>
     <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>
@@ -130,6 +138,9 @@
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"แอปพลิเคชันบนโทรศัพท์ของคุณกำลังขออนุญาตเปิดใช้บลูทูธและทำให้อุปกรณ์อื่นค้นพบโทรศัพท์ของคุณได้ คุณต้องการดำเนินการนี้หรือไม่"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"กำลังเปิดบลูทูธ…"</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"เชื่อมต่ออัตโนมัติ"</string>
+    <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"ขอการเชื่อมต่อบลูทูธ"</string>
+    <string name="bluetooth_connection_notif_message" msgid="1833221950512058309">"แตะเพื่อเชื่อมต่อไปยัง \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\""</string>
+    <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"คุณต้องการเชื่อมต่อไปยัง \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" หรือไม่"</string>
     <string name="date_and_time" msgid="4114084177056654663">"การตั้งเวลาและวันที่"</string>
     <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>
@@ -235,7 +246,7 @@
     <string name="airplane_mode_summary" msgid="3154817401368780988">"ปิดใช้งานการเชื่อมต่อแบบไร้สายทั้งหมด"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"กำลังตัดการเชื่อมต่อระบบไร้สาย..."</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"เปิดใช้งานการเชื่อมต่อแบบไร้สาย..."</string>
-    <string name="radio_controls_title" msgid="5868688473587168882">"ระบบไร้สายและเครือข่าย"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"เพิ่มเติม..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"ระบบไร้สายและเครือข่าย"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"จัดการ Wi-Fi, บลูทูธ, โหมดใช้งานบนเครื่องบิน, เครือข่ายมือถือ และ VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"การโรมมิ่งข้อมูล"</string>
@@ -271,8 +282,8 @@
     <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">"ตำแหน่งและความปลอดภัย"</string>
-    <string name="location_security_settings_title" msgid="4624434296446625554">"การตั้งค่าตำแหน่งและความปลอดภัย"</string>
+    <string name="location_settings_title" msgid="8935806698251432196">"บริการแจ้งตำแหน่ง"</string>
+    <string name="security_settings_title" msgid="7945465324818485460">"ความปลอดภัย"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"ตั้งค่าตำแหน่งของฉัน ปลดล็อกหน้าจอ ล็อกซิมการ์ด ล็อกที่จัดเก็บข้อมูลรับรอง"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"ตั้งค่าตำแหน่งของฉัน การปลดล็อกหน้าจอ การล็อกที่จัดเก็บข้อมูลรับรอง"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"รหัสผ่าน"</string>
@@ -316,7 +327,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>
@@ -375,8 +386,8 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"ดูหรือปิดการใช้งานผู้ดูแลอุปกรณ์"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"บลูทูธ"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"เปิดบลูทูธ"</string>
-    <string name="bluetooth_settings" msgid="2725796451253089609">"การตั้งค่าบลูทูธ"</string>
-    <string name="bluetooth_settings_title" msgid="2824020086246268296">"การตั้งค่าบลูทูธ"</string>
+    <string name="bluetooth_settings" msgid="1810521656168174329">"บลูทูธ"</string>
+    <string name="bluetooth_settings_title" msgid="1908745291161353016">"บลูทูธ"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"จัดการการเชื่อมต่อ ตั้งชื่ออุปกรณ์และการค้นพบ"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"คำขอกำหนดค่าอุปกรณ์ให้ตรงกันทางบลูทูธ"</string>
     <string name="bluetooth_enter_pin_msg" msgid="1499285355129256289">\n"ป้อน PIN เพื่อจับคู่อุปกรณ์กับ \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" (ลองป้อน 0000 หรือ 1234) คุณอาจจำเป็นต้องป้อน PIN ที่ตรงกันบนอุปกรณ์บลูทูธ"</string>
@@ -394,7 +405,10 @@
     <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>
+    <!-- no translation found for bluetooth_search_for_devices (5957007154213560390) -->
+    <skip />
+    <!-- no translation found for bluetooth_searching_for_devices (9203739709307871727) -->
+    <skip />
     <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>
@@ -404,6 +418,10 @@
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"ยกเลิกการกำหนดค่าอุปกรณ์ให้ตรงกัน"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"ตัดการเชื่อมต่อและยกเลิกการกำหนดค่าอุปกรณ์ให้ตรงกัน"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"ตัวเลือก…"</string>
+    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"ขั้นสูง"</string>
+    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"บลูทูธขั้นสูง"</string>
+    <string name="bluetooth_advanced_settings_label" msgid="8659717781212434173">"บลูทูธขั้นสูง"</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="3631028334811113629">"เปิดบลูทูธเพื่อดูอุปกรณ์ที่ใช้งานได้"</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>
@@ -445,27 +463,31 @@
     <string name="nfc_toggle_error" msgid="2233172102497535522">"เกิดข้อผิดพลาด"</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"เปิด Wi-Fi"</string>
-    <string name="wifi_settings" msgid="4746946030627213196">"การตั้งค่า Wi-Fi"</string>
+    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="2810363951104753710">"การตั้งค่า Wi-Fi"</string>
+    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"ตั้งค่าและจัดการจุดเข้าใช้งานระบบไร้สาย"</string>
-    <string name="wifi_starting" msgid="6710266609710860129">"กำลังเปิด..."</string>
-    <string name="wifi_stopping" msgid="5952909472548218348">"กำลังปิด..."</string>
+    <string name="wifi_starting" msgid="7732330327758522943">"กำลังเปิด Wi-Fi..."</string>
+    <string name="wifi_stopping" msgid="244864762599017659">"กำลังปิด Wi-Fi..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"ข้อผิดพลาด"</string>
     <string name="wifi_in_airplane_mode" msgid="7618393787965366655">"โหมดใช้งานบนเครื่องบิน"</string>
     <string name="wifi_fail_to_scan" msgid="6194542252808587669">"สแกนหาเครือข่ายไม่ได้"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"การแจ้งเตือนของเครือข่าย"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"แจ้งฉันเมื่อมีเครือข่ายเปิดให้ใช้งานได้"</string>
+    <string name="wifi_enable_watchdog_service" msgid="4723544454066601706">"การตรวจสอบการเชื่อมต่อ Wi-Fi"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="8687400936839455926">"ตรวจหาและจัดการปัญหาการเชื่อมต่อเครือข่ายที่เป็นไปได้"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"นโยบายการยกเลิกการเชื่อมต่อ Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"ระบุเมื่อต้องการเปลี่ยนจาก Wi-Fi เป็นข้อมูลมือถือ"</string>
     <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" msgid="6234851776910938957">"เพิ่มเครือข่าย"</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>
     <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_empty_list_wifi_off" msgid="3682507011071029311">"เปิด Wi-Fi เพื่อดูเครือข่ายที่ใช้งานได้"</string>
     <string name="wifi_network_setup" msgid="7974851890019344870">"การตั้งค่าเครือข่าย"</string>
     <string name="wifi_wps_pin" msgid="5471842298708321115">"ป้อน PIN จากจุดเข้าใช้งาน"</string>
     <string name="wifi_wps_setup_title" msgid="150518971269252336">"ตั้งค่า WPS"</string>
@@ -501,13 +523,13 @@
     <string name="wifi_save" msgid="3331121567988522826">"บันทึก"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"ยกเลิก"</string>
     <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"ตรวจพบเซสชัน WPS อื่น โปรดลองอีกครั้งในอีก 2-3 นาที"</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"ขั้นสูง"</string>
+    <!-- outdated translation 5419052271935350999 -->     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"ขั้นสูง"</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>
-    <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"การตั้งค่า IP"</string>
+    <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"การตั้งค่า IP"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"บันทึก"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"ยกเลิก"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"โปรดพิมพ์ที่อยู่ IP ที่ถูกต้อง"</string>
@@ -525,7 +547,7 @@
     <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">"AndroidHotspot"</string>
     <string name="sound_settings_title" msgid="8735891486683305886">"เสียง"</string>
-    <string name="display_settings_title" msgid="2378894265964357591">"คัดกรอง"</string>
+    <string name="display_settings_title" msgid="1708697328627382561">"แสดง"</string>
     <string name="sound_settings" msgid="5007659014828162881">"การตั้งค่าเสียง"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"โหมดปิดเสียง"</string>
     <string name="silent_mode_summary" msgid="3309650676072917899">"ปิดเสียงทั้งหมดยกเว้นสื่อและเสียงปลุก"</string>
@@ -598,7 +620,18 @@
     <string name="brightness_summary" msgid="838917350127550703">"ปรับความสว่างหน้าจอ"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"ระยะหมดเวลา"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"หน้าจอปิดการทำงานโดยอัตโนมัติหลังจาก <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"วอลเปเปอร์"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android Dreams"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"โปรแกรมรักษาหน้าจอและการควบคุมการไม่มีกิจกรรมอื่นๆ"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Dream ที่เลือก"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"เวลาที่เปิดใช้งาน"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"หลังจากไม่มีกิจกรรมเป็นเวลา <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"ไม่เลย"</string>
+    <string name="dream_test" msgid="5968002644622194481">"ลองใช้งาน!"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"ปรับความสว่างอัตโนมัติ"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"ขนาดอักษร"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"ขนาดโดยรวมของอักษร"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"เลือกขนาดอักษร"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"การตั้งค่าการล็อกซิมการ์ด"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"ตั้งค่าการล็อกซิมการ์ด"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"การล็อกซิมการ์ด"</string>
@@ -643,8 +676,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>
@@ -696,6 +730,16 @@
     <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 storage_menu_usb (1580545228584324704) -->
+    <skip />
+    <!-- no translation found for storage_title_usb (5775322159427546546) -->
+    <skip />
+    <!-- no translation found for usb_label_mtp (4157227401755543412) -->
+    <skip />
+    <!-- no translation found for usb_label_ptp (7417254019489575819) -->
+    <skip />
+    <!-- no translation found for usb_label_installer_cd (7438467574756086977) -->
+    <skip />
     <string name="battery_status_title" msgid="9159414319574976203">"สถานะแบตเตอรี่"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"ระดับแบตเตอรี่"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -806,6 +850,8 @@
     <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>
+    <string name="wireless_category_general" msgid="2973810407987118067">"ทั่วไป"</string>
+    <string name="wireless_category_mobile_networks" msgid="1254629216798424288">"เครือข่ายมือถือ"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"เครือข่ายมือถือ"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"ตั้งค่าตัวเลือกสำหรับการโรมมิ่ง เครือข่าย APN"</string>
     <string name="location_title" msgid="1029961368397484576">"ตำแหน่งของฉัน"</string>
@@ -883,7 +929,7 @@
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"การรักษาความปลอดภัยแท็บเล็ตของคุณ"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"การป้องกันโทรศัพท์ของคุณ"</string>
     <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"ป้องกันการใช้งานแท็บเล็ตของคุณโดยไม่ได้รับอนุญาตโดยการสร้างรูปแบบการปลดล็อคหน้าจอส่วนบุคคล ใช้นิ้วของคุณลากเชื่อมต่อจุดในลำดับใดก็ได้บนหน้าจอถัดไป คุณต้องเชื่อมต่ออย่างน้อยสี่จุด "\n\n"เมื่อพร้อมที่จะเริ่มต้น แตะ \"ถัดไป\""</string>
-    <string name="lock_intro_message" product="default" msgid="9100785646737118042"><font size="17">"ปกป้องโทรศัพท์ของคุณจากการใช้งานโดยไม่ได้รับอนุญาตโดยสร้างรูปแบบการปลดล็อกหน้าจอส่วนบุคคล"\n<font height="17">\n</font><b>"1"</b>"  บนหน้าจอถัดไป คอยดูเมื่อมีการวาดรูปแบบตัวอย่าง"\n<font height="17">\n</font><b>"2"</b>"  เมื่อคุณพร้อม ให้วาดรูปแบบการปลดล็อกส่วนตัวของคุณ ลองวาดหลายๆ รูปแบบได้ แต่อย่างน้อยต้องเชื่อมต่อกันอย่างน้อย 4 จุด "\n<font height="17">\n</font><b>"3"</b>"  วาดรูปแบบซ้ำเพื่อยืนยัน "\n<font height="17">\n</font><b>"พร้อมจะลงมือหรือยัง ถ้าใช่ ให้แตะ “ถัดไป”"</b>" "\n<font height="3">\n</font>"ถ้าไม่ต้องการปกป้องโทรศัพท์ ให้แตะ \"ยกเลิก\""</font></string>
+    <!-- outdated translation 3692151094288835065 -->     <string name="lock_intro_message" product="default" msgid="5796785892741212873">"ป้องกันการใช้งานแท็บเล็ตของคุณโดยไม่ได้รับอนุญาตโดยการสร้างรูปแบบการปลดล็อคหน้าจอส่วนบุคคล ใช้นิ้วของคุณลากเชื่อมต่อจุดในลำดับใดก็ได้บนหน้าจอถัดไป คุณต้องเชื่อมต่ออย่างน้อยสี่จุด "\n\n"เมื่อพร้อมที่จะเริ่มต้น แตะ \"ถัดไป\""</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"จัดการแอปพลิเคชัน"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"จัดการและนำแอปพลิเคชันที่ติดตั้งไว้ออก"</string>
     <string name="applications_settings" msgid="3736173521008476946">"แอปพลิเคชัน"</string>
@@ -893,6 +939,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>
@@ -905,9 +953,10 @@
     <string name="force_stop" msgid="7435006169872876756">"บังคับให้หยุด"</string>
     <string name="total_size_label" msgid="1048676419552557254">"ทั้งหมด"</string>
     <string name="application_size_label" msgid="5055196275624686382">"แอปพลิเคชัน"</string>
+    <string name="external_code_size_label" msgid="3459343140355961335">"แอปพลิเคชันสำหรับจัดเก็บข้อมูล USB"</string>
     <string name="data_size_label" msgid="8679376373625710107">"ข้อมูล"</string>
-    <string name="external_size_label" product="nosdcard" msgid="4465530017830945766">"ที่เก็บข้อมูล USB"</string>
-    <string name="external_size_label" product="default" msgid="2107155737635944440">"การ์ด SD"</string>
+    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"ข้อมูลที่จัดเก็บใน USB"</string>
+    <string name="external_data_size_label" product="default" msgid="626414192825329708">"การ์ด SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"ถอนการติดตั้ง"</string>
     <string name="disable_text" msgid="6544054052049395202">"ปิดใช้งาน"</string>
     <string name="enable_text" msgid="9217362512327828987">"เปิดใช้งาน"</string>
@@ -1026,7 +1075,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 +1085,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>
@@ -1066,7 +1117,7 @@
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"การตั้งค่าแป้นพิมพ์บนหน้าจอ"</string>
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"แป้นพิมพ์บนเครื่อง"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"การตั้งค่าแป้นพิมพ์บนเครื่อง"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"การพัฒนา"</string>
+    <string name="development_settings_title" msgid="215179176067683667">"ตัวเลือกสำหรับนักพัฒนาซอฟต์แวร์"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"ตั้งค่าตัวเลือกสำหรับการพัฒนาแอปพลิเคชัน"</string>
     <string name="enable_adb" msgid="7982306934419797485">"การแก้ไขข้อบกพร่อง USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"โหมดแก้ไขข้อบกพร่องเมื่อเชื่อมต่อ USB"</string>
@@ -1091,14 +1142,14 @@
     <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="toggle_large_text_title" msgid="42259643359869436">"ข้อความขนาดใหญ่"</string>
     <string name="accessibility_services_category" msgid="8127851026323672607">"บริการเกี่ยวกับการเข้าถึง"</string>
+    <string name="toggle_accessibility_title" msgid="7338739354952553958">"อนุญาตให้เข้าถึงบริการ"</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>
@@ -1106,10 +1157,11 @@
     <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>
-    <string name="power_usage_summary_title" msgid="5180282911164282324">"การใช้แบตเตอรี่"</string>
+    <string name="power_usage_summary_title" msgid="7190304207330319919">"แบตเตอรี่"</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>
@@ -1218,6 +1270,8 @@
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"การตั้งค่า <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"เปิดใช้งาน <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> แล้ว"</string>
     <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"ปิดใช้งาน <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> แล้ว"</string>
+    <string name="tts_engine_settings_section" msgid="2346105138448751893">"การตั้งค่าเครื่องมือ"</string>
+    <string name="tts_engine_settings_title" msgid="3499112142425680334">"การตั้งค่าสำหรับ <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"ภาษาและเสียง"</string>
     <string name="pico_installed" msgid="2452546687858267414">"ติดตั้งแล้ว"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"ไม่ได้ติดตั้ง"</string>
@@ -1228,114 +1282,33 @@
     <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">"ตั้งค่าและจัดการ VPN"</string>
-    <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="trusted_credentials" msgid="4266945289534242402">"ข้อมูลรับรองที่เชื่อถือได้"</string>
+    <string name="trusted_credentials_summary" msgid="6735221351155686632">"แสดงใบรับรอง CA ที่เชื่อถือได้"</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>
-    <string name="privacy_settings_title" msgid="1987089301293213705">"การตั้งค่าความเป็นส่วนตัว"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"การสำรองข้อมูลและการรีเซ็ต"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"การสำรองข้อมูลและการรีเซ็ต"</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>
@@ -1439,4 +1412,107 @@
     <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>
+    <!-- no translation found for debug_ui_category (9023948280291055349) -->
+    <skip />
+    <!-- no translation found for strict_mode (1938795874357830695) -->
+    <skip />
+    <!-- no translation found for strict_mode_summary (142834318897332338) -->
+    <skip />
+    <!-- no translation found for pointer_location (6084434787496938001) -->
+    <skip />
+    <!-- no translation found for pointer_location_summary (840819275172753713) -->
+    <skip />
+    <!-- no translation found for show_screen_updates (8282711794220426931) -->
+    <skip />
+    <!-- no translation found for show_screen_updates_summary (1716122382094924596) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage (2389212910758076024) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage_summary (2113341923988958266) -->
+    <skip />
+    <!-- no translation found for window_animation_scale_title (6162587588166114700) -->
+    <skip />
+    <!-- no translation found for transition_animation_scale_title (387527540523595875) -->
+    <skip />
+    <!-- no translation found for debug_applications_category (6221644998451283813) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities (3622005081180597749) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities_summary (3592221124808773368) -->
+    <skip />
+    <!-- no translation found for app_process_limit_title (4121324758038197598) -->
+    <skip />
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"การใช้ข้อมูล"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"รอบการใช้ข้อมูล"</string>
+    <string name="data_usage_menu_split_4g" msgid="7417435609285381968">"แยกการใช้งาน 4G"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"แสดงการใช้ Wi-Fi"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"เปลี่ยนรอบ..."</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"วันที่ของเดือนในการรีเซ็ตรอบการใช้ข้อมูล:"</string>
+    <string name="data_usage_disable_mobile_limit" msgid="289740911281022322">"ปิดใช้ข้อมูลมือถือเมื่อถึงกำหนด"</string>
+    <string name="data_usage_disable_4g_limit" msgid="5808210773758699800">"ปิดใช้งานข้อมูล 4G เมื่อถึงกำหนด"</string>
+    <string name="data_usage_disable_3g_limit" msgid="3856971004328238231">"ปิดใช้ข้อมูล 2G-3G เมื่อถึงกำหนด"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_mobile" msgid="454140350007299045">"มือถือ"</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">"ข้อมูลมือถือ"</string>
+    <string name="data_usage_enable_3g" msgid="6304006671869578254">"ข้อมูล 2G-3G"</string>
+    <string name="data_usage_enable_4g" msgid="3635854097335036738">"ข้อมูล 4G"</string>
+    <string name="data_usage_app_settings" msgid="3727561362090820369">"ดูการตั้งค่าแอปพลิเคชัน"</string>
+    <string name="data_usage_app_restrict_background" msgid="8856643905291165256">"จำกัดการใช้ข้อมูลแบ็กกราวด์"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="1503361245973512092">"อนุญาตข้อมูลแบ็กกราวด์ของแอปเฉพาะการใช้เครือข่ายที่ไม่มีขีดจำกัด"</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="8110736468987743260">"การจำกัดข้อมูลแบ็กกราวด์"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="100001698378554777">"คุณลักษณะนี้อาจส่งผลกระทบต่อแอปพลิเคชันในทางลบซึ่งขึ้นอยู่กับการใช้ข้อมูลแบ็กกราวด์"\n\n"อาจพบตัวควบคุมการใช้ข้อมูลที่เหมาะสมเพิ่มเติมในการตั้งค่าของแอปพลิเคชันนี้"</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"วันที่รีเซ็ตรอบการใช้"</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"วันที่ของแต่ละเดือน:"</string>
+    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"ตั้งค่าแล้ว"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"การจำกัดการใช้ข้อมูล"</string>
+    <string name="data_usage_limit_dialog_mobile" msgid="7931094451923591578">"การเชื่อมต่อข้อมูลผ่านมือถือของคุณจะถูกปิดใช้งานเมื่อถึงขีดจำกัดที่ระบุไว้"\n\n"หากต้องการหลีกเลี่ยงการเรียกเก็บเงินเพิ่มเิติม ให้พิจารณาใช้ขนาดการใช้ข้อมูลที่ลดลงเนื่องจากอุปกรณ์และวิธีการเก็บเงินของผู้ให้บริการอาจแตกต่างกัน"</string>
+    <string name="data_usage_limit_dialog_3g" msgid="5478553071420316963">"การเชื่อมต่อข้อมูล 2G-3G ของคุณจะถูกปิดใช้งานเมื่อถึงขีดจำกัดที่ระบุไว้"\n\n"หากต้องการหลีกเลี่ยงการเรียกเก็บเงินเพิ่มเิติม ให้พิจารณาใช้ขนาดการใช้ข้อมูลที่ลดลงเนื่องจากอุปกรณ์และวิธีการทเก็บเงินของผู้ให้บริการอาจแตกต่างกัน"</string>
+    <string name="data_usage_limit_dialog_4g" msgid="6134008906742403777">"การเชื่อมต่อข้อมูล 4G ของคุณจะถูกปิดใช้งานเมื่อถึงขีดจำกัดที่ระบุไว้"\n\n"หากต้องการหลีกเลี่ยงการเรียกเก็บเงินเพิ่มเิติม ให้พิจารณาใช้ขนาดการใช้ข้อมูลที่ลดลง เนื่องจากอุปกรณ์และวิธีการเก็บเงินของผู้ให้บริการอาจแตกต่างกัน"</string>
+    <string name="data_usage_disabled_dialog_3g_title" msgid="4221584306492812040">"ปิดใช้งานข้อมูล 2G-3G"</string>
+    <string name="data_usage_disabled_dialog_4g_title" msgid="715585612162185936">"ปิดใช้งานข้อมูล 4G"</string>
+    <string name="data_usage_disabled_dialog_mobile_title" msgid="209516216265000221">"ปิดใช้งานข้อมูลมือถือ"</string>
+    <string name="data_usage_disabled_dialog" msgid="2874031671067845964">"ถึงขีดจำกัดการใช้้ข้อมูลที่ระบุแล้ว"\n\n"การใช้ข้อมูลเพิ่มเติมอาจมีค่าใช้จ่ายที่เรียกเก็บโดยผู้ให้บริการ"</string>
+    <string name="data_usage_disabled_dialog_enable" msgid="2441219164620753329">"เปิดใช้งานข้อมูลอีกครั้ง"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="32">"<xliff:g id="NUMBER">%1$s</xliff:g>"</font><font size="12">"<xliff:g id="UNIT">%2$s</xliff:g>"</font>\n<font size="12">"คำเตือน"</font></string>
+    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"หมายเลขฉุกเฉิน"</string>
+    <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"กลับสู่การโทร"</string>
+    <string name="vpn_name" msgid="4689699885361002297">"ชื่อ"</string>
+    <string name="vpn_type" msgid="5435733139514388070">"ประเภท"</string>
+    <string name="vpn_server" msgid="2123096727287421913">"ที่อยู่เซิร์ฟเวอร์"</string>
+    <string name="vpn_mppe" msgid="6639001940500288972">"การเข้ารหัส PPP (MPPE)"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"ข้อมูลลับ L2TP"</string>
+    <string name="vpn_ipsec_identifier" msgid="4098175859460006296">"ตัวระบุ IPSec"</string>
+    <string name="vpn_ipsec_secret" msgid="4526453255704888704">"คีย์ IPSec ที่แบ่งปันไว้ล่วงหน้า"</string>
+    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"ใบรับรองผู้ใช้ IPSec"</string>
+    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"ใบรับรอง IPSec CA"</string>
+    <!-- no translation found for vpn_search_domains (5391995501541199624) -->
+    <skip />
+    <!-- no translation found for vpn_routes (8556236801755260073) -->
+    <skip />
+    <string name="vpn_username" msgid="1863901629860867849">"ชื่อผู้ใช้"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"รหัสผ่าน"</string>
+    <!-- no translation found for vpn_save_login (6350322456427484881) -->
+    <skip />
+    <!-- no translation found for vpn_not_used (9094191054524660891) -->
+    <skip />
+    <string name="vpn_no_ca_cert" msgid="7820884983947090538">"(ไม่ตรวจสอบเซิร์ฟเวอร์)"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"ยกเลิก"</string>
+    <string name="vpn_save" msgid="4233484051644764510">"บันทึก"</string>
+    <string name="vpn_connect" msgid="8469608541746132301">"เชื่อมต่อ"</string>
+    <string name="vpn_edit" msgid="1111459297288136079">"แก้ไขเครือข่าย VPN"</string>
+    <string name="vpn_connect_to" msgid="7328758950427515753">"เชื่อมต่อกับ <xliff:g id="NETWORK">%s</xliff:g>"</string>
+    <string name="vpn_title" msgid="7982620762043790565">"การตั้งค่า VPN"</string>
+    <string name="vpn_create" msgid="8966010925994175306">"เพิ่มเครือข่าย VPN"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"แก้ไขเครือข่าย"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"ลบเครือข่าย"</string>
+    <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"ระบบ"</string>
+    <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"ผู้ใช้"</string>
+    <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"ปิดใช้งาน"</string>
+    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"เปิดใช้งาน"</string>
+    <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"นำออก"</string>
+    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"เปิดใช้งานระบบใบรับรอง CA หรือไม่"</string>
+    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"ปิดใช้งานระบบใบรับรอง CA หรือไม่"</string>
+    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"นำใบรับรอง CA ของผู้ใช้ออกถาวรหรือไม่"</string>
 </resources>
diff --git a/res/values-tl/arrays.xml b/res/values-tl/arrays.xml
index 772f990..f2ddfd9 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>
@@ -214,4 +240,36 @@
     <item msgid="3878793616631049349">"Gamitin lang ang pagsusuring HDCP para sa nilalamang DRM"</item>
     <item msgid="45075631231212732">"Palaging gumamit ng pagsusuring HDCP"</item>
   </string-array>
+    <!-- no translation found for window_animation_scale_entries:0 (8134156599370824081) -->
+    <!-- no translation found for window_animation_scale_entries:1 (6624864048416710414) -->
+    <!-- no translation found for window_animation_scale_entries:2 (2219332261255416635) -->
+    <!-- no translation found for window_animation_scale_entries:3 (3544428804137048509) -->
+    <!-- no translation found for window_animation_scale_entries:4 (3110710404225974514) -->
+    <!-- no translation found for window_animation_scale_entries:5 (4402738611528318731) -->
+    <!-- no translation found for window_animation_scale_entries:6 (6189539267968330656) -->
+    <!-- no translation found for transition_animation_scale_entries:0 (8464255836173039442) -->
+    <!-- no translation found for transition_animation_scale_entries:1 (3375781541913316411) -->
+    <!-- no translation found for transition_animation_scale_entries:2 (1991041427801869945) -->
+    <!-- no translation found for transition_animation_scale_entries:3 (4012689927622382874) -->
+    <!-- no translation found for transition_animation_scale_entries:4 (3289156759925947169) -->
+    <!-- no translation found for transition_animation_scale_entries:5 (7705857441213621835) -->
+    <!-- no translation found for transition_animation_scale_entries:6 (6660750935954853365) -->
+    <!-- no translation found for app_process_limit_entries:0 (6799596560242275471) -->
+    <!-- no translation found for app_process_limit_entries:1 (2412794376818632575) -->
+    <!-- no translation found for app_process_limit_entries:2 (1578904888612645001) -->
+    <!-- no translation found for app_process_limit_entries:3 (8819235336299873577) -->
+  <string-array name="vpn_types_long">
+    <item msgid="2732002039459078847">"PPTP VPN"</item>
+    <item msgid="3799752201662127867">"L2TP/IPSec VPN na may mga paunang nabahaging key"</item>
+    <item msgid="4725504331295252103">"L2TP/IPSec VPN na may mga certificate"</item>
+    <item msgid="7526551163264034377">"IPSec VPN na may mga paunang nabahaging keys at pagpapatotoo ng Xauth"</item>
+    <item msgid="8064740940687465039">"IPSec VPN na may mga certificate at pagpapatotoo ng Xauth"</item>
+    <item msgid="4946199982372391490">"IPSec VPN na may mga certificate at hybrid na pagpapatotoo"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:0 (8621078286418985762) -->
+    <!-- no translation found for vpn_states:1 (6692305604213080515) -->
+    <!-- no translation found for vpn_states:2 (8001704909356800092) -->
+    <!-- no translation found for vpn_states:3 (4039737283841672166) -->
+    <!-- no translation found for vpn_states:4 (4042143101664725090) -->
+    <!-- no translation found for vpn_states:5 (2690164254699635531) -->
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index a9bd26a..9b5ea57 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -19,6 +19,10 @@
     <string name="yes" msgid="4676390750360727396">"Oo"</string>
     <string name="no" msgid="6731231425810196216">"Hindi"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Hindi Kilala"</string>
+    <string name="header_category_wireless_networks" msgid="4944823405420438623">"WIRELESS &amp; MGA NETWORK"</string>
+    <string name="header_category_device" msgid="5781174212691167553">"DEVICE"</string>
+    <string name="header_category_personal" msgid="6225932173498802187">"PERSONAL"</string>
+    <string name="header_category_system" msgid="2073558547468647128">"SYSTEM"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"I-on ang radyo"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"I-off ang radyo"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Tingnan ang address book ng SIM"</string>
@@ -111,7 +115,11 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Pinapares…"</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"Naipares ngunit hindi konektado"</string>
     <string name="bluetooth_device" msgid="6873461446424952003">"handsfree/headset"</string>
-    <string name="progress_scanning" msgid="3760897655335759141">"Pag-scan"</string>
+    <!-- outdated translation 3760897655335759141 -->     <string name="progress_scanning" msgid="192587958424295789">"Pag-scan"</string>
+    <!-- no translation found for progress_tap_to_pair (4192342336107106334) -->
+    <skip />
+    <!-- no translation found for bluetooth_no_devices_found (2412462335116297668) -->
+    <skip />
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Kahilingan sa pagpapares ng bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Kahilingan sa pagpares"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Piliin upang ipares sa <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
@@ -130,6 +138,9 @@
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Humihiling ng pahintulot ang isang application sa iyong telepono na i-on ang Bluetooth at upang gawing natutuklasan ang iyong telepono ng mga ibang device. Gusto mo ba itong gawin?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Ino-on ang Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Awtomatikong kumonekta"</string>
+    <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Kahilingan sa pagkonekta ng Bluetooth"</string>
+    <string name="bluetooth_connection_notif_message" msgid="1833221950512058309">"Pindutin upang kumonekta sa \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\""</string>
+    <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Nais mo bang kumonekta sa \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Mga setting ng petsa &amp; oras"</string>
     <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>
@@ -235,7 +246,7 @@
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Huwag paganahin lahat ng mga koneksyong wireless"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"Hindi pinapagana ang mga koneksyon na wireless…"</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"Pinapagana ang mga wireless na koneksyon…"</string>
-    <string name="radio_controls_title" msgid="5868688473587168882">"Wireless &amp; mga network"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Higit pa..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Wireless &amp; mga network"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"Pamahalaan ang Wi-Fi, Bluetooth, airplane mode, mga network ng mobile, &amp; mga VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming ng data"</string>
@@ -271,8 +282,8 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Impo ng may-ari"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="2382525043173672857">"Magpasok ng teksto upang maipakita sa lock screen"</string>
-    <string name="security_settings_title" msgid="5168491784222013179">"Lokasyon &amp; seguridad"</string>
-    <string name="location_security_settings_title" msgid="4624434296446625554">"Mga setting ng lokasyon &amp; seguridad"</string>
+    <string name="location_settings_title" msgid="8935806698251432196">"Mga serbisyo ng Lokasyon"</string>
+    <string name="security_settings_title" msgid="7945465324818485460">"Seguridad"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Itakda ang Aking Lokasyon, pag-unlock ng screen, lock ng SIM card, lock ng imbakan ng kredensyal"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Itakda ang Aking Lokasyon, pag-unlock ng screen, lock ng imbakan ng kredensyal"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Mga Password"</string>
@@ -316,7 +327,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>
@@ -375,8 +386,8 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Tingnan o alisin sa pagkaka-activate ang mga administrator ng device"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"I-on ang Bluetooth"</string>
-    <string name="bluetooth_settings" msgid="2725796451253089609">"Mga setting ng bluetooth"</string>
-    <string name="bluetooth_settings_title" msgid="2824020086246268296">"Mga setting ng bluetooth"</string>
+    <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
+    <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Mamahala ng mga koneksyon, magtakda ng pangalan ng device &amp; pagiging natutuklas"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Kahilingan sa pagpapares ng bluetooth"</string>
     <string name="bluetooth_enter_pin_msg" msgid="1499285355129256289">\n"Ilagay ang PIN upang magpares sa \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". (Subukan ang 0000 o 1234.) Maaaring kailanganin mong ilagay ang parehong PIN sa Bluetooth device."</string>
@@ -394,7 +405,10 @@
     <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Tinanggihan ng <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ang pagpapares."</string>
     <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"Nagkaproblema sa pagkonekta sa <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Mag-scan para sa mga device"</string>
-    <string name="bluetooth_preference_find_nearby_title" msgid="5087410003465463318">"Maghanap ng kalapit na device"</string>
+    <!-- no translation found for bluetooth_search_for_devices (5957007154213560390) -->
+    <skip />
+    <!-- no translation found for bluetooth_searching_for_devices (9203739709307871727) -->
+    <skip />
     <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"Mga setting ng device"</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Mga ipinares na device"</string>
     <string name="bluetooth_preference_found_devices" msgid="3133019331974936204">"Mga nakitang device"</string>
@@ -404,6 +418,10 @@
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Alisin sa pagkakapares"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Alisin sa koneksyon &amp; alisin sa pagkakapares"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Mga Pagpipilian…"</string>
+    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Advanced"</string>
+    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Advanced na Bluetooth"</string>
+    <string name="bluetooth_advanced_settings_label" msgid="8659717781212434173">"Advanced na Bluetooth"</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="3631028334811113629">"I-on ang bluetooth upang makita ang mga available na device"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Kumonekta sa…"</string>
     <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"Media"</string>
     <string name="bluetooth_profile_headset" msgid="81844079120986198">"Handsfree"</string>
@@ -445,27 +463,31 @@
     <string name="nfc_toggle_error" msgid="2233172102497535522">"May naganap na isang error."</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"I-on ang Wi-Fi"</string>
-    <string name="wifi_settings" msgid="4746946030627213196">"Mga setting ng Wi-Fi"</string>
+    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="2810363951104753710">"Mga setting ng Wi-Fi"</string>
+    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Mag-set up &amp; mamahala ng mga wireless na access point"</string>
-    <string name="wifi_starting" msgid="6710266609710860129">"Ino-on…"</string>
-    <string name="wifi_stopping" msgid="5952909472548218348">"Ino-off…"</string>
+    <string name="wifi_starting" msgid="7732330327758522943">"Binubuksan ang Wi-Fi..."</string>
+    <string name="wifi_stopping" msgid="244864762599017659">"Ino-off ang Wi-Fi..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"Error"</string>
     <string name="wifi_in_airplane_mode" msgid="7618393787965366655">"Sa airplane mode"</string>
     <string name="wifi_fail_to_scan" msgid="6194542252808587669">"Hindi magawang mag-scan para sa mga network"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Notification ng network"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"I-notify ako kapag available ang bukas na network"</string>
+    <string name="wifi_enable_watchdog_service" msgid="4723544454066601706">"Mga Pagsuri sa Pagkakakonekta ng Wi-Fi"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="8687400936839455926">"Tukuyin at pamahalaan ang potensyal na mga problema sa pagkakakonekta sa network"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Patakaran sa pag-alis sa pagkakakonekta ng Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Tukuyin kung kailan lilipat mula sa Wi-Fi patungong data ng mobile"</string>
     <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" msgid="6234851776910938957">"Magdagdag ng network"</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>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Kumonekta sa network"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Kalimutan ang network"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Baguhin ang network"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="3682507011071029311">"I-on ang wifi upang makita ang mga available na network"</string>
     <string name="wifi_network_setup" msgid="7974851890019344870">"Setup ng Network"</string>
     <string name="wifi_wps_pin" msgid="5471842298708321115">"Ipasok ang pin mula sa access point"</string>
     <string name="wifi_wps_setup_title" msgid="150518971269252336">"Pag-set up ng WPS"</string>
@@ -501,13 +523,13 @@
     <string name="wifi_save" msgid="3331121567988522826">"I-save"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Kanselahin"</string>
     <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"Nakita ang isa pang sesyon ng WPS, pakisubukang muli sa loob ng ilang minuto"</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Advanced"</string>
+    <!-- outdated translation 5419052271935350999 -->     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Advanced"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Frequency band ng Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Tukuyin ang sakop ng frequency ng pagpapatakbo"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Nagkaproblema sa pagtatakda ng frequency band."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC address"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP address"</string>
-    <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"Mga setting ng IP"</string>
+    <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Mga setting ng IP"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"I-save"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Kanselahin"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Mangyaring mag-type ng wastong IP address."</string>
@@ -525,7 +547,7 @@
     <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> portable na Wi-Fi hotspot"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="sound_settings_title" msgid="8735891486683305886">"Tunog"</string>
-    <string name="display_settings_title" msgid="2378894265964357591">"Screen"</string>
+    <string name="display_settings_title" msgid="1708697328627382561">"Ipakita"</string>
     <string name="sound_settings" msgid="5007659014828162881">"Mga setting ng tunog"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Silent mode"</string>
     <string name="silent_mode_summary" msgid="3309650676072917899">"I-silent ang lahat ng mga tunog maliban sa media &amp; mga alarm"</string>
@@ -598,7 +620,18 @@
     <string name="brightness_summary" msgid="838917350127550703">"Ayusin ang liwanag ng screen"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Timeout"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Awtomatikong nag-o-off ang screen pagkatapos ng <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Wallpaper"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android Dreams"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Mga screen saver at iba pang mga dibersyon ng idle"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Napiling dream"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Kailan ia-activate"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"Pagkatapos ng idle ng paggugol ng <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Hindi Kailanman"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Subukan ito!"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Awtomatikong pagliwanag"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Laki ng font"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Pangkalahatang laki ng mga font"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Pumili ng laki ng font"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Mga setting ng lock ng SIM card"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"I-set up ang lock ng SIM card"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Lock ng SIM card"</string>
@@ -643,8 +676,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>
@@ -696,6 +730,16 @@
     <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"Maa-unmount ang SD card."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Pag-unmount"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Nagaganap ang pag-unmount"</string>
+    <!-- no translation found for storage_menu_usb (1580545228584324704) -->
+    <skip />
+    <!-- no translation found for storage_title_usb (5775322159427546546) -->
+    <skip />
+    <!-- no translation found for usb_label_mtp (4157227401755543412) -->
+    <skip />
+    <!-- no translation found for usb_label_ptp (7417254019489575819) -->
+    <skip />
+    <!-- no translation found for usb_label_installer_cd (7438467574756086977) -->
+    <skip />
     <string name="battery_status_title" msgid="9159414319574976203">"Katayuan ng baterya"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Antas ng baterya"</string>
     <string name="apn_settings" msgid="3743170484827528406">"Mga APN"</string>
@@ -806,6 +850,8 @@
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"Hindi makapag-tether sa higit <xliff:g id="MAXCONNECTION">%1$d</xliff:g> (na) device"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Maa-untether ang <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Tulong"</string>
+    <string name="wireless_category_general" msgid="2973810407987118067">"Pangkalahatan"</string>
+    <string name="wireless_category_mobile_networks" msgid="1254629216798424288">"Mga mobile network"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mga mobile network"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Itakda ang mga pagpipilian para sa roaming, mga network, mga APN"</string>
     <string name="location_title" msgid="1029961368397484576">"Aking Lokasyon"</string>
@@ -883,7 +929,7 @@
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Sine-secure ang iyong tablet"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Pag-secure ng iyong telepono"</string>
     <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"Protektahan ang iyong tablet mula sa walang pahintulot na paggamit sa pamamagitan ng paglikha ng isang personal na pattern ng pag-unlock ng screen. Gamitin ang iyong daliri upang ikonekta ang mga tuldok sa anumang order sa susunod na screen. Dapat mong ikonekta ang hindi bababa sa apat na tuldok. "\n\n"Handa nang magsimula? Pindutin ang \"Susunod\"."</string>
-    <string name="lock_intro_message" product="default" msgid="9100785646737118042"><font size="17">"Protektahan ang iyong telepono mula sa walang pahintulot na paggamit sa pamamagitan ng paglikha ng personal na pattern. "\n<font height="17">\n</font><b>"1"</b>"  Sa susunod na screen, manood habang kinukuha ang pattern ng halimbawa. "\n<font height="17">\n</font><b>"2"</b>"  Kapag handa na, kumuha ng iyong sariling personal na naka-unlock na pattern. Eksperimento na may iba\'t ibang mga pattern ngunit magkonekta nang hindi bababa sa apat na tuldok. "\n<font height="17">\n</font><b>"3"</b>"  Muling kunin ang iyong pattern upang makumpirma. "\n<font height="17">\n</font><b>"Handa nang magsimula? Piliin ang “Susunod”"</b>". "\n<font height="3">\n</font>"Upang iwanang hindi protektado ang iyong telepono, piliin ang “Kanselahin”."</font></string>
+    <!-- outdated translation 3692151094288835065 -->     <string name="lock_intro_message" product="default" msgid="5796785892741212873">"Protektahan ang iyong tablet mula sa walang pahintulot na paggamit sa pamamagitan ng paglikha ng isang personal na pattern ng pag-unlock ng screen. Gamitin ang iyong daliri upang ikonekta ang mga tuldok sa anumang order sa susunod na screen. Dapat mong ikonekta ang hindi bababa sa apat na tuldok. "\n\n"Handa nang magsimula? Pindutin ang \"Susunod\"."</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Pamahalaan ang mga application"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Pamahalaan at alisin ang naka-install na mga application"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Mga Application"</string>
@@ -893,6 +939,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>
@@ -905,9 +953,10 @@
     <string name="force_stop" msgid="7435006169872876756">"Sapilitang pagtigil"</string>
     <string name="total_size_label" msgid="1048676419552557254">"Kabuuan"</string>
     <string name="application_size_label" msgid="5055196275624686382">"Application"</string>
+    <string name="external_code_size_label" msgid="3459343140355961335">"USB storage app"</string>
     <string name="data_size_label" msgid="8679376373625710107">"Data"</string>
-    <string name="external_size_label" product="nosdcard" msgid="4465530017830945766">"Imbakan na USB"</string>
-    <string name="external_size_label" product="default" msgid="2107155737635944440">"SD card"</string>
+    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Data ng USB storage"</string>
+    <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD card"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"I-uninstall"</string>
     <string name="disable_text" msgid="6544054052049395202">"Huwag Paganahin"</string>
     <string name="enable_text" msgid="9217362512327828987">"Paganahin"</string>
@@ -1026,7 +1075,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 +1085,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>
@@ -1066,7 +1117,7 @@
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Mga setting ng keyboard ng onscreen"</string>
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Pisikal na keyboard"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Mga setting ng pisikal na keyboard"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Pag-develop"</string>
+    <string name="development_settings_title" msgid="215179176067683667">"Mga pagpipilian ng nag-develop"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"Magtakda ng mga pagpipilian para sa pagbuo ng application"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Debugging ng USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Debug mode kapag nakakonekta ang USB"</string>
@@ -1091,14 +1142,14 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Kakayahang Ma-access"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Mga setting ng pagiging maa-access"</string>
     <string name="accessibility_settings_summary" msgid="8185181964847149507">"Mamahala ng mga pagpipilian sa pagiging maa-access"</string>
-    <string name="toggle_accessibility_title" msgid="650839277066574497">"Pagiging maa-access"</string>
+    <string name="toggle_large_text_title" msgid="42259643359869436">"Malaking teksto"</string>
     <string name="accessibility_services_category" msgid="8127851026323672607">"Mga serbisyo sa pagiging maa-access"</string>
+    <string name="toggle_accessibility_title" msgid="7338739354952553958">"Bigyang-daan serbisyo sa pagiging maa-access"</string>
     <string name="no_accessibility_services_summary" msgid="694578333333808159">"Walang naka-install na mga serbisyo ng pagiging maa-access."</string>
     <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Maaaring makolekta ng serbisyo sa pagiging maa-access nito ang lahat ng tekstong iyong itina-type, kabilang ang personal na data na mga numero ng credit card maliban ang mga password. Maaaring i-log ang mga pakikipag-ugnay ng iyong user interface. Galing ito mula sa application na <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Gamitin ang serbisyo sa pagiging maa-access na ito?"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Huwag paganahin ang pagiging maa-access?"</string>
     <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"Walang nakitang mga application na nauugnay sa pagiging maa-access"</string>
     <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"Wala kang anumang mga application na nauugnay sa accessibility na naka-install."\n\n"Maaari kang mag-download ng screen reader para sa iyong device mula sa Android Market."\n\n"I-click ang OK upang i-install ang screen reader."</string>
-    <string name="accessibility_script_injection_category" msgid="8649951751131431904">"Script sa accessibility"</string>
     <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"Mag-download ng script sa accessibility"</string>
     <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"Payagan app. mag-download ng script sa accessibility mula Google"</string>
     <string name="accessibility_script_injection_security_warning" product="tablet" msgid="1113600871264359828">"Maaaring hilingin ng ilang application sa Google na mag-download ng mga script sa iyong tablet na gumagawa sa kanilang nilalaman na higit na naa-access. Sigurado ka bang gusto mong payagan ang Google na mag-install ng mga script sa accessibility sa iyong tablet?"</string>
@@ -1106,10 +1157,11 @@
     <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>
-    <string name="power_usage_summary_title" msgid="5180282911164282324">"Paggamit ng baterya"</string>
+    <string name="power_usage_summary_title" msgid="7190304207330319919">"Baterya"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Ano ang gumagamit ng baterya"</string>
     <string name="power_usage_not_available" msgid="3583407442633768046">"Walang data gamit baterya"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Paggamit ng baterya mula nang hindi nakasaksak"</string>
@@ -1218,6 +1270,8 @@
     <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>
+    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Mga setting ng engine"</string>
+    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Mga setting para sa <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
     <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>
@@ -1228,114 +1282,33 @@
     <string name="gadget_title" msgid="7455548605888590466">"Kontrol ng Power"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Ina-update ang setting ng Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Pag-update ng setting ng Bluetooth"</string>
-    <string name="vpn_settings_activity_title" msgid="7276864950701612579">"Mga setting ng VPN"</string>
-    <string name="vpn_connect_to" msgid="2541409082892684362">"Kumunekta sa <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpn_username_colon" msgid="7854930370861306247">"Username:"</string>
-    <string name="vpn_password_colon" msgid="5716278710848606626">"Password:"</string>
-    <string name="vpn_a_username" msgid="6664733641993968692">"isang username"</string>
-    <string name="vpn_a_password" msgid="1537213632501483753">"isang password"</string>
-    <string name="vpn_save_username" msgid="1408415289165970790">"Tandaan ang username"</string>
-    <string name="vpn_connect_button" msgid="1699007212602470655">"Kumonekta"</string>
-    <string name="vpn_yes_button" msgid="8034531001149843119">"Oo"</string>
-    <string name="vpn_no_button" msgid="7620339571187119107">"Hindi"</string>
-    <string name="vpn_back_button" msgid="192036339792734970">"Bumalik"</string>
-    <string name="vpn_mistake_button" msgid="1683383660912491270">"Hindi"</string>
-    <string name="vpn_menu_done" msgid="93528279226907926">"I-save"</string>
-    <string name="vpn_menu_cancel" msgid="7234451214611202868">"Kanselahin"</string>
-    <string name="vpn_menu_revert" msgid="4407762442281467659">"Ibalik"</string>
-    <string name="vpn_menu_connect" msgid="1089399414463784218">"Kumonekta sa network"</string>
-    <string name="vpn_menu_disconnect" msgid="8254492450022562235">"Alisin sa pagkakakontekta sa network"</string>
-    <string name="vpn_menu_edit" msgid="4526245173583195618">"I-edit ang network"</string>
-    <string name="vpn_menu_delete" msgid="3326527392609513129">"Tanggalin ang network"</string>
-    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"Dapat mong ipasok ang <xliff:g id="CODE">%s</xliff:g>."</string>
-    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"Dapat mong piliin ang <xliff:g id="OPTION">%s</xliff:g>."</string>
-    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"Ang pangalan ng VPN na \'<xliff:g id="NAME">%s</xliff:g>\' ay umiiral na. Humanap ng isa pang pangalan."</string>
-    <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"Sigurado ka bang gusto mong tanggalin ang VPN na ito?"</string>
-    <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"Sigurado ka bang ayaw mong likhain ang profile na ito?"</string>
-    <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"Sigurado ka bang gusto mong itapon ang mga pagbabago na nagawa sa profile na ito?"</string>
-    <string name="vpn_confirm_reconnect" msgid="5748535476278674296">"Hindi magawang kumonekta sa network. Gusto mong subukang muli?"</string>
-    <string name="vpn_reconnect_from_lost" msgid="2442844155623372118">"Nawala ang koneksyon. Gusto mo bang kumonekta muli?"</string>
-    <string name="vpn_unknown_server_dialog_msg" msgid="3080742299823671319">"Hindi malutas ang pangalan ng server. Gusto mo bang suriin ang setting ng pangalan ng iyong server?"</string>
-    <string name="vpn_challenge_error_dialog_msg" msgid="6174901754230038601">"Error sa hamon. Gusto mo bang tingnan ang iyong lihim na setting?"</string>
-    <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"Isa o higit pang mga lihim ang nawawala sa configuration ng VPN. Gusto mong tingnan ang iyong lihim na setting?"</string>
-    <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"Hindi tama ang username o password na iyong ipinasok. Gusto mo bang subukang muli?"</string>
-    <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"Nag-hung up ang server. Maaaring mali ang ipinasok mong username o password. Gusto mo bang subukang muli?"</string>
-    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"Nag-hung up ang server. Posibleng nasa likod ka ng firewall na pumipigil sa iyo mula sa pagkonekta sa server. Gusto mo bang subukang muli?"</string>
-    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"Nabigo ang negotiation sa server. Maaaring hindi sumang-ayon ang server sa iyong pagpipilian sa pag-encrypt. Gusto mo bang suriin ang iyong setting ng pag-encrypt?"</string>
-    <string name="vpn_type_title" msgid="6392933604218676224">"Magdagdag ng VPN"</string>
-    <string name="vpn_add_new_vpn" msgid="5438260689052714550">"Magdagdag ng VPN"</string>
-    <string name="vpn_details_title" msgid="418806440938510331">"Mga detalye ng VPN"</string>
-    <string name="vpn_edit_title_add" msgid="2121313217989682890">"Magdagdag ng <xliff:g id="NAME">%s</xliff:g> VPN"</string>
-    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"Mga detalye ni <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpns" msgid="3148141862835492816">"Mga VPN"</string>
-    <string name="vpn_connecting" msgid="8039521381692090116">"Kumukonekta..."</string>
-    <string name="vpn_disconnecting" msgid="7748050200708257066">"Nadidiskonekta…"</string>
-    <string name="vpn_connected" msgid="7641723116362845781">"Konektado"</string>
-    <string name="vpn_connect_hint" msgid="7442898962925875181">"Kumonekta sa network"</string>
-    <string name="vpn_name" msgid="1550918148476193076">"Pangalan ng VPN"</string>
-    <string name="vpn_a_name" msgid="8445736942405283509">"isang pangalan ng VPN"</string>
-    <string name="vpn_profile_added" msgid="9061017910337129840">"Idinagdag ang \'<xliff:g id="NAME">%s</xliff:g>\'"</string>
-    <string name="vpn_profile_replaced" msgid="587435576816273815">"Ang mga pagbabago ay ginawa sa \'<xliff:g id="NAME">%s</xliff:g>\'"</string>
-    <string name="vpn_user_certificate_title" msgid="6812545893924071742">"Magtakda ng certificate ng user"</string>
-    <string name="vpn_user_certificate" msgid="949322691686938888">"Certificate ng user"</string>
-    <string name="vpn_a_user_certificate" msgid="8943983437956898649">"isang certificate ng user"</string>
-    <string name="vpn_ca_certificate_title" msgid="7846466160795589985">"Magtakda ng CA certificate"</string>
-    <string name="vpn_ca_certificate" msgid="465085144064264742">"Certificate ng Certificate authority (CA)"</string>
-    <string name="vpn_a_ca_certificate" msgid="3374242520974884295">"isang CA certificate"</string>
-    <string name="vpn_l2tp_secret_string_title" msgid="5039677186748940987">"Itakda ang L2TP na lihim"</string>
-    <string name="vpn_l2tp_secret" msgid="529359749677142076">"L2TP na lihim"</string>
-    <string name="vpn_a_l2tp_secret" msgid="6612042930810981845">"isang L2TP secret"</string>
-    <string name="vpn_pptp_encryption_title" msgid="2236795167467896499">"pag-encrypt"</string>
-    <string name="vpn_pptp_encryption" msgid="2602329949737259686">"PPTP encryption"</string>
-    <string name="vpn_ipsec_presharedkey_title" msgid="2184060087690539175">"Magtakda ng IPSec pre-shared key"</string>
-    <string name="vpn_ipsec_presharedkey" msgid="5434316521616673741">"IPSec pre-shared key"</string>
-    <string name="vpn_a_ipsec_presharedkey" msgid="1255301923217898418">"isang IPSec pre-shared key"</string>
-    <string name="vpn_vpn_server_title" msgid="8897005887420358913">"Itakda ang VPN server"</string>
-    <string name="vpn_vpn_server" msgid="1141754908824209260">"VPN server"</string>
-    <string name="vpn_a_vpn_server" msgid="5960906152125045853">"isang VPN server"</string>
-    <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"VPN na pangalan ng server"</string>
-    <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"Mga domain sa paghahanap ng DNS"</string>
-    <string name="vpn_dns_search_list" msgid="4230034234026605360">"Mga domain sa paghahanap ng DNS"</string>
-    <string name="vpn_field_is_set" msgid="7137320847812992243">"Ang <xliff:g id="VALUE">%s</xliff:g> ay nakatakda"</string>
-    <string name="vpn_field_not_set" msgid="2972519243515893804">"Hindi nakatakda ang <xliff:g id="VALUE">%s</xliff:g>"</string>
-    <string name="vpn_field_not_set_optional" msgid="8840557698252556791">"Hindi nakatakda ang <xliff:g id="VALUE">%s</xliff:g> (opsyonal)"</string>
-    <string name="vpn_enable_field" msgid="3700967675854517191">"Paganahin ang <xliff:g id="OPTION">%s</xliff:g>"</string>
-    <string name="vpn_disable_field" msgid="6905658811179634005">"Huwag paganahin ang <xliff:g id="OPTION">%s</xliff:g>"</string>
-    <string name="vpn_is_enabled" msgid="1266304230417098877">"Pinagana ang <xliff:g id="OPTION">%s</xliff:g>"</string>
-    <string name="vpn_is_disabled" msgid="2013622485867806167">"Hindi pinagana ang <xliff:g id="OPTION">%s</xliff:g>"</string>
     <string name="vpn_settings_title" msgid="7327468307909556719">"Mga setting ng VPN"</string>
     <string name="vpn_settings_summary" msgid="8849924181594963972">"I-set up &amp; pamahalaan ang Mga Virtual Private Networks (mga VPN)"</string>
-    <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="trusted_credentials" msgid="4266945289534242402">"Pinagkakatiwalaang kredensyal"</string>
+    <string name="trusted_credentials_summary" msgid="6735221351155686632">"Ipakita ang mga pinagkakatiwalaang mga CA 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>
-    <string name="privacy_settings_title" msgid="1987089301293213705">"Mga setting ng Privacy"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"I-backup &amp; i-reset"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"i-backup &amp; i-reset"</string>
     <string name="backup_section_title" msgid="8856083167469467588">"I-backup at ipanumbalik"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Personal na data"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"I-back up ang aking data"</string>
@@ -1440,4 +1413,107 @@
     <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>
+    <!-- no translation found for debug_ui_category (9023948280291055349) -->
+    <skip />
+    <!-- no translation found for strict_mode (1938795874357830695) -->
+    <skip />
+    <!-- no translation found for strict_mode_summary (142834318897332338) -->
+    <skip />
+    <!-- no translation found for pointer_location (6084434787496938001) -->
+    <skip />
+    <!-- no translation found for pointer_location_summary (840819275172753713) -->
+    <skip />
+    <!-- no translation found for show_screen_updates (8282711794220426931) -->
+    <skip />
+    <!-- no translation found for show_screen_updates_summary (1716122382094924596) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage (2389212910758076024) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage_summary (2113341923988958266) -->
+    <skip />
+    <!-- no translation found for window_animation_scale_title (6162587588166114700) -->
+    <skip />
+    <!-- no translation found for transition_animation_scale_title (387527540523595875) -->
+    <skip />
+    <!-- no translation found for debug_applications_category (6221644998451283813) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities (3622005081180597749) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities_summary (3592221124808773368) -->
+    <skip />
+    <!-- no translation found for app_process_limit_title (4121324758038197598) -->
+    <skip />
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Paggamit ng data"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"Cycle sa paggamit ng data"</string>
+    <string name="data_usage_menu_split_4g" msgid="7417435609285381968">"Ihiwalay ang paggamit ng 4G"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Ipakita ang paggamit ng Wi-Fi"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"Baguhin ang cycle…"</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Araw ng buwan pang i-reset ang ikot ng paggamit ng data:"</string>
+    <string name="data_usage_disable_mobile_limit" msgid="289740911281022322">"Wag gumana mobile data sa limit"</string>
+    <string name="data_usage_disable_4g_limit" msgid="5808210773758699800">"Wag paganahin 4G data sa limit"</string>
+    <string name="data_usage_disable_3g_limit" msgid="3856971004328238231">"Wag gumana 2G-3G data sa 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">"Data ng Mobile"</string>
+    <string name="data_usage_enable_3g" msgid="6304006671869578254">"data ng 2G-3G"</string>
+    <string name="data_usage_enable_4g" msgid="3635854097335036738">"data ng 4G"</string>
+    <string name="data_usage_app_settings" msgid="3727561362090820369">"Tingnan setting ng application"</string>
+    <string name="data_usage_app_restrict_background" msgid="8856643905291165256">"Higpitan paggamit bckground data"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="1503361245973512092">"Payagan lang mga data sa background ng app sa unlimited network"</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="8110736468987743260">"Pinaghihigpitan ang data ng background"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="100001698378554777">"Maaaring magkaroon ng negatibong epekto ang tampok na ito sa mga application na umaasa sa paggamit ng data sa background."\n\n"Higit pang mga kontrol sa paggamit ng data ang mahahanap sa loob ng mga setting ng application na ito."</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Petsa ng pag-reset ng cycle sa paggamit"</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Petsa ng bawat buwan:"</string>
+    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Itakda"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Pag-limit sa paggamit ng data"</string>
+    <string name="data_usage_limit_dialog_mobile" msgid="7931094451923591578">"Hindi pagaganahin ang iyong koneksyon ng mobile kapag naabot ang tinukoy na limitasyon."\n\n"Upang maiwasan ang mga bayarin sa overage, pag-isipang gumamit ng nabawasang limitasyon, dahil maaaring mag-iba ang pamamaraan ng accounting ng device at carrier."</string>
+    <string name="data_usage_limit_dialog_3g" msgid="5478553071420316963">"Hindi papaganahin ang iyong koneksyon ng data ng 2G-3G kapag naabot ang tinukoy na limitasyon."\n\n"Upang maiwasan ang mga bayarin sa overage, pag-isipang gumamit ng nabawasang limitasyon, dahil maaaring mag-iba ang pamamaraan ng accounting ng device at carrier."</string>
+    <string name="data_usage_limit_dialog_4g" msgid="6134008906742403777">"Hindi pagaganahin ang iyong koneksyon ng data ng 4G kapag naabot ang tinukoy na limitasyon."\n\n"Upang maiwasan ang mga bayarin sa overage, pag-isipang gumamit ng nabawasang limitasyon, dahil maaaring mag-iba ang pamamaraan ng accounting ng device at carrier."</string>
+    <string name="data_usage_disabled_dialog_3g_title" msgid="4221584306492812040">"Di pinagana ang data ng 2G-3G"</string>
+    <string name="data_usage_disabled_dialog_4g_title" msgid="715585612162185936">"Hindi pinagana ang data ng 4G"</string>
+    <string name="data_usage_disabled_dialog_mobile_title" msgid="209516216265000221">"Di pinagana ang data ng mobile"</string>
+    <string name="data_usage_disabled_dialog" msgid="2874031671067845964">"Naabot na ang tinukoy na limitasyon ng paggamit ng data."\n\n"Maaaring magtamo ng mga bayarin ang karagdagang paggamit ng data."</string>
+    <string name="data_usage_disabled_dialog_enable" msgid="2441219164620753329">"Muling paganahin ang data"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="32">"<xliff:g id="NUMBER">%1$s</xliff:g>"</font>" "<font size="12">"<xliff:g id="UNIT">%2$s</xliff:g>"</font>\n<font size="12">"babala"</font></string>
+    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Emergency na tawag"</string>
+    <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Balikan ang tawag"</string>
+    <string name="vpn_name" msgid="4689699885361002297">"Pangalan"</string>
+    <string name="vpn_type" msgid="5435733139514388070">"Uri"</string>
+    <string name="vpn_server" msgid="2123096727287421913">"Address ng server"</string>
+    <string name="vpn_mppe" msgid="6639001940500288972">"PPP encryption (MPPE)"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"L2TP na lihim"</string>
+    <string name="vpn_ipsec_identifier" msgid="4098175859460006296">"IPSec identifierr"</string>
+    <string name="vpn_ipsec_secret" msgid="4526453255704888704">"IPSec na paunang nabahaging key"</string>
+    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"Certificate ng user ng IPSec"</string>
+    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"CA certificate ng IPSec"</string>
+    <!-- no translation found for vpn_search_domains (5391995501541199624) -->
+    <skip />
+    <!-- no translation found for vpn_routes (8556236801755260073) -->
+    <skip />
+    <string name="vpn_username" msgid="1863901629860867849">"Username"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Password"</string>
+    <!-- no translation found for vpn_save_login (6350322456427484881) -->
+    <skip />
+    <!-- no translation found for vpn_not_used (9094191054524660891) -->
+    <skip />
+    <string name="vpn_no_ca_cert" msgid="7820884983947090538">"(huwag i-verify ang server)"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"Kanselahin"</string>
+    <string name="vpn_save" msgid="4233484051644764510">"I-save"</string>
+    <string name="vpn_connect" msgid="8469608541746132301">"Kumonekta"</string>
+    <string name="vpn_edit" msgid="1111459297288136079">"I-edit ang VPN network"</string>
+    <string name="vpn_connect_to" msgid="7328758950427515753">"Kumonekta sa <xliff:g id="NETWORK">%s</xliff:g>"</string>
+    <string name="vpn_title" msgid="7982620762043790565">"Mga setting ng VPN"</string>
+    <string name="vpn_create" msgid="8966010925994175306">"Idagdag ang VPN network"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"I-edit ang network"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"Tanggalin ang network"</string>
+    <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"System"</string>
+    <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"User"</string>
+    <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Hindi pinagana"</string>
+    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Paganahin"</string>
+    <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Alisin"</string>
+    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Paganahin ang CA certificate ng system?"</string>
+    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Huwag paganahin ang CA certificate ng system?"</string>
+    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Permanenteng alisin ang CA certificate ng user?"</string>
 </resources>
diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
index ba31802..ab568dd 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>
@@ -214,4 +240,36 @@
     <item msgid="3878793616631049349">"HDCP denetimini yalnızca DRM içeriği için kullan"</item>
     <item msgid="45075631231212732">"HDCP denetimini her zaman kullan"</item>
   </string-array>
+    <!-- no translation found for window_animation_scale_entries:0 (8134156599370824081) -->
+    <!-- no translation found for window_animation_scale_entries:1 (6624864048416710414) -->
+    <!-- no translation found for window_animation_scale_entries:2 (2219332261255416635) -->
+    <!-- no translation found for window_animation_scale_entries:3 (3544428804137048509) -->
+    <!-- no translation found for window_animation_scale_entries:4 (3110710404225974514) -->
+    <!-- no translation found for window_animation_scale_entries:5 (4402738611528318731) -->
+    <!-- no translation found for window_animation_scale_entries:6 (6189539267968330656) -->
+    <!-- no translation found for transition_animation_scale_entries:0 (8464255836173039442) -->
+    <!-- no translation found for transition_animation_scale_entries:1 (3375781541913316411) -->
+    <!-- no translation found for transition_animation_scale_entries:2 (1991041427801869945) -->
+    <!-- no translation found for transition_animation_scale_entries:3 (4012689927622382874) -->
+    <!-- no translation found for transition_animation_scale_entries:4 (3289156759925947169) -->
+    <!-- no translation found for transition_animation_scale_entries:5 (7705857441213621835) -->
+    <!-- no translation found for transition_animation_scale_entries:6 (6660750935954853365) -->
+    <!-- no translation found for app_process_limit_entries:0 (6799596560242275471) -->
+    <!-- no translation found for app_process_limit_entries:1 (2412794376818632575) -->
+    <!-- no translation found for app_process_limit_entries:2 (1578904888612645001) -->
+    <!-- no translation found for app_process_limit_entries:3 (8819235336299873577) -->
+  <string-array name="vpn_types_long">
+    <item msgid="2732002039459078847">"PPTP VPN"</item>
+    <item msgid="3799752201662127867">"Önceden paylaşılan anahtara sahip L2TP/IPSec VPN"</item>
+    <item msgid="4725504331295252103">"Sertifikalara sahip L2TP/IPSec VPN"</item>
+    <item msgid="7526551163264034377">"Önceden paylaşılan anahtarlara ve Xauth kimlik doğrulamaya sahip IPSec VPN"</item>
+    <item msgid="8064740940687465039">"Sertifikalara ve Xauth kimlik doğrulamaya sahip IPSec VPN"</item>
+    <item msgid="4946199982372391490">"Sertifikalara ve karma kimlik doğrulamaya sahip IPSec VPN"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:0 (8621078286418985762) -->
+    <!-- no translation found for vpn_states:1 (6692305604213080515) -->
+    <!-- no translation found for vpn_states:2 (8001704909356800092) -->
+    <!-- no translation found for vpn_states:3 (4039737283841672166) -->
+    <!-- no translation found for vpn_states:4 (4042143101664725090) -->
+    <!-- no translation found for vpn_states:5 (2690164254699635531) -->
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index f8058df..b3800b6 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -19,6 +19,10 @@
     <string name="yes" msgid="4676390750360727396">"Evet"</string>
     <string name="no" msgid="6731231425810196216">"Hayır"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Bilinmiyor"</string>
+    <string name="header_category_wireless_networks" msgid="4944823405420438623">"KABLOSUZ ve AĞLAR"</string>
+    <string name="header_category_device" msgid="5781174212691167553">"CİHAZ"</string>
+    <string name="header_category_personal" msgid="6225932173498802187">"KİŞİSEL"</string>
+    <string name="header_category_system" msgid="2073558547468647128">"SİSTEM"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Radyoyu aç"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Radyoyu kapat"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"SIM adres defterini görüntüle"</string>
@@ -111,7 +115,11 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Eşleştiriliyor…"</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"Eşleşti ancak bağlanmadı"</string>
     <string name="bluetooth_device" msgid="6873461446424952003">"eller boşta/kulaklıklı mikrofon seti"</string>
-    <string name="progress_scanning" msgid="3760897655335759141">"Taranıyor"</string>
+    <!-- outdated translation 3760897655335759141 -->     <string name="progress_scanning" msgid="192587958424295789">"Taranıyor"</string>
+    <!-- no translation found for progress_tap_to_pair (4192342336107106334) -->
+    <skip />
+    <!-- no translation found for bluetooth_no_devices_found (2412462335116297668) -->
+    <skip />
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Bluetooth eşleşme isteği"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Eşleşme isteği"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ile eşleştirmek için seçin"</string>
@@ -130,6 +138,9 @@
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Telefonunuzdaki bir uygulama, Bluetooth\'u açmak ve telefonunuzu diğer cihazlar tarafından keşfedilebilir duruma getirmek için izin istiyor. Bunu yapmak istiyor musunuz?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Bluetooth açılıyor..."</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Otomatik bağlan"</string>
+    <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth bağlantısı isteği"</string>
+    <string name="bluetooth_connection_notif_message" msgid="1833221950512058309">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" adlı cihaza bağlanmak için dokunun"</string>
+    <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" adlı cihaza bağlanmak istiyor musunuz?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Tarih ve saat ayarları"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"13:00"</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
@@ -235,7 +246,7 @@
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Tüm kablosuz bağlantıları devre dışı bırak"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"Kablosuz bağlantılar devre dışı bırakılıyor…"</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"Kablosuz bağlantılar etkinleştiriliyor…"</string>
-    <string name="radio_controls_title" msgid="5868688473587168882">"Kablosuz özelliği ve ağlar"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Diğer…"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Kablosuz özelliği ve ağlar"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"Kablosuz, Bluetooth, uçak modu, mobil ağ ve VPN özelliklerini yönet"</string>
     <string name="roaming" msgid="3596055926335478572">"Veri dolaşımı"</string>
@@ -271,8 +282,8 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Sahip bilgileri"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="2382525043173672857">"Kilit ekranında görüntülenecek metni girin"</string>
-    <string name="security_settings_title" msgid="5168491784222013179">"Konum ve güvenlik"</string>
-    <string name="location_security_settings_title" msgid="4624434296446625554">"Konum ve güvenlik ayarları"</string>
+    <string name="location_settings_title" msgid="8935806698251432196">"Konum hizmetleri"</string>
+    <string name="security_settings_title" msgid="7945465324818485460">"Güvenlik"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Konumum, ekran kil. açma, SIM kart kil., kim. bilg. dep.kilidini ayarla"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Konumum, ekran kilidi açma, kimlik bilgileri deposunun kilidi özelliklerini ayarla"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Şifreler"</string>
@@ -316,7 +327,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>
@@ -375,8 +386,8 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Cihaz yöneticilerini görüntüle veya devre dışı bırak"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Bluetooth\'u aç"</string>
-    <string name="bluetooth_settings" msgid="2725796451253089609">"Bluetooth ayarları"</string>
-    <string name="bluetooth_settings_title" msgid="2824020086246268296">"Bluetooth ayarları"</string>
+    <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
+    <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Bağlantıları yönet, cihaz adını gir ve keşfedilebilirlik ayarını yap"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Bluetooth eşleşme isteği"</string>
     <string name="bluetooth_enter_pin_msg" msgid="1499285355129256289">\n"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" ile eşleştirmek için PIN girin. (0000 veya 1234 deneyin) Aynı PIN\'i Bluetooth cihazınızdan da girmeniz gerekebilir."</string>
@@ -394,7 +405,10 @@
     <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Eşleştirme <xliff:g id="DEVICE_NAME">%1$s</xliff:g> tarafından reddedildi."</string>
     <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> noktasına bağlanırken bir sorun oluştu."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Cihazları tara"</string>
-    <string name="bluetooth_preference_find_nearby_title" msgid="5087410003465463318">"Yakındaki cihazları bul"</string>
+    <!-- no translation found for bluetooth_search_for_devices (5957007154213560390) -->
+    <skip />
+    <!-- no translation found for bluetooth_searching_for_devices (9203739709307871727) -->
+    <skip />
     <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"Cihaz ayarları"</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Eşleştirilen cihazlar"</string>
     <string name="bluetooth_preference_found_devices" msgid="3133019331974936204">"Bulunan cihazlar"</string>
@@ -404,6 +418,10 @@
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Eşleşmeyi bitir"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Bağlantıyı kes ve eşleşmeyi bitir"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Seçenekler…"</string>
+    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Gelişmiş"</string>
+    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Gelişmiş Bluetooth"</string>
+    <string name="bluetooth_advanced_settings_label" msgid="8659717781212434173">"Gelişmiş Bluetooth"</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="3631028334811113629">"Kullanılabilir cihazlr görmek içn bluetooth\'u açın"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Bağlan…"</string>
     <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"Medya"</string>
     <string name="bluetooth_profile_headset" msgid="81844079120986198">"Eller serbest"</string>
@@ -445,27 +463,31 @@
     <string name="nfc_toggle_error" msgid="2233172102497535522">"Bir hata oluştu."</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Kablosuz"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Kablosuzu aç"</string>
-    <string name="wifi_settings" msgid="4746946030627213196">"Kablosuz ayarları"</string>
+    <string name="wifi_settings" msgid="1277428034634973011">"Kablosuz"</string>
     <string name="wifi_settings_category" msgid="2810363951104753710">"Kablosuz ayarları"</string>
+    <string name="wifi_settings_title" msgid="4351120897298124250">"Kablosuz"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Kablosuz erişim noktalarını kur ve yönet"</string>
-    <string name="wifi_starting" msgid="6710266609710860129">"Açılıyor…"</string>
-    <string name="wifi_stopping" msgid="5952909472548218348">"Kapatılıyor…"</string>
+    <string name="wifi_starting" msgid="7732330327758522943">"Kablosuz açılıyor..."</string>
+    <string name="wifi_stopping" msgid="244864762599017659">"Kablosuz kapatılıyor…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Hata"</string>
     <string name="wifi_in_airplane_mode" msgid="7618393787965366655">"Uçak modunda"</string>
     <string name="wifi_fail_to_scan" msgid="6194542252808587669">"Ağ aranamıyor"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Ağ bildirimi"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Açık bir ağ kullanılabilir olduğunda bana bildir"</string>
+    <string name="wifi_enable_watchdog_service" msgid="4723544454066601706">"Kablosuz Bağlantı Denetimleri"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="8687400936839455926">"Ağ bağlantısıyla ilgili olası sorunları algıla ve yönet"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Kablosuz bağlantı kesme politikası"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Kablosuzdan mobil veriye geçme zamanını belirt"</string>
     <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" msgid="6234851776910938957">"Ağ ekle"</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>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Ağa bağlan"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Ağı unut"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Ağı değiştir"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="3682507011071029311">"Kullanılabilir ağları görmek için kablusuzu açın"</string>
     <string name="wifi_network_setup" msgid="7974851890019344870">"Ağ Kurulumu"</string>
     <string name="wifi_wps_pin" msgid="5471842298708321115">"Erişim noktasının PIN\'ini girin"</string>
     <string name="wifi_wps_setup_title" msgid="150518971269252336">"WPS Ayarı"</string>
@@ -501,13 +523,13 @@
     <string name="wifi_save" msgid="3331121567988522826">"Kaydet"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"İptal"</string>
     <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"Başka bir WPS oturumu saptandı, lütfen bir kaç dakika sonra tekrar deneyin"</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Gelişmiş"</string>
+    <!-- outdated translation 5419052271935350999 -->     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Gelişmiş"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Kablosuz frekans bandı"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"İşlemin sıklık aralığını belirtin"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Frekans bandı ayarlanırken bir sorun oldu."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC adresi"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP adresi"</string>
-    <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"IP ayarları"</string>
+    <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP ayarları"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Kaydet"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"İptal"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Lütfen geçerli bir IP adresi yazın."</string>
@@ -525,7 +547,7 @@
     <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> taşınabilir kablosuz ortak erişim noktası"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Android Ortak Erişim Noktası"</string>
     <string name="sound_settings_title" msgid="8735891486683305886">"Ses"</string>
-    <string name="display_settings_title" msgid="2378894265964357591">"Ekran"</string>
+    <string name="display_settings_title" msgid="1708697328627382561">"Ekran"</string>
     <string name="sound_settings" msgid="5007659014828162881">"Ses ayarları"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Sessiz mod"</string>
     <string name="silent_mode_summary" msgid="3309650676072917899">"Medya ve alarmlar dışında tüm sesleri kapat"</string>
@@ -598,7 +620,18 @@
     <string name="brightness_summary" msgid="838917350127550703">"Ekranın parlaklığını ayarla"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Zaman aşımı"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> sonra ekran otomatik olarak kapanır"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Duvar Kağıdı"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android Dreams"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Ekran koruyucular ve diğer opsiyonlar"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Seçili rüya"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Etkinleştirme zamanı"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> boşta kaldıktan sonra"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Hiçbir zaman"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Deneyin!"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Otomatik parlaklık"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Yazı tipi boyutu"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Tüm yazı tipi boyutları"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Yazı tipini seçin"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM kart kilit ayarları"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"SIM kart kilidini ayarla"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM kart kilidi"</string>
@@ -643,8 +676,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>
@@ -696,6 +730,16 @@
     <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"SD kart bağlantısı kesilecek."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Kaldırılıyor"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Kaldırma işlemi devam ediyor"</string>
+    <!-- no translation found for storage_menu_usb (1580545228584324704) -->
+    <skip />
+    <!-- no translation found for storage_title_usb (5775322159427546546) -->
+    <skip />
+    <!-- no translation found for usb_label_mtp (4157227401755543412) -->
+    <skip />
+    <!-- no translation found for usb_label_ptp (7417254019489575819) -->
+    <skip />
+    <!-- no translation found for usb_label_installer_cd (7438467574756086977) -->
+    <skip />
     <string name="battery_status_title" msgid="9159414319574976203">"Pil durumu"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Pil düzeyi"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN\'ler"</string>
@@ -806,6 +850,8 @@
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"En çok <xliff:g id="MAXCONNECTION">%1$d</xliff:g> cihaz için intrnt paylş oluşturulabilir"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> internet paylaşımı kesilecek."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Yardım"</string>
+    <string name="wireless_category_general" msgid="2973810407987118067">"Genel"</string>
+    <string name="wireless_category_mobile_networks" msgid="1254629216798424288">"Mobil ağlar"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobil ağlar"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Dolaşım, şebeke, APN seçeneklerini ayarla"</string>
     <string name="location_title" msgid="1029961368397484576">"Konumum"</string>
@@ -883,7 +929,7 @@
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Tabletinizin güvenliğini sağlama"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Telefonunuzu güvenlik altına alma"</string>
     <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"Kişisel bir kilit açma deseni oluşturarak tabletinizi yetkisiz kullanıma karşı koruyun. Bir sonraki ekrana geçmek için parmaklarınızı kullanarak noktaları istediğiniz sırada birleştirin. En az dört noktayı birleştirmelisiniz. "\n\n"Başlamaya hazır mısınız? \"İleri\"ye dokunun."</string>
-    <string name="lock_intro_message" product="default" msgid="9100785646737118042"><font size="17">"Kişisel bir ekran kilidi açma deseni oluşturarak telefonunuzu yetkisiz kullanımdan koruyun. "\n<font height="17">\n</font><b>"1"</b>"  Bir sonraki ekranda örnek bir desenin çizilişini izleyin. "\n<font height="17">\n</font><b>"2"</b>"  Hazır olduğunuzda, kendi kişisel kilit açma deseninizi çizin. Değişik desenleri deneyebilirsiniz ancak en az dört noktayı birleştirin. "\n<font height="17">\n</font><b>"3"</b>"  Onaylamak için deseninizi yeniden çizin. "\n<font height="17">\n</font><b>"Başlamaya hazır mısınız? \"İleri\"ye dokunun"</b>". "\n<font height="3">\n</font>"Telefonunuzu korumasız bırakmak için \"İptal\"e dokunun."</font></string>
+    <!-- outdated translation 3692151094288835065 -->     <string name="lock_intro_message" product="default" msgid="5796785892741212873">"Kişisel bir kilit açma deseni oluşturarak tabletinizi yetkisiz kullanıma karşı koruyun. Bir sonraki ekrana geçmek için parmaklarınızı kullanarak noktaları istediğiniz sırada birleştirin. En az dört noktayı birleştirmelisiniz. "\n\n"Başlamaya hazır mısınız? \"İleri\"ye dokunun."</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Uygulamaları yönet"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Yüklü uygulamaları yönet ve kaldır"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Uygulamalar"</string>
@@ -893,6 +939,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>
@@ -905,9 +953,10 @@
     <string name="force_stop" msgid="7435006169872876756">"Durmaya zorla"</string>
     <string name="total_size_label" msgid="1048676419552557254">"Toplam"</string>
     <string name="application_size_label" msgid="5055196275624686382">"Uygulama"</string>
+    <string name="external_code_size_label" msgid="3459343140355961335">"USB depolama uygulaması"</string>
     <string name="data_size_label" msgid="8679376373625710107">"Veri"</string>
-    <string name="external_size_label" product="nosdcard" msgid="4465530017830945766">"USB depolama birimi"</string>
-    <string name="external_size_label" product="default" msgid="2107155737635944440">"SD kart"</string>
+    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB depolama verileri"</string>
+    <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD kart"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Kaldır"</string>
     <string name="disable_text" msgid="6544054052049395202">"Devre dışı bırak"</string>
     <string name="enable_text" msgid="9217362512327828987">"Etkinleştir"</string>
@@ -1026,7 +1075,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 +1085,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>
@@ -1066,7 +1117,7 @@
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Ekran klavyesi ayarları"</string>
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Fiziksel Klavye"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Fiziksel klavye ayarları"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Geliştirme"</string>
+    <string name="development_settings_title" msgid="215179176067683667">"Geliştirici seçenekleri"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"Uygulama geliştirme için seçenekleri ayarla"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB hata ayıklaması"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"USB bağlandığında hata ayıklama modu"</string>
@@ -1091,14 +1142,14 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Erişilebilirlik"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Erişebilirlik ayarları"</string>
     <string name="accessibility_settings_summary" msgid="8185181964847149507">"Erişilebilirlik seçeneklerini yönet"</string>
-    <string name="toggle_accessibility_title" msgid="650839277066574497">"Erişilebilirlik"</string>
+    <string name="toggle_large_text_title" msgid="42259643359869436">"Büyük metin"</string>
     <string name="accessibility_services_category" msgid="8127851026323672607">"Erişilebilirlik hizmetleri"</string>
+    <string name="toggle_accessibility_title" msgid="7338739354952553958">"Erişilebilirlik hizmetlerine izin ver"</string>
     <string name="no_accessibility_services_summary" msgid="694578333333808159">"Yüklenmiş erişilebilirlik hizmeti yok."</string>
     <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Bu erişebilirlik hizmeti, şifreler hariç ve kişisel veriler, kredi kartı numaraları dahil olmak üzere yazdığınız tüm metinleri toplayabilir. Kullanıcı arayüzü etkileşimlerinizin kaydını da tutabilir. <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> uygulamasından gelmektedir. Bu erişebilirlik hizmetini kullanmak istiyor musunuz?"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Erişilebilirlik devre dışı bırakılsın mı?"</string>
     <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"Erişilebilirlikle ilgili uygulama bulunamadı"</string>
     <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"Erişilebilirlikle ilgili yüklü herhangi bir uygulamanız yok."\n\n"Android Market\'ten cihazınız için bir ekran okuyucu indirebilirsiniz."\n\n"Ekran okuyucuyu yüklemek için Tamam düğmesini tıklayın."</string>
-    <string name="accessibility_script_injection_category" msgid="8649951751131431904">"Erişilebilirlik komut dsy"</string>
     <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"Erişilebilirlik komut dosyalarını indir"</string>
     <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"Uyg., Google\'dan erişilebilirlik komut dosyaları indirms izin ver"</string>
     <string name="accessibility_script_injection_security_warning" product="tablet" msgid="1113600871264359828">"Bazı uygulamalar, içeriklerinin daha erişilebilir olması için Google\'dan tabletinize komut dosyaları indirmesini isteyebilir. Google\'ın tabletinize erişilebilirlik komut dosyaları yüklemesine izin vermek istediğinizden emin misiniz?"</string>
@@ -1106,10 +1157,11 @@
     <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>
-    <string name="power_usage_summary_title" msgid="5180282911164282324">"Pil kullanımı"</string>
+    <string name="power_usage_summary_title" msgid="7190304207330319919">"Pil"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Pili ne kullanıyor?"</string>
     <string name="power_usage_not_available" msgid="3583407442633768046">"Pil kullanma verisi mevcut değil"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Fişten çekildikten sonra pil kullanımı"</string>
@@ -1218,6 +1270,8 @@
     <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>
+    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Motor ayarları"</string>
+    <string name="tts_engine_settings_title" msgid="3499112142425680334">"<xliff:g id="TTS_ENGINE_NAME">%s</xliff:g> ayarları"</string>
     <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>
@@ -1228,114 +1282,33 @@
     <string name="gadget_title" msgid="7455548605888590466">"Güç Denetimi"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Kablosuz ayarı güncelleniyor"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetooth ayarları güncelleniyor"</string>
-    <string name="vpn_settings_activity_title" msgid="7276864950701612579">"VPN ayarları"</string>
-    <string name="vpn_connect_to" msgid="2541409082892684362">"Şuna bağlan: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpn_username_colon" msgid="7854930370861306247">"Kullanıcı adı:"</string>
-    <string name="vpn_password_colon" msgid="5716278710848606626">"Şifre:"</string>
-    <string name="vpn_a_username" msgid="6664733641993968692">"bir kullanıcı adı"</string>
-    <string name="vpn_a_password" msgid="1537213632501483753">"bir şifre"</string>
-    <string name="vpn_save_username" msgid="1408415289165970790">"Kullanıcı adını hatırla"</string>
-    <string name="vpn_connect_button" msgid="1699007212602470655">"Bağlan"</string>
-    <string name="vpn_yes_button" msgid="8034531001149843119">"Evet"</string>
-    <string name="vpn_no_button" msgid="7620339571187119107">"Hayır"</string>
-    <string name="vpn_back_button" msgid="192036339792734970">"Geri"</string>
-    <string name="vpn_mistake_button" msgid="1683383660912491270">"Hayır"</string>
-    <string name="vpn_menu_done" msgid="93528279226907926">"Kaydet"</string>
-    <string name="vpn_menu_cancel" msgid="7234451214611202868">"İptal"</string>
-    <string name="vpn_menu_revert" msgid="4407762442281467659">"Geri Döndür"</string>
-    <string name="vpn_menu_connect" msgid="1089399414463784218">"Ağa bağlan"</string>
-    <string name="vpn_menu_disconnect" msgid="8254492450022562235">"Ağ bağlantısını kes"</string>
-    <string name="vpn_menu_edit" msgid="4526245173583195618">"Ağı düzenle"</string>
-    <string name="vpn_menu_delete" msgid="3326527392609513129">"Ağı sil"</string>
-    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"Şunu girmelisiniz: <xliff:g id="CODE">%s</xliff:g>"</string>
-    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"Şunu seçmelisiniz: <xliff:g id="OPTION">%s</xliff:g>."</string>
-    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"\'<xliff:g id="NAME">%s</xliff:g>\' VPN adı zaten var. Başka bir ad bulun."</string>
-    <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"Bu VPN\'yi silmek istediğinizden emin misiniz?"</string>
-    <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"Bu profili oluşturmak istemediğinizden emin misiniz?"</string>
-    <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"Bu profilde yapılan değişiklikleri silmek istediğinizden emin misiniz?"</string>
-    <string name="vpn_confirm_reconnect" msgid="5748535476278674296">"Ağa bağlanılamıyor. Tekrar denemek ister misiniz?"</string>
-    <string name="vpn_reconnect_from_lost" msgid="2442844155623372118">"Bağlantı kaybedildi. Tekrar bağlanmak istiyor musunuz?"</string>
-    <string name="vpn_unknown_server_dialog_msg" msgid="3080742299823671319">"Sunucu adı çözümlenemiyor. Sunucu adı ayarınızı kontrol etmek ister misiniz?"</string>
-    <string name="vpn_challenge_error_dialog_msg" msgid="6174901754230038601">"Hataya itiraz edin. Gizli bilgi ayarınızı kontrol etmek ister misiniz?"</string>
-    <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"Bu VPN yapılandırmasında bir veya birden fazla gizli bilgi eksik. Gizli ayarınızı kontrol etmek ister misiniz?"</string>
-    <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"Girdiğiniz kullanıcı adı veya şifre yanlış. Tekrar denemek istiyor musunuz?"</string>
-    <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"Sunucu bağlantısı kesildi. Girdiğiniz kullanıcı adı veya şifre yanlış olabilir. Tekrar denemek istiyor musunuz?"</string>
-    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"Sunucu engellendi. Sunucuya bağlanmanıza engel olan bir güvenlik duvarının ardında bulunuyor olabilirsiniz. Tekrar denemek ister misiniz?"</string>
-    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"Sunucu anlaşması başarısız oldu. Sunucu şifreleme seçeneğiniz ile uyuşmuyor olabilir. Şifreleme ayarınızı kontrol etmek istiyor musunuz?"</string>
-    <string name="vpn_type_title" msgid="6392933604218676224">"VPN ekle"</string>
-    <string name="vpn_add_new_vpn" msgid="5438260689052714550">"VPN ekle"</string>
-    <string name="vpn_details_title" msgid="418806440938510331">"VPN ayrıntıları"</string>
-    <string name="vpn_edit_title_add" msgid="2121313217989682890">"<xliff:g id="NAME">%s</xliff:g> VPN\'si ekle"</string>
-    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"<xliff:g id="NAME">%s</xliff:g> ayrıntıları"</string>
-    <string name="vpns" msgid="3148141862835492816">"VPN\'ler"</string>
-    <string name="vpn_connecting" msgid="8039521381692090116">"Bağlanıyor..."</string>
-    <string name="vpn_disconnecting" msgid="7748050200708257066">"Bağlantı kesiliyor..."</string>
-    <string name="vpn_connected" msgid="7641723116362845781">"Bağlandı"</string>
-    <string name="vpn_connect_hint" msgid="7442898962925875181">"Ağa bağlan"</string>
-    <string name="vpn_name" msgid="1550918148476193076">"VPN adı"</string>
-    <string name="vpn_a_name" msgid="8445736942405283509">"bir VPN adı"</string>
-    <string name="vpn_profile_added" msgid="9061017910337129840">"\'<xliff:g id="NAME">%s</xliff:g>\' eklendi"</string>
-    <string name="vpn_profile_replaced" msgid="587435576816273815">"\'<xliff:g id="NAME">%s</xliff:g>\' üzerinde değişiklikler yapıldı"</string>
-    <string name="vpn_user_certificate_title" msgid="6812545893924071742">"Kullanıcı sertifikasını ayarla"</string>
-    <string name="vpn_user_certificate" msgid="949322691686938888">"Kullanıcı sertifikası"</string>
-    <string name="vpn_a_user_certificate" msgid="8943983437956898649">"bir kullanıcı sertifikası"</string>
-    <string name="vpn_ca_certificate_title" msgid="7846466160795589985">"CA sertifikasını ayarla"</string>
-    <string name="vpn_ca_certificate" msgid="465085144064264742">"Sertifika yetkilisi (CA) sertifikası"</string>
-    <string name="vpn_a_ca_certificate" msgid="3374242520974884295">"bir CA sertifikası"</string>
-    <string name="vpn_l2tp_secret_string_title" msgid="5039677186748940987">"L2TP gizli bilgisini ayarla"</string>
-    <string name="vpn_l2tp_secret" msgid="529359749677142076">"L2TP gizli bilgisi"</string>
-    <string name="vpn_a_l2tp_secret" msgid="6612042930810981845">"bir L2TP gizli bilgisi"</string>
-    <string name="vpn_pptp_encryption_title" msgid="2236795167467896499">"şifreleme"</string>
-    <string name="vpn_pptp_encryption" msgid="2602329949737259686">"PPTP şifreleme"</string>
-    <string name="vpn_ipsec_presharedkey_title" msgid="2184060087690539175">"IPSec önceden paylaşılan anahtarı ayarla"</string>
-    <string name="vpn_ipsec_presharedkey" msgid="5434316521616673741">"IPSec önceden paylaşılan anahtar"</string>
-    <string name="vpn_a_ipsec_presharedkey" msgid="1255301923217898418">"bir IPSec önceden paylaşılan anahtar"</string>
-    <string name="vpn_vpn_server_title" msgid="8897005887420358913">"VPN sunucusunu ayarla"</string>
-    <string name="vpn_vpn_server" msgid="1141754908824209260">"VPN sunucusu"</string>
-    <string name="vpn_a_vpn_server" msgid="5960906152125045853">"bir VPN sunucusu"</string>
-    <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"VPN sunucu adı"</string>
-    <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"DNS arama alanları"</string>
-    <string name="vpn_dns_search_list" msgid="4230034234026605360">"DNS arama alanları"</string>
-    <string name="vpn_field_is_set" msgid="7137320847812992243">"<xliff:g id="VALUE">%s</xliff:g> ayarlandı"</string>
-    <string name="vpn_field_not_set" msgid="2972519243515893804">"<xliff:g id="VALUE">%s</xliff:g> ayarlanmadı"</string>
-    <string name="vpn_field_not_set_optional" msgid="8840557698252556791">"<xliff:g id="VALUE">%s</xliff:g> ayarlanmadı (isteğe bağlı)"</string>
-    <string name="vpn_enable_field" msgid="3700967675854517191">"<xliff:g id="OPTION">%s</xliff:g> seçeneğini etkinleştir"</string>
-    <string name="vpn_disable_field" msgid="6905658811179634005">"<xliff:g id="OPTION">%s</xliff:g> seçeneğini devre dışı bırak"</string>
-    <string name="vpn_is_enabled" msgid="1266304230417098877">"<xliff:g id="OPTION">%s</xliff:g> etkinleştirildi"</string>
-    <string name="vpn_is_disabled" msgid="2013622485867806167">"<xliff:g id="OPTION">%s</xliff:g> devre dışı bırakıldı"</string>
     <string name="vpn_settings_title" msgid="7327468307909556719">"VPN ayarları"</string>
     <string name="vpn_settings_summary" msgid="8849924181594963972">"Sanal Özel Ağlar (VPN\'ler) kur ve yönet"</string>
-    <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="trusted_credentials" msgid="4266945289534242402">"Güvenilir kimlik bilgisi"</string>
+    <string name="trusted_credentials_summary" msgid="6735221351155686632">"Güvenilir CA sertifikalarını görüntüle"</string>
     <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>
-    <string name="privacy_settings_title" msgid="1987089301293213705">"Gizlilik ayarları"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"Yedekle ve sıfırla"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"Yedekle ve sıfırla"</string>
     <string name="backup_section_title" msgid="8856083167469467588">"Yedekleme ve geri yükleme"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Kişisel veriler"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Verilerimi yedekle"</string>
@@ -1439,4 +1412,107 @@
     <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>
+    <!-- no translation found for debug_ui_category (9023948280291055349) -->
+    <skip />
+    <!-- no translation found for strict_mode (1938795874357830695) -->
+    <skip />
+    <!-- no translation found for strict_mode_summary (142834318897332338) -->
+    <skip />
+    <!-- no translation found for pointer_location (6084434787496938001) -->
+    <skip />
+    <!-- no translation found for pointer_location_summary (840819275172753713) -->
+    <skip />
+    <!-- no translation found for show_screen_updates (8282711794220426931) -->
+    <skip />
+    <!-- no translation found for show_screen_updates_summary (1716122382094924596) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage (2389212910758076024) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage_summary (2113341923988958266) -->
+    <skip />
+    <!-- no translation found for window_animation_scale_title (6162587588166114700) -->
+    <skip />
+    <!-- no translation found for transition_animation_scale_title (387527540523595875) -->
+    <skip />
+    <!-- no translation found for debug_applications_category (6221644998451283813) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities (3622005081180597749) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities_summary (3592221124808773368) -->
+    <skip />
+    <!-- no translation found for app_process_limit_title (4121324758038197598) -->
+    <skip />
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Veri kullanımı"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"Veri kullanım dönemi"</string>
+    <string name="data_usage_menu_split_4g" msgid="7417435609285381968">"4G kullanımını ayır"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Kablosuz kullanımını göster"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"Dönemi değiştir..."</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Ayın, veri kullanım döneminin sıfırlandığı günü:"</string>
+    <string name="data_usage_disable_mobile_limit" msgid="289740911281022322">"Mobil verileri snrd dvr dışı brk"</string>
+    <string name="data_usage_disable_4g_limit" msgid="5808210773758699800">"4G verileri sınırda dvr dışı brk"</string>
+    <string name="data_usage_disable_3g_limit" msgid="3856971004328238231">"2G-3G verileri snrd dvr dışı brk"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Kablosuz"</string>
+    <string name="data_usage_tab_mobile" msgid="454140350007299045">"Mobil"</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">"Mobil veriler"</string>
+    <string name="data_usage_enable_3g" msgid="6304006671869578254">"2G-3G verileri"</string>
+    <string name="data_usage_enable_4g" msgid="3635854097335036738">"4G verileri"</string>
+    <string name="data_usage_app_settings" msgid="3727561362090820369">"Uygulama ayarlarını görüntüle"</string>
+    <string name="data_usage_app_restrict_background" msgid="8856643905291165256">"Arka plan veri kullanımn sınırla"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="1503361245973512092">"Arka plan verilerine yalnzca sınırsız ağ kullanımında izin ver"</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="8110736468987743260">"Arka plan veriler sınırlandırılıyor"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="100001698378554777">"Bu özellik arka plan veri kullanımına bağlı uygulamaları olumsuz etkileyebilir."\n\n"Bu uygulamanın ayarları içinde daha uygun veri kullanım denetimleri bulunabilir."</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Kullanım dönemi sıfırlama tarihi"</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Her ayın şu günü:"</string>
+    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Ayarla"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Veri kullanımını sınırlama"</string>
+    <string name="data_usage_limit_dialog_mobile" msgid="7931094451923591578">"Belirlenen sınıra ulaşıldığında mobil veri bağlantınız devre dışı bırakılacak."\n\n"Cihazın ve taşıyıcının hesaplama yöntemleri farklı olabileceğinden fazla kullanım ücretlerinden sakınmak için daha düşük bir sınır kullanmayı düşünün."</string>
+    <string name="data_usage_limit_dialog_3g" msgid="5478553071420316963">"Belirlenen sınıra ulaşıldığında 2G-3G veri bağlantınız devre dışı bırakılacak."\n\n"Cihazın ve taşıyıcının hesaplama yöntemleri farklı olabileceğinden fazla kullanım ücretlerinden sakınmak için daha düşük bir sınır kullanmayı düşünün."</string>
+    <string name="data_usage_limit_dialog_4g" msgid="6134008906742403777">"Belirlenen sınıra ulaşıldığında 4G veri bağlantınız devre dışı bırakılacak."\n\n"Cihazın ve taşıyıcının hesaplama yöntemleri farklı olabileceğinden fazla kullanım ücretlerinden sakınmak için daha düşük bir sınır kullanmayı düşünün."</string>
+    <string name="data_usage_disabled_dialog_3g_title" msgid="4221584306492812040">"2G-3G verileri devre dışı bırakıldı"</string>
+    <string name="data_usage_disabled_dialog_4g_title" msgid="715585612162185936">"4G verileri devre dışı"</string>
+    <string name="data_usage_disabled_dialog_mobile_title" msgid="209516216265000221">"Mobil veriler devre dışı"</string>
+    <string name="data_usage_disabled_dialog" msgid="2874031671067845964">"Belirtilen veri kullanım sınırına ulaşıldı."\n\n"Ek veri kullanımında operatör ücretleri alınabilir."</string>
+    <string name="data_usage_disabled_dialog_enable" msgid="2441219164620753329">"Veriyi yeniden etkinleştir"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="32">"<xliff:g id="NUMBER">%1$s</xliff:g>"</font>" "<font size="12">"<xliff:g id="UNIT">%2$s</xliff:g>"</font>\n<font size="12">"uyarı"</font></string>
+    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Acil durum çağrısı"</string>
+    <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Çağrıya dön"</string>
+    <string name="vpn_name" msgid="4689699885361002297">"Ad"</string>
+    <string name="vpn_type" msgid="5435733139514388070">"Tür"</string>
+    <string name="vpn_server" msgid="2123096727287421913">"Sunucu adresi"</string>
+    <string name="vpn_mppe" msgid="6639001940500288972">"PPP şifreleme (MPPE)"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"L2TP gizli bilgisi"</string>
+    <string name="vpn_ipsec_identifier" msgid="4098175859460006296">"IPSec kimliği"</string>
+    <string name="vpn_ipsec_secret" msgid="4526453255704888704">"IPSec önceden paylaşılan anahtar"</string>
+    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"IPSec kullanıcı sertifikası"</string>
+    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec CA sertifikası"</string>
+    <!-- no translation found for vpn_search_domains (5391995501541199624) -->
+    <skip />
+    <!-- no translation found for vpn_routes (8556236801755260073) -->
+    <skip />
+    <string name="vpn_username" msgid="1863901629860867849">"Kullanıcı adı"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Şifre"</string>
+    <!-- no translation found for vpn_save_login (6350322456427484881) -->
+    <skip />
+    <!-- no translation found for vpn_not_used (9094191054524660891) -->
+    <skip />
+    <string name="vpn_no_ca_cert" msgid="7820884983947090538">"(sunucuyu doğrulama)"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"İptal"</string>
+    <string name="vpn_save" msgid="4233484051644764510">"Kaydet"</string>
+    <string name="vpn_connect" msgid="8469608541746132301">"Bağlan"</string>
+    <string name="vpn_edit" msgid="1111459297288136079">"VPN ağını düzenle"</string>
+    <string name="vpn_connect_to" msgid="7328758950427515753">"<xliff:g id="NETWORK">%s</xliff:g> ağına bağlan"</string>
+    <string name="vpn_title" msgid="7982620762043790565">"VPN ayarları"</string>
+    <string name="vpn_create" msgid="8966010925994175306">"VPN ağı ekle"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"Ağı düzenle"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"Ağı sil"</string>
+    <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Sistem"</string>
+    <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Kullanıcı"</string>
+    <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Devre dışı bırak"</string>
+    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Etkinleştir"</string>
+    <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Kaldır"</string>
+    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Sistem CA sertifikası etkinleştirilsin mi?"</string>
+    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Sistem CA sertifikası devre dışı bırakılsın mı?"</string>
+    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Kullanıcı CA sertifikası kalıcı olarak kaldırılsın mı?"</string>
 </resources>
diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml
index 93701b3..7d0997f 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>
@@ -214,4 +240,36 @@
     <item msgid="3878793616631049349">"Використовувати перевірку HDCP лише для вмісту, захищеного DRM"</item>
     <item msgid="45075631231212732">"Завжди використовувати перевірку HDCP"</item>
   </string-array>
+    <!-- no translation found for window_animation_scale_entries:0 (8134156599370824081) -->
+    <!-- no translation found for window_animation_scale_entries:1 (6624864048416710414) -->
+    <!-- no translation found for window_animation_scale_entries:2 (2219332261255416635) -->
+    <!-- no translation found for window_animation_scale_entries:3 (3544428804137048509) -->
+    <!-- no translation found for window_animation_scale_entries:4 (3110710404225974514) -->
+    <!-- no translation found for window_animation_scale_entries:5 (4402738611528318731) -->
+    <!-- no translation found for window_animation_scale_entries:6 (6189539267968330656) -->
+    <!-- no translation found for transition_animation_scale_entries:0 (8464255836173039442) -->
+    <!-- no translation found for transition_animation_scale_entries:1 (3375781541913316411) -->
+    <!-- no translation found for transition_animation_scale_entries:2 (1991041427801869945) -->
+    <!-- no translation found for transition_animation_scale_entries:3 (4012689927622382874) -->
+    <!-- no translation found for transition_animation_scale_entries:4 (3289156759925947169) -->
+    <!-- no translation found for transition_animation_scale_entries:5 (7705857441213621835) -->
+    <!-- no translation found for transition_animation_scale_entries:6 (6660750935954853365) -->
+    <!-- no translation found for app_process_limit_entries:0 (6799596560242275471) -->
+    <!-- no translation found for app_process_limit_entries:1 (2412794376818632575) -->
+    <!-- no translation found for app_process_limit_entries:2 (1578904888612645001) -->
+    <!-- no translation found for app_process_limit_entries:3 (8819235336299873577) -->
+  <string-array name="vpn_types_long">
+    <item msgid="2732002039459078847">"PPTP VPN"</item>
+    <item msgid="3799752201662127867">"L2TP/IPSec VPN зі спільними ключами"</item>
+    <item msgid="4725504331295252103">"L2TP/IPSec VPN із сертифікатами"</item>
+    <item msgid="7526551163264034377">"IPSec VPN зі спільними ключами й автентифікацією Xauth"</item>
+    <item msgid="8064740940687465039">"IPSec VPN із сертифікатами та автентифікацією Xauth"</item>
+    <item msgid="4946199982372391490">"IPSec VPN із сертифікатами та гібридною автентифікацією"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:0 (8621078286418985762) -->
+    <!-- no translation found for vpn_states:1 (6692305604213080515) -->
+    <!-- no translation found for vpn_states:2 (8001704909356800092) -->
+    <!-- no translation found for vpn_states:3 (4039737283841672166) -->
+    <!-- no translation found for vpn_states:4 (4042143101664725090) -->
+    <!-- no translation found for vpn_states:5 (2690164254699635531) -->
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index d9b9d24..0d9a276 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -19,6 +19,10 @@
     <string name="yes" msgid="4676390750360727396">"Так"</string>
     <string name="no" msgid="6731231425810196216">"Ні"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Невідомо"</string>
+    <string name="header_category_wireless_networks" msgid="4944823405420438623">"БЕЗДРОТОВИЙ ЗВ’ЯЗОК І МЕРЕЖІ"</string>
+    <string name="header_category_device" msgid="5781174212691167553">"ПРИСТРІЙ"</string>
+    <string name="header_category_personal" msgid="6225932173498802187">"ОСОБИСТЕ"</string>
+    <string name="header_category_system" msgid="2073558547468647128">"СИСТЕМА"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Увімкнути радіо"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Вимкнути радіо"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Перегл. адрес. книгу SIM"</string>
@@ -111,7 +115,11 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Ств.пари..."</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"Створ. пару, але не підкл."</string>
     <string name="bluetooth_device" msgid="6873461446424952003">"вільні руки/гарніт."</string>
-    <string name="progress_scanning" msgid="3760897655335759141">"Сканування"</string>
+    <!-- outdated translation 3760897655335759141 -->     <string name="progress_scanning" msgid="192587958424295789">"Сканування"</string>
+    <!-- no translation found for progress_tap_to_pair (4192342336107106334) -->
+    <skip />
+    <!-- no translation found for bluetooth_no_devices_found (2412462335116297668) -->
+    <skip />
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Запит Bluetooth на ств. пари"</string>
     <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>
@@ -130,6 +138,9 @@
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Програма у вашому телефоні просить дозволу на ввімкнення Bluetooth і надання телефону видимості іншими пристроями. Зробити це?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Увімкнення Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Автоматичне з\'єднання"</string>
+    <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Запит на з’єднання Bluetooth"</string>
+    <string name="bluetooth_connection_notif_message" msgid="1833221950512058309">"Торкніться, щоб підключитися до пристрою \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\""</string>
+    <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Підключитися до пристрою \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Налаштування дати та часу"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"13:00"</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
@@ -235,7 +246,7 @@
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Вимкніть усі бездротові з\'єднання"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"Вимкнення бездротових з\'єднань..."</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"Увімкнення бездротових з\'єднань…"</string>
-    <string name="radio_controls_title" msgid="5868688473587168882">"Бездрот. зв\'язок і мережі"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Більше..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Бездротовий зв\'язок і мережі"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"Керуйте Wi-Fi, Bluetooth, реж. польоту, мобільними мережами та VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Роумінг даних"</string>
@@ -271,8 +282,8 @@
     <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">"Місцезнаходж. і безпека"</string>
-    <string name="location_security_settings_title" msgid="4624434296446625554">"Налашт-ня місцезнаходж. і безпеки"</string>
+    <string name="location_settings_title" msgid="8935806698251432196">"Служби визначення місцезнаходження"</string>
+    <string name="security_settings_title" msgid="7945465324818485460">"Безпека"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Устан. Моє місцезн., розблок. екрана, блок. SIM-карти, сховища обл. даних"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Устан. Моє місцезн., розбл. екрана, блок. схов. обл. даних"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Паролі"</string>
@@ -316,7 +327,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>
@@ -375,8 +386,8 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Переглянути чи дезактив. адмін-ів пристрою"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Увімк. Bluetooth"</string>
-    <string name="bluetooth_settings" msgid="2725796451253089609">"Налашт-ня Bluetooth"</string>
-    <string name="bluetooth_settings_title" msgid="2824020086246268296">"Налашт-ня Bluetooth"</string>
+    <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
+    <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Кер. підключ. і встан. назву пристрою та його видимість."</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Запит Bluetooth на ств. пари"</string>
     <string name="bluetooth_enter_pin_msg" msgid="1499285355129256289">\n"Введіть PIN-код для створення пари з пристроєм \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". (Спробуйте 0000 чи 1234.) Можливо, потрібно буде ввести той самий PIN-код у пристрої Bluetooth."</string>
@@ -394,7 +405,10 @@
     <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>
+    <!-- no translation found for bluetooth_search_for_devices (5957007154213560390) -->
+    <skip />
+    <!-- no translation found for bluetooth_searching_for_devices (9203739709307871727) -->
+    <skip />
     <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>
@@ -404,6 +418,10 @@
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Скас.пару"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Відключ. і скас. ств. пари"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Параметри…"</string>
+    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Розширені"</string>
+    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Розшир. налаштування Bluetooth"</string>
+    <string name="bluetooth_advanced_settings_label" msgid="8659717781212434173">"Розш.налашт.Bluetooth"</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="3631028334811113629">"Увімкніть Bluetooth, щоб побачити доступні пристр."</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>
@@ -445,27 +463,31 @@
     <string name="nfc_toggle_error" msgid="2233172102497535522">"Сталася помилка."</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Увімкнути Wi-Fi"</string>
-    <string name="wifi_settings" msgid="4746946030627213196">"Налашт-ня Wi-Fi"</string>
+    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="2810363951104753710">"Налашт-ня Wi-Fi"</string>
+    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Налашт. і керуйте бездрот. точками доступу"</string>
-    <string name="wifi_starting" msgid="6710266609710860129">"Увімкнення..."</string>
-    <string name="wifi_stopping" msgid="5952909472548218348">"Вимкнення..."</string>
+    <string name="wifi_starting" msgid="7732330327758522943">"Увімкнення Wi-Fi..."</string>
+    <string name="wifi_stopping" msgid="244864762599017659">"Вимкнення Wi-Fi..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"Помилка"</string>
     <string name="wifi_in_airplane_mode" msgid="7618393787965366655">"У режимі польоту"</string>
     <string name="wifi_fail_to_scan" msgid="6194542252808587669">"Неможл. здійснити скан. мереж"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Сповіщення мережі"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Сповіщати мене про доступність відкритої мережі"</string>
+    <string name="wifi_enable_watchdog_service" msgid="4723544454066601706">"Перевірки під’єднання через Wi-Fi"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="8687400936839455926">"Виявляти потенційні проблеми з під’єднанням до мережі та керувати ними"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Політика від’єднання Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Укажіть, коли переключ. від Wi-Fi до моб. даних"</string>
     <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" msgid="6234851776910938957">"Додати мережу"</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>
     <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_empty_list_wifi_off" msgid="3682507011071029311">"Увімкніть Wi-Fi, щоб побачити доступні мережі"</string>
     <string name="wifi_network_setup" msgid="7974851890019344870">"Налаштування мережі"</string>
     <string name="wifi_wps_pin" msgid="5471842298708321115">"Введіть PIN-код із точки доступу"</string>
     <string name="wifi_wps_setup_title" msgid="150518971269252336">"Налаштування WPS"</string>
@@ -501,13 +523,13 @@
     <string name="wifi_save" msgid="3331121567988522826">"Зберег."</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Скасувати"</string>
     <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"Виявлено ще один сеанс WPS, повторіть спробу через декілька хвилин"</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Додатково"</string>
+    <!-- outdated translation 5419052271935350999 -->     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Додатково"</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">"ІР-адреса"</string>
-    <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"Налаштув-ня IP"</string>
+    <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Налаштування IP-адр."</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Зберег."</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Скасувати"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Введіть дійсну ІР-адресу."</string>
@@ -525,7 +547,7 @@
     <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">"AndroidHotspot"</string>
     <string name="sound_settings_title" msgid="8735891486683305886">"Звук"</string>
-    <string name="display_settings_title" msgid="2378894265964357591">"На екран"</string>
+    <string name="display_settings_title" msgid="1708697328627382561">"Відображ."</string>
     <string name="sound_settings" msgid="5007659014828162881">"Налашт-ня звуку"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Беззвуч. режим"</string>
     <string name="silent_mode_summary" msgid="3309650676072917899">"Вимкнути всі звуки, крім медіа та сповіщень"</string>
@@ -598,7 +620,18 @@
     <string name="brightness_summary" msgid="838917350127550703">"Налаштуйте яскравість екрана"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Час очікування"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Екран автоматично відключається через <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Фоновий малюнок"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android Dreams"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Заставки й інші розваги в режимі очікування"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Selected dream"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Час для активації"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"Через <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> в режимі очікування"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Ніколи"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Спробувати!"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Автоматична яскравість"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Розмір шрифту"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Загальний розмір шрифтів"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Виберіть розмір шрифту"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Налашт. блокув. SIM-карти"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Налашт. блок. SIM-карти"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Блок. SIM-карти"</string>
@@ -643,8 +676,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>
@@ -696,6 +730,16 @@
     <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 storage_menu_usb (1580545228584324704) -->
+    <skip />
+    <!-- no translation found for storage_title_usb (5775322159427546546) -->
+    <skip />
+    <!-- no translation found for usb_label_mtp (4157227401755543412) -->
+    <skip />
+    <!-- no translation found for usb_label_ptp (7417254019489575819) -->
+    <skip />
+    <!-- no translation found for usb_label_installer_cd (7438467574756086977) -->
+    <skip />
     <string name="battery_status_title" msgid="9159414319574976203">"Стан батареї"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Рівень батареї"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -806,6 +850,8 @@
     <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>
+    <string name="wireless_category_general" msgid="2973810407987118067">"Загальне"</string>
+    <string name="wireless_category_mobile_networks" msgid="1254629216798424288">"Мобільні мережі"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Мобільні мережі"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"Устан. параметри для роумінгу, мереж, APN"</string>
     <string name="location_title" msgid="1029961368397484576">"Моє місцезнах."</string>
@@ -883,7 +929,7 @@
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Захист вашого пристрою"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Захист вашого телефону"</string>
     <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"Захистіть свій пристрій від несанкціонованого використання, створивши особистий шаблон розблокування екрана. На наступному крані пальцем з\'єднайте крапки в будь-якому порядку. Потрібно з\'єднати принаймні чотири крапки. "\n\n"Готові? Натисніть \"Далі\"."</string>
-    <string name="lock_intro_message" product="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>
+    <!-- outdated translation 3692151094288835065 -->     <string name="lock_intro_message" product="default" msgid="5796785892741212873">"Захистіть свій пристрій від несанкціонованого використання, створивши особистий шаблон розблокування екрана. На наступному крані пальцем з\'єднайте крапки в будь-якому порядку. Потрібно з\'єднати принаймні чотири крапки. "\n\n"Готові? Натисніть \"Далі\"."</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Керувати програмами"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Керувати та видаляти встановлені програми"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Програми"</string>
@@ -893,6 +939,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>
@@ -905,9 +953,10 @@
     <string name="force_stop" msgid="7435006169872876756">"Примус.припин."</string>
     <string name="total_size_label" msgid="1048676419552557254">"Усього"</string>
     <string name="application_size_label" msgid="5055196275624686382">"Програма"</string>
+    <string name="external_code_size_label" msgid="3459343140355961335">"Програма на носії USB"</string>
     <string name="data_size_label" msgid="8679376373625710107">"Дані"</string>
-    <string name="external_size_label" product="nosdcard" msgid="4465530017830945766">"Носій USB"</string>
-    <string name="external_size_label" product="default" msgid="2107155737635944440">"Карта SD"</string>
+    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Дані на носії USB"</string>
+    <string name="external_data_size_label" product="default" msgid="626414192825329708">"Карта SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Видалити"</string>
     <string name="disable_text" msgid="6544054052049395202">"Вимкнути"</string>
     <string name="enable_text" msgid="9217362512327828987">"Увімкнути"</string>
@@ -1026,7 +1075,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 +1085,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>
@@ -1066,7 +1117,7 @@
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Налашт-ня екранної клавіатури"</string>
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Фізична клавіатура"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Налаштування фізичної клавіатури"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Розробка"</string>
+    <string name="development_settings_title" msgid="215179176067683667">"Параметри розробника"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"Установ. параметри для розробки програми"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Налагодження USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Реж. налагодж., коли підкл. ч-з USB"</string>
@@ -1091,14 +1142,14 @@
     <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="toggle_large_text_title" msgid="42259643359869436">"Великий текст"</string>
     <string name="accessibility_services_category" msgid="8127851026323672607">"Служби забезп. доступн-ті"</string>
+    <string name="toggle_accessibility_title" msgid="7338739354952553958">"Дозволити служби забезпеч. доступності"</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"Натисніть \"OK\", щоб установити зчитувач з екрана."</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>
@@ -1106,10 +1157,11 @@
     <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>
-    <string name="power_usage_summary_title" msgid="5180282911164282324">"Викор. батареї"</string>
+    <string name="power_usage_summary_title" msgid="7190304207330319919">"Акумулятор"</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>
@@ -1218,6 +1270,8 @@
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Налашт-ня <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> увімкнено"</string>
     <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> вимкнено"</string>
+    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Налаштування пошукової системи"</string>
+    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Налаштування для <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"Мови та голоси"</string>
     <string name="pico_installed" msgid="2452546687858267414">"Установлено"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"Не встановл."</string>
@@ -1228,114 +1282,33 @@
     <string name="gadget_title" msgid="7455548605888590466">"Контроль потужн."</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Оновлення налашт. Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Оновлення налашт. Bluetooth"</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 &amp;quot;<xliff:g id="NAME">%s</xliff:g>&amp;quot; вже існує. Придумайте іншу назву."</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">"Додати VPN <xliff:g id="NAME">%s</xliff:g>"</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">"&amp;quot;<xliff:g id="NAME">%s</xliff:g>&amp;quot; додано"</string>
-    <string name="vpn_profile_replaced" msgid="587435576816273815">"Зміни внесено до &amp;quot;<xliff:g id="NAME">%s</xliff:g>&amp;quot;"</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">"Устан. сертифікат ЦС"</string>
-    <string name="vpn_ca_certificate" msgid="465085144064264742">"Сертифікат центру сертифікації (ЦС)"</string>
-    <string name="vpn_a_ca_certificate" msgid="3374242520974884295">"сертифікат ЦС"</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">"Устан. і керуйте віртуальними приватн. мережами (VPN)"</string>
-    <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="trusted_credentials" msgid="4266945289534242402">"Надійні облікові дані"</string>
+    <string name="trusted_credentials_summary" msgid="6735221351155686632">"Показати надійні сертифікати ЦС"</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>
-    <string name="privacy_settings_title" msgid="1987089301293213705">"Налашт. конфід-сті"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"Резервне копіювання та скидання"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"Резервне копіювання та скидання"</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>
@@ -1440,4 +1413,107 @@
     <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>
+    <!-- no translation found for debug_ui_category (9023948280291055349) -->
+    <skip />
+    <!-- no translation found for strict_mode (1938795874357830695) -->
+    <skip />
+    <!-- no translation found for strict_mode_summary (142834318897332338) -->
+    <skip />
+    <!-- no translation found for pointer_location (6084434787496938001) -->
+    <skip />
+    <!-- no translation found for pointer_location_summary (840819275172753713) -->
+    <skip />
+    <!-- no translation found for show_screen_updates (8282711794220426931) -->
+    <skip />
+    <!-- no translation found for show_screen_updates_summary (1716122382094924596) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage (2389212910758076024) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage_summary (2113341923988958266) -->
+    <skip />
+    <!-- no translation found for window_animation_scale_title (6162587588166114700) -->
+    <skip />
+    <!-- no translation found for transition_animation_scale_title (387527540523595875) -->
+    <skip />
+    <!-- no translation found for debug_applications_category (6221644998451283813) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities (3622005081180597749) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities_summary (3592221124808773368) -->
+    <skip />
+    <!-- no translation found for app_process_limit_title (4121324758038197598) -->
+    <skip />
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Використання даних"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"Цикл використання даних"</string>
+    <string name="data_usage_menu_split_4g" msgid="7417435609285381968">"Відокремити використання 4G"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Показувати використання Wi-Fi"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"Змінити цикл..."</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"День місяця для скидання циклу використання даних:"</string>
+    <string name="data_usage_disable_mobile_limit" msgid="289740911281022322">"Вимк.моб.дані при досяг. ліміту"</string>
+    <string name="data_usage_disable_4g_limit" msgid="5808210773758699800">"Вимик. дані 4G при досяг. ліміту"</string>
+    <string name="data_usage_disable_3g_limit" msgid="3856971004328238231">"Вимк.дані 2G–3G при досяг.ліміту"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_mobile" msgid="454140350007299045">"Мобільні"</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">"Мобільне передавання даних"</string>
+    <string name="data_usage_enable_3g" msgid="6304006671869578254">"Дані 2G–3G"</string>
+    <string name="data_usage_enable_4g" msgid="3635854097335036738">"Дані 4G"</string>
+    <string name="data_usage_app_settings" msgid="3727561362090820369">"Див. налаштування програми"</string>
+    <string name="data_usage_app_restrict_background" msgid="8856643905291165256">"Обмежити використ. фонових даних"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="1503361245973512092">"Дозвол. лише фонові дані програми під час викор. необмеж. мережі"</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="8110736468987743260">"Обмеження фонових даних"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="100001698378554777">"Ця функція може негативно вплинути на програми, які залежать від використання фонових даних."\n\n"Відповідніші елементи керування використанням даних можна знайти в налаштуваннях цієї програми."</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Дата скидання циклу використання даних"</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Дата кожного місяця:"</string>
+    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Установити"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Обмежити використання даних"</string>
+    <string name="data_usage_limit_dialog_mobile" msgid="7931094451923591578">"Мобільне передавання даних буде вимкнено в разі досягнення вказаного ліміту."\n\n"Щоб уникнути перевищення оплати, використовуйте менший ліміт, оскільки методи підрахунку пристрою й оператора можуть відрізнятися."</string>
+    <string name="data_usage_limit_dialog_3g" msgid="5478553071420316963">"Передавання даних 2G-3G буде вимкнено в разі досягнення вказаного ліміту."\n\n"Щоб уникнути перевищення оплати, використовуйте менший ліміт, оскільки методи підрахунку пристрою й оператора можуть відрізнятися."</string>
+    <string name="data_usage_limit_dialog_4g" msgid="6134008906742403777">"Передавання даних 4G буде вимкнено в разі досягнення вказаного ліміту."\n\n"Щоб уникнути перевищення оплати, використовуйте менший ліміт, оскільки методи підрахунку пристрою й оператора можуть відрізнятися."</string>
+    <string name="data_usage_disabled_dialog_3g_title" msgid="4221584306492812040">"Дані 2G–3G вимкнено"</string>
+    <string name="data_usage_disabled_dialog_4g_title" msgid="715585612162185936">"Дані 4G вимкнено"</string>
+    <string name="data_usage_disabled_dialog_mobile_title" msgid="209516216265000221">"Мобільне передав. даних вимкнено"</string>
+    <string name="data_usage_disabled_dialog" msgid="2874031671067845964">"Досягнено зазначеного ліміту використання даних."\n\n"Додаткове використання даних може призвести до стягування плати оператором."</string>
+    <string name="data_usage_disabled_dialog_enable" msgid="2441219164620753329">"Повторно ввімкнути дані"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="32">"<xliff:g id="NUMBER">%1$s</xliff:g>"</font>" "<font size="12">"<xliff:g id="UNIT">%2$s</xliff:g>"</font>\n<font size="12">"застереження"</font></string>
+    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Аварійний виклик"</string>
+    <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Повернутися до дзвінка"</string>
+    <string name="vpn_name" msgid="4689699885361002297">"Назва"</string>
+    <string name="vpn_type" msgid="5435733139514388070">"Тип"</string>
+    <string name="vpn_server" msgid="2123096727287421913">"Адреса сервера"</string>
+    <string name="vpn_mppe" msgid="6639001940500288972">"Шифрування PPP (MPPE)"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"Ключ L2TP"</string>
+    <string name="vpn_ipsec_identifier" msgid="4098175859460006296">"Ідентифікатор IPSec"</string>
+    <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Спільний ключ IPSec"</string>
+    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"Сертифікат користувача IPSec"</string>
+    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"Сертифікат IPSec від ЦС"</string>
+    <!-- no translation found for vpn_search_domains (5391995501541199624) -->
+    <skip />
+    <!-- no translation found for vpn_routes (8556236801755260073) -->
+    <skip />
+    <string name="vpn_username" msgid="1863901629860867849">"Ім’я користувача"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Пароль"</string>
+    <!-- no translation found for vpn_save_login (6350322456427484881) -->
+    <skip />
+    <!-- no translation found for vpn_not_used (9094191054524660891) -->
+    <skip />
+    <string name="vpn_no_ca_cert" msgid="7820884983947090538">"(не перевіряти сервер)"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"Скасувати"</string>
+    <string name="vpn_save" msgid="4233484051644764510">"Зберегти"</string>
+    <string name="vpn_connect" msgid="8469608541746132301">"Під’єднатися"</string>
+    <string name="vpn_edit" msgid="1111459297288136079">"Редагувати мережу VPN"</string>
+    <string name="vpn_connect_to" msgid="7328758950427515753">"Під’єднатися до мережі <xliff:g id="NETWORK">%s</xliff:g>"</string>
+    <string name="vpn_title" msgid="7982620762043790565">"Налаштування VPN"</string>
+    <string name="vpn_create" msgid="8966010925994175306">"Додати мережу VPN"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"Редаг. мережу"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"Видалити мережу"</string>
+    <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Система"</string>
+    <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Користувач"</string>
+    <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Вимкнути"</string>
+    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Увімкнути"</string>
+    <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Видалити"</string>
+    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Увімкнути сертифікат ЦС для системи?"</string>
+    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Вимкнути сертифікат ЦС для системи?"</string>
+    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Назавжди видалити сертифікат ЦС для користувача?"</string>
 </resources>
diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml
index c873648..a78487c 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>
@@ -214,4 +240,36 @@
     <item msgid="3878793616631049349">"Chỉ sử dụng kiểm tra HDCP cho nội dung DRM"</item>
     <item msgid="45075631231212732">"Luôn sử dụng kiểm tra HDCP"</item>
   </string-array>
+    <!-- no translation found for window_animation_scale_entries:0 (8134156599370824081) -->
+    <!-- no translation found for window_animation_scale_entries:1 (6624864048416710414) -->
+    <!-- no translation found for window_animation_scale_entries:2 (2219332261255416635) -->
+    <!-- no translation found for window_animation_scale_entries:3 (3544428804137048509) -->
+    <!-- no translation found for window_animation_scale_entries:4 (3110710404225974514) -->
+    <!-- no translation found for window_animation_scale_entries:5 (4402738611528318731) -->
+    <!-- no translation found for window_animation_scale_entries:6 (6189539267968330656) -->
+    <!-- no translation found for transition_animation_scale_entries:0 (8464255836173039442) -->
+    <!-- no translation found for transition_animation_scale_entries:1 (3375781541913316411) -->
+    <!-- no translation found for transition_animation_scale_entries:2 (1991041427801869945) -->
+    <!-- no translation found for transition_animation_scale_entries:3 (4012689927622382874) -->
+    <!-- no translation found for transition_animation_scale_entries:4 (3289156759925947169) -->
+    <!-- no translation found for transition_animation_scale_entries:5 (7705857441213621835) -->
+    <!-- no translation found for transition_animation_scale_entries:6 (6660750935954853365) -->
+    <!-- no translation found for app_process_limit_entries:0 (6799596560242275471) -->
+    <!-- no translation found for app_process_limit_entries:1 (2412794376818632575) -->
+    <!-- no translation found for app_process_limit_entries:2 (1578904888612645001) -->
+    <!-- no translation found for app_process_limit_entries:3 (8819235336299873577) -->
+  <string-array name="vpn_types_long">
+    <item msgid="2732002039459078847">"PPTP VPN"</item>
+    <item msgid="3799752201662127867">"L2TP/IPSec VPN có khóa chia sẻ trước"</item>
+    <item msgid="4725504331295252103">"L2TP/IPSec VPN có chứng chỉ"</item>
+    <item msgid="7526551163264034377">"IPSec VPN có khóa được chia sẻ trước và xác thực Xauth"</item>
+    <item msgid="8064740940687465039">"IPSec VPN có chứng chỉ và xác thực Xauth"</item>
+    <item msgid="4946199982372391490">"IPSec VPN có chứng chỉ và xác thực kết hợp"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:0 (8621078286418985762) -->
+    <!-- no translation found for vpn_states:1 (6692305604213080515) -->
+    <!-- no translation found for vpn_states:2 (8001704909356800092) -->
+    <!-- no translation found for vpn_states:3 (4039737283841672166) -->
+    <!-- no translation found for vpn_states:4 (4042143101664725090) -->
+    <!-- no translation found for vpn_states:5 (2690164254699635531) -->
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 4836d40..4eac6a3 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -19,6 +19,10 @@
     <string name="yes" msgid="4676390750360727396">"Có"</string>
     <string name="no" msgid="6731231425810196216">"Không"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Không xác định"</string>
+    <string name="header_category_wireless_networks" msgid="4944823405420438623">"KHÔNG DÂY &amp; MẠNG"</string>
+    <string name="header_category_device" msgid="5781174212691167553">"THIẾT BỊ"</string>
+    <string name="header_category_personal" msgid="6225932173498802187">"CÁ NHÂN"</string>
+    <string name="header_category_system" msgid="2073558547468647128">"HỆ THỐNG"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Bật radio"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Tắt radio"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"Xem sổ địa chỉ trên SIM"</string>
@@ -73,7 +77,7 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Đang sạc"</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">"Huỷ sạc"</string>
+    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Hủy sạc"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Hiện không sạc"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Đầy"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Đã tháo đầu cắm"</string>
@@ -111,7 +115,11 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Đang ghép nối…"</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"Ghép nối nhưng không kết nối"</string>
     <string name="bluetooth_device" msgid="6873461446424952003">"thiết bị rảnh tay/tai nghe"</string>
-    <string name="progress_scanning" msgid="3760897655335759141">"Đang quét"</string>
+    <!-- outdated translation 3760897655335759141 -->     <string name="progress_scanning" msgid="192587958424295789">"Đang quét"</string>
+    <!-- no translation found for progress_tap_to_pair (4192342336107106334) -->
+    <skip />
+    <!-- no translation found for bluetooth_no_devices_found (2412462335116297668) -->
+    <skip />
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Yêu cầu ghép nối Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Yêu cầu ghép nối"</string>
     <string name="bluetooth_notif_message" msgid="618099089987569242">"Chọn để ghép nối với <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
@@ -130,6 +138,9 @@
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"Một ứng dụng trên điện thoại của bạn đang yêu cầu cho phép bật Bluetooth và đặt điện thoại của bạn ở chế độ có thể phát hiện được bởi các thiết bị khác. Bạn có muốn thực hiện điều này không?"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"Đang bật Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"Kết nối tự động"</string>
+    <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Yêu cầu kết nối Bluetooth"</string>
+    <string name="bluetooth_connection_notif_message" msgid="1833221950512058309">"Chạm để kết nối với \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\""</string>
+    <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Bạn có muốn kết nối với \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" không?"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Cài đặt ngày &amp; giờ"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00 chiều"</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
@@ -227,7 +238,7 @@
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"Bộ nhớ USB"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Thẻ SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Cài đặt proxy"</string>
-    <string name="cancel" msgid="6859253417269739139">"Huỷ"</string>
+    <string name="cancel" msgid="6859253417269739139">"Hủy"</string>
     <string name="settings_label" msgid="1626402585530130914">"Cài đặt"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Cài đặt"</string>
     <string name="settings_shortcut" msgid="8597387747077828217">"Chọn lối tắt cài đặt"</string>
@@ -235,7 +246,7 @@
     <string name="airplane_mode_summary" msgid="3154817401368780988">"Vô hiệu hoá tất cả kết nối không dây"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"Đang vô hiệu hoá kết nối không dây…"</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"Đang bật kết nối không dây…"</string>
-    <string name="radio_controls_title" msgid="5868688473587168882">"Không dây &amp; mạng"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Khác…"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Không dây &amp; mạng"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"Quản lý Wi-Fi, Bluetooth, chế độ trên máy bay, mạng di động, &amp; VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Chuyển vùng dữ liệu"</string>
@@ -271,8 +282,8 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Thông tin chủ sở hữu"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="2382525043173672857">"Nhập văn bản để hiển thị trên màn hình khóa"</string>
-    <string name="security_settings_title" msgid="5168491784222013179">"Vị trí &amp; bảo mật"</string>
-    <string name="location_security_settings_title" msgid="4624434296446625554">"Cài đặt vị trí &amp; bảo mật"</string>
+    <string name="location_settings_title" msgid="8935806698251432196">"Dịch vụ vị trí"</string>
+    <string name="security_settings_title" msgid="7945465324818485460">"Bảo mật"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Đặt Vị trí của tôi, mở khoá màn hình, khoá thẻ SIM, khoá bộ nhớ thông tin xác thực"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Đặt Vị trí của tôi, mở khoá màn hình, khoá bộ nhớ thông tin xác thực"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Mật khẩu"</string>
@@ -316,7 +327,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>
@@ -367,7 +378,7 @@
   </plurals>
     <string name="lockpassword_password_recently_used" msgid="2739642871806935825">"Quản trị viên thiết bị không cho phép sử dụng mật khẩu hiện tại"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
-    <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Huỷ"</string>
+    <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Hủy"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Hủy"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Tiếp theo"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Quản trị viên thiết bị"</string>
@@ -375,8 +386,8 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Xem hoặc hủy kích hoạt quản trị viên điện thoại"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Bật Bluetooth"</string>
-    <string name="bluetooth_settings" msgid="2725796451253089609">"Cài đặt Bluetooth"</string>
-    <string name="bluetooth_settings_title" msgid="2824020086246268296">"Cài đặt Bluetooth"</string>
+    <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
+    <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Quản lý kết nối, đặt tên thiết bị &amp; khả năng phát hiện thiết bị"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Yêu cầu ghép nối Bluetooth"</string>
     <string name="bluetooth_enter_pin_msg" msgid="1499285355129256289">\n"Nhập PIN để ghép nối với \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\". (Thử 0000 hoặc 1234). Có thể bạn cần phải nhập cùng một PIN đó vào thiết bị Bluetooth."</string>
@@ -394,7 +405,10 @@
     <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Ghép nối bị <xliff:g id="DEVICE_NAME">%1$s</xliff:g> từ chối."</string>
     <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"Đã xảy ra sự cố khi kết nối tới <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Quét tìm thiết bị"</string>
-    <string name="bluetooth_preference_find_nearby_title" msgid="5087410003465463318">"Tìm thiết bị gần đó"</string>
+    <!-- no translation found for bluetooth_search_for_devices (5957007154213560390) -->
+    <skip />
+    <!-- no translation found for bluetooth_searching_for_devices (9203739709307871727) -->
+    <skip />
     <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"Cài đặt thiết bị"</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Thiết bị được ghép nối"</string>
     <string name="bluetooth_preference_found_devices" msgid="3133019331974936204">"Đã tìm thấy điện thoại"</string>
@@ -403,7 +417,11 @@
     <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Ghép nối &amp; kết nối"</string>
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Bỏ ghép nối"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Ngắt kết nối &amp; bỏ ghép nối"</string>
-    <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Tuỳ chọn…"</string>
+    <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Tùy chọn…"</string>
+    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Nâng cao"</string>
+    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth nâng cao"</string>
+    <string name="bluetooth_advanced_settings_label" msgid="8659717781212434173">"Bluetooth nâng cao"</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="3631028334811113629">"Bật bluetooth để xem các thiết bị khả dụng"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Kết nối với…"</string>
     <string name="bluetooth_profile_a2dp" msgid="3259633293424539529">"Phương tiện"</string>
     <string name="bluetooth_profile_headset" msgid="81844079120986198">"Thiết bị rảnh tay"</string>
@@ -416,7 +434,7 @@
     <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"Truy cập Internet qua <xliff:g id="DEVICE_NAME">%1$s</xliff:g> sẽ bị ngắt kết nối."</string>
     <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="5455448395850929200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sẽ bị ngắt kết nối khỏi chia sẻ kết nối Internet của máy tính bảng này."</string>
     <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5266851881175033601">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sẽ bị ngắt kết nối khỏi chia sẻ kết nối Internet của điện thoại này."</string>
-    <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"Tuỳ chọn <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_device_advanced_title" msgid="528816860793581131">"Tùy chọn <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="bluetooth_device_advanced_device_actions_title" msgid="3793430949811946844">"Hoạt động của thiết bị"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Kết nối"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Kết nối với thiết bị Bluetooth"</string>
@@ -445,27 +463,31 @@
     <string name="nfc_toggle_error" msgid="2233172102497535522">"Đã xảy ra lỗi."</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Bật Wi-Fi"</string>
-    <string name="wifi_settings" msgid="4746946030627213196">"Cài đặt Wi-Fi"</string>
+    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="2810363951104753710">"Cài đặt Wi-Fi"</string>
+    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Thiết lập &amp; quản lý điểm truy cập mạng"</string>
-    <string name="wifi_starting" msgid="6710266609710860129">"Đang bật…"</string>
-    <string name="wifi_stopping" msgid="5952909472548218348">"Đang tắt..."</string>
+    <string name="wifi_starting" msgid="7732330327758522943">"Đang bật Wi-Fi…"</string>
+    <string name="wifi_stopping" msgid="244864762599017659">"Đang tắt Wi-Fi…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Lỗi"</string>
     <string name="wifi_in_airplane_mode" msgid="7618393787965366655">"Ở chế độ trên máy bay"</string>
     <string name="wifi_fail_to_scan" msgid="6194542252808587669">"Không thể quét mạng"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Thông báo mạng"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Thông báo cho tôi khi mạng mở khả dụng"</string>
+    <string name="wifi_enable_watchdog_service" msgid="4723544454066601706">"Kiểm tra kết nối Wi-Fi"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="8687400936839455926">"Phát hiện và quản lý sự cố kết nối mạng có thể xảy ra"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Chính sách ngắt kết nối Wi-Fi"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"Chỉ định thời điểm sẽ chuyển từ Wi-Fi sang dữ liệu di động"</string>
     <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" msgid="6234851776910938957">"Thêm mạng"</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>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Kết nối tới mạng"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Quên mạng"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Sửa đổi mạng"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="3682507011071029311">"Bật wifi để xem các mạng khả dụng"</string>
     <string name="wifi_network_setup" msgid="7974851890019344870">"Thiết lập mạng"</string>
     <string name="wifi_wps_pin" msgid="5471842298708321115">"Nhập pin từ điểm truy cập"</string>
     <string name="wifi_wps_setup_title" msgid="150518971269252336">"Thiết lập WPS"</string>
@@ -499,17 +521,17 @@
     <string name="wifi_connect" msgid="1076622875777072845">"Kết nối"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Quên"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Lưu"</string>
-    <string name="wifi_cancel" msgid="6763568902542968964">"Huỷ"</string>
+    <string name="wifi_cancel" msgid="6763568902542968964">"Hủy"</string>
     <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"Đã phát hiện một phiên WPS khác, vui lòng thử lại sau vài phút"</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"Nâng cao"</string>
+    <!-- outdated translation 5419052271935350999 -->     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Nâng cao"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Dải tần số Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Chỉ định dải tần số hoạt động"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Đã xảy ra sự cố khi thiết đặt dải tần số."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Địa chỉ MAC"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Địa chỉ IP"</string>
-    <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"Cài đặt IP"</string>
+    <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Cài đặt IP"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Lưu"</string>
-    <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Huỷ"</string>
+    <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Hủy"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"Vui lòng nhập địa chỉ IP hợp lệ."</string>
     <string name="wifi_ip_settings_invalid_gateway" msgid="6383012465511093067">"Vui lòng nhập địa chỉ cổng hợp lệ."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="3428867750550854065">"Vui lòng nhập địa chỉ dns hợp lệ."</string>
@@ -525,7 +547,7 @@
     <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> điểm phát sóng Wi-Fi di động"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="sound_settings_title" msgid="8735891486683305886">"Âm thanh"</string>
-    <string name="display_settings_title" msgid="2378894265964357591">"Màn hình"</string>
+    <string name="display_settings_title" msgid="1708697328627382561">"Hiển thị"</string>
     <string name="sound_settings" msgid="5007659014828162881">"Cài đặt âm thanh"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Chế độ im lặng"</string>
     <string name="silent_mode_summary" msgid="3309650676072917899">"Đặt chế độ im lặng cho tất cả âm thanh ngoại trừ phương tiện &amp; báo thức"</string>
@@ -598,7 +620,18 @@
     <string name="brightness_summary" msgid="838917350127550703">"Điều chỉnh độ sáng của màn hình"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"Thời gian chờ"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"Màn hình tự động tắt sau <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"Hình nền"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android Dreams"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"Trình bảo vệ màn hình và các trò tiêu khiển nhàn rỗi khác"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"Mô-đun đã chọn"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"Thời điểm kích hoạt"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"Sau <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> không hoạt động"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"Không bao giờ"</string>
+    <string name="dream_test" msgid="5968002644622194481">"Dùng thử!"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Độ sáng tự động"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Kích thước phông chữ"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"Kích thước phông chữ chung"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"Chọn kích thước phông chữ"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Cài đặt khoá thẻ SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Thiết lập khoá thẻ SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Khoá thẻ SIM"</string>
@@ -621,7 +654,7 @@
     <string name="sim_change_succeeded" msgid="8556135413096489627">"Mã PIN của SIM đã được thay đổi thành công"</string>
     <string name="sim_lock_failed" msgid="6676748290838006404">"Không thể thay đổi trạng thái khoá thẻ SIM."\n"Có thể mã PIN không chính xác."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
-    <string name="sim_enter_cancel" msgid="6240422158517208036">"Huỷ"</string>
+    <string name="sim_enter_cancel" msgid="6240422158517208036">"Hủy"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Trạng thái của máy tính bảng"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"Trạng thái điện thoại"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Bản cập nhật hệ thống"</string>
@@ -643,8 +676,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>
@@ -696,6 +730,16 @@
     <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"Thẻ SD sẽ được ngắt kết nối."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Đang tháo"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Đang tháo thẻ"</string>
+    <!-- no translation found for storage_menu_usb (1580545228584324704) -->
+    <skip />
+    <!-- no translation found for storage_title_usb (5775322159427546546) -->
+    <skip />
+    <!-- no translation found for usb_label_mtp (4157227401755543412) -->
+    <skip />
+    <!-- no translation found for usb_label_ptp (7417254019489575819) -->
+    <skip />
+    <!-- no translation found for usb_label_installer_cd (7438467574756086977) -->
+    <skip />
     <string name="battery_status_title" msgid="9159414319574976203">"Tình trạng pin"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Mức pin"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -723,7 +767,7 @@
     <string name="menu_delete" msgid="6981294422841124659">"Xoá APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"APN mới"</string>
     <string name="menu_save" msgid="8109345640668285399">"Lưu"</string>
-    <string name="menu_cancel" msgid="2194502410474697474">"Huỷ"</string>
+    <string name="menu_cancel" msgid="2194502410474697474">"Hủy"</string>
     <string name="error_title" msgid="1319225301794168762">"Chú ý"</string>
     <string name="error_name_empty" msgid="1498238337687930558">"Không được để trống trường Tên"</string>
     <string name="error_apn_empty" msgid="1513892291812404310">"APN không được để trống."</string>
@@ -806,8 +850,10 @@
     <string name="bluetooth_tethering_overflow_error" msgid="2222060504731415763">"Không thể chia sẻ với nhiều hơn <xliff:g id="MAXCONNECTION">%1$d</xliff:g> điện thoại"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sẽ được tháo."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Trợ giúp"</string>
+    <string name="wireless_category_general" msgid="2973810407987118067">"Chung"</string>
+    <string name="wireless_category_mobile_networks" msgid="1254629216798424288">"Mạng di động"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mạng di động"</string>
-    <string name="network_settings_summary" msgid="5149750850846813553">"Đặt tuỳ chọn cho chuyển vùng, mạng, APN"</string>
+    <string name="network_settings_summary" msgid="5149750850846813553">"Đặt tùy chọn cho chuyển vùng, mạng, APN"</string>
     <string name="location_title" msgid="1029961368397484576">"Vị trí của tôi"</string>
     <string name="location_network_based" msgid="8815705866861993344">"Sử dụng mạng không dây"</string>
     <string name="location_networks_disabled" msgid="2708968452901433980">"Xem vị trí trong ứng dụng (chẳng hạn như Maps) bằng mạng không dây"</string>
@@ -878,12 +924,12 @@
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Cách vẽ hình mở khoá"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Quá nhiều lần không chính xác!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Hãy thử lại sau <xliff:g id="NUMBER">%d</xliff:g> giây."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Huỷ"</string>
+    <string name="skip_button_label" msgid="8680422740354436943">"Hủy"</string>
     <string name="next_button_label" msgid="8890792540116568321">"Tiếp theo"</string>
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Đang bảo vệ máy tính bảng của bạn"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Đang bảo vệ điện thoại của bạn"</string>
     <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"Bảo vệ máy tính bảng của bạn khỏi việc sử dụng trái phép bằng cách tạo hình mở khóa màn hình cá nhân. Sử dụng ngón tay để kết nối các điểm theo bất kỳ thứ tự nào trên màn hình. Bạn phải kết nối ít nhất bốn điểm. "\n\n"Bạn đã sẵn sàng bắt đầu? Chạm vào \"Tiếp theo\"."</string>
-    <string name="lock_intro_message" product="default" msgid="9100785646737118042"><font size="17">"Bảo vệ điện thoại của bạn khỏi việc sử dụng trái phép bằng cách tạo hình mở khoá màn hình cá nhân. "\n<font height="17">\n</font><b>"1"</b>"  Trên màn hình tiếp theo, hãy xem khi một hình ví dụ được vẽ. "\n<font height="17">\n</font><b>"2"</b>"  Khi đã sẵn sàng, hãy vẽ hình mở khoá cá nhân của riêng bạn. Thử nghiệm với các hình khác nhau nhưng kết nối ít nhất bốn điểm. "\n<font height="17">\n</font><b>"3"</b>"  Vẽ lại hình của bạn để xác nhận. "\n<font height="17">\n</font><b>"Bạn đã sẵn sàng bắt đầu? Chạm vào “Tiếp theo”"</b>". "\n<font height="3">\n</font>"Để điện thoại không được bảo vệ, hãy chạm vào “Huỷ”."</font></string>
+    <!-- outdated translation 3692151094288835065 -->     <string name="lock_intro_message" product="default" msgid="5796785892741212873">"Bảo vệ máy tính bảng của bạn khỏi việc sử dụng trái phép bằng cách tạo hình mở khóa màn hình cá nhân. Sử dụng ngón tay để kết nối các điểm theo bất kỳ thứ tự nào trên màn hình. Bạn phải kết nối ít nhất bốn điểm. "\n\n"Bạn đã sẵn sàng bắt đầu? Chạm vào \"Tiếp theo\"."</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"Quản lý ứng dụng"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"Quản lý và xoá ứng dụng đã cài đặt"</string>
     <string name="applications_settings" msgid="3736173521008476946">"Ứng dụng"</string>
@@ -893,6 +939,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>
@@ -905,9 +953,10 @@
     <string name="force_stop" msgid="7435006169872876756">"Buộc dừng"</string>
     <string name="total_size_label" msgid="1048676419552557254">"Tổng"</string>
     <string name="application_size_label" msgid="5055196275624686382">"Ứng dụng"</string>
+    <string name="external_code_size_label" msgid="3459343140355961335">"Ứng dụng bộ lưu trữ USB"</string>
     <string name="data_size_label" msgid="8679376373625710107">"Dữ liệu"</string>
-    <string name="external_size_label" product="nosdcard" msgid="4465530017830945766">"Bộ nhớ USB"</string>
-    <string name="external_size_label" product="default" msgid="2107155737635944440">"Thẻ SD"</string>
+    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Dữ liệu bộ lưu trữ USB"</string>
+    <string name="external_data_size_label" product="default" msgid="626414192825329708">"Thẻ SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Gỡ cài đặt"</string>
     <string name="disable_text" msgid="6544054052049395202">"Tắt"</string>
     <string name="enable_text" msgid="9217362512327828987">"Bật"</string>
@@ -926,7 +975,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Hiển thị quá trình đã được lưu trong bộ nhớ cache"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Quản lý dung lượng"</string>
     <string name="filter" msgid="2018011724373033887">"Bộ lọc"</string>
-    <string name="filter_dlg_title" msgid="6507663329723966854">"Chọn tuỳ chọn bộ lọc"</string>
+    <string name="filter_dlg_title" msgid="6507663329723966854">"Chọn tùy chọn bộ lọc"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Tất cả"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Đã tải xuống"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Đang hoạt động"</string>
@@ -941,7 +990,7 @@
     <string name="clear_data_dlg_title" msgid="4470209520936375508">"Xoá"</string>
     <string name="clear_data_dlg_text" msgid="8368035073300828451">"Tất cả dữ liệu của ứng dụng này sẽ bị xoá vĩnh viễn. Dữ liệu này bao gồm tất cả các tệp, cài đặt, tài khoản, cơ sở dữ liệu, v.v..."</string>
     <string name="dlg_ok" msgid="2402639055725653590">"OK"</string>
-    <string name="dlg_cancel" msgid="1674753358972975911">"Huỷ"</string>
+    <string name="dlg_cancel" msgid="1674753358972975911">"Hủy"</string>
     <string name="app_not_found_dlg_title" msgid="8458335716378083713">"Không tìm thấy ứng dụng"</string>
     <string name="app_not_found_dlg_text" msgid="2980271680333341554">"Không tìm thấy ứng dụng trong danh sách các ứng dụng đã cài đặt."</string>
     <string name="clear_data_failed" msgid="581956197586913865">"Không thể xoá dữ liệu ứng dụng."</string>
@@ -1026,7 +1075,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 +1085,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>
@@ -1047,7 +1098,7 @@
     <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Xoá"</string>
     <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"Lối tắt của bạn cho <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) sẽ bị xoá."</string>
     <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"OK"</string>
-    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Huỷ"</string>
+    <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Hủy"</string>
     <string name="quick_launch_display_mode_applications" msgid="3748789806447639039">"Ứng dụng"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Lối tắt"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Nhập văn bản"</string>
@@ -1066,8 +1117,8 @@
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Cài đặt bàn phím ảo"</string>
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Bàn phím thực"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Cài đặt bàn phím thực"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"Phát triển"</string>
-    <string name="development_settings_summary" msgid="2151320488701538355">"Đặt tuỳ chọn cho phát triển ứng dụng"</string>
+    <string name="development_settings_title" msgid="215179176067683667">"Tùy chọn Nhà phát triển"</string>
+    <string name="development_settings_summary" msgid="2151320488701538355">"Đặt tùy chọn cho phát triển ứng dụng"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Gỡ lỗi USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Chế độ gỡ lỗi khi USB được kết nối"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Không khoá màn hình"</string>
@@ -1090,15 +1141,15 @@
     <string name="usage_time_label" msgid="295954901452833058">"Thời gian sử dụng"</string>
     <string name="accessibility_settings" msgid="3975902491934816215">"Khả năng truy cập"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Cài đặt hỗ trợ truy cập"</string>
-    <string name="accessibility_settings_summary" msgid="8185181964847149507">"Quản lý tuỳ chọn khả năng truy cập"</string>
-    <string name="toggle_accessibility_title" msgid="650839277066574497">"Khả năng truy cập"</string>
+    <string name="accessibility_settings_summary" msgid="8185181964847149507">"Quản lý tùy chọn khả năng truy cập"</string>
+    <string name="toggle_large_text_title" msgid="42259643359869436">"Văn bản lớn"</string>
     <string name="accessibility_services_category" msgid="8127851026323672607">"Dịch vụ hỗ trợ truy cập"</string>
+    <string name="toggle_accessibility_title" msgid="7338739354952553958">"Cho phép dịch vụ hỗ trợ truy cập"</string>
     <string name="no_accessibility_services_summary" msgid="694578333333808159">"Không có dịch vụ hỗ trợ truy cập được cài đặt nào."</string>
     <string name="accessibility_service_security_warning" msgid="4066258132331302670">"Dịch vụ hỗ trợ truy cập này có thể thu thập tất cả văn bản bạn nhập, bao gồm dữ liệu cá nhân, số thẻ tín dụng ngoại trừ mật khẩu. Dịch vụ cũng có thể ghi các tương tác giao diện người dùng của bạn. Dịch vụ xuất phát từ ứng dụng <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>. Sử dụng dịch vụ hỗ trợ truy cập này?"</string>
     <string name="accessibility_service_disable_warning" msgid="8930591383312775132">"Vô hiệu hoá khả năng truy cập?"</string>
     <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"Không tìm thấy ứng dụng liên quan đến khả năng truy cập"</string>
     <string name="accessibility_service_no_apps_message" msgid="2663371323410332529">"Bạn chưa cài đặt bất kỳ ứng dụng có liên quan đến hỗ trợ truy cập nào."\n\n"Bạn có thể tải xuống trình đọc màn hình cho điện thoại của mình từ Android Market."\n\n"Nhấp vào OK để cài đặt trình đọc màn hình."</string>
-    <string name="accessibility_script_injection_category" msgid="8649951751131431904">"Tập lệnh hỗ trợ truy cập"</string>
     <string name="accessibility_script_injection_enabled" msgid="6927896081016611012">"Tải xuống tập lệnh hỗ trợ truy cập"</string>
     <string name="accessibility_script_injection_enabled_summary" msgid="3629525134901617621">"Cho phép ứng dụng tải xuống tập lệnh hỗ trợ truy cập từ Google"</string>
     <string name="accessibility_script_injection_security_warning" product="tablet" msgid="1113600871264359828">"Một số ứng dụng có thể yêu cầu Google tải tập lệnh xuống máy tính bảng của bạn giúp nội dung của chúng có thể truy cập dễ hơn. Bạn có chắc chắn muốn cho phép Google cài đặt tập lệnh hỗ trợ truy cập trên máy tính bảng của bạn không?"</string>
@@ -1106,10 +1157,11 @@
     <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>
-    <string name="power_usage_summary_title" msgid="5180282911164282324">"Sử dụng pin"</string>
+    <string name="power_usage_summary_title" msgid="7190304207330319919">"Pin"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Cái gì đang sử dụng pin"</string>
     <string name="power_usage_not_available" msgid="3583407442633768046">"Không có dữ liệu sử dụng pin"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Sử dụng pin từ khi tháo đầu cắm"</string>
@@ -1218,6 +1270,8 @@
     <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>
+    <string name="tts_engine_settings_section" msgid="2346105138448751893">"Cài đặt công cụ"</string>
+    <string name="tts_engine_settings_title" msgid="3499112142425680334">"Cài đặt cho <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
     <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>
@@ -1228,114 +1282,33 @@
     <string name="gadget_title" msgid="7455548605888590466">"Kiểm soát Nguồn điện"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Đang cập nhật cài đặt Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Đang cập nhật cài đặt Bluetooth"</string>
-    <string name="vpn_settings_activity_title" msgid="7276864950701612579">"Cài đặt VPN"</string>
-    <string name="vpn_connect_to" msgid="2541409082892684362">"Kết nối tới <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpn_username_colon" msgid="7854930370861306247">"Tên người dùng:"</string>
-    <string name="vpn_password_colon" msgid="5716278710848606626">"Mật khẩu:"</string>
-    <string name="vpn_a_username" msgid="6664733641993968692">"tên người dùng"</string>
-    <string name="vpn_a_password" msgid="1537213632501483753">"một mật khẩu"</string>
-    <string name="vpn_save_username" msgid="1408415289165970790">"Nhớ tên người dùng"</string>
-    <string name="vpn_connect_button" msgid="1699007212602470655">"Kết nối"</string>
-    <string name="vpn_yes_button" msgid="8034531001149843119">"Có"</string>
-    <string name="vpn_no_button" msgid="7620339571187119107">"Không"</string>
-    <string name="vpn_back_button" msgid="192036339792734970">"Quay lại"</string>
-    <string name="vpn_mistake_button" msgid="1683383660912491270">"Không"</string>
-    <string name="vpn_menu_done" msgid="93528279226907926">"Lưu"</string>
-    <string name="vpn_menu_cancel" msgid="7234451214611202868">"Huỷ"</string>
-    <string name="vpn_menu_revert" msgid="4407762442281467659">"Hoàn nguyên"</string>
-    <string name="vpn_menu_connect" msgid="1089399414463784218">"Kết nối tới mạng"</string>
-    <string name="vpn_menu_disconnect" msgid="8254492450022562235">"Ngắt kết nối khỏi mạng"</string>
-    <string name="vpn_menu_edit" msgid="4526245173583195618">"Chỉnh sửa mạng"</string>
-    <string name="vpn_menu_delete" msgid="3326527392609513129">"Xoá mạng"</string>
-    <string name="vpn_error_miss_entering" msgid="5377667978602483250">"Bạn phải nhập <xliff:g id="CODE">%s</xliff:g>."</string>
-    <string name="vpn_error_miss_selecting" msgid="4890780825580511345">"Bạn phải chọn <xliff:g id="OPTION">%s</xliff:g>."</string>
-    <string name="vpn_error_duplicate_name" msgid="2693927537390963745">"Tên VPN \'<xliff:g id="NAME">%s</xliff:g>\' đã tồn tại. Hãy tìm tên khác."</string>
-    <string name="vpn_confirm_profile_deletion" msgid="8679536635364177239">"Bạn có chắc chắn muốn xoá VPN này không?"</string>
-    <string name="vpn_confirm_add_profile_cancellation" msgid="3377869170901609182">"Bạn có chắc chắn không muốn tạo tiểu sử này không?"</string>
-    <string name="vpn_confirm_edit_profile_cancellation" msgid="7496760181072204494">"Bạn có chắc chắn muốn huỷ các thay đổi được thực hiện đối với tiểu sử này không?"</string>
-    <string name="vpn_confirm_reconnect" msgid="5748535476278674296">"Không thể kết nối với mạng. Bạn có muốn thử lại không?"</string>
-    <string name="vpn_reconnect_from_lost" msgid="2442844155623372118">"Mất kết nối. Bạn có muốn kết nối lại không?"</string>
-    <string name="vpn_unknown_server_dialog_msg" msgid="3080742299823671319">"Không thể quyết định tên máy chủ. Bạn có muốn chọn cài đặt tên máy chủ của mình không?"</string>
-    <string name="vpn_challenge_error_dialog_msg" msgid="6174901754230038601">"Lỗi thử thách. Bạn có muốn kiểm tra cài đặt bảo mật của mình không?"</string>
-    <string name="vpn_secret_not_set_dialog_msg" msgid="8013052814131532765">"Thiếu một hoặc nhiều thông tin bảo mật trong cấu hình VPN này. Bạn có muốn kiểm tra cài đặt bảo mật của mình không?"</string>
-    <string name="vpn_auth_error_dialog_msg" msgid="5476820106624807614">"Tên người dùng hoặc mật khẩu bạn đã nhập không chính xác. Bạn có muốn thử lại không?"</string>
-    <string name="vpn_remote_hung_up_error_dialog_msg" msgid="1566946015052633150">"Máy chủ bị treo. Tên người dùng hoặc mật khẩu bạn đã nhập có thể không chính xác. Bạn có muốn thử lại không?"</string>
-    <string name="vpn_remote_ppp_hung_up_error_dialog_msg" msgid="5135958511128503344">"Máy chủ bị treo. Có thể bạn đang sử dụng tường lửa ngăn kết nối đến máy chủ. Bạn có muốn thử lại không?"</string>
-    <string name="vpn_ppp_negotiation_failed_dialog_msg" msgid="4611293656718340994">"Thương lượng máy chủ không thành công. Máy chủ có thể không đồng ý với tuỳ chọn mã hoá của bạn. Bạn có muốn kiểm tra cài đặt mã hoá của mình không?"</string>
-    <string name="vpn_type_title" msgid="6392933604218676224">"Thêm VPN"</string>
-    <string name="vpn_add_new_vpn" msgid="5438260689052714550">"Thêm VPN"</string>
-    <string name="vpn_details_title" msgid="418806440938510331">"Chi tiết về VPN"</string>
-    <string name="vpn_edit_title_add" msgid="2121313217989682890">"Thêm VPN <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"Chi tiết <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="vpns" msgid="3148141862835492816">"VPN"</string>
-    <string name="vpn_connecting" msgid="8039521381692090116">"Đang kết nối..."</string>
-    <string name="vpn_disconnecting" msgid="7748050200708257066">"Đang ngắt kết nối..."</string>
-    <string name="vpn_connected" msgid="7641723116362845781">"Đã kết nối"</string>
-    <string name="vpn_connect_hint" msgid="7442898962925875181">"Kết nối tới mạng"</string>
-    <string name="vpn_name" msgid="1550918148476193076">"Tên VPN"</string>
-    <string name="vpn_a_name" msgid="8445736942405283509">"tên VPN"</string>
-    <string name="vpn_profile_added" msgid="9061017910337129840">"\'<xliff:g id="NAME">%s</xliff:g>\' đã được thêm vào"</string>
-    <string name="vpn_profile_replaced" msgid="587435576816273815">"Các thay đổi đã thực hiện đối với \'<xliff:g id="NAME">%s</xliff:g>\'"</string>
-    <string name="vpn_user_certificate_title" msgid="6812545893924071742">"Đặt chứng chỉ người dùng"</string>
-    <string name="vpn_user_certificate" msgid="949322691686938888">"Chứng chỉ người dùng"</string>
-    <string name="vpn_a_user_certificate" msgid="8943983437956898649">"chứng chỉ người dùng"</string>
-    <string name="vpn_ca_certificate_title" msgid="7846466160795589985">"Đặt chứng chỉ CA"</string>
-    <string name="vpn_ca_certificate" msgid="465085144064264742">"Chứng chỉ của tổ chức cấp chứng chỉ (CA)"</string>
-    <string name="vpn_a_ca_certificate" msgid="3374242520974884295">"Chứng chỉ CA"</string>
-    <string name="vpn_l2tp_secret_string_title" msgid="5039677186748940987">"Đặt bảo mật L2TP"</string>
-    <string name="vpn_l2tp_secret" msgid="529359749677142076">"Bảo mật L2TP"</string>
-    <string name="vpn_a_l2tp_secret" msgid="6612042930810981845">"bảo mật L2TP"</string>
-    <string name="vpn_pptp_encryption_title" msgid="2236795167467896499">"mã hoá"</string>
-    <string name="vpn_pptp_encryption" msgid="2602329949737259686">"Mã hoá PPTP"</string>
-    <string name="vpn_ipsec_presharedkey_title" msgid="2184060087690539175">"Đặt khoá chia sẻ trước IPSec"</string>
-    <string name="vpn_ipsec_presharedkey" msgid="5434316521616673741">"khoá chia sẻ trước IPSec"</string>
-    <string name="vpn_a_ipsec_presharedkey" msgid="1255301923217898418">"khoá chia sẻ trước IPSec"</string>
-    <string name="vpn_vpn_server_title" msgid="8897005887420358913">"Đặt máy chủ VPN"</string>
-    <string name="vpn_vpn_server" msgid="1141754908824209260">"Máy chủ VPN"</string>
-    <string name="vpn_a_vpn_server" msgid="5960906152125045853">"máy chủ VPN"</string>
-    <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"Tên máy chủ VPN"</string>
-    <string name="vpn_dns_search_list_title" msgid="1022776976104584251">"Tên miền tìm kiếm DNS"</string>
-    <string name="vpn_dns_search_list" msgid="4230034234026605360">"Tên miền tìm kiếm DNS"</string>
-    <string name="vpn_field_is_set" msgid="7137320847812992243">"<xliff:g id="VALUE">%s</xliff:g> đã được đặt"</string>
-    <string name="vpn_field_not_set" msgid="2972519243515893804">"<xliff:g id="VALUE">%s</xliff:g> chưa được đặt"</string>
-    <string name="vpn_field_not_set_optional" msgid="8840557698252556791">"<xliff:g id="VALUE">%s</xliff:g> chưa được đặt (tuỳ chọn)"</string>
-    <string name="vpn_enable_field" msgid="3700967675854517191">"Bật <xliff:g id="OPTION">%s</xliff:g>"</string>
-    <string name="vpn_disable_field" msgid="6905658811179634005">"Vô hiệu hoá <xliff:g id="OPTION">%s</xliff:g>"</string>
-    <string name="vpn_is_enabled" msgid="1266304230417098877">"<xliff:g id="OPTION">%s</xliff:g> đã được bật"</string>
-    <string name="vpn_is_disabled" msgid="2013622485867806167">"<xliff:g id="OPTION">%s</xliff:g> đã bị vô hiệu hoá"</string>
     <string name="vpn_settings_title" msgid="7327468307909556719">"Cài đặt VPN"</string>
     <string name="vpn_settings_summary" msgid="8849924181594963972">"Thiết lập &amp; quản lý Mạng Riêng Ảo (VPN)"</string>
-    <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="trusted_credentials" msgid="4266945289534242402">"Thông tin đăng nhập tin cậy"</string>
+    <string name="trusted_credentials_summary" msgid="6735221351155686632">"Hiển thị chứng chỉ CA tin cậy"</string>
     <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>
-    <string name="privacy_settings_title" msgid="1987089301293213705">"Cài đặt bảo mật"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"Sao lưu &amp; đặt lại"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"Sao lưu &amp; đặt lại"</string>
     <string name="backup_section_title" msgid="8856083167469467588">"Sao lưu và khôi phục"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Dữ liệu cá nhân"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Sao lưu dữ liệu của tôi"</string>
@@ -1348,7 +1321,7 @@
     <string name="backup_erase_dialog_message" msgid="7766283133557587608">"Bạn có chắc chắn muốn dừng sao lưu mật khẩu Wi-Fi, dấu trang và dữ liệu ứng dụng và cài đặt khác của mình và xóa tất cả bản sao trên các máy chủ Google không?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Cài đặt quản trị viên thiết bị"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Quản trị viên thiết bị"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Huỷ kích hoạt"</string>
+    <string name="remove_device_admin" msgid="3596845261596451437">"Hủy kích hoạt"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Quản trị viên thiết bị"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Không có quản trị viên thiết bị"</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Kích hoạt quản trị viên thiết bị?"</string>
@@ -1440,4 +1413,107 @@
     <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>
+    <!-- no translation found for debug_ui_category (9023948280291055349) -->
+    <skip />
+    <!-- no translation found for strict_mode (1938795874357830695) -->
+    <skip />
+    <!-- no translation found for strict_mode_summary (142834318897332338) -->
+    <skip />
+    <!-- no translation found for pointer_location (6084434787496938001) -->
+    <skip />
+    <!-- no translation found for pointer_location_summary (840819275172753713) -->
+    <skip />
+    <!-- no translation found for show_screen_updates (8282711794220426931) -->
+    <skip />
+    <!-- no translation found for show_screen_updates_summary (1716122382094924596) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage (2389212910758076024) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage_summary (2113341923988958266) -->
+    <skip />
+    <!-- no translation found for window_animation_scale_title (6162587588166114700) -->
+    <skip />
+    <!-- no translation found for transition_animation_scale_title (387527540523595875) -->
+    <skip />
+    <!-- no translation found for debug_applications_category (6221644998451283813) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities (3622005081180597749) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities_summary (3592221124808773368) -->
+    <skip />
+    <!-- no translation found for app_process_limit_title (4121324758038197598) -->
+    <skip />
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Sử dụng dữ liệu"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"Chu kỳ sử dụng dữ liệu"</string>
+    <string name="data_usage_menu_split_4g" msgid="7417435609285381968">"Tách sử dụng 4G"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Hiển thị sử dụng Wi-Fi"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"Thay đổi chu kỳ..."</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Ngày trong tháng để đặt lại chu kỳ sử dụng dữ liệu:"</string>
+    <string name="data_usage_disable_mobile_limit" msgid="289740911281022322">"Tắt d.liệu d.động khi đạt g.hạn"</string>
+    <string name="data_usage_disable_4g_limit" msgid="5808210773758699800">"Tắt dữ liệu 4G khi đạt giới hạn"</string>
+    <string name="data_usage_disable_3g_limit" msgid="3856971004328238231">"Tắt d.liệu 2G-3G khi đạt g.hạn"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_mobile" msgid="454140350007299045">"Di động"</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">"Dữ liệu di động"</string>
+    <string name="data_usage_enable_3g" msgid="6304006671869578254">"Dữ liệu 2G-3G"</string>
+    <string name="data_usage_enable_4g" msgid="3635854097335036738">"4G dữ liệu"</string>
+    <string name="data_usage_app_settings" msgid="3727561362090820369">"Xem cài đặt ứng dụng"</string>
+    <string name="data_usage_app_restrict_background" msgid="8856643905291165256">"Hạn chế sử dụng dữ liệu nền"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="1503361245973512092">"Chỉ cho phép dữ liệu nền ứng dụng khi sử dụng mạng ko giới hạn"</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="8110736468987743260">"Hạn chế dữ liệu nền"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="100001698378554777">"Tính năng này có thể tác động tiêu cực đến các ứng dụng phụ thuộc vào sử dụng dữ liệu nền."\n\n"Có thể tìm thấy các kiểm soát sử dụng dữ liệu phù hợp hơn trong cài đặt của ứng dụng này."</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Ngày đặt lại chu kỳ sử dụng"</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Ngày của từng tháng:"</string>
+    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Thiết lập"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Giới hạn sử dụng dữ liệu"</string>
+    <string name="data_usage_limit_dialog_mobile" msgid="7931094451923591578">"Kết nối dữ liệu di động sẽ bị vô hiệu hóa khi đạt đến giới hạn được chỉ định."\n\n"Để tránh phí tăng thêm, hãy xem xét sử dụng giới hạn giảm đi vì cách tính toán của điện thoại và nhà cung cấp có thể khác nhau."</string>
+    <string name="data_usage_limit_dialog_3g" msgid="5478553071420316963">"Kết nối dữ liệu 2G-3G sẽ bị vô hiệu hóa khi đạt đến giới hạn được chỉ định."\n\n"Để tránh phí tăng thêm, hãy xem xét sử dụng giới hạn giảm đi vì cách tính toán của điện thoại và nhà cung cấp có thể khác nhau."</string>
+    <string name="data_usage_limit_dialog_4g" msgid="6134008906742403777">"Kết nối dữ liệu 4G sẽ bị vô hiệu hóa khi đạt đến giới hạn được chỉ định."\n\n"Để tránh phí tăng thêm, hãy xem xét sử dụng giới hạn giảm đi vì cách tính toán của điện thoại và nhà cung cấp có thể khác nhau."</string>
+    <string name="data_usage_disabled_dialog_3g_title" msgid="4221584306492812040">"Đã tắt dữ liệu 2G-3G"</string>
+    <string name="data_usage_disabled_dialog_4g_title" msgid="715585612162185936">"Đã tắt dữ liệu 4G"</string>
+    <string name="data_usage_disabled_dialog_mobile_title" msgid="209516216265000221">"Dữ liệu di động bị vô hiệu hóa"</string>
+    <string name="data_usage_disabled_dialog" msgid="2874031671067845964">"Đã đạt tới giới hạn sử dụng dữ liệu được chỉ định."\n\n"Nhà cung cấp có thể tính phí cho việc sử dụng thêm dữ liệu."</string>
+    <string name="data_usage_disabled_dialog_enable" msgid="2441219164620753329">"Bật lại dữ liệu"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="32">"<xliff:g id="NUMBER">%1$s</xliff:g>"</font>" "<font size="12">"<xliff:g id="UNIT">%2$s</xliff:g>"</font>\n<font size="12">"cảnh báo"</font></string>
+    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Cuộc gọi khẩn cấp"</string>
+    <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Quay lại cuộc gọi"</string>
+    <string name="vpn_name" msgid="4689699885361002297">"Tên"</string>
+    <string name="vpn_type" msgid="5435733139514388070">"Loại"</string>
+    <string name="vpn_server" msgid="2123096727287421913">"Địa chỉ máy chủ"</string>
+    <string name="vpn_mppe" msgid="6639001940500288972">"Mã hóa PPP (MPPE)"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"Bảo mật L2TP"</string>
+    <string name="vpn_ipsec_identifier" msgid="4098175859460006296">"Số nhận dạng IPSec"</string>
+    <string name="vpn_ipsec_secret" msgid="4526453255704888704">"Khóa chia sẻ trước IPSec"</string>
+    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"Chứng chỉ người dùng IPSec"</string>
+    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"Chứng chỉ IPSec CA"</string>
+    <!-- no translation found for vpn_search_domains (5391995501541199624) -->
+    <skip />
+    <!-- no translation found for vpn_routes (8556236801755260073) -->
+    <skip />
+    <string name="vpn_username" msgid="1863901629860867849">"Tên người dùng"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"Mật khẩu"</string>
+    <!-- no translation found for vpn_save_login (6350322456427484881) -->
+    <skip />
+    <!-- no translation found for vpn_not_used (9094191054524660891) -->
+    <skip />
+    <string name="vpn_no_ca_cert" msgid="7820884983947090538">"(không xác minh máy chủ)"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"Hủy"</string>
+    <string name="vpn_save" msgid="4233484051644764510">"Lưu"</string>
+    <string name="vpn_connect" msgid="8469608541746132301">"Kết nối"</string>
+    <string name="vpn_edit" msgid="1111459297288136079">"Chỉnh sửa mạng VPN"</string>
+    <string name="vpn_connect_to" msgid="7328758950427515753">"Kết nối tới mạng <xliff:g id="NETWORK">%s</xliff:g>"</string>
+    <string name="vpn_title" msgid="7982620762043790565">"Cài đặt VPN"</string>
+    <string name="vpn_create" msgid="8966010925994175306">"Thêm mạng VPN"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"Chỉnh sửa mạng"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"Xoá mạng"</string>
+    <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Hệ thống"</string>
+    <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Người dùng"</string>
+    <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Tắt"</string>
+    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Bật"</string>
+    <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Xóa"</string>
+    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Bật chứng chỉ CA hệ thống?"</string>
+    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Tắt chứng chỉ CA hệ thống?"</string>
+    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Xóa vĩnh viễn chứng chỉ CA người dùng?"</string>
 </resources>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index c001714..3fc0e8b 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>
@@ -214,4 +240,36 @@
     <item msgid="3878793616631049349">"仅使用 HDCP 检查 DRM 内容"</item>
     <item msgid="45075631231212732">"始终使用 HDCP 检查"</item>
   </string-array>
+    <!-- no translation found for window_animation_scale_entries:0 (8134156599370824081) -->
+    <!-- no translation found for window_animation_scale_entries:1 (6624864048416710414) -->
+    <!-- no translation found for window_animation_scale_entries:2 (2219332261255416635) -->
+    <!-- no translation found for window_animation_scale_entries:3 (3544428804137048509) -->
+    <!-- no translation found for window_animation_scale_entries:4 (3110710404225974514) -->
+    <!-- no translation found for window_animation_scale_entries:5 (4402738611528318731) -->
+    <!-- no translation found for window_animation_scale_entries:6 (6189539267968330656) -->
+    <!-- no translation found for transition_animation_scale_entries:0 (8464255836173039442) -->
+    <!-- no translation found for transition_animation_scale_entries:1 (3375781541913316411) -->
+    <!-- no translation found for transition_animation_scale_entries:2 (1991041427801869945) -->
+    <!-- no translation found for transition_animation_scale_entries:3 (4012689927622382874) -->
+    <!-- no translation found for transition_animation_scale_entries:4 (3289156759925947169) -->
+    <!-- no translation found for transition_animation_scale_entries:5 (7705857441213621835) -->
+    <!-- no translation found for transition_animation_scale_entries:6 (6660750935954853365) -->
+    <!-- no translation found for app_process_limit_entries:0 (6799596560242275471) -->
+    <!-- no translation found for app_process_limit_entries:1 (2412794376818632575) -->
+    <!-- no translation found for app_process_limit_entries:2 (1578904888612645001) -->
+    <!-- no translation found for app_process_limit_entries:3 (8819235336299873577) -->
+  <string-array name="vpn_types_long">
+    <item msgid="2732002039459078847">"PPTP VPN"</item>
+    <item msgid="3799752201662127867">"具有预共享密钥的 L2TP/IPSec VPN"</item>
+    <item msgid="4725504331295252103">"具有证书的 L2TP/IPSec VPN"</item>
+    <item msgid="7526551163264034377">"具有预共享密钥且进行 Xauth 身份验证的 IPSec VPN"</item>
+    <item msgid="8064740940687465039">"具有证书且进行 Xauth 身份验证的 IPSec VPN"</item>
+    <item msgid="4946199982372391490">"具有证书且进行混合身份验证的 IPSec VPN"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:0 (8621078286418985762) -->
+    <!-- no translation found for vpn_states:1 (6692305604213080515) -->
+    <!-- no translation found for vpn_states:2 (8001704909356800092) -->
+    <!-- no translation found for vpn_states:3 (4039737283841672166) -->
+    <!-- no translation found for vpn_states:4 (4042143101664725090) -->
+    <!-- no translation found for vpn_states:5 (2690164254699635531) -->
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index b49947f..838bbae 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -19,6 +19,10 @@
     <string name="yes" msgid="4676390750360727396">"是"</string>
     <string name="no" msgid="6731231425810196216">"无"</string>
     <string name="device_info_default" msgid="7847265875578739287">"未知"</string>
+    <string name="header_category_wireless_networks" msgid="4944823405420438623">"无线和网络"</string>
+    <string name="header_category_device" msgid="5781174212691167553">"设备"</string>
+    <string name="header_category_personal" msgid="6225932173498802187">"个人"</string>
+    <string name="header_category_system" msgid="2073558547468647128">"系统"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"打开无线通信"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"关闭无线通信"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"查看 SIM 卡地址簿"</string>
@@ -111,7 +115,11 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"正在配对..."</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"已配对但未连接"</string>
     <string name="bluetooth_device" msgid="6873461446424952003">"免提/耳机"</string>
-    <string name="progress_scanning" msgid="3760897655335759141">"正在扫描"</string>
+    <!-- outdated translation 3760897655335759141 -->     <string name="progress_scanning" msgid="192587958424295789">"正在扫描"</string>
+    <!-- no translation found for progress_tap_to_pair (4192342336107106334) -->
+    <skip />
+    <!-- no translation found for bluetooth_no_devices_found (2412462335116297668) -->
+    <skip />
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"蓝牙配对请求"</string>
     <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>
@@ -130,6 +138,9 @@
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"手机上的某一应用程序正在请求相应权限以便打开蓝牙，从而让其他设备可检测到您的手机。要授予该权限吗？"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"正在打开蓝牙…"</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"自动连接"</string>
+    <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"蓝牙连接请求"</string>
+    <string name="bluetooth_connection_notif_message" msgid="1833221950512058309">"触摸以连接到“<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”"</string>
+    <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"要连接到“<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”吗？"</string>
     <string name="date_and_time" msgid="4114084177056654663">"日期和时间设置"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"下午 1:00"</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
@@ -235,7 +246,7 @@
     <string name="airplane_mode_summary" msgid="3154817401368780988">"停用所有无线连接"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"正在停用无线连接..."</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"正在启用无线连接..."</string>
-    <string name="radio_controls_title" msgid="5868688473587168882">"无线和网络"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"更多..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"无线和网络"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"管理 Wi-Fi、蓝牙、飞行模式、移动网络和虚拟专用网"</string>
     <string name="roaming" msgid="3596055926335478572">"数据漫游"</string>
@@ -271,8 +282,8 @@
     <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">"位置和安全"</string>
-    <string name="location_security_settings_title" msgid="4624434296446625554">"位置和安全设置"</string>
+    <string name="location_settings_title" msgid="8935806698251432196">"位置服务"</string>
+    <string name="security_settings_title" msgid="7945465324818485460">"安全"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"设置我的位置、屏幕解锁、SIM 卡锁定和凭据存储锁定"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"设置我的位置、屏幕解锁和凭据存储锁定"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"密码"</string>
@@ -316,7 +327,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>
@@ -375,8 +386,8 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"查看或停用设备管理器"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"蓝牙"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"打开蓝牙"</string>
-    <string name="bluetooth_settings" msgid="2725796451253089609">"蓝牙设置"</string>
-    <string name="bluetooth_settings_title" msgid="2824020086246268296">"蓝牙设置"</string>
+    <string name="bluetooth_settings" msgid="1810521656168174329">"蓝牙"</string>
+    <string name="bluetooth_settings_title" msgid="1908745291161353016">"蓝牙"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"管理连接、设置设备名称和可检测性"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"蓝牙配对请求"</string>
     <string name="bluetooth_enter_pin_msg" msgid="1499285355129256289">\n"输入 PIN 与<xliff:g id="DEVICE_NAME">%1$s</xliff:g>配对。（请尝试 0000 或 1234。）您可能需要在蓝牙设备上输入同样的 PIN。"</string>
@@ -394,7 +405,10 @@
     <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>
+    <!-- no translation found for bluetooth_search_for_devices (5957007154213560390) -->
+    <skip />
+    <!-- no translation found for bluetooth_searching_for_devices (9203739709307871727) -->
+    <skip />
     <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>
@@ -404,6 +418,10 @@
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"取消配对"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"断开连接和取消配对"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"选项…"</string>
+    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"高级"</string>
+    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"高级蓝牙设置"</string>
+    <string name="bluetooth_advanced_settings_label" msgid="8659717781212434173">"高级蓝牙设置"</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="3631028334811113629">"打开蓝牙以查看可用设备"</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>
@@ -445,27 +463,31 @@
     <string name="nfc_toggle_error" msgid="2233172102497535522">"出现错误。"</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"打开 Wi-Fi"</string>
-    <string name="wifi_settings" msgid="4746946030627213196">"Wi-Fi 设置"</string>
+    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="2810363951104753710">"Wi-Fi 设置"</string>
+    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"设置和管理无线接入点"</string>
-    <string name="wifi_starting" msgid="6710266609710860129">"正在打开..."</string>
-    <string name="wifi_stopping" msgid="5952909472548218348">"正在关闭..."</string>
+    <string name="wifi_starting" msgid="7732330327758522943">"正在打开 Wi-Fi..."</string>
+    <string name="wifi_stopping" msgid="244864762599017659">"正在关闭 Wi-Fi..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"出错"</string>
     <string name="wifi_in_airplane_mode" msgid="7618393787965366655">"正处于飞行模式"</string>
     <string name="wifi_fail_to_scan" msgid="6194542252808587669">"无法通过扫描查找网络"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"网络通知"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"附近有开放网络时通知我"</string>
+    <string name="wifi_enable_watchdog_service" msgid="4723544454066601706">"Wi-Fi 连接状况检查"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="8687400936839455926">"检测和管理潜在的网络连接状况问题"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Wi-Fi 断开连接策略"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"指定何时要从 Wi-Fi 切换到手机数据"</string>
     <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" msgid="6234851776910938957">"添加网络"</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>
     <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_empty_list_wifi_off" msgid="3682507011071029311">"打开 Wi-Fi 以查看可用网络"</string>
     <string name="wifi_network_setup" msgid="7974851890019344870">"网络设置"</string>
     <string name="wifi_wps_pin" msgid="5471842298708321115">"从接入点输入 PIN"</string>
     <string name="wifi_wps_setup_title" msgid="150518971269252336">"WPS 设置"</string>
@@ -501,13 +523,13 @@
     <string name="wifi_save" msgid="3331121567988522826">"保存"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"取消"</string>
     <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"系统检测到其他的 WPS 会话，请过几分钟再试"</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"高级"</string>
+    <!-- outdated translation 5419052271935350999 -->     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"高级"</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>
-    <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"IP 设置"</string>
+    <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP 设置"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"保存"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"取消"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"请输入有效的 IP 地址。"</string>
@@ -525,7 +547,7 @@
     <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>
+    <string name="display_settings_title" msgid="1708697328627382561">"显示"</string>
     <string name="sound_settings" msgid="5007659014828162881">"声音设置"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"静音模式"</string>
     <string name="silent_mode_summary" msgid="3309650676072917899">"除媒体和闹钟以外，所有声音均设为静音"</string>
@@ -598,7 +620,18 @@
     <string name="brightness_summary" msgid="838917350127550703">"调整屏幕亮度"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"超时"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"屏幕会在 <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>后自动关闭"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"墙纸"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android Dream"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"屏幕保护程序和其他待机程序"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"所选 Dream"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"激活时间"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"闲置 <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>后"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"从不"</string>
+    <string name="dream_test" msgid="5968002644622194481">"试试看！"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"自动调整亮度"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"字体大小"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"整体字体大小"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"选择字体大小"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM 卡锁定设置"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"设置 SIM 卡锁定"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM 卡锁定"</string>
@@ -643,8 +676,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>
@@ -696,6 +730,16 @@
     <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 storage_menu_usb (1580545228584324704) -->
+    <skip />
+    <!-- no translation found for storage_title_usb (5775322159427546546) -->
+    <skip />
+    <!-- no translation found for usb_label_mtp (4157227401755543412) -->
+    <skip />
+    <!-- no translation found for usb_label_ptp (7417254019489575819) -->
+    <skip />
+    <!-- no translation found for usb_label_installer_cd (7438467574756086977) -->
+    <skip />
     <string name="battery_status_title" msgid="9159414319574976203">"电池状态"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"电池电量"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -806,6 +850,8 @@
     <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>
+    <string name="wireless_category_general" msgid="2973810407987118067">"常规"</string>
+    <string name="wireless_category_mobile_networks" msgid="1254629216798424288">"移动网络"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"移动网络"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"设置漫游、网络、APN 选项"</string>
     <string name="location_title" msgid="1029961368397484576">"我的位置"</string>
@@ -883,7 +929,7 @@
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"保护您的平板电脑"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"手机安全设置"</string>
     <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"通过创建个人屏幕解锁图案，防止他人未经授权使用您的平板电脑。用手指按任意顺序连接下一屏幕上的点，但至少要连接四个点。"\n\n"可以开始了吗？触摸“下一步”。"</string>
-    <string name="lock_intro_message" product="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>
+    <!-- outdated translation 3692151094288835065 -->     <string name="lock_intro_message" product="default" msgid="5796785892741212873">"通过创建个人屏幕解锁图案，防止他人未经授权使用您的平板电脑。用手指按任意顺序连接下一屏幕上的点，但至少要连接四个点。"\n\n"可以开始了吗？触摸“下一步”。"</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"管理应用程序"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"管理和删除安装的应用程序"</string>
     <string name="applications_settings" msgid="3736173521008476946">"应用程序"</string>
@@ -893,6 +939,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>
@@ -905,9 +953,10 @@
     <string name="force_stop" msgid="7435006169872876756">"强行停止"</string>
     <string name="total_size_label" msgid="1048676419552557254">"总计"</string>
     <string name="application_size_label" msgid="5055196275624686382">"应用程序"</string>
+    <string name="external_code_size_label" msgid="3459343140355961335">"USB 存储（应用程序）"</string>
     <string name="data_size_label" msgid="8679376373625710107">"数据"</string>
-    <string name="external_size_label" product="nosdcard" msgid="4465530017830945766">"USB 存储器"</string>
-    <string name="external_size_label" product="default" msgid="2107155737635944440">"SD 卡"</string>
+    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB 存储（数据）"</string>
+    <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD 卡"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"卸载"</string>
     <string name="disable_text" msgid="6544054052049395202">"停用"</string>
     <string name="enable_text" msgid="9217362512327828987">"启用"</string>
@@ -1026,7 +1075,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 +1085,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>
@@ -1066,7 +1117,7 @@
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"屏幕键盘设置"</string>
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"物理键盘"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"物理键盘设置"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"开发"</string>
+    <string name="development_settings_title" msgid="215179176067683667">"开发人员选项"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"设置应用程序开发选项"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB 调试"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"连接 USB 后启用调试模式"</string>
@@ -1091,14 +1142,14 @@
     <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="toggle_large_text_title" msgid="42259643359869436">"大文字"</string>
     <string name="accessibility_services_category" msgid="8127851026323672607">"辅助功能服务"</string>
+    <string name="toggle_accessibility_title" msgid="7338739354952553958">"允许辅助功能服务"</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 电子市场下载适用于您设备的屏幕阅读器。"\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>
@@ -1106,10 +1157,11 @@
     <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>
-    <string name="power_usage_summary_title" msgid="5180282911164282324">"电量使用情况"</string>
+    <string name="power_usage_summary_title" msgid="7190304207330319919">"电池"</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>
@@ -1218,6 +1270,8 @@
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>设置"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"已启用 <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"已停用 <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
+    <string name="tts_engine_settings_section" msgid="2346105138448751893">"引擎设置"</string>
+    <string name="tts_engine_settings_title" msgid="3499112142425680334">"“<xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>”的设置"</string>
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"语言和语音"</string>
     <string name="pico_installed" msgid="2452546687858267414">"已安装"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"未安装"</string>
@@ -1228,114 +1282,33 @@
     <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">"虚拟专用网设置"</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">"确定要删除此虚拟专用网吗？"</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">"此虚拟专用网配置中缺少一个或多个密钥。是否要检查密钥设置？"</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">"添加虚拟专用网"</string>
-    <string name="vpn_add_new_vpn" msgid="5438260689052714550">"添加虚拟专用网"</string>
-    <string name="vpn_details_title" msgid="418806440938510331">"VPN 详细信息"</string>
-    <string name="vpn_edit_title_add" msgid="2121313217989682890">"添加 VPN“<xliff:g id="NAME">%s</xliff:g>”"</string>
-    <string name="vpn_edit_title_edit" msgid="2457278794066617935">"“<xliff:g id="NAME">%s</xliff:g>”详情"</string>
-    <string name="vpns" msgid="3148141862835492816">"虚拟专用网"</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">"虚拟专用网名称"</string>
-    <string name="vpn_a_name" msgid="8445736942405283509">"虚拟专用网名称"</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">"设置虚拟专用网服务器"</string>
-    <string name="vpn_vpn_server" msgid="1141754908824209260">"虚拟专用网服务器"</string>
-    <string name="vpn_a_vpn_server" msgid="5960906152125045853">"虚拟专用网服务器"</string>
-    <string name="vpn_vpn_server_dialog_title" msgid="7850850940160521918">"虚拟专用网服务器名称"</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">"虚拟专用网设置"</string>
     <string name="vpn_settings_summary" msgid="8849924181594963972">"设置和管理虚拟专用网"</string>
-    <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="trusted_credentials" msgid="4266945289534242402">"受信任的凭据"</string>
+    <string name="trusted_credentials_summary" msgid="6735221351155686632">"显示受信任的 CA 证书"</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>
-    <string name="privacy_settings_title" msgid="1987089301293213705">"隐私权设置"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"备份和重置"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"备份和重置"</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>
@@ -1439,4 +1412,107 @@
     <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>
+    <!-- no translation found for debug_ui_category (9023948280291055349) -->
+    <skip />
+    <!-- no translation found for strict_mode (1938795874357830695) -->
+    <skip />
+    <!-- no translation found for strict_mode_summary (142834318897332338) -->
+    <skip />
+    <!-- no translation found for pointer_location (6084434787496938001) -->
+    <skip />
+    <!-- no translation found for pointer_location_summary (840819275172753713) -->
+    <skip />
+    <!-- no translation found for show_screen_updates (8282711794220426931) -->
+    <skip />
+    <!-- no translation found for show_screen_updates_summary (1716122382094924596) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage (2389212910758076024) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage_summary (2113341923988958266) -->
+    <skip />
+    <!-- no translation found for window_animation_scale_title (6162587588166114700) -->
+    <skip />
+    <!-- no translation found for transition_animation_scale_title (387527540523595875) -->
+    <skip />
+    <!-- no translation found for debug_applications_category (6221644998451283813) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities (3622005081180597749) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities_summary (3592221124808773368) -->
+    <skip />
+    <!-- no translation found for app_process_limit_title (4121324758038197598) -->
+    <skip />
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"数据使用情况"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"数据使用情况周期"</string>
+    <string name="data_usage_menu_split_4g" msgid="7417435609285381968">"单独显示 4G 数据使用情况"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"显示 Wi-Fi 使用情况"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"更改周期..."</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"重置数据使用情况周期的日期："</string>
+    <string name="data_usage_disable_mobile_limit" msgid="289740911281022322">"达到限制时停用移动数据"</string>
+    <string name="data_usage_disable_4g_limit" msgid="5808210773758699800">"达到限制时停用 4G 数据"</string>
+    <string name="data_usage_disable_3g_limit" msgid="3856971004328238231">"达到限制时停用 2G-3G 数据"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_mobile" msgid="454140350007299045">"移动"</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">"移动数据"</string>
+    <string name="data_usage_enable_3g" msgid="6304006671869578254">"2G-3G 数据"</string>
+    <string name="data_usage_enable_4g" msgid="3635854097335036738">"4G 数据"</string>
+    <string name="data_usage_app_settings" msgid="3727561362090820369">"查看应用程序设置"</string>
+    <string name="data_usage_app_restrict_background" msgid="8856643905291165256">"限制背景数据的使用"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="1503361245973512092">"只在使用无限网络时允许使用应用程序背景数据"</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="8110736468987743260">"正在限制背景数据的使用"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="100001698378554777">"此功能可能会对依赖背景数据使用情况的应用程序产生负面影响。"\n\n"您可在此应用程序的设置中找到更多相应的数据使用情况控件。"</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"使用情况周期重置日期"</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"每月日期："</string>
+    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"确定"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"正在限制数据使用量"</string>
+    <string name="data_usage_limit_dialog_mobile" msgid="7931094451923591578">"达到指定的数据使用上限时，系统会停用您的移动数据连接。"\n\n"由于设备与运营商的计算方法可能有所不同，因此为了避免支付额外费用，请考虑使用较低的上限。"</string>
+    <string name="data_usage_limit_dialog_3g" msgid="5478553071420316963">"达到指定的数据使用上限时，系统会停用您的 2G-3G 数据连接。"\n\n"由于设备与运营商的计算方法可能有所不同，因此为了避免支付额外费用，请考虑使用较低的上限。"</string>
+    <string name="data_usage_limit_dialog_4g" msgid="6134008906742403777">"达到指定的数据使用上限时，系统会停用您的 4G 数据连接。"\n\n"由于设备与运营商的计算方法可能有所不同，因此为了避免支付额外费用，请考虑使用较低的上限。"</string>
+    <string name="data_usage_disabled_dialog_3g_title" msgid="4221584306492812040">"2G-3G 数据已停用"</string>
+    <string name="data_usage_disabled_dialog_4g_title" msgid="715585612162185936">"4G 数据已停用"</string>
+    <string name="data_usage_disabled_dialog_mobile_title" msgid="209516216265000221">"移动数据已停用"</string>
+    <string name="data_usage_disabled_dialog" msgid="2874031671067845964">"已达到指定的数据使用量上限。"\n\n"如果使用额外的数据，运营商可能会收取相应的费用。"</string>
+    <string name="data_usage_disabled_dialog_enable" msgid="2441219164620753329">"重新启用数据连接"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="32">"<xliff:g id="NUMBER">%1$s</xliff:g>"</font>" "<font size="12">"<xliff:g id="UNIT">%2$s</xliff:g>"</font>\n<font size="12">"警告"</font></string>
+    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"紧急呼救"</string>
+    <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"返回通话"</string>
+    <string name="vpn_name" msgid="4689699885361002297">"名称"</string>
+    <string name="vpn_type" msgid="5435733139514388070">"类型"</string>
+    <string name="vpn_server" msgid="2123096727287421913">"服务器地址"</string>
+    <string name="vpn_mppe" msgid="6639001940500288972">"PPP 加密 (MPPE)"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"L2TP 密钥"</string>
+    <string name="vpn_ipsec_identifier" msgid="4098175859460006296">"IPSec 标识符"</string>
+    <string name="vpn_ipsec_secret" msgid="4526453255704888704">"IPSec 预共享密钥"</string>
+    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"IPSec 用户证书"</string>
+    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec CA 证书"</string>
+    <!-- no translation found for vpn_search_domains (5391995501541199624) -->
+    <skip />
+    <!-- no translation found for vpn_routes (8556236801755260073) -->
+    <skip />
+    <string name="vpn_username" msgid="1863901629860867849">"用户名"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"密码"</string>
+    <!-- no translation found for vpn_save_login (6350322456427484881) -->
+    <skip />
+    <!-- no translation found for vpn_not_used (9094191054524660891) -->
+    <skip />
+    <string name="vpn_no_ca_cert" msgid="7820884983947090538">"（不验证服务器）"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"取消"</string>
+    <string name="vpn_save" msgid="4233484051644764510">"保存"</string>
+    <string name="vpn_connect" msgid="8469608541746132301">"连接"</string>
+    <string name="vpn_edit" msgid="1111459297288136079">"修改 VPN 网络"</string>
+    <string name="vpn_connect_to" msgid="7328758950427515753">"连接到<xliff:g id="NETWORK">%s</xliff:g>"</string>
+    <string name="vpn_title" msgid="7982620762043790565">"VPN 设置"</string>
+    <string name="vpn_create" msgid="8966010925994175306">"添加 VPN 网络"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"修改网络"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"删除网络"</string>
+    <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"系统"</string>
+    <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"用户"</string>
+    <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"停用"</string>
+    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"启用"</string>
+    <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"删除"</string>
+    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"要停用该系统 CA 证书吗？"</string>
+    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"要停用该系统 CA 证书吗？"</string>
+    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"要永久删除该用户 CA 证书吗？"</string>
 </resources>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index 3cc5f05..821b631 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>
@@ -214,4 +240,36 @@
     <item msgid="3878793616631049349">"僅使用 HDCP 檢查 DRM 內容"</item>
     <item msgid="45075631231212732">"一律使用 HDCP 檢查"</item>
   </string-array>
+    <!-- no translation found for window_animation_scale_entries:0 (8134156599370824081) -->
+    <!-- no translation found for window_animation_scale_entries:1 (6624864048416710414) -->
+    <!-- no translation found for window_animation_scale_entries:2 (2219332261255416635) -->
+    <!-- no translation found for window_animation_scale_entries:3 (3544428804137048509) -->
+    <!-- no translation found for window_animation_scale_entries:4 (3110710404225974514) -->
+    <!-- no translation found for window_animation_scale_entries:5 (4402738611528318731) -->
+    <!-- no translation found for window_animation_scale_entries:6 (6189539267968330656) -->
+    <!-- no translation found for transition_animation_scale_entries:0 (8464255836173039442) -->
+    <!-- no translation found for transition_animation_scale_entries:1 (3375781541913316411) -->
+    <!-- no translation found for transition_animation_scale_entries:2 (1991041427801869945) -->
+    <!-- no translation found for transition_animation_scale_entries:3 (4012689927622382874) -->
+    <!-- no translation found for transition_animation_scale_entries:4 (3289156759925947169) -->
+    <!-- no translation found for transition_animation_scale_entries:5 (7705857441213621835) -->
+    <!-- no translation found for transition_animation_scale_entries:6 (6660750935954853365) -->
+    <!-- no translation found for app_process_limit_entries:0 (6799596560242275471) -->
+    <!-- no translation found for app_process_limit_entries:1 (2412794376818632575) -->
+    <!-- no translation found for app_process_limit_entries:2 (1578904888612645001) -->
+    <!-- no translation found for app_process_limit_entries:3 (8819235336299873577) -->
+  <string-array name="vpn_types_long">
+    <item msgid="2732002039459078847">"PPTP VPN"</item>
+    <item msgid="3799752201662127867">"L2TP/IPSec VPN (預先共用金鑰)"</item>
+    <item msgid="4725504331295252103">"L2TP/IPSec VPN (憑證)"</item>
+    <item msgid="7526551163264034377">"IPSec VPN (預先共用金鑰和 Xauth 驗證)"</item>
+    <item msgid="8064740940687465039">"IPSec VPN (憑證和 Xauth 驗證)"</item>
+    <item msgid="4946199982372391490">"IPSec VPN (憑證和混合驗證)"</item>
+  </string-array>
+    <!-- no translation found for vpn_states:0 (8621078286418985762) -->
+    <!-- no translation found for vpn_states:1 (6692305604213080515) -->
+    <!-- no translation found for vpn_states:2 (8001704909356800092) -->
+    <!-- no translation found for vpn_states:3 (4039737283841672166) -->
+    <!-- no translation found for vpn_states:4 (4042143101664725090) -->
+    <!-- no translation found for vpn_states:5 (2690164254699635531) -->
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index e6ac218..1bc19d2 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -19,6 +19,10 @@
     <string name="yes" msgid="4676390750360727396">"是"</string>
     <string name="no" msgid="6731231425810196216">"否"</string>
     <string name="device_info_default" msgid="7847265875578739287">"不明"</string>
+    <string name="header_category_wireless_networks" msgid="4944823405420438623">"無線與網路"</string>
+    <string name="header_category_device" msgid="5781174212691167553">"裝置"</string>
+    <string name="header_category_personal" msgid="6225932173498802187">"個人"</string>
+    <string name="header_category_system" msgid="2073558547468647128">"系統"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"開啟無線通訊"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"關閉無線通訊"</string>
     <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"檢視 SIM 地址簿"</string>
@@ -111,7 +115,11 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"配對中..."</string>
     <string name="bluetooth_paired" msgid="1247541089000057726">"已配對，但尚未連接"</string>
     <string name="bluetooth_device" msgid="6873461446424952003">"免持/頭戴式"</string>
-    <string name="progress_scanning" msgid="3760897655335759141">"掃描中"</string>
+    <!-- outdated translation 3760897655335759141 -->     <string name="progress_scanning" msgid="192587958424295789">"掃描中"</string>
+    <!-- no translation found for progress_tap_to_pair (4192342336107106334) -->
+    <skip />
+    <!-- no translation found for bluetooth_no_devices_found (2412462335116297668) -->
+    <skip />
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"藍牙配對要求"</string>
     <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>
@@ -130,6 +138,9 @@
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="7471195931669103553">"手機上的某個應用程式要求開啟藍牙功能，讓其他藍牙裝置可以搜尋到您的手機。您想要允許這項要求嗎？"</string>
     <string name="bluetooth_turning_on" msgid="3107102168379705771">"正在開啟藍牙..."</string>
     <string name="bluetooth_auto_connect" msgid="8013003320667198460">"自動連線"</string>
+    <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"藍牙連線要求"</string>
+    <string name="bluetooth_connection_notif_message" msgid="1833221950512058309">"輕觸一下即可連線至「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」"</string>
+    <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"您要連線至「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」嗎？"</string>
     <string name="date_and_time" msgid="4114084177056654663">"日期與時間設定"</string>
     <string name="date_time_12_hour_sample" msgid="3259617262618020574">"下午 1:00"</string>
     <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
@@ -235,7 +246,7 @@
     <string name="airplane_mode_summary" msgid="3154817401368780988">"停用所有的無線網路連線"</string>
     <string name="airplane_mode_turning_on" msgid="8871739222526957255">"停用無線網路連線中..."</string>
     <string name="airplane_mode_turning_off" msgid="3393168549611505996">"啟用無線網路連線中..."</string>
-    <string name="radio_controls_title" msgid="5868688473587168882">"無線與網路"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"更多內容..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"無線與網路"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"管理 Wi-Fi、藍牙、飛行模式、行動網路和 VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"漫游服務"</string>
@@ -271,8 +282,8 @@
     <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">"位置與安全性"</string>
-    <string name="location_security_settings_title" msgid="4624434296446625554">"位置與安全性設定"</string>
+    <string name="location_settings_title" msgid="8935806698251432196">"位置資訊服務"</string>
+    <string name="security_settings_title" msgid="7945465324818485460">"安全性"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"設定我的位置、畫面解鎖、SIM 卡鎖定、認證儲存空間鎖定"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"設定我的位置、解除鎖定畫面及鎖定認證儲存空間"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"密碼"</string>
@@ -316,7 +327,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>
@@ -375,8 +386,8 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"查看或撤銷裝置管理員"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"藍牙"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"開啟藍牙"</string>
-    <string name="bluetooth_settings" msgid="2725796451253089609">"藍牙設定"</string>
-    <string name="bluetooth_settings_title" msgid="2824020086246268296">"藍牙設定"</string>
+    <string name="bluetooth_settings" msgid="1810521656168174329">"藍牙"</string>
+    <string name="bluetooth_settings_title" msgid="1908745291161353016">"藍牙"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"管理連線、設定裝置名稱與可偵測性"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"藍牙配對要求"</string>
     <string name="bluetooth_enter_pin_msg" msgid="1499285355129256289">\n"輸入 PIN 與「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」進行配對 (如 0000 或 1234)。您可能也需要在藍牙裝置上輸入相同的 PIN。"</string>
@@ -394,7 +405,10 @@
     <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>
+    <!-- no translation found for bluetooth_search_for_devices (5957007154213560390) -->
+    <skip />
+    <!-- no translation found for bluetooth_searching_for_devices (9203739709307871727) -->
+    <skip />
     <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>
@@ -404,6 +418,10 @@
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"解除配對"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"中斷連線並解除配對"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"選項..."</string>
+    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"進階選項"</string>
+    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"藍牙進階設定"</string>
+    <string name="bluetooth_advanced_settings_label" msgid="8659717781212434173">"藍牙進階設定"</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="3631028334811113629">"開啟藍牙以檢視可用的裝置"</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>
@@ -445,27 +463,31 @@
     <string name="nfc_toggle_error" msgid="2233172102497535522">"發生錯誤。"</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"開啟 Wi-Fi"</string>
-    <string name="wifi_settings" msgid="4746946030627213196">"Wi-Fi 設定"</string>
+    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="2810363951104753710">"Wi-Fi 設定"</string>
+    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"設定、管理無線網路存取點"</string>
-    <string name="wifi_starting" msgid="6710266609710860129">"開啟中..."</string>
-    <string name="wifi_stopping" msgid="5952909472548218348">"關閉中..."</string>
+    <string name="wifi_starting" msgid="7732330327758522943">"正在開啟 Wi-Fi..."</string>
+    <string name="wifi_stopping" msgid="244864762599017659">"正在關閉 Wi-Fi…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"錯誤"</string>
     <string name="wifi_in_airplane_mode" msgid="7618393787965366655">"處於飛航模式時"</string>
     <string name="wifi_fail_to_scan" msgid="6194542252808587669">"無法掃描網路"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"網路通知"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"有開放網路時通知我"</string>
+    <string name="wifi_enable_watchdog_service" msgid="4723544454066601706">"Wi-Fi 連線檢查"</string>
+    <string name="wifi_enable_watchdog_service_summary" msgid="8687400936839455926">"偵測及管理網路連線可能發生的問題"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="2256739245628081979">"Wi-Fi 中斷連線設定"</string>
     <string name="wifi_setting_sleep_policy_summary" msgid="7573693311804602041">"指定何時要從 Wi-Fi 切換到行動數據"</string>
     <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" msgid="6234851776910938957">"新增網路"</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>
     <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_empty_list_wifi_off" msgid="3682507011071029311">"開啟 Wi-Fi 以檢視可用的網路"</string>
     <string name="wifi_network_setup" msgid="7974851890019344870">"網路設定"</string>
     <string name="wifi_wps_pin" msgid="5471842298708321115">"從存取點輸入 Pin"</string>
     <string name="wifi_wps_setup_title" msgid="150518971269252336">"WPS 設定"</string>
@@ -482,8 +504,8 @@
     <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_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>
@@ -501,13 +523,13 @@
     <string name="wifi_save" msgid="3331121567988522826">"儲存"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"取消"</string>
     <string name="wifi_wps_overlap_error" msgid="6820987241637459748">"已偵測到其他 WPS 工作階段，請在幾分鐘後重試"</string>
-    <string name="wifi_advanced_titlebar" msgid="5419052271935350999">"進階"</string>
+    <!-- outdated translation 5419052271935350999 -->     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"進階"</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>
-    <string name="wifi_ip_settings_titlebar" msgid="4345739031248760326">"IP 設定"</string>
+    <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP 設定"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"儲存"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"取消"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="6387653152103405443">"請輸入有效的 IP 位址。"</string>
@@ -525,7 +547,7 @@
     <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>
+    <string name="display_settings_title" msgid="1708697328627382561">"顯示"</string>
     <string name="sound_settings" msgid="5007659014828162881">"音效設定"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"靜音模式"</string>
     <string name="silent_mode_summary" msgid="3309650676072917899">"將所有非媒體音效及鬧鐘音效設為靜音"</string>
@@ -598,7 +620,18 @@
     <string name="brightness_summary" msgid="838917350127550703">"調整螢幕亮度"</string>
     <string name="screen_timeout" msgid="6962654593018319466">"逾時"</string>
     <string name="screen_timeout_summary" msgid="4471347210332380587">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>後自動關閉螢幕"</string>
+    <string name="wallpaper_settings_title" msgid="5449180116365824625">"桌布"</string>
+    <string name="dream_settings_title" msgid="6536876013377446805">"Android Dreams"</string>
+    <string name="dream_settings_summary" msgid="6809871648071408259">"螢幕保護程式和其他閒置處理方式"</string>
+    <string name="dream_component_title" msgid="505229894674572578">"選取的 Dream"</string>
+    <string name="dream_timeout_title" msgid="1385909618566514628">"啟動時間"</string>
+    <string name="dream_timeout_summary" msgid="6721955887728454226">"閒置 <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>後"</string>
+    <string name="dream_timeout_zero_summary" msgid="2450290346381400092">"永不"</string>
+    <string name="dream_test" msgid="5968002644622194481">"試試看！"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"自動調整亮度"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"字型大小"</string>
+    <string name="summary_font_size" msgid="7548243392515500554">"整體字型大小"</string>
+    <string name="dialog_title_font_size" msgid="4503471078477715461">"選取字型大小"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM 卡鎖定設定"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"設定 SIM 卡鎖定"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM 卡鎖定"</string>
@@ -643,8 +676,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>
@@ -696,6 +730,16 @@
     <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 storage_menu_usb (1580545228584324704) -->
+    <skip />
+    <!-- no translation found for storage_title_usb (5775322159427546546) -->
+    <skip />
+    <!-- no translation found for usb_label_mtp (4157227401755543412) -->
+    <skip />
+    <!-- no translation found for usb_label_ptp (7417254019489575819) -->
+    <skip />
+    <!-- no translation found for usb_label_installer_cd (7438467574756086977) -->
+    <skip />
     <string name="battery_status_title" msgid="9159414319574976203">"電池狀態"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"電池存量"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -806,6 +850,8 @@
     <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>
+    <string name="wireless_category_general" msgid="2973810407987118067">"一般"</string>
+    <string name="wireless_category_mobile_networks" msgid="1254629216798424288">"行動網路"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"行動網路"</string>
     <string name="network_settings_summary" msgid="5149750850846813553">"設定漫遊、網路、APN 選項"</string>
     <string name="location_title" msgid="1029961368397484576">"我的位置"</string>
@@ -883,7 +929,7 @@
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"保護平板電腦的安全"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"手機安全設定"</string>
     <string name="lock_intro_message" product="tablet" msgid="3692151094288835065">"建立個人螢幕解鎖圖形，避免有人擅自使用您的平板電腦。在下個畫面中，手指以任意順序連續按螢幕中的點，至少有四點要連結。"\n\n"準備好要開始了嗎？請輕觸 [下一步]。"</string>
-    <string name="lock_intro_message" product="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>
+    <!-- outdated translation 3692151094288835065 -->     <string name="lock_intro_message" product="default" msgid="5796785892741212873">"建立個人螢幕解鎖圖形，避免有人擅自使用您的平板電腦。在下個畫面中，手指以任意順序連續按螢幕中的點，至少有四點要連結。"\n\n"準備好要開始了嗎？請輕觸 [下一步]。"</string>
     <string name="manageapplications_settings_title" msgid="5712405848153426706">"管理應用程式"</string>
     <string name="manageapplications_settings_summary" msgid="6097117021500651232">"管理及移除已安裝的應用程式"</string>
     <string name="applications_settings" msgid="3736173521008476946">"應用程式"</string>
@@ -893,6 +939,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>
@@ -905,9 +953,10 @@
     <string name="force_stop" msgid="7435006169872876756">"強制停止"</string>
     <string name="total_size_label" msgid="1048676419552557254">"總共"</string>
     <string name="application_size_label" msgid="5055196275624686382">"應用程式"</string>
+    <string name="external_code_size_label" msgid="3459343140355961335">"USB 儲存裝置應用程式"</string>
     <string name="data_size_label" msgid="8679376373625710107">"資料"</string>
-    <string name="external_size_label" product="nosdcard" msgid="4465530017830945766">"USB 儲存裝置"</string>
-    <string name="external_size_label" product="default" msgid="2107155737635944440">"SD 卡"</string>
+    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB 儲存裝置資料"</string>
+    <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD 卡"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"解除安裝"</string>
     <string name="disable_text" msgid="6544054052049395202">"停用"</string>
     <string name="enable_text" msgid="9217362512327828987">"啟用"</string>
@@ -1026,7 +1075,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 +1085,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>
@@ -1066,7 +1117,7 @@
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"螢幕鍵盤設定"</string>
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"實體鍵盤"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"實體鍵盤設定"</string>
-    <string name="development_settings_title" msgid="6719732334835420989">"開發"</string>
+    <string name="development_settings_title" msgid="215179176067683667">"開發人員選項"</string>
     <string name="development_settings_summary" msgid="2151320488701538355">"設定應用程式開發選項"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB 偵錯"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"連接 USB 時進入偵錯模式"</string>
@@ -1091,14 +1142,14 @@
     <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="toggle_large_text_title" msgid="42259643359869436">"大字體"</string>
     <string name="accessibility_services_category" msgid="8127851026323672607">"協助工具服務"</string>
+    <string name="toggle_accessibility_title" msgid="7338739354952553958">"允許協助工具服務"</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>
@@ -1106,10 +1157,11 @@
     <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>
-    <string name="power_usage_summary_title" msgid="5180282911164282324">"電池使用狀況"</string>
+    <string name="power_usage_summary_title" msgid="7190304207330319919">"電池"</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>
@@ -1218,6 +1270,8 @@
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>設定"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"已啟用 <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"已停用 <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
+    <string name="tts_engine_settings_section" msgid="2346105138448751893">"引擎設定"</string>
+    <string name="tts_engine_settings_title" msgid="3499112142425680334">"<xliff:g id="TTS_ENGINE_NAME">%s</xliff:g> 設定"</string>
     <string name="pico_languages_and_voices" msgid="4611320375917773238">"語言及語音"</string>
     <string name="pico_installed" msgid="2452546687858267414">"已安裝"</string>
     <string name="pico_not_installed" msgid="6266845418419994311">"未安裝"</string>
@@ -1228,114 +1282,33 @@
     <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">"設定與管理虛擬私人網路 (VPN)"</string>
-    <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="trusted_credentials" msgid="4266945289534242402">"信任的憑證"</string>
+    <string name="trusted_credentials_summary" msgid="6735221351155686632">"顯示信任的 CA 憑證"</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>
-    <string name="privacy_settings_title" msgid="1987089301293213705">"隱私設定"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"備份與重設"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"備份與重設"</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>
@@ -1360,7 +1333,7 @@
     <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="sound_category_feedback_title" msgid="4399742321363475393">"反饋"</string>
     <string name="wifi_setup_title" msgid="661074868726906436">"Wi-Fi 設定"</string>
     <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"連線至 Wi-Fi 網路 <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_connecting_network" msgid="2408378435027118687">"正在連線至 Wi-Fi 網路 <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
@@ -1439,4 +1412,107 @@
     <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>
+    <!-- no translation found for debug_ui_category (9023948280291055349) -->
+    <skip />
+    <!-- no translation found for strict_mode (1938795874357830695) -->
+    <skip />
+    <!-- no translation found for strict_mode_summary (142834318897332338) -->
+    <skip />
+    <!-- no translation found for pointer_location (6084434787496938001) -->
+    <skip />
+    <!-- no translation found for pointer_location_summary (840819275172753713) -->
+    <skip />
+    <!-- no translation found for show_screen_updates (8282711794220426931) -->
+    <skip />
+    <!-- no translation found for show_screen_updates_summary (1716122382094924596) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage (2389212910758076024) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage_summary (2113341923988958266) -->
+    <skip />
+    <!-- no translation found for window_animation_scale_title (6162587588166114700) -->
+    <skip />
+    <!-- no translation found for transition_animation_scale_title (387527540523595875) -->
+    <skip />
+    <!-- no translation found for debug_applications_category (6221644998451283813) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities (3622005081180597749) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities_summary (3592221124808773368) -->
+    <skip />
+    <!-- no translation found for app_process_limit_title (4121324758038197598) -->
+    <skip />
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"資料用量"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"資料用量週期"</string>
+    <string name="data_usage_menu_split_4g" msgid="7417435609285381968">"分割 4G 用量"</string>
+    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"顯示 Wi-Fi 用量"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"變更週期..."</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"資料用量週期的重設日期："</string>
+    <string name="data_usage_disable_mobile_limit" msgid="289740911281022322">"達到上限時停用行動數據"</string>
+    <string name="data_usage_disable_4g_limit" msgid="5808210773758699800">"達到上限時停用 4G 數據"</string>
+    <string name="data_usage_disable_3g_limit" msgid="3856971004328238231">"達到上限時停用 2G-3G 數據"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_mobile" msgid="454140350007299045">"行動數據"</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">"行動數據"</string>
+    <string name="data_usage_enable_3g" msgid="6304006671869578254">"2G-3G 數據"</string>
+    <string name="data_usage_enable_4g" msgid="3635854097335036738">"4G 數據"</string>
+    <string name="data_usage_app_settings" msgid="3727561362090820369">"查看應用程式設定"</string>
+    <string name="data_usage_app_restrict_background" msgid="8856643905291165256">"限制背景資料用量"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="1503361245973512092">"使用無限網路時只允許應用程式背景資料。"</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="8110736468987743260">"限制背景資料"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="100001698378554777">"根據背景資料用量的不同，這項功能可能會對應用程式產生負面影響。"\n\n"您可以在應用程式設定中找到更多相關的資料用量控制項。"</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"用量週期重設日期"</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"每月固定日期："</string>
+    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"儲存設定"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"限制資料用量"</string>
+    <string name="data_usage_limit_dialog_mobile" msgid="7931094451923591578">"系統會在達到指定上限時，停用您的行動數據連線。"\n\n"如要避免支付超量費用，請根據裝置與系統業者的計費方式不同，考慮降低使用限制。"</string>
+    <string name="data_usage_limit_dialog_3g" msgid="5478553071420316963">"系統會在達到指定的上限時，停用您的 2G-3G 數據連線。"\n\n"如要避免支付超量費用，請根據裝置與系統業者的計費方式不同，考慮降低使用限制。"</string>
+    <string name="data_usage_limit_dialog_4g" msgid="6134008906742403777">"系統會在達到指定上限時，停用您的 4G 數據連線。"\n\n"如要避免支付超量費用，請根據裝置與系統業者的計費方式不同，考慮降低使用限制。"</string>
+    <string name="data_usage_disabled_dialog_3g_title" msgid="4221584306492812040">"已停用 2G-3G 數據"</string>
+    <string name="data_usage_disabled_dialog_4g_title" msgid="715585612162185936">"已停用 4G 數據"</string>
+    <string name="data_usage_disabled_dialog_mobile_title" msgid="209516216265000221">"已停用行動數據"</string>
+    <string name="data_usage_disabled_dialog" msgid="2874031671067845964">"已達到指定的資料用量上限。"\n\n"如果使用額外的資料用量，系統業者可能會向您收費。"</string>
+    <string name="data_usage_disabled_dialog_enable" msgid="2441219164620753329">"重新啟用數據"</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="32">"<xliff:g id="NUMBER">%1$s</xliff:g>"</font>" "<font size="12">"<xliff:g id="UNIT">%2$s</xliff:g>"</font>\n<font size="12">"警告"</font></string>
+    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"緊急電話"</string>
+    <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"返回通話"</string>
+    <string name="vpn_name" msgid="4689699885361002297">"名稱"</string>
+    <string name="vpn_type" msgid="5435733139514388070">"類型"</string>
+    <string name="vpn_server" msgid="2123096727287421913">"伺服器位址"</string>
+    <string name="vpn_mppe" msgid="6639001940500288972">"PPP 加密 (MPPE)"</string>
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"L2TP 密碼"</string>
+    <string name="vpn_ipsec_identifier" msgid="4098175859460006296">"IPSec 識別碼"</string>
+    <string name="vpn_ipsec_secret" msgid="4526453255704888704">"IPSec 預先共用金鑰"</string>
+    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"IPSec 使用者憑證"</string>
+    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec CA 憑證"</string>
+    <!-- no translation found for vpn_search_domains (5391995501541199624) -->
+    <skip />
+    <!-- no translation found for vpn_routes (8556236801755260073) -->
+    <skip />
+    <string name="vpn_username" msgid="1863901629860867849">"使用者名稱"</string>
+    <string name="vpn_password" msgid="6756043647233596772">"密碼"</string>
+    <!-- no translation found for vpn_save_login (6350322456427484881) -->
+    <skip />
+    <!-- no translation found for vpn_not_used (9094191054524660891) -->
+    <skip />
+    <string name="vpn_no_ca_cert" msgid="7820884983947090538">"(不要驗證伺服器)"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"取消"</string>
+    <string name="vpn_save" msgid="4233484051644764510">"儲存"</string>
+    <string name="vpn_connect" msgid="8469608541746132301">"連線"</string>
+    <string name="vpn_edit" msgid="1111459297288136079">"編輯 VPN 網路"</string>
+    <string name="vpn_connect_to" msgid="7328758950427515753">"連線至 <xliff:g id="NETWORK">%s</xliff:g>"</string>
+    <string name="vpn_title" msgid="7982620762043790565">"VPN 設定"</string>
+    <string name="vpn_create" msgid="8966010925994175306">"新增 VPN 網路"</string>
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"編輯網路"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"刪除網路"</string>
+    <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"系統"</string>
+    <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"使用者"</string>
+    <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"停用"</string>
+    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"啟用"</string>
+    <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"移除"</string>
+    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"啟用系統 CA 憑證嗎？"</string>
+    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"停用系統 CA 憑證嗎？"</string>
+    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"永久移除使用者 CA 憑證嗎？"</string>
 </resources>
diff --git a/res/xml/vpn_type.xml b/res/values-zu-nokeys/strings.xml
similarity index 61%
copy from res/xml/vpn_type.xml
copy to res/values-zu-nokeys/strings.xml
index fbc7822..7b465fc 100644
--- a/res/xml/vpn_type.xml
+++ b/res/values-zu-nokeys/strings.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
+<?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.
@@ -12,10 +12,9 @@
      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"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
-        android:title="@string/vpn_type_title">
-
-</PreferenceScreen>   
+<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..46b0afa
--- /dev/null
+++ b/res/values-zu/arrays.xml
@@ -0,0 +1,259 @@
+<?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) -->
+    <!-- no translation found for window_animation_scale_entries:0 (8134156599370824081) -->
+    <!-- no translation found for window_animation_scale_entries:1 (6624864048416710414) -->
+    <!-- no translation found for window_animation_scale_entries:2 (2219332261255416635) -->
+    <!-- no translation found for window_animation_scale_entries:3 (3544428804137048509) -->
+    <!-- no translation found for window_animation_scale_entries:4 (3110710404225974514) -->
+    <!-- no translation found for window_animation_scale_entries:5 (4402738611528318731) -->
+    <!-- no translation found for window_animation_scale_entries:6 (6189539267968330656) -->
+    <!-- no translation found for transition_animation_scale_entries:0 (8464255836173039442) -->
+    <!-- no translation found for transition_animation_scale_entries:1 (3375781541913316411) -->
+    <!-- no translation found for transition_animation_scale_entries:2 (1991041427801869945) -->
+    <!-- no translation found for transition_animation_scale_entries:3 (4012689927622382874) -->
+    <!-- no translation found for transition_animation_scale_entries:4 (3289156759925947169) -->
+    <!-- no translation found for transition_animation_scale_entries:5 (7705857441213621835) -->
+    <!-- no translation found for transition_animation_scale_entries:6 (6660750935954853365) -->
+    <!-- no translation found for app_process_limit_entries:0 (6799596560242275471) -->
+    <!-- no translation found for app_process_limit_entries:1 (2412794376818632575) -->
+    <!-- no translation found for app_process_limit_entries:2 (1578904888612645001) -->
+    <!-- no translation found for app_process_limit_entries:3 (8819235336299873577) -->
+    <!-- no translation found for vpn_types_long:0 (2732002039459078847) -->
+    <!-- no translation found for vpn_types_long:1 (3799752201662127867) -->
+    <!-- no translation found for vpn_types_long:2 (4725504331295252103) -->
+    <!-- no translation found for vpn_types_long:3 (7526551163264034377) -->
+    <!-- no translation found for vpn_types_long:4 (8064740940687465039) -->
+    <!-- no translation found for vpn_types_long:5 (4946199982372391490) -->
+    <!-- no translation found for vpn_states:0 (8621078286418985762) -->
+    <!-- no translation found for vpn_states:1 (6692305604213080515) -->
+    <!-- no translation found for vpn_states:2 (8001704909356800092) -->
+    <!-- no translation found for vpn_states:3 (4039737283841672166) -->
+    <!-- no translation found for vpn_states:4 (4042143101664725090) -->
+    <!-- no translation found for vpn_states:5 (2690164254699635531) -->
+</resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
new file mode 100644
index 0000000..214a6e7
--- /dev/null
+++ b/res/values-zu/strings.xml
@@ -0,0 +1,2061 @@
+<?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 header_category_wireless_networks (4944823405420438623) -->
+    <skip />
+    <!-- no translation found for header_category_device (5781174212691167553) -->
+    <skip />
+    <!-- no translation found for header_category_personal (6225932173498802187) -->
+    <skip />
+    <!-- no translation found for header_category_system (2073558547468647128) -->
+    <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 (192587958424295789) -->
+    <skip />
+    <!-- no translation found for progress_tap_to_pair (4192342336107106334) -->
+    <skip />
+    <!-- no translation found for bluetooth_no_devices_found (2412462335116297668) -->
+    <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 bluetooth_connection_permission_request (4747918249032890077) -->
+    <skip />
+    <!-- no translation found for bluetooth_connection_notif_message (1833221950512058309) -->
+    <skip />
+    <!-- no translation found for bluetooth_connection_dialog_text (8455427559949998023) -->
+    <skip />
+    <!-- no translation found for date_and_time (4114084177056654663) -->
+    <skip />
+    <string name="date_time_12_hour_sample" msgid="3259617262618020574">"1:00 pm"</string>
+    <string name="date_time_24_hour_sample" msgid="8916857570746212357">"13:00"</string>
+    <!-- no translation found for choose_timezone (7762866468013985022) -->
+    <skip />
+    <string name="normal_date_format" msgid="1982904221918374153">"Kuvamile (<xliff:g id="DATE">%s</xliff:g>)"</string>
+    <!-- no translation found for display_preview_label (1127597250917274792) -->
+    <skip />
+    <!-- no translation found for display_font_size_label (8941851418397475389) -->
+    <skip />
+    <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
+    <skip />
+    <string name="intent_sender_sendbroadcast_text" msgid="1415735148895872715">"Thumela <xliff:g id="BROADCAST">broadcast</xliff:g>"</string>
+    <string name="intent_sender_action_label" msgid="616458370005452389">"<xliff:g id="ACTION">Action</xliff:g>:"</string>
+    <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Qala <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
+    <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
+    <string name="intent_sender_account_label" msgid="465210404475603404">"I-Akhawunti:"</string>
+    <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 />
+    <!-- unknown quoting pattern: original -1, translation 1 -->
+    <!-- outdated translation 5868688473587168882 -->     <string name="radio_controls_title" msgid="6889937359495515769">"Okungenantambo &amp;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>
+    <!-- no translation found for location_settings_title (8935806698251432196) -->
+    <skip />
+    <!-- unknown quoting pattern: original -1, translation 1 -->
+    <!-- outdated translation 5168491784222013179 -->     <string name="security_settings_title" msgid="7945465324818485460">"Indawo &amp;amp; ukuphepha"</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 (1810521656168174329) -->
+    <skip />
+    <!-- no translation found for bluetooth_settings_title (1908745291161353016) -->
+    <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>
+    <!-- no translation found for bluetooth_search_for_devices (5957007154213560390) -->
+    <skip />
+    <!-- no translation found for bluetooth_searching_for_devices (9203739709307871727) -->
+    <skip />
+    <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>
+    <!-- no translation found for bluetooth_menu_advanced (8572178316357220524) -->
+    <skip />
+    <!-- no translation found for bluetooth_advanced_titlebar (2142159726881547669) -->
+    <skip />
+    <!-- no translation found for bluetooth_advanced_settings_label (8659717781212434173) -->
+    <skip />
+    <!-- no translation found for bluetooth_empty_list_bluetooth_off (3631028334811113629) -->
+    <skip />
+    <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 (1277428034634973011) -->
+    <skip />
+    <!-- no translation found for wifi_settings_category (2810363951104753710) -->
+    <skip />
+    <!-- no translation found for wifi_settings_title (4351120897298124250) -->
+    <skip />
+    <!-- no translation found for wifi_settings_summary (668767638556052820) -->
+    <skip />
+    <!-- no translation found for wifi_starting (7732330327758522943) -->
+    <skip />
+    <!-- no translation found for wifi_stopping (244864762599017659) -->
+    <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 />
+    <!-- no translation found for wifi_enable_watchdog_service (4723544454066601706) -->
+    <skip />
+    <!-- no translation found for wifi_enable_watchdog_service_summary (8687400936839455926) -->
+    <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>
+    <!-- outdated translation 1671334951296205616 -->     <string name="wifi_add_network" msgid="6234851776910938957">"Yengeza inethiwekhi ye-Wi-Fi"</string>
+    <!-- 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>
+    <!-- no translation found for wifi_empty_list_wifi_off (3682507011071029311) -->
+    <skip />
+    <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 />
+    <!-- outdated translation 5419052271935350999 -->     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"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_advanced_settings_label (3654366894867838338) -->
+    <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="1708697328627382561">"Bonisa"</string>
+    <!-- no translation found for sound_settings (5007659014828162881) -->
+    <skip />
+    <!-- no translation found for silent_mode_title (3181479108593217704) -->
+    <skip />
+    <string name="silent_mode_summary" msgid="3309650676072917899">"Thulisa yonke imisindo ngaphandle kwemimidya &amp; ama-alamu"</string>
+    <string name="silent_mode_incl_alarm_summary" msgid="2088830834182228458">"Yonke imisindo ngaphandle kwemidiya ithulisiwe"</string>
+    <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 storage_menu_usb (1580545228584324704) -->
+    <skip />
+    <!-- no translation found for storage_title_usb (5775322159427546546) -->
+    <skip />
+    <!-- no translation found for usb_label_mtp (4157227401755543412) -->
+    <skip />
+    <!-- no translation found for usb_label_ptp (7417254019489575819) -->
+    <skip />
+    <!-- no translation found for usb_label_installer_cd (7438467574756086977) -->
+    <skip />
+    <!-- no translation found for battery_status_title (9159414319574976203) -->
+    <skip />
+    <!-- no translation found for battery_level_title (2965679202786873272) -->
+    <skip />
+    <!-- no translation found for apn_settings (3743170484827528406) -->
+    <skip />
+    <!-- no translation found for apn_edit (1354715499708424718) -->
+    <skip />
+    <!-- no translation found for apn_not_set (7422262558097875757) -->
+    <skip />
+    <!-- no translation found for apn_name (4115580098369824123) -->
+    <skip />
+    <!-- no translation found for apn_apn (2479425126733513353) -->
+    <skip />
+    <!-- no translation found for apn_http_proxy (1826885957243696354) -->
+    <skip />
+    <!-- no translation found for apn_http_port (3763259523984976226) -->
+    <skip />
+    <!-- no translation found for apn_user (455637547356117761) -->
+    <skip />
+    <!-- no translation found for apn_password (5412301994998250968) -->
+    <skip />
+    <!-- no translation found for apn_server (2436185314756372858) -->
+    <skip />
+    <!-- no translation found for apn_mmsc (3670124402105585737) -->
+    <skip />
+    <!-- no translation found for apn_mms_proxy (5374082621073999275) -->
+    <skip />
+    <!-- no translation found for apn_mms_port (4074188088199243040) -->
+    <skip />
+    <!-- no translation found for apn_mcc (4258628382260674636) -->
+    <skip />
+    <!-- no translation found for apn_mnc (8629374076888809874) -->
+    <skip />
+    <string name="apn_auth_type" msgid="6167205395676037015">"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 wireless_category_general (2973810407987118067) -->
+    <skip />
+    <!-- no translation found for wireless_category_mobile_networks (1254629216798424288) -->
+    <skip />
+    <!-- no translation found for network_settings_title (7967552516440151852) -->
+    <skip />
+    <!-- no translation found for network_settings_summary (5149750850846813553) -->
+    <skip />
+    <string name="location_title" msgid="1029961368397484576">"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>
+    <!-- outdated translation 3692151094288835065 -->     <string name="lock_intro_message" product="default" msgid="5796785892741212873">"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>
+    <!-- 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 external_code_size_label (3459343140355961335) -->
+    <skip />
+    <!-- no translation found for data_size_label (8679376373625710107) -->
+    <skip />
+    <!-- no translation found for external_data_size_label (7533821466482000453) -->
+    <skip />
+    <!-- no translation found for external_data_size_label (626414192825329708) -->
+    <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 (215179176067683667) -->
+    <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>
+    <!-- no translation found for toggle_large_text_title (42259643359869436) -->
+    <skip />
+    <string name="accessibility_services_category" msgid="8127851026323672607">"Izinsizakalo zokufinyeleleka"</string>
+    <!-- outdated translation 650839277066574497 -->     <string name="toggle_accessibility_title" msgid="7338739354952553958">"Ukufinyeleleka"</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_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 />
+    <!-- outdated translation 5180282911164282324 -->     <string name="power_usage_summary_title" msgid="7190304207330319919">"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_title" msgid="7327468307909556719">"Izilungiselelo ze-VPN"</string>
+    <string name="vpn_settings_summary" msgid="8849924181594963972">"Hlela &amp; phatha Amanethiwekhi Ayimfihlo Okulungiswa (ama-VPN"</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>
+    <!-- no translation found for trusted_credentials (4266945289534242402) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_summary (6735221351155686632) -->
+    <skip />
+    <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>
+    <!-- outdated translation 9206631214140954954 -->     <string name="privacy_settings" msgid="5446972770562918934">"Ubumfihlo"</string>
+    <!-- outdated translation 1987089301293213705 -->     <string name="privacy_settings_title" msgid="4856282165773594890">"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 debug_ui_category (9023948280291055349) -->
+    <skip />
+    <!-- no translation found for strict_mode (1938795874357830695) -->
+    <skip />
+    <!-- no translation found for strict_mode_summary (142834318897332338) -->
+    <skip />
+    <!-- no translation found for pointer_location (6084434787496938001) -->
+    <skip />
+    <!-- no translation found for pointer_location_summary (840819275172753713) -->
+    <skip />
+    <!-- no translation found for show_screen_updates (8282711794220426931) -->
+    <skip />
+    <!-- no translation found for show_screen_updates_summary (1716122382094924596) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage (2389212910758076024) -->
+    <skip />
+    <!-- no translation found for show_cpu_usage_summary (2113341923988958266) -->
+    <skip />
+    <!-- no translation found for window_animation_scale_title (6162587588166114700) -->
+    <skip />
+    <!-- no translation found for transition_animation_scale_title (387527540523595875) -->
+    <skip />
+    <!-- no translation found for debug_applications_category (6221644998451283813) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities (3622005081180597749) -->
+    <skip />
+    <!-- no translation found for immediately_destroy_activities_summary (3592221124808773368) -->
+    <skip />
+    <!-- no translation found for app_process_limit_title (4121324758038197598) -->
+    <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 (8821760330497941117) -->
+    <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 (2441219164620753329) -->
+    <skip />
+    <!-- no translation found for data_usage_sweep_warning (6387081852568846982) -->
+    <skip />
+    <!-- no translation found for cryptkeeper_emergency_call (198578731586097145) -->
+    <skip />
+    <!-- no translation found for cryptkeeper_return_to_call (5613717339452772491) -->
+    <skip />
+    <!-- outdated translation 1550918148476193076 -->     <string name="vpn_name" msgid="4689699885361002297">"Igama le-VPN"</string>
+    <!-- no translation found for vpn_type (5435733139514388070) -->
+    <skip />
+    <!-- no translation found for vpn_server (2123096727287421913) -->
+    <skip />
+    <!-- no translation found for vpn_mppe (6639001940500288972) -->
+    <skip />
+    <string name="vpn_l2tp_secret" msgid="529359749677142076">"Imfihlo ye-L2TP"</string>
+    <!-- no translation found for vpn_ipsec_identifier (4098175859460006296) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_secret (4526453255704888704) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_user_cert (6880651510020187230) -->
+    <skip />
+    <!-- no translation found for vpn_ipsec_ca_cert (91338213449148229) -->
+    <skip />
+    <!-- no translation found for vpn_search_domains (5391995501541199624) -->
+    <skip />
+    <!-- no translation found for vpn_routes (8556236801755260073) -->
+    <skip />
+    <!-- no translation found for vpn_username (1863901629860867849) -->
+    <skip />
+    <!-- no translation found for vpn_password (6756043647233596772) -->
+    <skip />
+    <!-- no translation found for vpn_save_login (6350322456427484881) -->
+    <skip />
+    <!-- no translation found for vpn_not_used (9094191054524660891) -->
+    <skip />
+    <!-- no translation found for vpn_no_ca_cert (7820884983947090538) -->
+    <skip />
+    <!-- no translation found for vpn_cancel (1979937976123659332) -->
+    <skip />
+    <!-- no translation found for vpn_save (4233484051644764510) -->
+    <skip />
+    <!-- no translation found for vpn_connect (8469608541746132301) -->
+    <skip />
+    <!-- no translation found for vpn_edit (1111459297288136079) -->
+    <skip />
+    <!-- no translation found for vpn_connect_to (7328758950427515753) -->
+    <skip />
+    <!-- no translation found for vpn_title (7982620762043790565) -->
+    <skip />
+    <!-- no translation found for vpn_create (8966010925994175306) -->
+    <skip />
+    <string name="vpn_menu_edit" msgid="4526245173583195618">"Hlela inethiwekhi"</string>
+    <string name="vpn_menu_delete" msgid="3326527392609513129">"Susa inethiwekhi"</string>
+    <!-- no translation found for trusted_credentials_system_tab (3984284264816924534) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_user_tab (2244732111398939475) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_disable_label (3864493185845818506) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_enable_label (2498444573635146913) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_remove_label (3633691709300260836) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_enable_confirmation (83215982842660869) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_disable_confirmation (8199697813361646792) -->
+    <skip />
+    <!-- no translation found for trusted_credentials_remove_confirmation (443561923016852941) -->
+    <skip />
+</resources>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 482830c..45f7fd8 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -48,30 +48,6 @@
         <item>yyyy-MM-dd</item>
     </string-array>
 
-    <!-- Display settings.  The type of animations to show. -->
-    <string-array name="animations_entries">
-        <item>No animations</item>
-        <item>Some animations</item>
-        <item>All animations</item>
-    </string-array>
-
-    <!-- Display settings.  Summary for each type of animation. -->
-    <string-array name="animations_summaries">
-        <item>No window animations are shown</item>
-        <item>Some window animations are shown</item>
-        <item>All window animations are shown</item>
-    </string-array>
-
-    <!-- Do not translate. -->
-    <string-array name="animations_values">
-        <!-- Do not translate. -->
-        <item>00</item>
-        <!-- Do not translate. -->
-        <item>01</item>
-        <!-- Do not translate. -->
-        <item>11</item>
-    </string-array>
-
     <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
     <string-array name="screen_timeout_entries">
         <item>15 seconds</item>
@@ -101,6 +77,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 +145,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 -->
@@ -560,5 +588,107 @@
         <item>Use HDCP checking for DRM content only</item>
         <item>Always use HDCP checking</item>
     </string-array>
-</resources>
 
+    <!-- Titles for window animation scale preference. [CHAR LIMIT=35] -->
+    <string-array name="window_animation_scale_entries">
+        <item>Animation off</item>
+        <item>Animation scale .5x</item>
+        <item>Animation scale 1x</item>
+        <item>Animation scale 1.5x</item>
+        <item>Animation scale 2x</item>
+        <item>Animation scale 5x</item>
+        <item>Animation scale 10x</item>
+    </string-array>
+
+    <!-- Values for window animation scale preference. -->
+    <string-array name="window_animation_scale_values" translatable="false" >
+        <item>0</item>
+        <item>.5</item>
+        <item>1</item>
+        <item>1.5</item>
+        <item>2</item>
+        <item>5</item>
+        <item>10</item>
+    </string-array>
+
+    <!-- Titles for transition animation scale preference. [CHAR LIMIT=35] -->
+    <string-array name="transition_animation_scale_entries">
+        <item>Animation off</item>
+        <item>Animation scale .5x</item>
+        <item>Animation scale 1x</item>
+        <item>Animation scale 1.5x</item>
+        <item>Animation scale 2x</item>
+        <item>Animation scale 5x</item>
+        <item>Animation scale 10x</item>
+    </string-array>
+
+    <!-- Values for transition animation scale preference. -->
+    <string-array name="transition_animation_scale_values" translatable="false" >
+        <item>0</item>
+        <item>.5</item>
+        <item>1</item>
+        <item>1.5</item>
+        <item>2</item>
+        <item>5</item>
+        <item>10</item>
+    </string-array>
+
+    <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
+    <string-array name="app_process_limit_entries">
+        <item>Standard limit</item>
+        <item>No background processes</item>
+        <item>At most 1 process</item>
+        <item>At most 2 processes</item>
+        <item>At most 3 processes</item>
+        <item>At most 4 processes</item>
+    </string-array>
+
+    <!-- Values for app process limit preference. -->
+    <string-array name="app_process_limit_values" translatable="false" >
+        <item>-1</item>
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+    </string-array>
+
+    <!-- Match this with the constants in VpnProfile. --> <skip />
+    <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
+    <string-array name="vpn_types" translatable="false">
+        <item>PPTP</item>
+        <item>L2TP/IPSec PSK</item>
+        <item>L2TP/IPSec RSA</item>
+        <item>IPSec Xauth PSK</item>
+        <item>IPSec Xauth RSA</item>
+        <item>IPSec Hybrid RSA</item>
+    </string-array>
+
+    <!-- Match this with the constants in VpnProfile. --> <skip />
+    <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
+    <string-array name="vpn_types_long">
+        <item>PPTP VPN</item>
+        <item>L2TP/IPSec VPN with pre-shared keys</item>
+        <item>L2TP/IPSec VPN with certificates</item>
+        <item>IPSec VPN with pre-shared keys and Xauth authentication</item>
+        <item>IPSec VPN with certificates and Xauth authentication</item>
+        <item>IPSec VPN with certificates and hybrid authentication</item>
+    </string-array>
+
+    <!-- Match this with the constants in LegacyVpnInfo. --> <skip />
+    <!-- Status for a VPN network. [CHAR LIMIT=100] -->
+    <string-array name="vpn_states">
+        <!-- Status message when VPN is disconnected. -->
+        <item>Disconnected</item>
+        <!-- Status message when VPN is initializing. -->
+        <item>Initializing\u2026</item>
+        <!-- Status message when VPN is connecting. -->
+        <item>Connecting\u2026</item>
+        <!-- Status message when VPN is connected. -->
+        <item>Connected</item>
+        <!-- Status message when VPN is timeout. -->
+        <item>Timeout</item>
+        <!-- Status message when VPN is failed. -->
+        <item>Failed</item>
+    </string-array>
+</resources>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 7cff69c..a0a6c77 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -49,4 +49,28 @@
         <!-- 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="labelSize" format="dimension" />
+        <attr name="labelTemplate" format="reference" />
+        <attr name="labelColor" format="color" />
+    </declare-styleable>
+
+    <declare-styleable name="ChartGridView">
+        <attr name="primaryDrawable" format="reference" />
+        <attr name="secondaryDrawable" format="reference" />
+        <attr name="borderDrawable" format="reference" />
+        <attr name="labelColor" />
+    </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/colors.xml b/res/values/colors.xml
index 631fb19..09f2ca2 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -29,5 +29,8 @@
     <color name="crypt_keeper_clock_background">#ff9a9a9a</color>
     <color name="crypt_keeper_clock_foreground">#ff666666</color>
     <color name="crypt_keeper_clock_am_pm">#ff9a9a9a</color>
+
+    <color name="divider_color">#20ffffff</color>
+    <color name="title_color">#ff99cc00</color>
 </resources>
          
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 418121b..5394743 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -15,9 +15,17 @@
 -->
 
 <resources>
-    <dimen name="vpn_connect_margin_right">10sp</dimen>
-    <dimen name="vpn_connect_normal_text_size">16sp</dimen>
-    <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>
+
+    <dimen name="app_icon_size">56dip</dimen>
+    <dimen name="screen_margin_sides">64dip</dimen>
+    <dimen name="screen_margin_top">72dip</dimen>
+    <dimen name="screen_margin_bottom">48dip</dimen>
+    <dimen name="title_height">48dip</dimen>
+    <dimen name="content_margin_left">16dip</dimen>
+    <dimen name="description_margin_top">26dip</dimen>
+    <dimen name="description_margin_sides">40dip</dimen>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c5b1e7f..2912291 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>
@@ -227,7 +237,11 @@
     <!--Bluetooth settings screen, summary text under individual Bluetooth devices that are hands free or a headset -->
     <string name="bluetooth_device">handsfree/headset</string>
     <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
-    <string name="progress_scanning">Scanning</string>
+    <string name="progress_scanning">Searching</string>
+    <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices is finished, indicating that user can tap on a device to pair with it [CHAR LIMIT=20]-->
+    <string name="progress_tap_to_pair">Tap to pair</string>
+    <!--Bluetooth settings screen, text that appears when scanning for devices is finished and no nearby bluetooth device was found [CHAR LIMIT=40]-->
+    <string name="bluetooth_no_devices_found">No Bluetooth devices were found nearby.</string>
     <!-- Notification ticker text (shown in the status bar) when a Bluetooth device wants to pair with us -->
     <string name="bluetooth_notif_ticker">Bluetooth pairing request</string>
     <!-- Notification title when a Bluetooth device wants to pair with us -->
@@ -267,7 +281,7 @@
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default">"An application on your phone is requesting permission to turn on Bluetooth and to make your phone discoverable by other devices. Do you want to do this?"</string>
 
     <!-- Strings for msg to display to user while bluetooth is turning on -->
-    <string name="bluetooth_turning_on">"Turning on Bluetooth\u2026"</string>
+    <string name="bluetooth_turning_on">"Turning Bluetooth on\u2026"</string>
 
     <!-- Strings for device profile auto connect setting -->
     <string name="bluetooth_auto_connect">Auto connect</string>
@@ -281,6 +295,15 @@
     <!-- Bluetooth connection permission Alert Activity text [CHAR LIMIT=none]-->
     <string name="bluetooth_connection_dialog_text">"Do you want to connect to \u0022<xliff:g id="device_name">%1$s</xliff:g>\u0022?"</string>
 
+    <!-- Activity label of BluetoothPbPermissionActivity, also used as Strings in the permission dialog [CHAR LIMIT=none] -->
+    <string name="bluetooth_phonebook_request">"Phone book request"</string>
+
+    <!-- Bluetooth phone book permission Alert Activity text [CHAR LIMIT=none] -->
+    <string name="bluetooth_pb_acceptance_dialog_text">%1$s would like to access your contacts and call history. Give access to %2$s?</string>
+
+    <!-- Bluetooth phone book permission Alert Activity checkbox text [CHAR LIMIT=none] -->
+    <string name="bluetooth_pb_alwaysallowed">Always allowed?</string>
+
     <!-- Date & time settings screen title -->
     <string name="date_and_time">Date &amp; time settings</string>
     <!-- Date/time settings.  Summary of the checkbox for choosing between 12 hour time or 24 hour time.  Sample of 12-hour time -->
@@ -514,8 +537,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 +621,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 +776,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 +907,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>
 
@@ -926,14 +949,16 @@
 
     <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
     <string name="bluetooth_preference_scan_title">Scan for devices</string>
-    <!-- Bluetooth settings: The title of the preference (list item) that finds nearby devices [CHAR LIMIT=30] -->
-    <string name="bluetooth_preference_find_nearby_title">Find nearby devices</string>
+    <!-- Bluetooth settings: The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
+    <string name="bluetooth_search_for_devices">Search for devices</string>
+    <!-- Bluetooth settings: The title of the action button while a search for nearby devices is in progress [CHAR LIMIT=20] -->
+    <string name="bluetooth_searching_for_devices">Searching\u2026</string>
     <!-- Bluetooth settings: The sub heading for device settings. [CHAR LIMIT=30] -->
     <string name="bluetooth_preference_device_settings">Device settings</string>
-    <!-- Bluetooth settings: The sub heading for paired devices. [CHAR LIMIT=30] -->
+    <!-- Bluetooth settings: The sub heading for devices which have already been paired with this device. [CHAR LIMIT=40] -->
     <string name="bluetooth_preference_paired_devices">Paired devices</string>
-    <!-- Bluetooth settings: The sub heading for found devices when scanning. [CHAR LIMIT=30] -->
-    <string name="bluetooth_preference_found_devices">Found devices</string>
+    <!-- Bluetooth settings: The sub heading for available devices during and after scanning. [CHAR LIMIT=40] -->
+    <string name="bluetooth_preference_found_devices">Available devices</string>
     <!-- Bluetooth settings.  Context menu item for a device.  Action will connect to all profiles on the device. -->
     <string name="bluetooth_device_context_connect">Connect</string>
     <!-- Bluetooth settings.  Context menu item for a device.  Action will disconnect from all profiles on the device. -->
@@ -946,6 +971,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">To see devices, turn Bluetooth on.</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 +1075,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 Wi-Fi on\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 -->
@@ -1061,6 +1097,10 @@
     <string name="wifi_notify_open_networks">Network notification</string>
     <!-- Checkbox summary for option to notify user when open networks are nearby -->
     <string name="wifi_notify_open_networks_summary">Notify me when an open network is available</string>
+    <!-- Checkbox title for option to toggle wifi watchdog service -->
+    <string name="wifi_enable_watchdog_service">Wi-Fi Connectivity Checks</string>
+    <!-- Checkbox summary for option to toggle wifi watchdog service -->
+    <string name="wifi_enable_watchdog_service_summary">Detect and manage potential network connectivity problems</string>
     <!-- Setting title for setting the wifi sleep policy -->
     <string name="wifi_setting_sleep_policy_title">Wi-Fi disconnect policy</string>
     <!-- Setting summary for setting the wifi sleep policy -->
@@ -1069,8 +1109,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 +1123,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">To see available networks, turn Wi-Fi on.</string>
 
     <!-- Dialog for Access Points --> <skip />
     <!-- Label for network setup [CHAR LIMIT=50] -->
@@ -1162,7 +1204,7 @@
 
     <!-- Wi-Fi Advanced Settings --> <skip />
     <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. -->
-    <string name="wifi_advanced_titlebar">Advanced</string>
+    <string name="wifi_advanced_titlebar">Advanced Wi-Fi</string>
     <!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
     <string name="wifi_setting_frequency_band_title">Wi-Fi frequency band</string>
     <!-- Wi-Fi settings screen, setting summary for setting the wifi frequency band [CHAR LIMIT=50]-->
@@ -1175,8 +1217,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>
@@ -1306,7 +1349,7 @@
     <!-- Main Settings screen setting option name to go into the sound settings screen -->
     <string name="sound_settings_title">Sound</string>
     <!-- Main Settings screen setting option name to go into the display settings screen -->
-    <string name="display_settings_title">Screen</string>
+    <string name="display_settings_title">Display</string>
     <!-- Sound settings screen heading -->
     <string name="sound_settings">Sound settings</string>
     <!-- Sound settings screen, setting option name checkbox -->
@@ -1433,12 +1476,6 @@
     <!-- Display settings -->
     <!-- Sound & display settings screen, section header for settings related to display -->
     <string name="display_settings">Screen settings</string>
-    <!-- Sound & display settings screen, animations check box label -->
-    <string name="animations_title">Animation</string>
-    <!-- Sound & display settings screen, animations option summary text when check box is selected -->
-    <string name="animations_summary_on">Show animation when opening &amp; closing windows</string>
-    <!-- Sound & display settings screen, animations option summary text when check box is clear -->
-    <string name="animations_summary_off">Show animation when opening &amp; closing windows</string>
     <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
     <string name="accelerometer_title">Auto-rotate screen</string>
     <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
@@ -1457,8 +1494,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>
@@ -1520,8 +1579,6 @@
     <string name="firmware_version">Android version</string>
     <!-- About phone screen, status item label-->
     <string name="model_number">Model number</string>
-    <!-- About phone screen, fcc equipment id label [CHAR LIMIT=30]-->
-    <string name="fcc_equipment_id">FCC Equipment ID</string>
     <!-- About phone screen,  setting option name-->
     <string name="baseband_version">Baseband version</string>
     <!-- About phone screen,  setting option name-->
@@ -1672,6 +1729,17 @@
     <!-- SD card eject progress text   -->
     <string name="sd_ejecting_summary">Unmount in progress</string>
 
+    <!-- Storage setting.  Menu option for USB transfer settings [CHAR LIMIT=30]-->
+    <string name="storage_menu_usb">USB transfer settings</string>
+    <!-- Storage setting.  Title for USB transfer settings [CHAR LIMIT=30]-->
+    <string name="storage_title_usb">USB transfer settings</string>
+    <!-- Storage setting.  Label for MTP setting [CHAR LIMIT=30]-->
+    <string name="usb_label_mtp">Connect as a media device (MTP)</string>
+    <!-- Storage setting.  Label for PTP setting [CHAR LIMIT=30]-->
+    <string name="usb_label_ptp">Connect as a camera (PTP)</string>
+    <!-- Storage setting.  Label for installer CD [CHAR LIMIT=30]-->
+    <string name="usb_label_installer_cd">Install file transfer tools</string>
+
     <!-- Phone info screen, section titles: -->
     <string name="battery_status_title">Battery status</string>
     <!-- Phone info screen, section titles: -->
@@ -1907,6 +1975,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 -->
@@ -2082,12 +2154,8 @@
         \n\nReady to start? Touch \u201CNext\u201D.
     </string>
     <!-- ChooseLockPatternTutorial, tutorial screen text -->
-    <string name="lock_intro_message" product="default"><font size="17">Protect your phone from unauthorized use by creating a personal screen unlock pattern.
-        \n<font height="17">\n</font><b>1</b>\u00A0 On the next screen, watch while an example pattern is drawn.
-        \n<font height="17">\n</font><b>2</b>\u00A0 When ready, draw your own personal unlock pattern. Experiment with different patterns but connect at least four dots.
-        \n<font height="17">\n</font><b>3</b>\u00A0 Redraw your pattern to confirm.
-        \n<font height="17">\n</font><b>Ready to start? Touch \u201CNext\u201D</b>.
-        \n<font height="3">\n</font>To leave your phone unprotected, touch \u201CCancel\u201D.</font>
+    <string name="lock_intro_message" product="default">Protect your phone from unauthorized use by creating a personal screen unlock pattern. Use your finger to connect at least four dots in any order on the next screen.
+        \n\nReady to start? Touch \u201CNext\u201D.
     </string>
 
     <!-- Applications Settings --> <skip />
@@ -2115,6 +2183,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. -->
@@ -2139,12 +2211,14 @@
     <string name="total_size_label">Total</string>
     <!-- Manage applications, individual application info screen, label under Storage heading. The amount of space taken up by the application itself (for example, the java compield files and things like that) -->
     <string name="application_size_label">Application</string>
+    <!--  Manage applications, individual application info screen, label under Storage heading.  The amount of space taken up by the app's code on USB storage [CHARSIZE=40] -->
+    <string name="external_code_size_label">USB storage app</string>
     <!-- Manage applications, individual application info screen, label under Storage heading.  The amount of sapce taken up by the app's data (for example, downloaded emails or something like that) -->
     <string name="data_size_label">Data</string>
     <!--  Manage applications, individual application info screen, label under Storage heading.  The amount of space taken up by the app's data on USB storage [CHARSIZE=40] -->
-    <string name="external_size_label" product="nosdcard">USB storage</string>
+    <string name="external_data_size_label" product="nosdcard">USB storage data</string>
     <!--  Manage applications, individual application info screen, label under Storage heading.  The amount of space taken up by the app's data on the SD card [CHARSIZE=40] -->
-    <string name="external_size_label" product="default">SD card</string>
+    <string name="external_data_size_label" product="default">SD card</string>
     <!-- Manage applications, individual application info screen, button label under Storage heading. Button to remove the application from the system. -->
     <string name="uninstall_text">Uninstall</string>
     <!-- [CHAR LIMIT=25] Manage applications, individual application info screen, button label under Storage heading. Button to disable an existing application. -->
@@ -2407,8 +2481,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. -->
@@ -2425,6 +2501,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>
@@ -2494,7 +2572,7 @@
     <string name="builtin_keyboard_settings_summary">Physical keyboard settings</string>
 
     <!-- Development Settings.  the title for the item to take the user to Development settings.  Development settings are settings meant for application developers.  -->
-    <string name="development_settings_title">Development</string>
+    <string name="development_settings_title">Developer options</string>
     <!-- Development Settings summary.  The summary of the item to take the user to Development settings.  Development settings are settings meant for application developers. -->
     <string name="development_settings_summary">Set options for application development</string>
     <!-- Setting checkbox title for Whether to enable USB debugging support on the phone. -->
@@ -2557,12 +2635,23 @@
     <string name="accessibility_settings">Accessibility</string>
     <!-- Settings title for accessibility settings screen -->
     <string name="accessibility_settings_title">Accessibility settings</string>
-    <!-- Settings summary for accessibility settings -->
+    <!-- Settings summary for accessibility settings [CHAR LIMIT=40] -->
     <string name="accessibility_settings_summary">Manage accessibility options</string>
-    <!-- Setting Checkbox title for enabling accessibility -->
-    <string name="toggle_accessibility_title">Accessibility</string>
-    <!-- Setting accessibility services category -->
+    <!-- Setting Checkbox title for enabling accessibility large text [CHAR LIMIT=25] -->
+    <string name="toggle_large_text_title">Large text</string>
+    <!-- Setting accessibility services category [CHAR LIMIT=25] -->
     <string name="accessibility_services_category">Accessibility services</string>
+    <!-- Setting Checkbox title for enabling accessibility services [CHAR LIMIT=40] -->
+    <string name="toggle_accessibility_title">Allow accessibility services</string>
+    <!-- Setting Checkbox title for enabling touch exploration mode [CHAR LIMIT=40] -->
+    <string name="accessibility_touch_exploration_title">Enable touch exploration mode</string>
+    <!-- Setting Checkbox summary for enabling touch exploration mode [CHAR LIMIT=65] -->
+    <string name="accessibility_touch_exploration_summary">Allows you to touch the screen to hear the contents under your finger.</string>
+    <!-- Warning message describing changes in interaction from enabling touch exploration mode
+         and suggesting that the user goes through a tutorial, displayed as a dialog message the
+         first time the user selects to enable touch exploration -->
+    <string name="accessibility_touch_exploration_warning">Touch exploration mode changes the way your
+        device handles touch input. Would you like to take a short tutorial on using touch exploration?</string>
     <!-- Message for announcing the lack of installed accessibility services. -->
     <string name="no_accessibility_services_summary">No installed accessibility services.</string>
     <!-- Warning message about security implications of enabling an accessibility service,
@@ -2584,8 +2673,6 @@
         applications installed.\n\nYou can download a screen reader for your device from Android
         Market.\n\nClick "OK" to install the screen reader.</string>
 
-    <!-- Accessibility settings: Webpage accessibility scripts category [CHAR LIMIT=25] -->
-    <string name="accessibility_script_injection_category">Accessibility scripts</string>
     <!-- Accessibility settings: Checkbox title for enabling download of accessibility scripts [CHAR LIMIT=40] -->
     <string name="accessibility_script_injection_enabled">Download accessibility scripts</string>
     <!-- Accessibility settings: Checkbox summary for enabling download of accessibility scripts [CHAR LIMIT=65] -->
@@ -2607,6 +2694,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] -->
@@ -2620,7 +2710,7 @@
     <skip />
 
     <!-- Activity title for App Fuel Gauge summary -->
-    <string name="power_usage_summary_title">Battery use</string>
+    <string name="power_usage_summary_title">Battery</string>
     <!-- Activity title summary for App Fuel Gauge summary -->
     <string name="power_usage_summary">What has been using the battery</string>
     <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->
@@ -2858,6 +2948,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 -->
@@ -2880,150 +2978,13 @@
     <string name="gadget_toggle_wifi">Updating Wi-Fi setting</string>
     <string name="gadget_toggle_bluetooth">Updating Bluetooth setting</string>
 
-    <string name="vpn_settings_activity_title">VPN settings</string>
-
-    <!-- Title of VPN connect dialog -->
-    <string name="vpn_connect_to">Connect to <xliff:g id="name" example="Work Network">%s</xliff:g></string>
-    <!-- In VPN connect dialog, for inputing username and password -->
-    <string name="vpn_username_colon">Username:</string>
-    <string name="vpn_password_colon">Password:</string>
-    <string name="vpn_a_username">a username</string>
-    <string name="vpn_a_password">a password</string>
-
-    <!-- In VPN connect dialog where user may check to remember the username entered -->
-    <string name="vpn_save_username">Remember username</string>
-
-    <string name="vpn_connect_button">Connect</string>
-    <string name="vpn_yes_button">Yes</string>
-    <string name="vpn_no_button">No</string>
-    <string name="vpn_back_button">Back</string>
-    <string name="vpn_mistake_button">No</string>
-
-    <string name="vpn_menu_done">Save</string>
-    <string name="vpn_menu_cancel">Cancel</string>
-    <string name="vpn_menu_revert">Revert</string>
-    <string name="vpn_menu_connect">Connect to network</string>
-    <string name="vpn_menu_disconnect">Disconnect from network</string>
-    <string name="vpn_menu_edit">Edit network</string>
-    <string name="vpn_menu_delete">Delete network</string>
-
-    <!-- VPN error dialog messages -->
-    <string name="vpn_error_miss_entering">You must enter <xliff:g id="code">%s</xliff:g>.</string>
-    <string name="vpn_error_miss_selecting">You must select <xliff:g id="option">%s</xliff:g>.</string>
-    <string name="vpn_error_duplicate_name">The VPN name \'<xliff:g id="name" example="Home Network">%s</xliff:g>\' already exists. Find another name.</string>
-    <string name="vpn_confirm_profile_deletion">Are you sure you want to delete this VPN?</string>
-    <string name="vpn_confirm_add_profile_cancellation">Are you sure you don\'t want to create this profile?</string>
-    <string name="vpn_confirm_edit_profile_cancellation">Are you sure you want to discard the changes made to this profile?</string>
-    <string name="vpn_confirm_reconnect">Unable to connect to the network. Do you want to try again?</string>
-    <string name="vpn_reconnect_from_lost">Connection lost. Do you want to connect again?</string>
-    <string name="vpn_unknown_server_dialog_msg">Server name cannot be resolved. Do you want to check your server name setting?</string>
-    <string name="vpn_challenge_error_dialog_msg">Challenge error. Do you want to check your secret setting?</string>
-    <string name="vpn_secret_not_set_dialog_msg">One or more secrets are missing in this VPN configuration. Do you want to check your secret setting?</string>
-    <string name="vpn_auth_error_dialog_msg">The username or password you entered is incorrect. Do you want to try again?</string>
-    <string name="vpn_remote_hung_up_error_dialog_msg">Server hung up. The username or password you entered could be incorrect. Do you want to try again?</string>
-    <string name="vpn_remote_ppp_hung_up_error_dialog_msg">Server hung up. It is possible that you are behind a firewall that prevents you from connecting to the server. Do you want to try again?</string>
-    <string name="vpn_ppp_negotiation_failed_dialog_msg">Server negotiation failed. The server may not agree with your encryption option. Do you want to check your encryption setting?</string>
-
-    <!-- VPN type selection activity title -->
-    <string name="vpn_type_title">Add VPN</string>
-    <!-- "Add VPN" preference title -->
-    <string name="vpn_add_new_vpn">Add VPN</string>
-    <!-- VPN details screen title -->
-    <string name="vpn_details_title">VPN details</string>
-    <!-- VPN profile editor title when adding a new profile -->
-    <string name="vpn_edit_title_add">Add <xliff:g id="name">%s</xliff:g> VPN</string>
-    <!-- VPN profile editor title when editing an existing profile -->
-    <string name="vpn_edit_title_edit"><xliff:g id="name">%s</xliff:g> details</string>
-    <!-- Preference group title for a list of VPN profiles -->
-    <string name="vpns">VPNs</string>
-    <!-- Preference summary text when VPN is connecting -->
-    <string name="vpn_connecting">Connecting...</string>
-    <!-- Preference summary text when VPN is disconnecting -->
-    <string name="vpn_disconnecting">Disconnecting...</string>
-    <!-- Preference summary text when VPN is connected -->
-    <string name="vpn_connected">Connected</string>
-    <!-- Preference summary text when VPN is not connected -->
-    <string name="vpn_connect_hint">Connect to network</string>
-
-    <!-- Name of a VPN profile -->
-    <string name="vpn_name">VPN name</string>
-    <string name="vpn_a_name">a VPN name</string>
-
-    <!-- Toast message shown when a profile is added -->
-    <string name="vpn_profile_added">\'<xliff:g id="name">%s</xliff:g>\' is added</string>
-    <!-- Toast message shown when changes of a profile is saved -->
-    <string name="vpn_profile_replaced">Changes are made to \'<xliff:g id="name">%s</xliff:g>\'</string>
-
-    <!-- Preference title -->
-    <string name="vpn_user_certificate_title">Set user certificate</string>
-    <!-- Complete term -->
-    <string name="vpn_user_certificate">User certificate</string>
-    <string name="vpn_a_user_certificate">a user certificate</string>
-
-    <!-- Preference title -->
-    <string name="vpn_ca_certificate_title">Set CA certificate</string>
-    <!-- Complete term -->
-    <string name="vpn_ca_certificate">Certificate authority (CA) certificate</string>
-    <string name="vpn_a_ca_certificate">a CA certificate</string>
-    <!-- Preference title -->
-    <string name="vpn_l2tp_secret_string_title">Set L2TP secret</string>
-    <!-- Complete term -->
-    <string name="vpn_l2tp_secret">L2TP secret</string>
-    <string name="vpn_a_l2tp_secret">an L2TP secret</string>
-    <string name="vpn_pptp_encryption_title">encryption</string>
-    <string name="vpn_pptp_encryption">PPTP encryption</string>
-
-    <!-- Preference title -->
-    <string name="vpn_ipsec_presharedkey_title">Set IPSec pre-shared key</string>
-    <!-- Complete term -->
-    <string name="vpn_ipsec_presharedkey">IPSec pre-shared key</string>
-    <string name="vpn_a_ipsec_presharedkey">an IPSec pre-shared key</string>
-
-    <!-- Preference title -->
-    <string name="vpn_vpn_server_title">Set VPN server</string>
-    <!-- Complete term -->
-    <string name="vpn_vpn_server">VPN server</string>
-    <string name="vpn_a_vpn_server">a VPN server</string>
-    <!-- Dialog title for setting VPN server name -->
-    <string name="vpn_vpn_server_dialog_title">VPN server name</string>
-
-    <!-- Preference title -->
-    <string name="vpn_dns_search_list_title">DNS search domains</string>
-    <!-- Complete term -->
-    <string name="vpn_dns_search_list">DNS search domains</string>
-
-    <!-- Summary text to hint that the value is set -->
-    <string name="vpn_field_is_set"><xliff:g id="value">%s</xliff:g> is set</string>
-    <!-- Summary text to hint that the value is not set -->
-    <string name="vpn_field_not_set"><xliff:g id="value">%s</xliff:g> not set</string>
-    <!-- Summary text to hint that the value is not set but it's not required-->
-    <string name="vpn_field_not_set_optional"><xliff:g id="value">%s</xliff:g> not set (optional)</string>
-
-    <!-- CheckBoxPreference title to enable something -->
-    <string name="vpn_enable_field">Enable <xliff:g id="option">%s</xliff:g></string>
-    <!-- CheckBoxPreference title to disable something -->
-    <string name="vpn_disable_field">Disable <xliff:g id="option">%s</xliff:g></string>
-
-    <!-- CheckBoxPreference summary to hint that something is enabled -->
-    <string name="vpn_is_enabled"><xliff:g id="option">%s</xliff:g> is enabled</string>
-    <!-- CheckBoxPreference summary to hint that something is disabled -->
-    <string name="vpn_is_disabled"><xliff:g id="option">%s</xliff:g> is disabled</string>
-
     <!-- Title of preference to enter the VPN settings activity -->
     <string name="vpn_settings_title">VPN settings</string>
     <!-- Summary of preference to enter the VPN settings activity -->
     <string name="vpn_settings_summary">Set up &amp; manage Virtual Private Networks (VPNs)</string>
-    <!-- A secret edit field's grayed out value when it has not been modified -->
-    <string name="vpn_secret_unchanged">(unchanged)</string>
-    <!-- A secret edit field's grayed out value when it has not been set -->
-    <string name="vpn_secret_not_set">(not set)</string>
 
     <!-- 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] -->
@@ -3032,31 +2993,23 @@
     <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 preference to display trusted credentials (aka CA certificates) [CHAR LIMIT=30] -->
+    <string name="trusted_credentials">Trusted credentials</string>
+    <!-- Summary of preference to display trusted credentials (aka CA certificates) [CHAR LIMIT=NONE] -->
+    <string name="trusted_credentials_summary">Display trusted CA 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>
@@ -3066,19 +3019,23 @@
     <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>
     <!-- Sound settings screen, setting option summary text -->
     <string name="emergency_tone_summary">Set behavior when an emergency call is placed</string>
 
-    <!-- Privacy Settings screen --><skip />
-    <!-- Privacy settings menu title -->
-    <string name="privacy_settings">Privacy</string>
+    <!-- Backup and reset Settings screen --><skip />
+    <!-- Backup and reset settings menu title -->
+    <string name="privacy_settings">Backup &amp; reset</string>
     <!-- Privacy settings activity title -->
-    <string name="privacy_settings_title">Privacy settings</string>
+    <string name="privacy_settings_title">Backup &amp; reset</string>
     <!-- Backup section title -->
     <string name="backup_section_title">Backup and restore</string>
     <!-- Personal data section title -->
@@ -3350,4 +3307,253 @@
     <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>
+
+    <!-- Preference category for user interface debugging development settings. [CHAR LIMIT=25] -->
+    <string name="debug_ui_category">User interface</string>
+
+    <!-- UI debug setting: always enable strict mode? [CHAR LIMIT=25] -->
+    <string name="strict_mode">Strict mode enabled</string>
+    <!-- UI debug setting: show strict mode summary [CHAR LIMIT=50] -->
+    <string name="strict_mode_summary">Flash screen when apps do long operations
+            on main thread</string>
+
+    <!-- UI debug setting: show pointer location? [CHAR LIMIT=25] -->
+    <string name="pointer_location">Pointer location</string>
+    <!-- UI debug setting: show pointer location summary [CHAR LIMIT=50] -->
+    <string name="pointer_location_summary">Screen overlay showing current touch data</string>
+
+    <!-- UI debug setting: show where screen updates happen? [CHAR LIMIT=25] -->
+    <string name="show_screen_updates">Show screen updates</string>
+    <!-- UI debug setting: show screen updates summary [CHAR LIMIT=50] -->
+    <string name="show_screen_updates_summary">Flash areas of screen when they update</string>
+
+    <!-- UI debug setting: show how CPU is being used? [CHAR LIMIT=25] -->
+    <string name="show_cpu_usage">Show CPU usage</string>
+    <!-- UI debug setting: show cpu usage summary [CHAR LIMIT=50] -->
+    <string name="show_cpu_usage_summary">Screen overlay showing current CPU usage</string>
+
+    <!-- UI debug setting: scaling factor for window animations [CHAR LIMIT=25] -->
+    <string name="window_animation_scale_title">Window animation scale</string>
+
+    <!-- UI debug setting: scaling factor for transition animations [CHAR LIMIT=25] -->
+    <string name="transition_animation_scale_title">Transition animation scale</string>
+
+    <!-- Preference category for application debugging development settings. [CHAR LIMIT=25] -->
+    <string name="debug_applications_category">Applications</string>
+
+    <!-- UI debug setting: immediately destroy activities? [CHAR LIMIT=25] -->
+    <string name="immediately_destroy_activities">Don\'t keep activities</string>
+    <!-- UI debug setting: immediately destroy activities summary [CHAR LIMIT=50] -->
+    <string name="immediately_destroy_activities_summary">Destroy every activity as soon as
+            the user leaves it</string>
+
+    <!-- UI debug setting: limit number of running background processes [CHAR LIMIT=25] -->
+    <string name="app_process_limit_title">Background process limit</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 enable mobile data when roaming. [CHAR LIMIT=32] -->
+    <string name="data_usage_menu_roaming">Data roaming</string>
+    <!-- Title for checkbox menu option to restrict background data usage. [CHAR LIMIT=32] -->
+    <string name="data_usage_menu_restrict_background">Restrict background data</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>
+
+    <!-- Title of dialog shown before user restricts background data usage. [CHAR LIMIT=48] -->
+    <string name="data_usage_restrict_background_title">Restricting background data</string>
+    <!-- Body of dialog shown before user restricts background data usage. [CHAR LIMIT=NONE] -->
+    <string name="data_usage_restrict_background">This feature will disable auto-sync and may negatively impact applications which depend on background data usage.</string>
+
+    <!-- Label displaying current network data usage warning threshold. [CHAR LIMIT=18] -->
+    <string name="data_usage_sweep_warning"><font size="21"><xliff:g id="number" example="128">^1</xliff:g></font> <font size="9"><xliff:g id="unit" example="KB">^2</xliff:g></font>\n<font size="12">warning</font></string>
+    <!-- Label displaying current network data usage limit threshold. [CHAR LIMIT=18] -->
+    <string name="data_usage_sweep_limit"><font size="21"><xliff:g id="number" example="128">^1</xliff:g></font> <font size="9"><xliff:g id="unit" example="KB">^2</xliff:g></font>\n<font size="12">limit</font></string>
+
+    <!-- Title of data usage item that represents all uninstalled applications. [CHAR LIMIT=48] -->
+    <string name="data_usage_uninstalled_apps">Removed apps</string>
+
+    <!-- Button at the bottom of the CryptKeeper screen to make an emergency call. -->
+    <string name="cryptkeeper_emergency_call">Emergency call</string>
+    <!-- Button at the bottom of the CryptKeeper screen that lets the user return to a call -->
+    <string name="cryptkeeper_return_to_call">Return to call</string>
+
+    <!-- Input label for the name of a VPN network. [CHAR LIMIT=40] -->
+    <string name="vpn_name">Name</string>
+    <!-- Input label for the type of a VPN network. [CHAR LIMIT=40] -->
+    <string name="vpn_type">Type</string>
+    <!-- Input label for the server address of a VPN network. [CHAR LIMIT=40] -->
+    <string name="vpn_server">Server address</string>
+    <!-- Checkbox label to enable PPP encryption for a VPN network. [CHAR LIMIT=40] -->
+    <string name="vpn_mppe">PPP encryption (MPPE)</string>
+    <!-- Input label for the L2TP secret of a VPN network. [CHAR LIMIT=40] -->
+    <string name="vpn_l2tp_secret">L2TP secret</string>
+    <!-- Input label for the IPSec identifier of a VPN network. [CHAR LIMIT=40] -->
+    <string name="vpn_ipsec_identifier">IPSec identifier</string>
+    <!-- Input label for the IPSec pre-shared key of a VPN network. [CHAR LIMIT=40] -->
+    <string name="vpn_ipsec_secret">IPSec pre-shared key</string>
+    <!-- Selection label for the IPSec user certificate of a VPN network. [CHAR LIMIT=40] -->
+    <string name="vpn_ipsec_user_cert">IPSec user certificate</string>
+    <!-- Selection label for the IPSec CA certificate of a VPN network. [CHAR LIMIT=40] -->
+    <string name="vpn_ipsec_ca_cert">IPSec CA certificate</string>
+    <!-- Input label for the DNS search domains of a VPN network. [CHAR LIMIT=40] -->
+    <string name="vpn_search_domains">DNS search domains</string>
+    <!-- Input label for the forwarding routes of a VPN network. [CHAR LIMIT=40] -->
+    <string name="vpn_routes">Forwarding routes</string>
+    <!-- Input label for the username of a VPN network. [CHAR LIMIT=40] -->
+    <string name="vpn_username">Username</string>
+    <!-- Input label for the password of a VPN network. [CHAR LIMIT=40] -->
+    <string name="vpn_password">Password</string>
+    <!-- Checkbox label to save the username and the password for a VPN network. [CHAR LIMIT=40] -->
+    <string name="vpn_save_login">Save account information</string>
+
+    <!-- Hint for not filling an optional field in a VPN configuration. [CHAR LIMIT=40] -->
+    <string name="vpn_not_used">(not used)</string>
+    <!-- Option to not use a CA certificate to verify the VPN server. [CHAR LIMIT=40] -->
+    <string name="vpn_no_ca_cert">(do not verify server)</string>
+
+    <!-- Button label to cancel chaning a VPN network. [CHAR LIMIT=40] -->
+    <string name="vpn_cancel">Cancel</string>
+    <!-- Button label to save a VPN network. [CHAR LIMIT=40] -->
+    <string name="vpn_save">Save</string>
+    <!-- Button label to connect to a VPN network. [CHAR LIMIT=40] -->
+    <string name="vpn_connect">Connect</string>
+    <!-- Dialog title to edit a VPN network. [CHAR LIMIT=40] -->
+    <string name="vpn_edit">Edit VPN network</string>
+    <!-- Dialog title to connect to a VPN network. [CHAR LIMIT=40] -->
+    <string name="vpn_connect_to">Connect to <xliff:g id="network" example="School">%s</xliff:g></string>
+
+    <!-- Preference title for VPN settings. [CHAR LIMIT=40] -->
+    <string name="vpn_title">VPN settings</string>
+    <!-- Preference title to create a new VPN network. [CHAR LIMIT=40] -->
+    <string name="vpn_create">Add VPN network</string>
+    <!-- Menu item to edit a VPN network. [CHAR LIMIT=40] -->
+    <string name="vpn_menu_edit">Edit network</string>
+    <!-- Menu item to delete a VPN network. [CHAR LIMIT=40] -->
+    <string name="vpn_menu_delete">Delete network</string>
+
+    <!-- Tab label for built-in system CA certificates. -->
+    <string name="trusted_credentials_system_tab">System</string>
+    <!-- Tab label for user added CA certificates. -->
+    <string name="trusted_credentials_user_tab">User</string>
+    <!-- Button label for disabling a system CA certificate. -->
+    <string name="trusted_credentials_disable_label">Disable</string>
+    <!-- Button label for enabling a system CA certificate. -->
+    <string name="trusted_credentials_enable_label">Enable</string>
+    <!-- Button label for removing a user CA certificate. -->
+    <string name="trusted_credentials_remove_label">Remove</string>
+    <!-- Alert dialog confirmation when enabling a system CA certificate. -->
+    <string name="trusted_credentials_enable_confirmation">Enable the system CA certificate?</string>
+    <!-- Alert dialog confirmation when disabling a system CA certificate. -->
+    <string name="trusted_credentials_disable_confirmation">Disable the system CA certificate?</string>
+    <!-- Alert dialog confirmation when removing a user CA certificate. -->
+    <string name="trusted_credentials_remove_confirmation">Permanently remove the user CA certificate?</string>
+
+    <!-- Title for the touch exploration tutorial. [CHAR LIMIT=40] -->
+    <string name="accessibility_tutorial_title">Touch exploration tutorial</string>
+    <!-- Button label to go to the next touch exploration tutorial lesson. [CHAR LIMIT=10] -->
+    <string name="accessibility_tutorial_next">Next</string>
+    <!-- Button label to go back to the previous touch explorationtutorial lesson. [CHAR LIMIT=10] -->
+    <string name="accessibility_tutorial_back">Back</string>
+    <!-- Button label to exit the touch explorationtutorial. [CHAR LIMIT=10] -->
+    <string name="accessibility_tutorial_finish">Finish</string>
+    <!-- Button label to skip the touch exploration tutorial. [CHAR LIMIT=10] -->
+    <string name="accessibility_tutorial_skip">Skip</string>
+
+    <!-- Title for touch exploration tutorial lesson 1. -->
+    <string name="accessibility_tutorial_lesson_1_title">Exploring the screen</string>
+    <!-- Instruction for touch exploration tutorial lesson 1. -->
+    <string name="accessibility_tutorial_lesson_1_text_1">When touch exploration is enabled, you can touch the screen to hear spoken descriptions of the content under your finger. The screen currently contains a list of application icons. Find one of them by placing a finger on the screen and sliding it around.</string>
+    <!-- Instruction for touch exploration tutorial lesson 1, displayed after the user touches one icon. -->
+    <string name="accessibility_tutorial_lesson_1_text_2_more">Good, keep your finger on the screen and keep sliding around to find at least one more icon.</string>
+    <!-- Instruction for touch exploration tutorial lesson 1, displayed after the user touches a second icon. -->
+    <string name="accessibility_tutorial_lesson_1_text_3">When you\'ve found a widget that you want to click on, you can tap once to activate it. Slide your finger to find the icon for <xliff:g id="app_name" example="Browser">%s</xliff:g>.</string>
+    <!-- Instruction for touch exploration tutorial lesson 1, displayed if the user touched the target area and stays inside it. -->
+    <string name="accessibility_tutorial_lesson_1_text_4">Your finger is on top of the <xliff:g id="app_name" example="Browser">%s</xliff:g> icon. Tap once to activate the icon.</string>
+    <!-- Instruction for touch exploration tutorial lesson 1, displayed if the user touches inside the target area but moves outside. -->
+    <string name="accessibility_tutorial_lesson_1_text_4_exited">You\'ve entered and left the <xliff:g id="app_name" example="Browser">%s</xliff:g> icon. Slowly explore again to find the icon while keeping your finger on the screen.</string>
+    <!-- Instruction for touch exploration tutorial lesson 1, displayed after the user has tapped the target icon. -->
+    <string name="accessibility_tutorial_lesson_1_text_5">Good. To move to the next section, find and activate the button labeled \"<xliff:g id="next" example="Next">%s</xliff:g>\" that\'s located near the bottom-right of the screen.</string>
+
+    <!-- Title for touch exploration tutorial lesson 2. -->
+    <string name="accessibility_tutorial_lesson_2_title">Scrolling using two fingers</string>
+    <!-- Instruction for touch exploration tutorial lesson 2. -->
+    <string name="accessibility_tutorial_lesson_2_text_1">To perform single-finger gestures like scrolling, you can place two fingers on the screen. The screen currently contains a scrollable list of application names. First, try exploring a few of the list items using one finger.</string>
+    <!-- Instruction for touch exploration tutorial lesson 2, displayed after the user touches one list item. -->
+    <string name="accessibility_tutorial_lesson_2_text_2_more">Good, keep sliding your finger around to find at least one more list item.</string>
+    <!-- Instruction for touch exploration tutorial lesson 2, displayed after the user touches a second list item. -->
+    <string name="accessibility_tutorial_lesson_2_text_3">Now scroll through the list by placing two fingers on a list item and sliding your fingers up. If you reach the top of the screen, you can place your fingers back on the list and continue.</string>
+    <!-- Instruction for touch exploration tutorial lesson 2, displayed after the user scrolls a small amount. -->
+    <string name="accessibility_tutorial_lesson_2_text_3_more">Good, keep sliding your fingers up to scroll some more.</string>
+    <!-- Instruction for touch exploration tutorial lesson 2, displayed after the user has scrolled a large amount. -->
+    <string name="accessibility_tutorial_lesson_2_text_4">You have completed the touch exploration tutorial. To exit, find and click the button labeled \"<xliff:g id="finish" example="Finish">%s</xliff:g>.\"</string>
+
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 1a6380f..d214d48 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>
@@ -126,16 +126,63 @@
     </style>
 
     <style name="SecurityPreferenceButtonContainer" parent="@android:style/Holo.SegmentedButton">
-        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
+        <item name="android:weightSum">2</item>
         <item name="android:dividerPadding">8dip</item>
     </style>
 
     <style name="SecurityPreferenceButton" parent="@android:style/Widget.Holo.Button.Borderless">
-        <item name="android:layout_width">140dip</item>
+        <item name="android:layout_width">0dip</item>
+        <item name="android:layout_weight">1</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:ellipsize">marquee</item>
         <item name="android:singleLine">true</item>
     </style>
 
+    <style name="vpn_label">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textSize">16sp</item>
+    </style>
+
+    <style name="vpn_value">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textSize">18sp</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:paddingBottom">1mm</item>
+    </style>
+
+    <style name="InputMethodPreferenceStyle">
+        <item name="android:layout">@layout/preference_inputmethod</item>
+        <item name="android:widgetLayout">@layout/preference_inputmethod_widget</item>
+    </style>
+
+    <style name="AccessibilityTutorialDivider">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">2dip</item>
+        <item name="android:gravity">fill_horizontal</item>
+        <item name="android:background">@color/divider_color</item>
+    </style>
+
+    <style name="AccessibilityTutorialTitle" parent="@android:style/TextAppearance.Large">
+        <item name="android:textColor">@color/title_color</item>
+    </style>
+
+    <style name="AccessibilityTutorialBodyTextPrimary" parent="@android:style/TextAppearance.Small">
+    </style>
+
+    <style name="AccessibilityTutorialIcon">
+        <item name="android:layout_width">96dip</item>
+        <item name="android:layout_height">96dip</item>
+        <item name="android:layout_gravity">center</item>
+        <item name="android:gravity">center_horizontal</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:ellipsize">marquee</item>
+        <item name="android:textSize">12dip</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:shadowRadius">2.0</item>
+        <item name="android:shadowColor">#B0000000</item>
+    </style>
 </resources>
diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml
index 771b69e..90aef84 100644
--- a/res/xml/accessibility_settings.xml
+++ b/res/xml/accessibility_settings.xml
@@ -19,20 +19,23 @@
         android:title="@string/accessibility_settings_title">
 
     <CheckBoxPreference
-            android:key="toggle_accessibility_service_checkbox"
-            android:title="@string/toggle_accessibility_title"
+            android:key="toggle_large_text_checkbox"
+            android:title="@string/toggle_large_text_title"
             android:persistent="false"/>
 
     <PreferenceCategory android:key="accessibility_services_category"
-            android:title="@string/accessibility_services_category" />
-
-    <PreferenceCategory android:key="accessibility_script_injection_category"
-            android:title="@string/accessibility_script_injection_category">
+            android:title="@string/accessibility_services_category">
+        <CheckBoxPreference
+                android:key="toggle_accessibility_service_checkbox"
+                android:title="@string/toggle_accessibility_title"
+                android:persistent="false"
+                android:order="-10000"/>
         <CheckBoxPreference
                 android:key="toggle_accessibility_script_injection_checkbox"
                 android:title="@string/accessibility_script_injection_enabled"
                 android:summary="@string/accessibility_script_injection_enabled_summary"
-                android:persistent="false" />
+                android:persistent="false"
+                android:order="10000" />
     </PreferenceCategory>
 
     <PreferenceCategory android:key="power_button_category"
diff --git a/res/xml/application_settings.xml b/res/xml/application_settings.xml
index 4e77a93..3329662 100644
--- a/res/xml/application_settings.xml
+++ b/res/xml/application_settings.xml
@@ -14,6 +14,13 @@
      limitations under the License.
 -->
 
+<!--
+
+      This code is deprecated. This screen is no longer used in Settings.
+      The ApplicationSettings class is kept in case an external app references it directly.
+
+-->
+
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
         android:title="@string/applications_settings_header"
         android:summary="@string/applications_settings_summary"
@@ -40,18 +47,11 @@
                 android:value="com.android.settings.Settings$StorageUseActivity" />
     </PreferenceScreen>
 
-    <PreferenceScreen
-            android:key="power_usage"
-            android:fragment="com.android.settings.fuelgauge.PowerUsageSummary"
-            android:title="@string/power_usage_summary_title"
-            android:summary="@string/power_usage_summary">
-    </PreferenceScreen>
-
     <CheckBoxPreference
-            android:key="toggle_install_applications"
-            android:title="@string/install_applications"
-            android:summaryOff="@string/install_unknown_applications"
-            android:summaryOn="@string/install_unknown_applications"
+            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
@@ -73,12 +73,5 @@
     </PreferenceScreen>
     -->
 
-
-    <PreferenceScreen 
-            android:title="@string/development_settings_title" 
-            android:summary="@string/development_settings_summary"
-            android:fragment="com.android.settings.DevelopmentSettings">
-    </PreferenceScreen>
-
 </PreferenceScreen>
 
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/development_prefs.xml b/res/xml/development_prefs.xml
index 292206a..a73e7d1 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -38,4 +38,61 @@
         android:dialogTitle="@string/hdcp_checking_dialog_title"
         android:entries="@array/hdcp_checking_titles"
         android:entryValues="@array/hdcp_checking_values" />
+
+    <PreferenceCategory android:key="debug_ui_category"
+            android:title="@string/debug_ui_category">
+
+        <CheckBoxPreference
+            android:key="strict_mode"
+            android:title="@string/strict_mode"
+            android:summary="@string/strict_mode_summary"/>
+
+        <CheckBoxPreference
+            android:key="pointer_location"
+            android:title="@string/pointer_location"
+            android:summary="@string/pointer_location_summary"/>
+
+        <CheckBoxPreference
+            android:key="show_screen_updates"
+            android:title="@string/show_screen_updates"
+            android:summary="@string/show_screen_updates_summary"/>
+
+        <CheckBoxPreference
+            android:key="show_cpu_usage"
+            android:title="@string/show_cpu_usage"
+            android:summary="@string/show_cpu_usage_summary"/>
+
+        <ListPreference
+            android:key="window_animation_scale"
+            android:title="@string/window_animation_scale_title"
+            android:persistent="false"
+            android:entries="@array/window_animation_scale_entries"
+            android:entryValues="@array/window_animation_scale_values" />
+
+        <ListPreference
+            android:key="transition_animation_scale"
+            android:title="@string/transition_animation_scale_title"
+            android:persistent="false"
+            android:entries="@array/transition_animation_scale_entries"
+            android:entryValues="@array/transition_animation_scale_values" />
+
+    </PreferenceCategory>
+
+    <PreferenceCategory android:key="debug_applications_category"
+            android:title="@string/debug_applications_category">
+
+        <CheckBoxPreference
+            android:key="immediately_destroy_activities"
+            android:title="@string/immediately_destroy_activities"
+            android:summary="@string/immediately_destroy_activities_summary"/>
+
+        <ListPreference
+            android:key="app_process_limit"
+            android:title="@string/app_process_limit_title"
+            android:persistent="false"
+            android:entries="@array/app_process_limit_entries"
+            android:entryValues="@array/app_process_limit_values" />
+
+    </PreferenceCategory>
+
 </PreferenceScreen>
diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml
index ea79fe0..4dfc718 100644
--- a/res/xml/device_info_settings.xml
+++ b/res/xml/device_info_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.
@@ -19,32 +19,25 @@
 
         <!-- System update settings - launches activity -->
         <PreferenceScreen android:key="system_update_settings"
-                android:title="@string/system_update_settings_list_item_title"
+                android:title="@string/system_update_settings_list_item_title" 
                 android:summary="@string/system_update_settings_list_item_summary">
             <intent android:action="android.settings.SYSTEM_UPDATE_SETTINGS" />
         </PreferenceScreen>
 
         <!-- Device status - launches activity -->
         <PreferenceScreen android:key="status_info"
-                android:title="@string/device_status"
+                android:title="@string/device_status" 
                 android:summary="@string/device_status_summary">
             <intent android:action="android.intent.action.MAIN"
                     android:targetPackage="com.android.settings"
                     android:targetClass="com.android.settings.deviceinfo.Status" />
         </PreferenceScreen>
 
-        <PreferenceScreen
-                android:key="power_usage"
-                android:fragment="com.android.settings.fuelgauge.PowerUsageSummary"
-                android:title="@string/power_usage_summary_title"
-                android:summary="@string/power_usage_summary">
-        </PreferenceScreen>
-
         <!-- Legal Information -->
         <PreferenceScreen
                 android:key="container"
                 android:title="@string/legal_information">
-
+                    
             <!-- Note: The titles given here probably won't be used.  Instead, we programmatically
                        fill the title with the label of the activity with the corresponding action.
                        If there is not an activity for an action, the item will be removed from the
@@ -72,7 +65,7 @@
             </PreferenceScreen>
 
         </PreferenceScreen>
-
+        
         <PreferenceScreen
                 android:key="safetylegal"
                 android:title="@string/settings_safetylegal_title">
@@ -80,7 +73,7 @@
         </PreferenceScreen>
 
         <!-- Contributors -->
-        <!--
+        <!-- 
         <PreferenceScreen
                 android:key="contributors"
                 android:title="@string/contributors_title">
@@ -89,43 +82,37 @@
         -->
         <!-- System Tutorial - launches activity -->
         <PreferenceScreen android:key="system_tutorial"
-                android:title="@string/system_tutorial_list_item_title"
+                android:title="@string/system_tutorial_list_item_title" 
                 android:summary="@string/system_tutorial_list_item_summary">
             <intent android:action="android.intent.action.SYSTEM_TUTORIAL" />
         </PreferenceScreen>
-
+        
         <!-- Device hardware model -->
-        <Preference android:key="device_model"
+        <Preference android:key="device_model" 
                 style="?android:preferenceInformationStyle"
                 android:title="@string/model_number"
                 android:summary="@string/device_info_default"/>
-
+                
         <!-- Device firmware version -->
-        <Preference android:key="firmware_version"
+        <Preference android:key="firmware_version" 
                 style="?android:preferenceInformationStyle"
                 android:title="@string/firmware_version"
                 android:summary="@string/device_info_default"/>
-
-        <!-- Device FCC equipment id -->
-        <Preference android:key="fcc_equipment_id"
-                style="?android:preferenceInformationStyle"
-                android:title="@string/fcc_equipment_id"
-                android:summary="@string/device_info_default"/>
-
+                
         <!-- Device Baseband version -->
-        <Preference android:key="baseband_version"
+        <Preference android:key="baseband_version" 
                 style="?android:preferenceInformationStyle"
                 android:title="@string/baseband_version"
                 android:summary="@string/device_info_default"/>
-
+        
         <!-- Device Kernel version -->
-        <Preference android:key="kernel_version"
+        <Preference android:key="kernel_version" 
                 style="?android:preferenceInformationStyle"
                 android:title="@string/kernel_version"
                 android:summary="@string/device_info_default"/>
 
         <!-- Detailed build version -->
-        <Preference android:key="build_number"
+        <Preference android:key="build_number" 
                 style="?android:preferenceInformationStyle"
                 android:title="@string/build_number"
                 android:summary="@string/device_info_default"/>
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index 7fe7f76..c13a107 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -23,22 +23,34 @@
                 android:title="@string/brightness"
                 android:dialogTitle="@string/brightness" />
 
+        <PreferenceScreen
+                android:key="wallpaper"
+                android:title="@string/wallpaper_settings_title"
+                android:fragment="com.android.settings.WallpaperTypeSettings" />
+
         <CheckBoxPreference
             android:key="accelerometer"
             android:title="@string/accelerometer_title"/>
 
         <ListPreference
-            android:key="animations"
-            android:title="@string/animations_title"
-            android:persistent="false"
-            android:entries="@array/animations_entries"
-            android:entryValues="@array/animations_values" />
-
-        <ListPreference
                 android:key="screen_timeout"
                 android:title="@string/screen_timeout"
                 android:summary="@string/screen_timeout_summary"
                 android:persistent="false"
                 android:entries="@array/screen_timeout_entries"
                 android:entryValues="@array/screen_timeout_values" />
+
+        <PreferenceScreen 
+                android:title="@string/dream_settings_title" 
+                android:summary="@string/dream_settings_summary"
+                android:fragment="com.android.settings.DreamSettings" />
+
+        <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..fdf87fc 100644
--- a/res/xml/language_settings.xml
+++ b/res/xml/language_settings.xml
@@ -19,19 +19,47 @@
         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="keyboard_settings_category"
+            android:title="@string/keyboard_settings_category">
+        <PreferenceScreen android:key="current_input_method"
+                android:title="@string/current_input_method" />
+    </PreferenceCategory>
+    <PreferenceCategory
+            android:key="hard_keyboard"
+            android:title="@string/builtin_keyboard_settings_title"
+            android:persistent="false">
+        <CheckBoxPreference
+                android:key="auto_replace"
+                android:title="@string/auto_replace"
+                android:summaryOn="@string/auto_replace_summary"
+                android:summaryOff="@string/auto_replace_summary"
+                android:persistent="false"/>
+        <CheckBoxPreference
+                android:key="auto_caps"
+                android:title="@string/auto_caps"
+                android:summaryOn="@string/auto_caps_summary"
+                android:summaryOff="@string/auto_caps_summary"
+                android:persistent="false"/>
+        <CheckBoxPreference
+                android:key="auto_punctuate"
+                android:title="@string/auto_punctuate"
+                android:summaryOn="@string/auto_punctuate_summary"
+                android:summaryOff="@string/auto_punctuate_summary"
+                android:persistent="false"/>
+    </PreferenceCategory>
 
     <PreferenceCategory android:key="voice_input_category"
             android:title="@string/voice_input_category" >
@@ -55,24 +83,6 @@
                 android:title="@string/tts_settings_title" />
     </PreferenceCategory>
 
-    <PreferenceCategory android:key="keyboard_settings_category"
-            android:title="@string/keyboard_settings_category">
-        <PreferenceScreen android:key="current_input_method"
-                android:title="@string/current_input_method" />
-
-        <ListPreference android:key="input_method_selector"
-                android:title="@string/input_method_selector"
-                android:persistent="true"
-                android:entryValues="@array/input_method_selector_values"
-                android:entries="@array/input_method_selector_titles"
-                android:defaultValue="@string/input_method_selector_visibility_default_value"/>
-
-        <PreferenceScreen android:key="configure_input_method"
-                android:title="@string/configure_input_method">
-                <intent android:action="android.settings.INPUT_METHOD_SETTINGS"/>
-        </PreferenceScreen>
-    </PreferenceCategory>
-
     <PreferenceCategory android:key="pointer_settings_category"
             android:title="@string/pointer_settings_category">
         <com.android.settings.PointerSpeedPreference
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..9f78820 100644
--- a/res/xml/security_settings_misc.xml
+++ b/res/xml/security_settings_misc.xml
@@ -39,18 +39,27 @@
 
     <PreferenceCategory android:title="@string/device_admin_title"
             android:persistent="false">
+
         <Preference android:title="@string/manage_device_admin"
                 android:summary="@string/manage_device_admin_summary"
                 android:persistent="false"
                 android:fragment="com.android.settings.DeviceAdminSettings"/>
+
+        <CheckBoxPreference
+                android:key="toggle_install_applications"
+                android:title="@string/install_applications"
+                android:summaryOff="@string/install_unknown_applications"
+                android:summaryOn="@string/install_unknown_applications"
+                android:persistent="false" />
+
     </PreferenceCategory>
 
     <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/trusted_credentials"
+                android:summary="@string/trusted_credentials_summary"
+                android:persistent="false"
+                android:fragment="com.android.settings.TrustedCredentialsSettings"/>
 
         <Preference android:title="@string/credentials_install"
                 android:summary="@string/credentials_install_summary"
@@ -60,14 +69,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..cd6191f 100644
--- a/res/xml/settings_headers.xml
+++ b/res/xml/settings_headers.xml
@@ -17,44 +17,51 @@
 <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:id="@+id/wifi_settings"
+        android:fragment="com.android.settings.wifi.WifiSettings"
+        android:title="@string/wifi_settings_title"
+        android:icon="@drawable/ic_settings_wireless" />
+
+    <!-- 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" />
+
+    <!-- Operator hook -->
     <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 -->
-
+    <!-- Other wireless and network controls -->
     <header
         android:id="@+id/wireless_settings"
         android:title="@string/radio_controls_title"
+        android:breadCrumbTitle="@string/wireless_networks_settings_title"
         android:fragment="com.android.settings.WirelessSettings"
-        android:icon="@drawable/ic_settings_wireless" />
+        android:icon="@drawable/ic_settings_more_wireless" />
 
-    <!-- Call settings - this is in the phone process -->
 
-    <header
-        android:id="@+id/call_settings"
-        android:icon="@drawable/ic_settings_call"
-        android:title="@string/call_settings_title">
-        <intent
-            android:action="android.intent.action.MAIN"
-            android:targetPackage="com.android.phone"
-            android:targetClass="com.android.phone.CallFeaturesSetting" />
-    </header>
+    <!-- DEVICE -->
+    <header android:title="@string/header_category_device" />
 
     <!-- Sound -->
-
     <header
         android:id="@+id/sound_settings"
         android:icon="@drawable/ic_settings_sound"
@@ -62,73 +69,86 @@
         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 -->
+    <!-- Battery -->
+    <header
+        android:id="@+id/battery_settings"
+        android:fragment="com.android.settings.fuelgauge.PowerUsageSummary"
+        android:icon="@drawable/ic_settings_battery"
+        android:title="@string/power_usage_summary_title" />
 
+    <!-- Application Settings -->
+    <header
+        android:fragment="com.android.settings.applications.ManageApplications"
+        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" />
+
+    <!-- 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 -->
-
+    <!-- Backup and reset -->
     <header
-        android:id="@+id/accessibility_settings"
-        android:fragment="com.android.settings.AccessibilitySettings"
-        android:icon="@drawable/ic_settings_accessibility"
-        android:title="@string/accessibility_settings" />
+        android:fragment="com.android.settings.PrivacySettings"
+        android:icon="@drawable/ic_settings_privacy"
+        android:title="@string/privacy_settings"
+        android:id="@+id/privacy_settings" />
+
+
+    <!-- SYSTEM -->
+    <header android:title="@string/header_category_system" />
 
     <!-- Dock -->
-
     <header
         android:id="@+id/dock_settings"
         android:fragment="com.android.settings.DockSettings"
@@ -136,15 +156,27 @@
         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" />
 
+    <!-- Development -->
+    <header
+        android:id="@+id/development_settings"
+        android:fragment="com.android.settings.DevelopmentSettings"
+        android:icon="@drawable/ic_settings_development"
+        android:title="@string/development_settings_title" />
+
+    <!-- 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/vpn_type.xml b/res/xml/usb_settings.xml
similarity index 65%
copy from res/xml/vpn_type.xml
copy to res/xml/usb_settings.xml
index fbc7822..e2a950d 100644
--- a/res/xml/vpn_type.xml
+++ b/res/xml/usb_settings.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 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.
@@ -15,7 +15,16 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
-        android:title="@string/vpn_type_title">
+        android:title="@string/location_settings_title">
 
-</PreferenceScreen>   
+    <CheckBoxPreference
+        android:key="usb_mtp"
+        android:title="@string/usb_label_mtp"
+        />
+
+    <CheckBoxPreference
+        android:key="usb_ptp"
+        android:title="@string/usb_label_ptp"
+        />
+
+</PreferenceScreen>
diff --git a/res/xml/vpn_edit.xml b/res/xml/vpn_edit.xml
deleted file mode 100644
index a3cab9c..0000000
--- a/res/xml/vpn_edit.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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.
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
-
-    <EditTextPreference
-        android:key="vpn_name"
-        android:title="@string/vpn_name"
-        android:dialogTitle="@string/vpn_name"
-        android:singleLine="true"/>
-
-</PreferenceScreen>   
diff --git a/res/xml/vpn_settings.xml b/res/xml/vpn_settings.xml
deleted file mode 100644
index 773ae1c..0000000
--- a/res/xml/vpn_settings.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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.
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        android:title="@string/vpn_settings_activity_title">
-
-    <PreferenceScreen android:key="add_new_vpn"
-        android:title="@string/vpn_add_new_vpn">
-        <!--intent
-            android:action="android.intent.action.MAIN"
-            android:targetPackage="com.android.settings.vpn"
-            android:targetClass="com.android.settings.vpn.VpnEditor" /-->
-    </PreferenceScreen>
-
-    <!--CheckBoxPreference android:key="installer_enabled"
-            android:defaultValue="false"
-            android:title="@string/installer_enabled"
-            android:summaryOn="@string/installer_enabled_summary_on"
-            android:summaryOff="@string/installer_enabled_summary_off" /-->
-
-    <PreferenceCategory android:key="vpn_list" android:title="@string/vpns">
-    </PreferenceCategory>
-</PreferenceScreen>   
diff --git a/res/xml/vpn_type.xml b/res/xml/vpn_settings2.xml
similarity index 71%
copy from res/xml/vpn_type.xml
copy to res/xml/vpn_settings2.xml
index fbc7822..38632cc 100644
--- a/res/xml/vpn_type.xml
+++ b/res/xml/vpn_settings2.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 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.
@@ -15,7 +15,9 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
-        android:title="@string/vpn_type_title">
-
-</PreferenceScreen>   
+        android:title="@string/vpn_title">
+    <Preference android:key="add_network"
+            android:title="@string/vpn_create"
+            android:order="1"
+            android:persistent="false"/>
+</PreferenceScreen>
diff --git a/res/xml/vpn_type.xml b/res/xml/wallpaper_settings.xml
similarity index 76%
rename from res/xml/vpn_type.xml
rename to res/xml/wallpaper_settings.xml
index fbc7822..63346f7 100644
--- a/res/xml/vpn_type.xml
+++ b/res/xml/wallpaper_settings.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 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.
@@ -15,7 +15,6 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
-        android:title="@string/vpn_type_title">
+        android:title="@string/wallpaper_settings_title">
 
-</PreferenceScreen>   
+</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..d7344b1 100644
--- a/res/xml/wifi_advanced_settings.xml
+++ b/res/xml/wifi_advanced_settings.xml
@@ -17,6 +17,29 @@
 <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" />
+
+    <!-- android:dependency="enable_wifi" -->
+    <CheckBoxPreference
+            android:key="wifi_enable_watchdog_service"
+            android:title="@string/wifi_enable_watchdog_service"
+            android:summary="@string/wifi_enable_watchdog_service_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..0488e02 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.vpn2.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..bbb3678 100644
--- a/src/com/android/settings/AccessibilitySettings.java
+++ b/src/com/android/settings/AccessibilitySettings.java
@@ -16,14 +16,18 @@
 
 package com.android.settings;
 
+import android.accessibilityservice.AccessibilityServiceInfo;
+import android.app.ActivityManagerNative;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.Service;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.ServiceInfo;
+import android.content.res.Configuration;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.RemoteException;
 import android.os.SystemProperties;
 import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
@@ -50,7 +54,12 @@
     private static final String DEFAULT_SCREENREADER_MARKET_LINK =
         "market://search?q=pname:com.google.android.marvin.talkback";
 
-    private final String TOGGLE_ACCESSIBILITY_CHECKBOX =
+    private static final float LARGE_FONT_SCALE = 1.3f;
+
+    private static final String TOGGLE_LARGE_TEXT_CHECKBOX =
+        "toggle_large_text_checkbox";
+
+    private static final String TOGGLE_ACCESSIBILITY_CHECKBOX =
         "toggle_accessibility_service_checkbox";
 
     private static final String ACCESSIBILITY_SERVICES_CATEGORY =
@@ -65,10 +74,10 @@
     private static final String POWER_BUTTON_ENDS_CALL_CHECKBOX =
         "power_button_ends_call";
 
-    private final String KEY_TOGGLE_ACCESSIBILITY_SERVICE_CHECKBOX =
+    private static final String KEY_TOGGLE_ACCESSIBILITY_SERVICE_CHECKBOX =
         "key_toggle_accessibility_service_checkbox";
 
-    private final String KEY_LONG_PRESS_TIMEOUT_LIST_PREFERENCE =
+    private static final String KEY_LONG_PRESS_TIMEOUT_LIST_PREFERENCE =
         "long_press_timeout_list_preference";
 
     private static final int DIALOG_ID_DISABLE_ACCESSIBILITY = 1;
@@ -76,9 +85,10 @@
     private static final int DIALOG_ID_ENABLE_ACCESSIBILITY_SERVICE = 3;
     private static final int DIALOG_ID_NO_ACCESSIBILITY_SERVICES = 4;
 
+    private CheckBoxPreference mToggleLargeTextCheckBox;
     private CheckBoxPreference mToggleAccessibilityCheckBox;
     private CheckBoxPreference mToggleScriptInjectionCheckBox;
-    private CheckBoxPreference mToggleAccessibilityServiceCheckBox;
+    private SettingsCheckBoxPreference mToggleAccessibilityServiceCheckBox;
 
     private PreferenceCategory mPowerButtonCategory;
     private CheckBoxPreference mPowerButtonEndsCallCheckBox;
@@ -87,8 +97,10 @@
 
     private ListPreference mLongPressTimeoutListPreference;
 
-    private Map<String, ServiceInfo> mAccessibilityServices =
-        new LinkedHashMap<String, ServiceInfo>();
+    private final Configuration mCurConfig = new Configuration();
+
+    private Map<String, AccessibilityServiceInfo> mAccessibilityServices =
+        new LinkedHashMap<String, AccessibilityServiceInfo>();
 
     private TextUtils.SimpleStringSplitter mStringColonSplitter =
         new TextUtils.SimpleStringSplitter(':');
@@ -99,6 +111,9 @@
 
         addPreferencesFromResource(R.xml.accessibility_settings);
 
+        mToggleLargeTextCheckBox = (CheckBoxPreference) findPreference(
+                TOGGLE_LARGE_TEXT_CHECKBOX);
+
         mAccessibilityServicesCategory =
             (PreferenceGroup) findPreference(ACCESSIBILITY_SERVICES_CATEGORY);
 
@@ -144,7 +159,7 @@
 
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
-        addAccessibilitServicePreferences();
+        addAccessibilityServicePreferences();
 
         final HashSet<String> enabled = new HashSet<String>();
         String settingValue = Settings.Secure.getString(getContentResolver(),
@@ -157,7 +172,7 @@
             }
         }
 
-        Map<String, ServiceInfo> accessibilityServices = mAccessibilityServices;
+        Map<String, AccessibilityServiceInfo> accessibilityServices = mAccessibilityServices;
 
         for (String key : accessibilityServices.keySet()) {
             CheckBoxPreference preference = (CheckBoxPreference) findPreference(key);
@@ -191,6 +206,8 @@
             showDialog(DIALOG_ID_NO_ACCESSIBILITY_SERVICES);
         }
 
+        readFontSizePreference();
+
         super.onActivityCreated(savedInstanceState);
     }
 
@@ -230,9 +247,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;
         }
     }
 
@@ -250,10 +267,10 @@
         int count = mAccessibilityServicesCategory.getPreferenceCount();
         for (int i = 0; i < count; i++) {
             Preference pref = mAccessibilityServicesCategory.getPreference(i);
-            pref.setEnabled(isEnabled);
+            if (pref != mToggleAccessibilityCheckBox) {
+                pref.setEnabled(isEnabled);
+            }
         }
-
-        mToggleScriptInjectionCheckBox.setEnabled(isEnabled);
     }
 
     @Override
@@ -262,6 +279,13 @@
 
         if (TOGGLE_ACCESSIBILITY_CHECKBOX.equals(key)) {
             handleEnableAccessibilityStateChange((CheckBoxPreference) preference);
+        } else if (TOGGLE_LARGE_TEXT_CHECKBOX.equals(key)) {
+            try {
+                mCurConfig.fontScale = mToggleLargeTextCheckBox.isChecked()
+                        ? LARGE_FONT_SCALE : 1;
+                ActivityManagerNative.getDefault().updateConfiguration(mCurConfig);
+            } catch (RemoteException e) {
+            }
         } else if (POWER_BUTTON_ENDS_CALL_CHECKBOX.equals(key)) {
             boolean isChecked = ((CheckBoxPreference) preference).isChecked();
             // The checkbox is labeled "Power button ends call"; thus the in-call
@@ -274,7 +298,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 +342,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
@@ -353,32 +378,56 @@
     /**
      * Adds {@link CheckBoxPreference} for enabling or disabling an accessibility services.
      */
-    private void addAccessibilitServicePreferences() {
+    private void addAccessibilityServicePreferences() {
         AccessibilityManager accessibilityManager =
             (AccessibilityManager) getSystemService(Service.ACCESSIBILITY_SERVICE);
 
-        List<ServiceInfo> installedServices = accessibilityManager.getAccessibilityServiceList();
+        List<AccessibilityServiceInfo> installedServices =
+            accessibilityManager.getInstalledAccessibilityServiceList();
 
-        if (installedServices.isEmpty()) {
-            getPreferenceScreen().removePreference(mAccessibilityServicesCategory);
-            return;
+        for (int i = 0; i < mAccessibilityServicesCategory.getPreferenceCount(); i++) {
+            Preference pref = mAccessibilityServicesCategory.getPreference(i);
+            if (pref != mToggleAccessibilityCheckBox
+                    && pref != mToggleScriptInjectionCheckBox) {
+                mAccessibilityServicesCategory.removePreference(pref);
+                i--;
+            }
         }
 
-        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);
+                preference.setOrder(i);
+                ServiceInfo serviceInfo = accessibilityServiceInfo.getResolveInfo().serviceInfo;
                 preference.setTitle(serviceInfo.loadLabel(getActivity().getPackageManager()));
                 mAccessibilityServicesCategory.addPreference(preference);
             }
         }
     }
 
+    public void readFontSizePreference() {
+        try {
+            mCurConfig.updateFrom(
+                ActivityManagerNative.getDefault().getConfiguration());
+        } catch (RemoteException e) {
+        }
+        mToggleLargeTextCheckBox.setChecked(Float.compare(mCurConfig.fontScale,
+                LARGE_FONT_SCALE) == 0);
+    }
+
     @Override
     public Dialog onCreateDialog(int dialogId) {
         switch (dialogId) {
@@ -424,7 +473,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/AccessibilityTutorialActivity.java b/src/com/android/settings/AccessibilityTutorialActivity.java
new file mode 100644
index 0000000..be9b90d
--- /dev/null
+++ b/src/com/android/settings/AccessibilityTutorialActivity.java
@@ -0,0 +1,616 @@
+/*
+ * Copyright (C) 2011 Google Inc.
+ *
+ * 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.app.Activity;
+import android.content.Context;
+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.os.Handler;
+import android.os.Message;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.view.accessibility.AccessibilityEvent;
+import android.view.accessibility.AccessibilityManager;
+import android.view.animation.Animation;
+import android.view.animation.Animation.AnimationListener;
+import android.view.animation.AnimationUtils;
+import android.widget.AbsListView;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.FrameLayout;
+import android.widget.GridView;
+import android.widget.ListView;
+import android.widget.TextView;
+import android.widget.ViewAnimator;
+
+import java.util.List;
+
+/**
+ * This class provides a short tutorial that introduces the user to the features
+ * available in Touch Exploration.
+ */
+public class AccessibilityTutorialActivity extends Activity {
+    /** Intent action for launching this activity. */
+    public static final String ACTION = "com.android.settings.touchtutorial.LAUNCH_TUTORIAL";
+
+    /** Instance state saving constant for the active module. */
+    private static final String KEY_ACTIVE_MODULE = "active_module";
+
+    /** The index of the module to show when first opening the tutorial. */
+    private static final int DEFAULT_MODULE = 0;
+
+    /** View animator for switching between modules. */
+    private ViewAnimator mViewAnimator;
+
+    private AccessibilityManager mAccessibilityManager;
+
+    private final AnimationListener mInAnimationListener = new AnimationListener() {
+        @Override
+        public void onAnimationEnd(Animation animation) {
+            final int index = mViewAnimator.getDisplayedChild();
+            final TutorialModule module = (TutorialModule) mViewAnimator.getChildAt(index);
+
+            activateModule(module);
+        }
+
+        @Override
+        public void onAnimationRepeat(Animation animation) {
+            // Do nothing.
+        }
+
+        @Override
+        public void onAnimationStart(Animation animation) {
+            // Do nothing.
+        }
+    };
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        final Animation inAnimation = AnimationUtils.loadAnimation(this,
+                android.R.anim.slide_in_left);
+        inAnimation.setAnimationListener(mInAnimationListener);
+
+        final Animation outAnimation = AnimationUtils.loadAnimation(this,
+                android.R.anim.slide_in_left);
+
+        mViewAnimator = new ViewAnimator(this);
+        mViewAnimator.setInAnimation(inAnimation);
+        mViewAnimator.setOutAnimation(outAnimation);
+        mViewAnimator.addView(new TouchTutorialModule1(this, this));
+        mViewAnimator.addView(new TouchTutorialModule2(this, this));
+
+        setContentView(mViewAnimator);
+
+        mAccessibilityManager = (AccessibilityManager) getSystemService(ACCESSIBILITY_SERVICE);
+
+        if (savedInstanceState != null) {
+            show(savedInstanceState.getInt(KEY_ACTIVE_MODULE, DEFAULT_MODULE));
+        } else {
+            show(DEFAULT_MODULE);
+        }
+    }
+
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+
+        outState.putInt(KEY_ACTIVE_MODULE, mViewAnimator.getDisplayedChild());
+    }
+
+    private void activateModule(TutorialModule module) {
+        module.activate();
+    }
+
+    private void deactivateModule(TutorialModule module) {
+        mAccessibilityManager.interrupt();
+        mViewAnimator.setOnKeyListener(null);
+        module.deactivate();
+    }
+
+    private void interrupt() {
+        mAccessibilityManager.interrupt();
+    }
+
+    private void next() {
+        show(mViewAnimator.getDisplayedChild() + 1);
+    }
+
+    private void previous() {
+        show(mViewAnimator.getDisplayedChild() - 1);
+    }
+
+    private void show(int which) {
+        if ((which < 0) || (which >= mViewAnimator.getChildCount())) {
+            return;
+        }
+
+        mAccessibilityManager.interrupt();
+
+        final int displayedIndex = mViewAnimator.getDisplayedChild();
+        final TutorialModule displayedView = (TutorialModule) mViewAnimator.getChildAt(
+                displayedIndex);
+        deactivateModule(displayedView);
+
+        mViewAnimator.setDisplayedChild(which);
+    }
+
+    /**
+     * Loads application labels and icons.
+     */
+    private static class AppsAdapter extends ArrayAdapter<ResolveInfo> {
+        protected final int mTextViewResourceId;
+
+        private final int mIconSize;
+        private final View.OnHoverListener mDefaultHoverListener;
+
+        private View.OnHoverListener mHoverListener;
+
+        public AppsAdapter(Context context, int resource, int textViewResourceId) {
+            super(context, resource, textViewResourceId);
+
+            mIconSize = context.getResources().getDimensionPixelSize(R.dimen.app_icon_size);
+            mTextViewResourceId = textViewResourceId;
+            mDefaultHoverListener = new View.OnHoverListener() {
+                @Override
+                public boolean onHover(View v, MotionEvent event) {
+                    if (mHoverListener != null) {
+                        return mHoverListener.onHover(v, event);
+                    } else {
+                        return false;
+                    }
+                }
+            };
+
+            loadAllApps();
+        }
+
+        public CharSequence getLabel(int position) {
+            final PackageManager packageManager = getContext().getPackageManager();
+            final ResolveInfo appInfo = getItem(position);
+            return appInfo.loadLabel(packageManager);
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            final PackageManager packageManager = getContext().getPackageManager();
+            final View view = super.getView(position, convertView, parent);
+            view.setOnHoverListener(mDefaultHoverListener);
+            view.setTag(position);
+
+            final ResolveInfo appInfo = getItem(position);
+            final CharSequence label = appInfo.loadLabel(packageManager);
+            final Drawable icon = appInfo.loadIcon(packageManager);
+            final TextView text = (TextView) view.findViewById(mTextViewResourceId);
+
+            icon.setBounds(0, 0, mIconSize, mIconSize);
+
+            populateView(text, label, icon);
+
+            return view;
+        }
+
+        private void loadAllApps() {
+            final Intent mainIntent = new Intent(Intent.ACTION_MAIN, null);
+            mainIntent.addCategory(Intent.CATEGORY_LAUNCHER);
+
+            final PackageManager pm = getContext().getPackageManager();
+            final List<ResolveInfo> apps = pm.queryIntentActivities(mainIntent, 0);
+
+            addAll(apps);
+        }
+
+        protected void populateView(TextView text, CharSequence label, Drawable icon) {
+            text.setText(label);
+            text.setCompoundDrawables(null, icon, null, null);
+        }
+
+        public void setOnHoverListener(View.OnHoverListener hoverListener) {
+            mHoverListener = hoverListener;
+        }
+    }
+
+    /**
+     * Introduces using a finger to explore and interact with on-screen content.
+     */
+    private static class TouchTutorialModule1 extends TutorialModule implements
+            View.OnHoverListener, AdapterView.OnItemClickListener {
+        /**
+         * Handles the case where the user overshoots the target area.
+         */
+        private class HoverTargetHandler extends Handler {
+            private static final int MSG_ENTERED_TARGET = 1;
+            private static final int DELAY_ENTERED_TARGET = 500;
+
+            private boolean mInsideTarget = false;
+
+            public void enteredTarget() {
+                mInsideTarget = true;
+                mHandler.sendEmptyMessageDelayed(MSG_ENTERED_TARGET, DELAY_ENTERED_TARGET);
+            }
+
+            public void exitedTarget() {
+                mInsideTarget = false;
+            }
+
+            @Override
+            public void handleMessage(Message msg) {
+                switch (msg.what) {
+                    case MSG_ENTERED_TARGET:
+                        if (mInsideTarget) {
+                            addInstruction(R.string.accessibility_tutorial_lesson_1_text_4,
+                                    mTargetName);
+                        } else {
+                            addInstruction(R.string.accessibility_tutorial_lesson_1_text_4_exited,
+                                    mTargetName);
+                            setFlag(FLAG_TOUCHED_TARGET, false);
+                        }
+                        break;
+                }
+            }
+        }
+
+        private static final int FLAG_TOUCH_ITEMS = 0x1;
+        private static final int FLAG_TOUCHED_ITEMS = 0x2;
+        private static final int FLAG_TOUCHED_TARGET = 0x4;
+        private static final int FLAG_TAPPED_TARGET = 0x8;
+
+        private static final int MORE_EXPLORED_COUNT = 1;
+        private static final int DONE_EXPLORED_COUNT = 2;
+
+        private final HoverTargetHandler mHandler;
+        private final AppsAdapter mAppsAdapter;
+        private final GridView mAllApps;
+
+        private int mTouched = 0;
+
+        private int mTargetPosition;
+        private CharSequence mTargetName;
+
+        public TouchTutorialModule1(Context context, AccessibilityTutorialActivity controller) {
+            super(context, controller, R.layout.accessibility_tutorial_1,
+                    R.string.accessibility_tutorial_lesson_1_title);
+
+            mHandler = new HoverTargetHandler();
+
+            mAppsAdapter = new AppsAdapter(context, R.layout.accessibility_tutorial_app_icon,
+                    R.id.app_icon);
+            mAppsAdapter.setOnHoverListener(this);
+
+            mAllApps = (GridView) findViewById(R.id.all_apps);
+            mAllApps.setAdapter(mAppsAdapter);
+            mAllApps.setOnItemClickListener(this);
+
+            findViewById(R.id.next_button).setOnHoverListener(this);
+
+            setPreviousVisible(false);
+        }
+
+        @Override
+        public boolean onHover(View v, MotionEvent event) {
+            switch (v.getId()) {
+                case R.id.app_icon:
+                    if (hasFlag(FLAG_TOUCH_ITEMS) && !hasFlag(FLAG_TOUCHED_ITEMS) && v.isEnabled()
+                            && (event.getAction() == MotionEvent.ACTION_HOVER_ENTER)) {
+                        mTouched++;
+
+                        if (mTouched >= DONE_EXPLORED_COUNT) {
+                            setFlag(FLAG_TOUCHED_ITEMS, true);
+                            addInstruction(R.string.accessibility_tutorial_lesson_1_text_3,
+                                    mTargetName);
+                        } else if (mTouched == MORE_EXPLORED_COUNT) {
+                            addInstruction(R.string.accessibility_tutorial_lesson_1_text_2_more);
+                        }
+
+                        v.setEnabled(false);
+                    } else if (hasFlag(FLAG_TOUCHED_ITEMS)
+                            && ((Integer) v.getTag() == mTargetPosition)) {
+                        if (!hasFlag(FLAG_TOUCHED_TARGET)
+                                && (event.getAction() == MotionEvent.ACTION_HOVER_ENTER)) {
+                            mHandler.enteredTarget();
+                            setFlag(FLAG_TOUCHED_TARGET, true);
+                        } else if (event.getAction() == MotionEvent.ACTION_HOVER_EXIT) {
+                            mHandler.exitedTarget();
+                        }
+                    }
+                    break;
+            }
+
+            return false;
+        }
+
+        @Override
+        public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+            if (hasFlag(FLAG_TOUCHED_TARGET) && !hasFlag(FLAG_TAPPED_TARGET)
+                    && (position == mTargetPosition)) {
+                setFlag(FLAG_TAPPED_TARGET, true);
+                final CharSequence nextText = getContext().getText(
+                        R.string.accessibility_tutorial_next);
+                addInstruction(R.string.accessibility_tutorial_lesson_1_text_5, nextText);
+            }
+        }
+
+        @Override
+        public void onShown() {
+            final int first = mAllApps.getFirstVisiblePosition();
+            final int last = mAllApps.getLastVisiblePosition();
+
+            mTargetPosition = 0;
+            mTargetName = mAppsAdapter.getLabel(mTargetPosition);
+
+            addInstruction(R.string.accessibility_tutorial_lesson_1_text_1);
+            setFlag(FLAG_TOUCH_ITEMS, true);
+        }
+    }
+
+    /**
+     * Introduces using two fingers to scroll through a list.
+     */
+    private static class TouchTutorialModule2 extends TutorialModule implements
+            AbsListView.OnScrollListener, View.OnHoverListener {
+        private static final int FLAG_EXPLORE_LIST = 0x1;
+        private static final int FLAG_SCROLL_LIST = 0x2;
+        private static final int FLAG_COMPLETED_TUTORIAL = 0x4;
+
+        private static final int MORE_EXPLORE_COUNT = 1;
+        private static final int DONE_EXPLORE_COUNT = 2;
+        private static final int MORE_SCROLL_COUNT = 2;
+        private static final int DONE_SCROLL_COUNT = 4;
+
+        private final AppsAdapter mAppsAdapter;
+
+        private int mExploreCount = 0;
+        private int mInitialVisibleItem = -1;
+        private int mScrollCount = 0;
+
+        public TouchTutorialModule2(Context context, AccessibilityTutorialActivity controller) {
+            super(context, controller, R.layout.accessibility_tutorial_2,
+                    R.string.accessibility_tutorial_lesson_2_title);
+
+            mAppsAdapter = new AppsAdapter(context, android.R.layout.simple_list_item_1,
+                    android.R.id.text1) {
+                @Override
+                protected void populateView(TextView text, CharSequence label, Drawable icon) {
+                    text.setText(label);
+                    text.setCompoundDrawables(icon, null, null, null);
+                }
+            };
+            mAppsAdapter.setOnHoverListener(this);
+
+            ((ListView) findViewById(R.id.list_view)).setAdapter(mAppsAdapter);
+            ((ListView) findViewById(R.id.list_view)).setOnScrollListener(this);
+
+            setNextVisible(false);
+            setFinishVisible(true);
+        }
+
+        @Override
+        public boolean onHover(View v, MotionEvent e) {
+            if (e.getAction() != MotionEvent.ACTION_HOVER_ENTER) {
+                return false;
+            }
+
+            switch (v.getId()) {
+                case android.R.id.text1:
+                    if (hasFlag(FLAG_EXPLORE_LIST) && !hasFlag(FLAG_SCROLL_LIST)) {
+                        mExploreCount++;
+
+                        if (mExploreCount >= DONE_EXPLORE_COUNT) {
+                            addInstruction(R.string.accessibility_tutorial_lesson_2_text_3);
+                            setFlag(FLAG_SCROLL_LIST, true);
+                        } else if (mExploreCount == MORE_EXPLORE_COUNT) {
+                            addInstruction(R.string.accessibility_tutorial_lesson_2_text_2_more);
+                        }
+                    }
+                    break;
+            }
+
+            return false;
+        }
+
+        @Override
+        public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount,
+                int totalItemCount) {
+            if (hasFlag(FLAG_SCROLL_LIST) && !hasFlag(FLAG_COMPLETED_TUTORIAL)) {
+                if (mInitialVisibleItem < 0) {
+                    mInitialVisibleItem = firstVisibleItem;
+                }
+
+                final int scrollCount = Math.abs(mInitialVisibleItem - firstVisibleItem);
+
+                if ((mScrollCount == scrollCount) || (scrollCount <= 0)) {
+                    return;
+                } else {
+                    mScrollCount = scrollCount;
+                }
+
+                if (mScrollCount >= DONE_SCROLL_COUNT) {
+                    final CharSequence finishText = getContext().getText(
+                            R.string.accessibility_tutorial_finish);
+                    addInstruction(R.string.accessibility_tutorial_lesson_2_text_4, finishText);
+                    setFlag(FLAG_COMPLETED_TUTORIAL, true);
+                } else if (mScrollCount == MORE_SCROLL_COUNT) {
+                    addInstruction(R.string.accessibility_tutorial_lesson_2_text_3_more);
+                }
+            }
+        }
+
+        @Override
+        public void onScrollStateChanged(AbsListView view, int scrollState) {
+            // Do nothing.
+        }
+
+        @Override
+        public void onShown() {
+            addInstruction(R.string.accessibility_tutorial_lesson_2_text_1);
+            setFlag(FLAG_EXPLORE_LIST, true);
+        }
+    }
+
+    /**
+     * Abstract class that represents a single module within a tutorial.
+     */
+    private static abstract class TutorialModule extends FrameLayout implements OnClickListener {
+        private final AccessibilityTutorialActivity mController;
+        private final TextView mInstructions;
+        private final TextView mTitle;
+        private final Button mPrevious;
+        private final Button mNext;
+        private final Button mFinish;
+
+        /** Which bit flags have been set. */
+        private long mFlags;
+
+        /** Whether this module is currently focused. */
+        private boolean mIsVisible;
+
+        /**
+         * Constructs a new tutorial module for the given context and controller
+         * with the specified layout.
+         *
+         * @param context The parent context.
+         * @param controller The parent tutorial controller.
+         * @param layoutResId The layout to use for this module.
+         */
+        public TutorialModule(Context context, AccessibilityTutorialActivity controller,
+                int layoutResId, int titleResId) {
+            super(context);
+
+            mController = controller;
+
+            final View container = LayoutInflater.from(context).inflate(
+                    R.layout.accessibility_tutorial_container, this, true);
+
+            mInstructions = (TextView) container.findViewById(R.id.instructions);
+            mTitle = (TextView) container.findViewById(R.id.title);
+            mTitle.setText(titleResId);
+            mPrevious = (Button) container.findViewById(R.id.back_button);
+            mPrevious.setOnClickListener(this);
+            mNext = (Button) container.findViewById(R.id.next_button);
+            mNext.setOnClickListener(this);
+            mFinish = (Button) container.findViewById(R.id.finish_button);
+            mFinish.setOnClickListener(this);
+
+            final ViewGroup contentHolder = (ViewGroup) container.findViewById(R.id.content);
+            LayoutInflater.from(context).inflate(layoutResId, contentHolder, true);
+        }
+
+        /**
+         * Called when this tutorial gains focus.
+         */
+        public final void activate() {
+            mIsVisible = true;
+
+            mFlags = 0;
+            mInstructions.setVisibility(View.GONE);
+            mTitle.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED);
+
+            onShown();
+        }
+
+        /**
+         * Formats an instruction string and adds it to the speaking queue.
+         *
+         * @param resId The resource id of the instruction string.
+         * @param formatArgs Optional formatting arguments.
+         * @see String#format(String, Object...)
+         */
+        protected void addInstruction(final int resId, Object... formatArgs) {
+            if (!mIsVisible) {
+                return;
+            }
+
+            final String text = getContext().getString(resId, formatArgs);
+
+            mInstructions.setVisibility(View.VISIBLE);
+            mInstructions.setText(text);
+            mInstructions.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED);
+        }
+
+        /**
+         * Called when this tutorial loses focus.
+         */
+        public void deactivate() {
+            mIsVisible = false;
+
+            mController.interrupt();
+        }
+
+        /**
+         * Returns {@code true} if the flag with the specified id has been set.
+         *
+         * @param flagId The id of the flag to check for.
+         * @return {@code true} if the flag with the specified id has been set.
+         */
+        protected boolean hasFlag(int flagId) {
+            return (mFlags & flagId) == flagId;
+        }
+
+        @Override
+        public void onClick(View v) {
+            switch (v.getId()) {
+                case R.id.back_button:
+                    mController.previous();
+                    break;
+                case R.id.next_button:
+                    mController.next();
+                    break;
+                case R.id.finish_button:
+                    mController.finish();
+                    break;
+            }
+        }
+
+        public abstract void onShown();
+
+        protected void setFinishVisible(boolean visible) {
+            mFinish.setVisibility(visible ? VISIBLE : GONE);
+        }
+
+        /**
+         * Sets or removes the flag with the specified id.
+         *
+         * @param flagId The id of the flag to modify.
+         * @param value {@code true} to set the flag, {@code false} to remove
+         *            it.
+         */
+        protected void setFlag(int flagId, boolean value) {
+            if (value) {
+                mFlags |= flagId;
+            } else {
+                mFlags = ~(~mFlags | flagId);
+            }
+        }
+
+        protected void setNextVisible(boolean visible) {
+            mNext.setVisibility(visible ? VISIBLE : GONE);
+        }
+
+        protected void setPreviousVisible(boolean visible) {
+            mPrevious.setVisibility(visible ? VISIBLE : GONE);
+        }
+    }
+}
diff --git a/src/com/android/settings/ApplicationSettings.java b/src/com/android/settings/ApplicationSettings.java
index da417ec..27fc3ec 100644
--- a/src/com/android/settings/ApplicationSettings.java
+++ b/src/com/android/settings/ApplicationSettings.java
@@ -16,21 +16,18 @@
 
 package com.android.settings;
 
-import android.app.AlertDialog;
-import android.content.DialogInterface;
-import android.content.res.Configuration;
+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 android.preference.Preference.OnPreferenceChangeListener;
+import android.preference.PreferenceScreen;
 import android.provider.Settings;
 
-public class ApplicationSettings extends SettingsPreferenceFragment implements
-        DialogInterface.OnClickListener {
+public class ApplicationSettings extends SettingsPreferenceFragment {
     
-    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.
@@ -42,20 +39,24 @@
     private static final String APP_INSTALL_SDCARD_ID = "sdcard";
     private static final String APP_INSTALL_AUTO_ID = "auto";
     
-    private CheckBoxPreference mToggleAppInstallation;
-
+    private CheckBoxPreference mToggleAdvancedSettings;
     private ListPreference mInstallLocation;
 
-    private DialogInterface mWarnInstallApps;
-
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
         addPreferencesFromResource(R.xml.application_settings);
 
-        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?
@@ -94,43 +95,29 @@
     }
 
     @Override
-    public void onDestroy() {
-        super.onDestroy();
-        if (mWarnInstallApps != null) {
-            mWarnInstallApps.dismiss();
-        }
-    }
-
-    @Override
     public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
-        if (preference == mToggleAppInstallation) {
-            if (mToggleAppInstallation.isChecked()) {
-                mToggleAppInstallation.setChecked(false);
-                warnAppInstallation();
-            } else {
-                setNonMarketAppsAllowed(false);
-            }
+        if (preference == mToggleAdvancedSettings) {
+            boolean value = mToggleAdvancedSettings.isChecked();
+            setAdvancedSettingsEnabled(value);
         }
 
         return super.onPreferenceTreeClick(preferenceScreen, preference);
     }
 
-    public void onClick(DialogInterface dialog, int which) {
-        if (dialog == mWarnInstallApps && which == DialogInterface.BUTTON_POSITIVE) {
-            setNonMarketAppsAllowed(true);
-            mToggleAppInstallation.setChecked(true);
-        }
+    private boolean isAdvancedSettingsEnabled() {
+        return Settings.System.getInt(getContentResolver(), 
+                                      Settings.System.ADVANCED_SETTINGS,
+                                      Settings.System.ADVANCED_SETTINGS_DEFAULT) > 0;
     }
 
-    private void setNonMarketAppsAllowed(boolean enabled) {
+    private void setAdvancedSettingsEnabled(boolean enabled) {
+        int value = enabled ? 1 : 0;
         // Change the system setting
-        Settings.Secure.putInt(getContentResolver(), Settings.Secure.INSTALL_NON_MARKET_APPS, 
-                                enabled ? 1 : 0);
-    }
-    
-    private boolean isNonMarketAppsAllowed() {
-        return Settings.Secure.getInt(getContentResolver(), 
-                                      Settings.Secure.INSTALL_NON_MARKET_APPS, 0) > 0;
+        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 String getAppInstallLocation() {
@@ -147,15 +134,4 @@
             return APP_INSTALL_AUTO_ID;
         }
     }
-
-    private void warnAppInstallation() {
-        // TODO: DialogFragment?
-        mWarnInstallApps = new AlertDialog.Builder(getActivity()).setTitle(
-                getResources().getString(R.string.error_title))
-                .setIcon(com.android.internal.R.drawable.ic_dialog_alert)
-                .setMessage(getResources().getString(R.string.install_all_warning))
-                .setPositiveButton(android.R.string.yes, this)
-                .setNegativeButton(android.R.string.no, null)
-                .show();
-    }
 }
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..612f4c0 100644
--- a/src/com/android/settings/CryptKeeper.java
+++ b/src/com/android/settings/CryptKeeper.java
@@ -16,6 +16,7 @@
 
 package com.android.settings;
 
+import com.android.internal.telephony.ITelephony;
 import com.android.internal.widget.PasswordEntryKeyboardHelper;
 import com.android.internal.widget.PasswordEntryKeyboardView;
 
@@ -33,9 +34,11 @@
 import android.os.IBinder;
 import android.os.Message;
 import android.os.PowerManager;
+import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.os.SystemProperties;
 import android.os.storage.IMountService;
+import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.Log;
@@ -62,6 +65,9 @@
     private static final int COOL_DOWN_ATTEMPTS = 10;
     private static final int COOL_DOWN_INTERVAL = 30; // 30 seconds
 
+    // Intent action for launching the Emergency Dialer activity.
+    static final String ACTION_EMERGENCY_DIAL = "com.android.phone.EmergencyDialer.DIAL";
+
     private int mCooldown;
     PowerManager.WakeLock mWakeLock;
     private EditText mPasswordEntry;
@@ -342,9 +348,13 @@
 
         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);
+        }
+
+        updateEmergencyCallButtonState();
     }
 
     private IMountService getMountService() {
@@ -357,7 +367,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();
 
@@ -379,4 +389,73 @@
         }
         return false;
     }
-}
\ No newline at end of file
+
+    //
+    // Code to update the state of, and handle clicks from, the "Emergency call" button.
+    //
+    // This code is mostly duplicated from the corresponding code in
+    // LockPatternUtils and LockPatternKeyguardView under frameworks/base.
+    //
+
+    private void updateEmergencyCallButtonState() {
+        Button button = (Button) findViewById(R.id.emergencyCallButton);
+        // The button isn't present at all in some configurations.
+        if (button == null) return;
+
+        if (isEmergencyCallCapable()) {
+            button.setVisibility(View.VISIBLE);
+            button.setOnClickListener(new View.OnClickListener() {
+                    public void onClick(View v) {
+                        takeEmergencyCallAction();
+                    }
+                });
+        } else {
+            button.setVisibility(View.GONE);
+            return;
+        }
+
+        int newState = TelephonyManager.getDefault().getCallState();
+        int textId;
+        if (newState == TelephonyManager.CALL_STATE_OFFHOOK) {
+            // show "return to call" text and show phone icon
+            textId = R.string.cryptkeeper_return_to_call;
+            int phoneCallIcon = R.drawable.stat_sys_phone_call;
+            button.setCompoundDrawablesWithIntrinsicBounds(phoneCallIcon, 0, 0, 0);
+        } else {
+            textId = R.string.cryptkeeper_emergency_call;
+            int emergencyIcon = R.drawable.ic_emergency;
+            button.setCompoundDrawablesWithIntrinsicBounds(emergencyIcon, 0, 0, 0);
+        }
+        button.setText(textId);
+    }
+
+    private boolean isEmergencyCallCapable() {
+        return getResources().getBoolean(com.android.internal.R.bool.config_voice_capable);
+    }
+
+    private void takeEmergencyCallAction() {
+        if (TelephonyManager.getDefault().getCallState() == TelephonyManager.CALL_STATE_OFFHOOK) {
+            resumeCall();
+        } else {
+            launchEmergencyDialer();
+        }
+    }
+
+    private void resumeCall() {
+        ITelephony phone = ITelephony.Stub.asInterface(ServiceManager.checkService("phone"));
+        if (phone != null) {
+            try {
+                phone.showCallScreen();
+            } catch (RemoteException e) {
+                Log.e(TAG, "Error calling ITelephony service: " + e);
+            }
+        }
+    }
+
+    private void launchEmergencyDialer() {
+        Intent intent = new Intent(ACTION_EMERGENCY_DIAL);
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
+                        | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
+        startActivity(intent);
+    }
+}
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..41a4be5 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.
@@ -73,8 +63,14 @@
             if (action.equals(Intent.ACTION_BATTERY_CHANGED)) {
                 int level = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, 0);
                 int plugged = intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, 0);
+                int invalidCharger = intent.getIntExtra(BatteryManager.EXTRA_INVALID_CHARGER, 0);
+
                 boolean levelOk = level >= MIN_BATTERY_LEVEL;
-                boolean pluggedOk = plugged == BatteryManager.BATTERY_PLUGGED_AC;
+                boolean pluggedOk =
+                    (plugged == BatteryManager.BATTERY_PLUGGED_AC ||
+                     plugged == BatteryManager.BATTERY_PLUGGED_USB) &&
+                     invalidCharger == 0;
+
                 // Update UI elements based on power/battery status
                 mInitiateButton.setEnabled(levelOk && pluggedOk);
                 mPowerWarning.setVisibility(pluggedOk ? View.GONE : View.VISIBLE );
@@ -163,7 +159,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 +182,7 @@
         // If the user entered a valid keyguard trace, present the final
         // confirmation prompt; otherwise, go back to the initial state.
         if (resultCode == Activity.RESULT_OK && data != null) {
-            String password = data.getStringExtra("password");
+            String password = data.getStringExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD);
             if (!TextUtils.isEmpty(password)) {
                 showFinalConfirmation(password);
             }
diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
new file mode 100644
index 0000000..739ed58
--- /dev/null
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -0,0 +1,1578 @@
+/*
+ * 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.POLICY_NONE;
+import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;
+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.animation.LayoutTransition;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.app.Fragment;
+import android.app.FragmentTransaction;
+import android.app.LoaderManager.LoaderCallbacks;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.Loader;
+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.content.res.Resources;
+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.net.TrafficStats;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.preference.Preference;
+import android.provider.Settings;
+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.View.OnClickListener;
+import android.view.ViewGroup;
+import android.view.ViewTreeObserver.OnGlobalLayoutListener;
+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.Button;
+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.net.SummaryForAllUidLoader;
+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.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 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_ROAMING = "confirmRoaming";
+    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 String TAG_CONFIRM_RESTRICT = "confirmRestrict";
+    private static final String TAG_CONFIRM_APP_RESTRICT = "confirmAppRestrict";
+    private static final String TAG_APP_DETAILS = "appDetails";
+
+    private static final int LOADER_SUMMARY = 2;
+
+    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 ViewGroup mTabsContainer;
+    private TabWidget mTabWidget;
+    private ListView mListView;
+    private DataUsageAdapter mAdapter;
+
+    private ViewGroup mHeader;
+
+    private ViewGroup mNetworkSwitchesContainer;
+    private LinearLayout mNetworkSwitches;
+    private Switch mDataEnabled;
+    private View mDataEnabledView;
+    private CheckBox mDisableAtLimit;
+    private View mDisableAtLimitView;
+
+    private Spinner mCycleSpinner;
+    private CycleAdapter mCycleAdapter;
+
+    private DataUsageChartView mChart;
+
+    private View mAppDetail;
+    private TextView mAppTitle;
+    private TextView mAppSubtitle;
+    private Button mAppSettings;
+
+    private LinearLayout mAppSwitches;
+    private CheckBox mAppRestrict;
+    private View mAppRestrictView;
+
+    private boolean mShowWifi = false;
+
+    private NetworkTemplate mTemplate = null;
+
+    private static final int UID_NONE = -1;
+    private int mUid = UID_NONE;
+
+    private Intent mAppSettingsIntent;
+
+    private NetworkPolicyEditor mPolicyEditor;
+
+    private NetworkStatsHistory mHistory;
+    private NetworkStatsHistory mDetailHistory;
+
+    private String mCurrentTab = null;
+    private String mIntentTab = null;
+
+    private MenuItem mMenuDataRoaming;
+    private MenuItem mMenuRestrictBackground;
+
+    /** 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);
+        mTabsContainer = (ViewGroup) view.findViewById(R.id.tabs_container);
+        mTabWidget = (TabWidget) view.findViewById(android.R.id.tabs);
+        mListView = (ListView) view.findViewById(android.R.id.list);
+
+        mTabHost.setup();
+        mTabHost.setOnTabChangedListener(mTabListener);
+
+        mHeader = (ViewGroup) inflater.inflate(R.layout.data_usage_header, mListView, false);
+        mListView.addHeaderView(mHeader, null, false);
+
+        {
+            // bind network switches
+            mNetworkSwitchesContainer = (ViewGroup) mHeader.findViewById(
+                    R.id.network_switches_container);
+            mNetworkSwitches = (LinearLayout) mHeader.findViewById(R.id.network_switches);
+
+            mDataEnabled = new Switch(inflater.getContext());
+            mDataEnabledView = inflatePreference(inflater, mNetworkSwitches, mDataEnabled);
+            mDataEnabled.setOnCheckedChangeListener(mDataEnabledListener);
+            mNetworkSwitches.addView(mDataEnabledView);
+
+            mDisableAtLimit = new CheckBox(inflater.getContext());
+            mDisableAtLimit.setClickable(false);
+            mDisableAtLimitView = inflatePreference(inflater, mNetworkSwitches, mDisableAtLimit);
+            mDisableAtLimitView.setOnClickListener(mDisableAtLimitListener);
+            mNetworkSwitches.addView(mDisableAtLimitView);
+        }
+
+        // bind cycle dropdown
+        mCycleSpinner = (Spinner) mHeader.findViewById(R.id.cycles);
+        mCycleAdapter = new CycleAdapter(context);
+        mCycleSpinner.setAdapter(mCycleAdapter);
+        mCycleSpinner.setOnItemSelectedListener(mCycleListener);
+
+        mChart = (DataUsageChartView) mHeader.findViewById(R.id.chart);
+        mChart.setListener(mChartListener);
+
+        {
+            // bind app detail controls
+            mAppDetail = view.findViewById(R.id.app_detail);
+            mAppTitle = (TextView) view.findViewById(R.id.app_title);
+            mAppSubtitle = (TextView) view.findViewById(R.id.app_subtitle);
+            mAppSwitches = (LinearLayout) view.findViewById(R.id.app_switches);
+
+            mAppSettings = (Button) view.findViewById(R.id.app_settings);
+            mAppSettings.setOnClickListener(mAppSettingsListener);
+
+            mAppRestrict = new CheckBox(inflater.getContext());
+            mAppRestrict.setClickable(false);
+            mAppRestrictView = inflatePreference(inflater, mAppSwitches, mAppRestrict);
+            setPreferenceTitle(mAppRestrictView, R.string.data_usage_app_restrict_background);
+            setPreferenceSummary(
+                    mAppRestrictView, R.string.data_usage_app_restrict_background_summary);
+            mAppRestrictView.setOnClickListener(mAppRestrictListener);
+            mAppSwitches.addView(mAppRestrictView);
+        }
+
+        // only assign layout transitions once first layout is finished
+        mHeader.getViewTreeObserver().addOnGlobalLayoutListener(mFirstLayoutListener);
+
+        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);
+        }
+
+        // kick off background task to update stats
+        new AsyncTask<Void, Void, Void>() {
+            @Override
+            protected Void doInBackground(Void... params) {
+                try {
+                    mStatsService.forceUpdate();
+                } catch (RemoteException e) {
+                }
+                return null;
+            }
+
+            @Override
+            protected void onPostExecute(Void result) {
+                updateBody();
+            }
+        }.execute();
+    }
+
+    @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();
+
+        mMenuDataRoaming = menu.findItem(R.id.data_usage_menu_roaming);
+        mMenuDataRoaming.setVisible(hasMobileRadio(context));
+        mMenuDataRoaming.setChecked(getDataRoaming());
+
+        mMenuRestrictBackground = menu.findItem(R.id.data_usage_menu_restrict_background);
+        mMenuRestrictBackground.setChecked(getRestrictBackground());
+
+        final MenuItem split4g = menu.findItem(R.id.data_usage_menu_split_4g);
+        split4g.setVisible(hasMobile4gRadio(context));
+        split4g.setChecked(isMobilePolicySplit());
+
+        final MenuItem showWifi = menu.findItem(R.id.data_usage_menu_show_wifi);
+        showWifi.setVisible(hasMobileRadio(context) && hasWifiRadio(context));
+        showWifi.setChecked(mShowWifi);
+
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.data_usage_menu_roaming: {
+                final boolean dataRoaming = !item.isChecked();
+                if (dataRoaming) {
+                    ConfirmDataRoamingFragment.show(this);
+                } else {
+                    // no confirmation to disable roaming
+                    setDataRoaming(false);
+                }
+                return true;
+            }
+            case R.id.data_usage_menu_restrict_background: {
+                final boolean restrictBackground = !item.isChecked();
+                if (restrictBackground) {
+                    ConfirmRestrictFragment.show(this);
+                } else {
+                    // no confirmation to drop restriction
+                    setRestrictBackground(false);
+                }
+                return true;
+            }
+            case R.id.data_usage_menu_split_4g: {
+                final boolean mobileSplit = !item.isChecked();
+                setMobilePolicySplit(mobileSplit);
+                item.setChecked(isMobilePolicySplit());
+                updateTabs();
+                return true;
+            }
+            case R.id.data_usage_menu_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;
+    }
+
+    /**
+     * Listener to setup {@link LayoutTransition} after first layout pass.
+     */
+    private OnGlobalLayoutListener mFirstLayoutListener = new OnGlobalLayoutListener() {
+        /** {@inheritDoc} */
+        public void onGlobalLayout() {
+            mHeader.getViewTreeObserver().removeGlobalOnLayoutListener(mFirstLayoutListener);
+
+            mTabsContainer.setLayoutTransition(new LayoutTransition());
+            mHeader.setLayoutTransition(new LayoutTransition());
+            mNetworkSwitchesContainer.setLayoutTransition(new LayoutTransition());
+
+            final LayoutTransition chartTransition = new LayoutTransition();
+            chartTransition.setStartDelay(LayoutTransition.APPEARING, 0);
+            chartTransition.setStartDelay(LayoutTransition.DISAPPEARING, 0);
+            mChart.setLayoutTransition(chartTransition);
+        }
+    };
+
+    /**
+     * 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");
+        }
+
+        final boolean tabChanged = !currentTab.equals(mCurrentTab);
+        mCurrentTab = currentTab;
+
+        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);
+
+        // only update policy when switching tabs
+        updatePolicy(tabChanged);
+        updateAppDetail();
+
+        // force scroll to top of body
+        mListView.smoothScrollToPosition(0);
+
+        mBinding = false;
+    }
+
+    private boolean isAppDetailMode() {
+        return mUid != UID_NONE;
+    }
+
+    /**
+     * Update UID details panels to match {@link #mUid}, showing or hiding them
+     * depending on {@link #isAppDetailMode()}.
+     */
+    private void updateAppDetail() {
+        if (isAppDetailMode()) {
+            mAppDetail.setVisibility(View.VISIBLE);
+            mCycleAdapter.setChangeVisible(false);
+        } else {
+            mAppDetail.setVisibility(View.GONE);
+            mCycleAdapter.setChangeVisible(true);
+
+            // hide detail stats when not in detail mode
+            mChart.bindDetailNetworkStats(null);
+            return;
+        }
+
+        // remove warning/limit sweeps while in detail mode
+        mChart.bindNetworkPolicy(null);
+
+        final PackageManager pm = getActivity().getPackageManager();
+        mAppTitle.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
+            mDetailHistory = 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.bindDetailNetworkStats(mDetailHistory);
+
+        updateDetailData();
+
+        final Context context = getActivity();
+        if (NetworkPolicyManager.isUidValidForPolicy(context, mUid)) {
+            mAppRestrictView.setVisibility(View.VISIBLE);
+            mAppRestrict.setChecked(getAppRestrictBackground());
+
+        } else {
+            mAppRestrictView.setVisibility(View.GONE);
+        }
+
+    }
+
+    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);
+    }
+
+    private boolean getDataRoaming() {
+        final ContentResolver resolver = getActivity().getContentResolver();
+        return Settings.Secure.getInt(resolver, Settings.Secure.DATA_ROAMING, 0) != 0;
+    }
+
+    private void setDataRoaming(boolean enabled) {
+        // TODO: teach telephony DataConnectionTracker to watch and apply
+        // updates when changed.
+        final ContentResolver resolver = getActivity().getContentResolver();
+        Settings.Secure.putInt(resolver, Settings.Secure.DATA_ROAMING, enabled ? 1 : 0);
+        mMenuDataRoaming.setChecked(enabled);
+    }
+
+    private boolean getRestrictBackground() {
+        return !mConnService.getBackgroundDataSetting();
+    }
+
+    private void setRestrictBackground(boolean restrictBackground) {
+        if (LOGD) Log.d(TAG, "setRestrictBackground()");
+        mConnService.setBackgroundDataSetting(!restrictBackground);
+        mMenuRestrictBackground.setChecked(restrictBackground);
+    }
+
+    private boolean getAppRestrictBackground() {
+        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);
+        }
+
+        return (uidPolicy & POLICY_REJECT_METERED_BACKGROUND) != 0;
+    }
+
+    private void setAppRestrictBackground(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);
+        }
+
+        mAppRestrict.setChecked(restrictBackground);
+    }
+
+    /**
+     * Update chart sweeps and cycle list to reflect {@link NetworkPolicy} for
+     * current {@link #mTemplate}.
+     */
+    private void updatePolicy(boolean refreshCycle) {
+        if (isAppDetailMode()) {
+            mNetworkSwitches.setVisibility(View.GONE);
+            // we fall through to update cycle list for detail mode
+        } else {
+            mNetworkSwitches.setVisibility(View.VISIBLE);
+
+            // when heading back to summary without cycle refresh, kick details
+            // update to repopulate list.
+            if (!refreshCycle) {
+                updateDetailData();
+            }
+        }
+
+        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);
+        }
+    }
+
+    /**
+     * 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();
+        long historyStart = mHistory.getStart();
+        long historyEnd = mHistory.getEnd();
+
+        if (historyStart == Long.MAX_VALUE || historyEnd == Long.MIN_VALUE) {
+            historyStart = System.currentTimeMillis();
+            historyEnd = System.currentTimeMillis();
+        }
+
+        boolean hasCycles = false;
+        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;
+                hasCycles = true;
+
+                // TODO: remove this guard once we have better testing
+                if (guardCount++ > 50) {
+                    Log.wtf(TAG, "stuck generating ranges for historyStart=" + historyStart
+                            + ", historyEnd=" + historyEnd + " and policy=" + policy);
+                }
+            }
+
+            // one last cycle entry to modify policy cycle day
+            mCycleAdapter.setChangePossible(true);
+        }
+
+        if (!hasCycles) {
+            // no valid cycles; show all data
+            // TODO: offer simple ranges like "last week" etc
+            mCycleAdapter.add(new CycleItem(context, historyStart, historyEnd));
+            mCycleAdapter.setChangePossible(false);
+        }
+
+        // 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 View.OnClickListener mAppRestrictListener = new View.OnClickListener() {
+        /** {@inheritDoc} */
+        public void onClick(View v) {
+            final boolean restrictBackground = !mAppRestrict.isChecked();
+
+            if (restrictBackground) {
+                // enabling restriction; show confirmation dialog which
+                // eventually calls setRestrictBackground() once user confirms.
+                ConfirmAppRestrictFragment.show(DataUsageSummary.this);
+            } else {
+                setAppRestrictBackground(false);
+            }
+        }
+    };
+
+    private OnClickListener mAppSettingsListener = new OnClickListener() {
+        /** {@inheritDoc} */
+        public void onClick(View v) {
+            // TODO: target torwards entire UID instead of just first package
+            startActivity(mAppSettingsIntent);
+        }
+    };
+
+    private OnItemClickListener mListListener = new OnItemClickListener() {
+        /** {@inheritDoc} */
+        public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+            final AppUsageItem app = (AppUsageItem) parent.getItemAtPosition(position);
+            AppDetailsFragment.show(DataUsageSummary.this, app.uid);
+        }
+    };
+
+    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.
+                mChart.setVisibleRange(cycle.start, cycle.end, mHistory.getEnd());
+
+                updateDetailData();
+            }
+        }
+
+        /** {@inheritDoc} */
+        public void onNothingSelected(AdapterView<?> parent) {
+            // ignored
+        }
+    };
+
+    /**
+     * Update details based on {@link #mChart} inspection range depending on
+     * current mode. In network mode, updates {@link #mAdapter} with sorted list
+     * of applications data usage, and when {@link #isAppDetailMode()} update
+     * app details.
+     */
+    private void updateDetailData() {
+        if (LOGD) Log.d(TAG, "updateDetailData()");
+
+        final long start = mChart.getInspectStart();
+        final long end = mChart.getInspectEnd();
+
+        if (isAppDetailMode()) {
+            if (mDetailHistory != null) {
+                final Context context = mChart.getContext();
+                final long now = System.currentTimeMillis();
+                final NetworkStatsHistory.Entry entry = mDetailHistory.getValues(
+                        start, end, now, null);
+                final long total = entry.rxBytes + entry.txBytes;
+                mAppSubtitle.setText(Formatter.formatFileSize(context, total));
+            }
+
+            getLoaderManager().destroyLoader(LOADER_SUMMARY);
+
+        } else {
+            // kick off loader for detailed stats
+            getLoaderManager().restartLoader(LOADER_SUMMARY,
+                    SummaryForAllUidLoader.buildArgs(mTemplate, start, end), mSummaryForAllUid);
+
+        }
+    }
+
+    private final LoaderCallbacks<NetworkStats> mSummaryForAllUid = new LoaderCallbacks<
+            NetworkStats>() {
+        /** {@inheritDoc} */
+        public Loader<NetworkStats> onCreateLoader(int id, Bundle args) {
+            return new SummaryForAllUidLoader(getActivity(), mStatsService, args);
+        }
+
+        /** {@inheritDoc} */
+        public void onLoadFinished(Loader<NetworkStats> loader, NetworkStats data) {
+            mAdapter.bindStats(data);
+        }
+
+        /** {@inheritDoc} */
+        public void onLoaderReset(Loader<NetworkStats> loader) {
+            mAdapter.bindStats(null);
+        }
+    };
+
+    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> {
+        private boolean mChangePossible = false;
+        private boolean mChangeVisible = false;
+
+        private final CycleChangeItem mChangeItem;
+
+        public CycleAdapter(Context context) {
+            super(context, android.R.layout.simple_spinner_item);
+            setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+            mChangeItem = new CycleChangeItem(context);
+        }
+
+        public void setChangePossible(boolean possible) {
+            mChangePossible = possible;
+            updateChange();
+        }
+
+        public void setChangeVisible(boolean visible) {
+            mChangeVisible = visible;
+            updateChange();
+        }
+
+        private void updateChange() {
+            remove(mChangeItem);
+            if (mChangePossible && mChangeVisible) {
+                add(mChangeItem);
+            }
+        }
+    }
+
+    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();
+
+        /**
+         * Bind the given {@link NetworkStats}, or {@code null} to clear list.
+         */
+        public void bindStats(NetworkStats stats) {
+            mItems.clear();
+
+            if (stats != null) {
+                final AppUsageItem systemItem = new AppUsageItem();
+                systemItem.uid = android.os.Process.SYSTEM_UID;
+
+                NetworkStats.Entry entry = null;
+                for (int i = 0; i < stats.size(); i++) {
+                    entry = stats.getValues(i, entry);
+
+                    final boolean isApp = entry.uid >= android.os.Process.FIRST_APPLICATION_UID
+                            && entry.uid <= android.os.Process.LAST_APPLICATION_UID;
+                    if (isApp || entry.uid == TrafficStats.UID_REMOVED) {
+                        final AppUsageItem item = new AppUsageItem();
+                        item.uid = entry.uid;
+                        item.total = entry.rxBytes + entry.txBytes;
+                        mItems.add(item);
+                    } else {
+                        systemItem.total += entry.rxBytes + entry.txBytes;
+                    }
+                }
+
+                if (systemItem.total > 0) {
+                    mItems.add(systemItem);
+                }
+            }
+
+            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 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(context, item.uid));
+            text2.setText(Formatter.formatFileSize(context, item.total));
+
+            return convertView;
+        }
+
+    }
+
+    /**
+     * Empty {@link Fragment} that controls display of UID details in
+     * {@link DataUsageSummary}.
+     */
+    public static class AppDetailsFragment extends Fragment {
+        public static final String EXTRA_UID = "uid";
+
+        public static void show(DataUsageSummary parent, int uid) {
+            final Bundle args = new Bundle();
+            args.putInt(EXTRA_UID, uid);
+
+            final AppDetailsFragment fragment = new AppDetailsFragment();
+            fragment.setArguments(args);
+            fragment.setTargetFragment(parent, 0);
+
+            final FragmentTransaction ft = parent.getFragmentManager().beginTransaction();
+            ft.add(fragment, TAG_APP_DETAILS);
+            ft.addToBackStack(TAG_APP_DETAILS);
+            ft.commit();
+        }
+
+        @Override
+        public void onStart() {
+            super.onStart();
+            final DataUsageSummary target = (DataUsageSummary) getTargetFragment();
+            target.mUid = getArguments().getInt(EXTRA_UID);
+            target.updateBody();
+        }
+
+        @Override
+        public void onStop() {
+            super.onStop();
+            final DataUsageSummary target = (DataUsageSummary) getTargetFragment();
+            target.mUid = UID_NONE;
+            target.updateBody();
+        }
+    }
+
+    /**
+     * 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();
+        }
+    }
+
+    /**
+     * Dialog to request user confirmation before setting
+     * {@link Settings.Secure#DATA_ROAMING}.
+     */
+    public static class ConfirmDataRoamingFragment extends DialogFragment {
+        public static void show(DataUsageSummary parent) {
+            final Bundle args = new Bundle();
+
+            final ConfirmDataRoamingFragment dialog = new ConfirmDataRoamingFragment();
+            dialog.setTargetFragment(parent, 0);
+            dialog.show(parent.getFragmentManager(), TAG_CONFIRM_ROAMING);
+        }
+
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            final Context context = getActivity();
+
+            final AlertDialog.Builder builder = new AlertDialog.Builder(context);
+            builder.setTitle(R.string.roaming_reenable_title);
+            builder.setMessage(R.string.roaming_warning);
+
+            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.setDataRoaming(true);
+                    }
+                }
+            });
+            builder.setNegativeButton(android.R.string.cancel, null);
+
+            return builder.create();
+        }
+    }
+
+    /**
+     * Dialog to request user confirmation before setting
+     * {@link ConnectivityManager#setBackgroundDataSetting(boolean)}.
+     */
+    public static class ConfirmRestrictFragment extends DialogFragment {
+        public static void show(DataUsageSummary parent) {
+            final Bundle args = new Bundle();
+
+            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_restrict_background_title);
+            builder.setMessage(R.string.data_usage_restrict_background);
+
+            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.setRestrictBackground(true);
+                    }
+                }
+            });
+            builder.setNegativeButton(android.R.string.cancel, null);
+
+            return builder.create();
+        }
+    }
+
+    /**
+     * Dialog to request user confirmation before setting
+     * {@link #POLICY_REJECT_METERED_BACKGROUND}.
+     */
+    public static class ConfirmAppRestrictFragment extends DialogFragment {
+        public static void show(DataUsageSummary parent) {
+            final ConfirmAppRestrictFragment dialog = new ConfirmAppRestrictFragment();
+            dialog.setTargetFragment(parent, 0);
+            dialog.show(parent.getFragmentManager(), TAG_CONFIRM_APP_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 DataUsageSummary target = (DataUsageSummary) getTargetFragment();
+                    if (target != null) {
+                        target.setAppRestrictBackground(true);
+                    }
+                }
+            });
+            builder.setNegativeButton(android.R.string.cancel, null);
+
+            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, MATCH_MOBILE_ALL);
+        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(Context context, int uid) {
+        final Resources res = context.getResources();
+        final PackageManager pm = context.getPackageManager();
+
+        // handle special case labels
+        switch (uid) {
+            case android.os.Process.SYSTEM_UID:
+                return res.getText(R.string.process_kernel_label);
+            case TrafficStats.UID_REMOVED:
+                return res.getText(R.string.data_usage_uninstalled_apps);
+        }
+
+        // otherwise fall back to using packagemanager labels
+        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);
+    }
+
+    /**
+     * Set {@link android.R.id#summary} for a preference view inflated with
+     * {@link #inflatePreference(LayoutInflater, ViewGroup, View)}.
+     */
+    private static void setPreferenceSummary(View parent, int resId) {
+        final TextView summary = (TextView) parent.findViewById(android.R.id.summary);
+        summary.setVisibility(View.VISIBLE);
+        summary.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/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 2508454..10afd55 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -16,13 +16,20 @@
 
 package com.android.settings;
 
+import android.app.ActivityManagerNative;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.ContentResolver;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.os.BatteryManager;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.IBinder;
+import android.os.Parcel;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.os.StrictMode;
 import android.os.SystemProperties;
 import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
@@ -31,6 +38,8 @@
 import android.preference.PreferenceScreen;
 import android.preference.Preference.OnPreferenceChangeListener;
 import android.provider.Settings;
+import android.text.TextUtils;
+import android.view.IWindowManager;
 
 /*
  * Displays preferences for application developers.
@@ -45,10 +54,33 @@
     private static final String HDCP_CHECKING_KEY = "hdcp_checking";
     private static final String HDCP_CHECKING_PROPERTY = "persist.sys.hdcp_checking";
 
+    private static final String STRICT_MODE_KEY = "strict_mode";
+    private static final String POINTER_LOCATION_KEY = "pointer_location";
+    private static final String SHOW_SCREEN_UPDATES_KEY = "show_screen_updates";
+    private static final String SHOW_CPU_USAGE_KEY = "show_cpu_usage";
+    private static final String WINDOW_ANIMATION_SCALE_KEY = "window_animation_scale";
+    private static final String TRANSITION_ANIMATION_SCALE_KEY = "transition_animation_scale";
+
+    private static final String IMMEDIATELY_DESTROY_ACTIVITIES_KEY
+            = "immediately_destroy_activities";
+    private static final String APP_PROCESS_LIMIT_KEY = "app_process_limit";
+
+    private IWindowManager mWindowManager;
+
     private CheckBoxPreference mEnableAdb;
     private CheckBoxPreference mKeepScreenOn;
     private CheckBoxPreference mAllowMockLocation;
 
+    private CheckBoxPreference mStrictMode;
+    private CheckBoxPreference mPointerLocation;
+    private CheckBoxPreference mShowScreenUpdates;
+    private CheckBoxPreference mShowCpuUsage;
+    private ListPreference mWindowAnimationScale;
+    private ListPreference mTransitionAnimationScale;
+
+    private CheckBoxPreference mImmediatelyDestroyActivities;
+    private ListPreference mAppProcessLimit;
+
     // To track whether Yes was clicked in the adb warning dialog
     private boolean mOkClicked;
 
@@ -58,12 +90,28 @@
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
+        mWindowManager = IWindowManager.Stub.asInterface(ServiceManager.getService("window"));
+
         addPreferencesFromResource(R.xml.development_prefs);
 
         mEnableAdb = (CheckBoxPreference) findPreference(ENABLE_ADB);
         mKeepScreenOn = (CheckBoxPreference) findPreference(KEEP_SCREEN_ON);
         mAllowMockLocation = (CheckBoxPreference) findPreference(ALLOW_MOCK_LOCATION);
 
+        mStrictMode = (CheckBoxPreference) findPreference(STRICT_MODE_KEY);
+        mPointerLocation = (CheckBoxPreference) findPreference(POINTER_LOCATION_KEY);
+        mShowScreenUpdates = (CheckBoxPreference) findPreference(SHOW_SCREEN_UPDATES_KEY);
+        mShowCpuUsage = (CheckBoxPreference) findPreference(SHOW_CPU_USAGE_KEY);
+        mWindowAnimationScale = (ListPreference) findPreference(WINDOW_ANIMATION_SCALE_KEY);
+        mWindowAnimationScale.setOnPreferenceChangeListener(this);
+        mTransitionAnimationScale = (ListPreference) findPreference(TRANSITION_ANIMATION_SCALE_KEY);
+        mTransitionAnimationScale.setOnPreferenceChangeListener(this);
+
+        mImmediatelyDestroyActivities = (CheckBoxPreference) findPreference(
+                IMMEDIATELY_DESTROY_ACTIVITIES_KEY);
+        mAppProcessLimit = (ListPreference) findPreference(APP_PROCESS_LIMIT_KEY);
+        mAppProcessLimit.setOnPreferenceChangeListener(this);
+
         removeHdcpOptionsForProduction();
     }
 
@@ -89,6 +137,13 @@
         mAllowMockLocation.setChecked(Settings.Secure.getInt(cr,
                 Settings.Secure.ALLOW_MOCK_LOCATION, 0) != 0);
         updateHdcpValues();
+        updateStrictModeVisualOptions();
+        updatePointerLocationOptions();
+        updateFlingerOptions();
+        updateCpuUsageOptions();
+        updateAnimationScaleOptions();
+        updateImmediatelyDestroyActivitiesOptions();
+        updateAppProcessLimitOptions();
     }
 
     private void updateHdcpValues() {
@@ -110,6 +165,169 @@
         }
     }
 
+    // Returns the current state of the system property that controls
+    // strictmode flashes.  One of:
+    //    0: not explicitly set one way or another
+    //    1: on
+    //    2: off
+    private int currentStrictModeActiveIndex() {
+        if (TextUtils.isEmpty(SystemProperties.get(StrictMode.VISUAL_PROPERTY))) {
+            return 0;
+        }
+        boolean enabled = SystemProperties.getBoolean(StrictMode.VISUAL_PROPERTY, false);
+        return enabled ? 1 : 2;
+    }
+
+    private void writeStrictModeVisualOptions() {
+        try {
+            mWindowManager.setStrictModeVisualIndicatorPreference(mStrictMode.isChecked()
+                    ? "1" : "");
+        } catch (RemoteException e) {
+        }
+    }
+
+    private void updateStrictModeVisualOptions() {
+        mStrictMode.setChecked(currentStrictModeActiveIndex() == 1);
+    }
+
+    private void writePointerLocationOptions() {
+        Settings.System.putInt(getActivity().getContentResolver(),
+                Settings.System.POINTER_LOCATION, mPointerLocation.isChecked() ? 1 : 0);
+    }
+
+    private void updatePointerLocationOptions() {
+        mPointerLocation.setChecked(Settings.System.getInt(getActivity().getContentResolver(),
+                Settings.System.POINTER_LOCATION, 0) != 0);
+    }
+
+    private void updateFlingerOptions() {
+        // magic communication with surface flinger.
+        try {
+            IBinder flinger = ServiceManager.getService("SurfaceFlinger");
+            if (flinger != null) {
+                Parcel data = Parcel.obtain();
+                Parcel reply = Parcel.obtain();
+                data.writeInterfaceToken("android.ui.ISurfaceComposer");
+                flinger.transact(1010, data, reply, 0);
+                @SuppressWarnings("unused")
+                int showCpu = reply.readInt();
+                @SuppressWarnings("unused")
+                int enableGL = reply.readInt();
+                int showUpdates = reply.readInt();
+                mShowScreenUpdates.setChecked(showUpdates != 0);
+                @SuppressWarnings("unused")
+                int showBackground = reply.readInt();
+                reply.recycle();
+                data.recycle();
+            }
+        } catch (RemoteException ex) {
+        }
+    }
+
+    private void writeFlingerOptions() {
+        try {
+            IBinder flinger = ServiceManager.getService("SurfaceFlinger");
+            if (flinger != null) {
+                Parcel data = Parcel.obtain();
+                data.writeInterfaceToken("android.ui.ISurfaceComposer");
+                data.writeInt(mShowScreenUpdates.isChecked() ? 1 : 0);
+                flinger.transact(1002, data, null, 0);
+                data.recycle();
+
+                updateFlingerOptions();
+            }
+        } catch (RemoteException ex) {
+        }
+    }
+
+    private void updateCpuUsageOptions() {
+        mShowCpuUsage.setChecked(Settings.System.getInt(getActivity().getContentResolver(),
+                Settings.System.SHOW_PROCESSES, 0) != 0);
+    }
+
+    private void writeCpuUsageOptions() {
+        boolean value = mShowCpuUsage.isChecked();
+        Settings.System.putInt(getActivity().getContentResolver(),
+                Settings.System.SHOW_PROCESSES, value ? 1 : 0);
+        Intent service = (new Intent())
+                .setClassName("android", "com.android.server.LoadAverageService");
+        if (value) {
+            getActivity().startService(service);
+        } else {
+            getActivity().stopService(service);
+        }
+    }
+
+    private void writeImmediatelyDestroyActivitiesOptions() {
+        try {
+            ActivityManagerNative.getDefault().setAlwaysFinish(
+                    mImmediatelyDestroyActivities.isChecked());
+        } catch (RemoteException ex) {
+        }
+    }
+
+    private void updateImmediatelyDestroyActivitiesOptions() {
+        mImmediatelyDestroyActivities.setChecked(Settings.System.getInt(
+            getActivity().getContentResolver(), Settings.System.ALWAYS_FINISH_ACTIVITIES, 0) != 0);
+    }
+
+    private void updateAnimationScaleValue(int which, ListPreference pref) {
+        try {
+            float scale = mWindowManager.getAnimationScale(which);
+            CharSequence[] values = pref.getEntryValues();
+            for (int i=0; i<values.length; i++) {
+                float val = Float.parseFloat(values[i].toString());
+                if (scale <= val) {
+                    pref.setValueIndex(i);
+                    pref.setSummary(pref.getEntries()[i]);
+                    return;
+                }
+            }
+            pref.setValueIndex(values.length-1);
+            pref.setSummary(pref.getEntries()[0]);
+        } catch (RemoteException e) {
+        }
+    }
+
+    private void updateAnimationScaleOptions() {
+        updateAnimationScaleValue(0, mWindowAnimationScale);
+        updateAnimationScaleValue(1, mTransitionAnimationScale);
+    }
+
+    private void writeAnimationScaleOption(int which, ListPreference pref, Object newValue) {
+        try {
+            float scale = Float.parseFloat(newValue.toString());
+            mWindowManager.setAnimationScale(which, scale);
+        } catch (RemoteException e) {
+        }
+    }
+
+    private void updateAppProcessLimitOptions() {
+        try {
+            int limit = ActivityManagerNative.getDefault().getProcessLimit();
+            CharSequence[] values = mAppProcessLimit.getEntryValues();
+            for (int i=0; i<values.length; i++) {
+                int val = Integer.parseInt(values[i].toString());
+                if (val >= limit) {
+                    mAppProcessLimit.setValueIndex(i);
+                    mAppProcessLimit.setSummary(mAppProcessLimit.getEntries()[i]);
+                    return;
+                }
+            }
+            mAppProcessLimit.setValueIndex(0);
+            mAppProcessLimit.setSummary(mAppProcessLimit.getEntries()[0]);
+        } catch (RemoteException e) {
+        }
+    }
+
+    private void writeAppProcessLimitOptions(Object newValue) {
+        try {
+            int limit = Integer.parseInt(newValue.toString());
+            ActivityManagerNative.getDefault().setProcessLimit(limit);
+        } catch (RemoteException e) {
+        }
+    }
+
     @Override
     public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
 
@@ -142,11 +360,40 @@
             Settings.Secure.putInt(getActivity().getContentResolver(),
                     Settings.Secure.ALLOW_MOCK_LOCATION,
                     mAllowMockLocation.isChecked() ? 1 : 0);
+        } else if (preference == mStrictMode) {
+            writeStrictModeVisualOptions();
+        } else if (preference == mPointerLocation) {
+            writePointerLocationOptions();
+        } else if (preference == mShowScreenUpdates) {
+            writeFlingerOptions();
+        } else if (preference == mShowCpuUsage) {
+            writeCpuUsageOptions();
+        } else if (preference == mImmediatelyDestroyActivities) {
+            writeImmediatelyDestroyActivitiesOptions();
         }
 
         return false;
     }
 
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        if (HDCP_CHECKING_KEY.equals(preference.getKey())) {
+            SystemProperties.set(HDCP_CHECKING_PROPERTY, newValue.toString());
+            updateHdcpValues();
+            return true;
+        } else if (preference == mWindowAnimationScale) {
+            writeAnimationScaleOption(0, mWindowAnimationScale, newValue);
+            return true;
+        } else if (preference == mTransitionAnimationScale) {
+            writeAnimationScaleOption(1, mTransitionAnimationScale, newValue);
+            return true;
+        } else if (preference == mAppProcessLimit) {
+            writeAppProcessLimitOptions(newValue);
+            return true;
+        }
+        return false;
+    }
+
     private void dismissDialog() {
         if (mOkDialog == null) return;
         mOkDialog.dismiss();
@@ -176,14 +423,4 @@
         dismissDialog();
         super.onDestroy();
     }
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        if (HDCP_CHECKING_KEY.equals(preference.getKey())) {
-            SystemProperties.set(HDCP_CHECKING_PROPERTY, newValue.toString());
-            updateHdcpValues();
-            return true;
-        }
-        return false;
-    }
 }
diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java
index d041c05..76f5a8e 100644
--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@ -40,7 +40,7 @@
 
 public class DeviceInfoSettings extends SettingsPreferenceFragment {
 
-    private static final String TAG = "DeviceInfoSettings";
+    private static final String LOG_TAG = "DeviceInfoSettings";
 
     private static final String KEY_CONTAINER = "container";
     private static final String KEY_TEAM = "team";
@@ -55,8 +55,6 @@
     private static final String KEY_DEVICE_MODEL = "device_model";
     private static final String KEY_BASEBAND_VERSION = "baseband_version";
     private static final String KEY_FIRMWARE_VERSION = "firmware_version";
-    private static final String KEY_EQUIPMENT_ID = "fcc_equipment_id";
-    private static final String PROPERTY_EQUIPMENT_ID = "ro.ril.fccid";
 
     long[] mHits = new long[3];
 
@@ -80,7 +78,6 @@
         setStringSummary(KEY_FIRMWARE_VERSION, Build.VERSION.RELEASE);
         findPreference(KEY_FIRMWARE_VERSION).setEnabled(true);
         setValueSummary(KEY_BASEBAND_VERSION, "gsm.version.baseband");
-        setValueSummary(KEY_EQUIPMENT_ID, PROPERTY_EQUIPMENT_ID);
         setStringSummary(KEY_DEVICE_MODEL, Build.MODEL);
         setStringSummary(KEY_BUILD_NUMBER, Build.DISPLAY);
         findPreference(KEY_KERNEL_VERSION).setSummary(getFormattedKernelVersion());
@@ -89,11 +86,6 @@
         removePreferenceIfPropertyMissing(getPreferenceScreen(), "safetylegal",
                 PROPERTY_URL_SAFETYLEGAL);
 
-        // Remove Equipment id preference if FCC ID is not set by RIL
-        removePreferenceIfPropertyMissing(getPreferenceScreen(), KEY_EQUIPMENT_ID,
-                PROPERTY_EQUIPMENT_ID);
-
-
         // Remove Baseband version if wifi-only device
         if (Utils.isWifiOnly()) {
             getPreferenceScreen().removePreference(findPreference(KEY_BASEBAND_VERSION));
@@ -136,6 +128,7 @@
                 try {
                     startActivity(intent);
                 } catch (Exception e) {
+                    Log.e(LOG_TAG, "Unable to start activity " + intent.toString());
                 }
             }
         }
@@ -150,7 +143,7 @@
             try {
                 preferenceGroup.removePreference(findPreference(preference));
             } catch (RuntimeException e) {
-                Log.d(TAG, "Property '" + property + "' missing and no '"
+                Log.d(LOG_TAG, "Property '" + property + "' missing and no '"
                         + preference + "' preference");
             }
         }
@@ -171,7 +164,7 @@
                     SystemProperties.get(property,
                             getResources().getString(R.string.device_info_default)));
         } catch (RuntimeException e) {
-
+            // No recovery
         }
     }
 
@@ -200,10 +193,10 @@
             Matcher m = p.matcher(procVersionStr);
 
             if (!m.matches()) {
-                Log.e(TAG, "Regex did not match on /proc/version: " + procVersionStr);
+                Log.e(LOG_TAG, "Regex did not match on /proc/version: " + procVersionStr);
                 return "Unavailable";
             } else if (m.groupCount() < 4) {
-                Log.e(TAG, "Regex match on /proc/version only returned " + m.groupCount()
+                Log.e(LOG_TAG, "Regex match on /proc/version only returned " + m.groupCount()
                         + " groups");
                 return "Unavailable";
             } else {
@@ -212,7 +205,7 @@
                         .append(m.group(4))).toString();
             }
         } catch (IOException e) {
-            Log.e(TAG,
+            Log.e(LOG_TAG,
                 "IO Exception when getting kernel version for Device Info screen",
                 e);
 
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index cdb0147..6ab88d0 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -18,21 +18,21 @@
 
 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.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;
 
@@ -44,15 +44,14 @@
     private static final int FALLBACK_SCREEN_TIMEOUT_VALUE = 30000;
 
     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 IWindowManager mWindowManager;
-
+    private final Configuration mCurConfig = new Configuration();
+    
     private ListPreference mScreenTimeoutPreference;
 
     private ContentObserver mAccelerometerRotationObserver = new ContentObserver(new Handler()) {
@@ -66,12 +65,9 @@
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         ContentResolver resolver = getActivity().getContentResolver();
-        mWindowManager = IWindowManager.Stub.asInterface(ServiceManager.getService("window"));
 
         addPreferencesFromResource(R.xml.display_settings);
 
-        mAnimations = (ListPreference) findPreference(KEY_ANIMATIONS);
-        mAnimations.setOnPreferenceChangeListener(this);
         mAccelerometer = (CheckBoxPreference) findPreference(KEY_ACCELEROMETER);
         mAccelerometer.setPersistent(false);
 
@@ -81,22 +77,41 @@
         mScreenTimeoutPreference.setValue(String.valueOf(currentTimeout));
         mScreenTimeoutPreference.setOnPreferenceChangeListener(this);
         disableUnusableTimeouts(mScreenTimeoutPreference);
-        updateTimeoutPreferenceDescription(resolver, currentTimeout);
+        updateTimeoutPreferenceDescription(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(
+            ListPreference pref,
+            int summaryStrings,
+            long currentTimeout) {
+        updateTimeoutPreferenceDescription(pref, summaryStrings, 0, currentTimeout);
+    }
+
+    private void updateTimeoutPreferenceDescription(
+            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,11 +150,33 @@
         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) {
+            Log.w(TAG, "Unable to retrieve font size");
+        }
+        pref.setValueIndex(floatToIndex(mCurConfig.fontScale, R.array.entryvalues_font_size));
+    }
+    
     @Override
     public void onResume() {
         super.onResume();
 
-        updateState(true);
+        updateState();
         getContentResolver().registerContentObserver(
                 Settings.System.getUriFor(Settings.System.ACCELEROMETER_ROTATION), true,
                 mAccelerometerRotationObserver);
@@ -152,33 +189,9 @@
         getContentResolver().unregisterContentObserver(mAccelerometerRotationObserver);
     }
 
-    private void updateState(boolean force) {
-        int animations = 0;
-        try {
-            mAnimationScales = mWindowManager.getAnimationScales();
-        } catch (RemoteException e) {
-        }
-        if (mAnimationScales != null) {
-            if (mAnimationScales.length >= 1) {
-                animations = ((int)(mAnimationScales[0]+.5f)) % 10;
-            }
-            if (mAnimationScales.length >= 2) {
-                animations += (((int)(mAnimationScales[1]+.5f)) & 0x7) * 10;
-            }
-        }
-        int idx = 0;
-        int best = 0;
-        CharSequence[] aents = mAnimations.getEntryValues();
-        for (int i=0; i<aents.length; i++) {
-            int val = Integer.parseInt(aents[i].toString());
-            if (val <= animations && val > best) {
-                best = val;
-                idx = i;
-            }
-        }
-        mAnimations.setValueIndex(idx);
-        updateAnimationsSummary(mAnimations.getValue());
+    private void updateState() {
         updateAccelerometerRotationCheckbox();
+        readFontSizePreference(mFontSizePref);
     }
 
     private void updateAccelerometerRotationCheckbox() {
@@ -187,19 +200,15 @@
                 Settings.System.ACCELEROMETER_ROTATION, 0) != 0);
     }
 
-    private void updateAnimationsSummary(Object value) {
-        CharSequence[] summaries = getResources().getTextArray(R.array.animations_summaries);
-        CharSequence[] values = mAnimations.getEntryValues();
-        for (int i=0; i<values.length; i++) {
-            //Log.i("foo", "Comparing entry "+ values[i] + " to current "
-            //        + mAnimations.getValue());
-            if (values[i].equals(value)) {
-                mAnimations.setSummary(summaries[i]);
-                break;
-            }
+    public void writeFontSizePreference(Object objValue) {
+        try {
+            mCurConfig.fontScale = Float.parseFloat(objValue.toString());
+            ActivityManagerNative.getDefault().updateConfiguration(mCurConfig);
+        } catch (RemoteException e) {
+            Log.w(TAG, "Unable to save font size");
         }
     }
-
+    
     @Override
     public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
         if (preference == mAccelerometer) {
@@ -207,40 +216,25 @@
                     Settings.System.ACCELEROMETER_ROTATION,
                     mAccelerometer.isChecked() ? 1 : 0);
         }
-        return true;
+        return super.onPreferenceTreeClick(preferenceScreen, preference);
     }
 
     public boolean onPreferenceChange(Preference preference, Object objValue) {
         final String key = preference.getKey();
-        if (KEY_ANIMATIONS.equals(key)) {
-            try {
-                int value = Integer.parseInt((String) objValue);
-                if (mAnimationScales.length >= 1) {
-                    mAnimationScales[0] = value%10;
-                }
-                if (mAnimationScales.length >= 2) {
-                    mAnimationScales[1] = (value/10)%10;
-                }
-                try {
-                    mWindowManager.setAnimationScales(mAnimationScales);
-                } catch (RemoteException e) {
-                }
-                updateAnimationsSummary(objValue);
-            } catch (NumberFormatException e) {
-                Log.e(TAG, "could not persist animation setting", e);
-            }
-
-        }
         if (KEY_SCREEN_TIMEOUT.equals(key)) {
             int value = Integer.parseInt((String) objValue);
             try {
                 Settings.System.putInt(getContentResolver(),
                         SCREEN_OFF_TIMEOUT, value);
-                updateTimeoutPreferenceDescription(getContentResolver(), value);
+                updateTimeoutPreferenceDescription(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/ProgressCategory.java b/src/com/android/settings/ProgressCategory.java
index c5b68b6..eee19bc 100644
--- a/src/com/android/settings/ProgressCategory.java
+++ b/src/com/android/settings/ProgressCategory.java
@@ -17,13 +17,15 @@
 package com.android.settings;
 
 import android.content.Context;
+import android.preference.Preference;
 import android.util.AttributeSet;
 import android.view.View;
+import android.widget.TextView;
 
 public class ProgressCategory extends ProgressCategoryBase {
 
     private boolean mProgress = false;
-    private View oldView = null;
+    private Preference mNoDeviceFoundPreference;
 
     public ProgressCategory(Context context, AttributeSet attrs) {
         super(context, attrs);
@@ -33,19 +35,27 @@
     @Override
     public void onBindView(View view) {
         super.onBindView(view);
-        final View textView = view.findViewById(R.id.scanning_text);
+        final TextView textView = (TextView) view.findViewById(R.id.scanning_text);
         final View progressBar = view.findViewById(R.id.scanning_progress);
 
-        final int visibility = mProgress ? View.VISIBLE : View.INVISIBLE;
-        textView.setVisibility(visibility);
-        progressBar.setVisibility(visibility);
+        textView.setText(mProgress ? R.string.progress_scanning : R.string.progress_tap_to_pair);
+        boolean noDeviceFound = getPreferenceCount() == 0;
+        textView.setVisibility(noDeviceFound ? View.INVISIBLE : View.VISIBLE);
+        progressBar.setVisibility(mProgress ? View.VISIBLE : View.INVISIBLE);
 
-        if (oldView != null) {
-            oldView.findViewById(R.id.scanning_progress).setVisibility(View.GONE);
-            oldView.findViewById(R.id.scanning_text).setVisibility(View.GONE);
-            oldView.setVisibility(View.GONE);
+        if (mProgress) {
+            if (mNoDeviceFoundPreference != null) {
+                removePreference(mNoDeviceFoundPreference);
+            }
+        } else {
+            if (noDeviceFound) {
+                if (mNoDeviceFoundPreference == null) {
+                    mNoDeviceFoundPreference = new Preference(getContext());
+                    mNoDeviceFoundPreference.setSummary(R.string.bluetooth_no_devices_found);
+                }
+                addPreference(mNoDeviceFoundPreference);
+            }
         }
-        oldView = view;
     }
 
     @Override
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..057e5de 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -19,15 +19,11 @@
 
 import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;
 
-import com.android.internal.widget.LockPatternUtils;
-
+import android.app.AlertDialog;
 import android.app.admin.DevicePolicyManager;
-import android.content.ContentQueryMap;
-import android.content.ContentResolver;
 import android.content.Context;
+import android.content.DialogInterface;
 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,15 +37,15 @@
 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.
  */
 public class SecuritySettings extends SettingsPreferenceFragment
-        implements OnPreferenceChangeListener {
+        implements OnPreferenceChangeListener, DialogInterface.OnClickListener {
 
     // Lock Settings
     private static final String KEY_UNLOCK_SET_OR_CHANGE = "unlock_set_or_change";
@@ -60,47 +56,28 @@
     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;
+    private static final String KEY_TOGGLE_INSTALL_APPLICATIONS = "toggle_install_applications";
 
     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;
 
+    private CheckBoxPreference mToggleAppInstallation;
+    private DialogInterface mWarnInstallApps;
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -112,25 +89,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 +97,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,13 +171,52 @@
         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);
 
+        mToggleAppInstallation = (CheckBoxPreference) findPreference(
+                KEY_TOGGLE_INSTALL_APPLICATIONS);
+        mToggleAppInstallation.setChecked(isNonMarketAppsAllowed());
+
         return root;
     }
 
+    private boolean isNonMarketAppsAllowed() {
+        return Settings.Secure.getInt(getContentResolver(),
+                                      Settings.Secure.INSTALL_NON_MARKET_APPS, 0) > 0;
+    }
+
+    private void setNonMarketAppsAllowed(boolean enabled) {
+        // Change the system setting
+        Settings.Secure.putInt(getContentResolver(), Settings.Secure.INSTALL_NON_MARKET_APPS,
+                                enabled ? 1 : 0);
+    }
+
+    private void warnAppInstallation() {
+        // TODO: DialogFragment?
+        mWarnInstallApps = new AlertDialog.Builder(getActivity()).setTitle(
+                getResources().getString(R.string.error_title))
+                .setIcon(com.android.internal.R.drawable.ic_dialog_alert)
+                .setMessage(getResources().getString(R.string.install_all_warning))
+                .setPositiveButton(android.R.string.yes, this)
+                .setNegativeButton(android.R.string.no, null)
+                .show();
+    }
+
+    public void onClick(DialogInterface dialog, int which) {
+        if (dialog == mWarnInstallApps && which == DialogInterface.BUTTON_POSITIVE) {
+            setNonMarketAppsAllowed(true);
+            mToggleAppInstallation.setChecked(true);
+        }
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        if (mWarnInstallApps != null) {
+            mWarnInstallApps.dismiss();
+        }
+    }
+
     private void setupLockAfterPreference() {
         // Compatible with pre-Froyo
         long currentTimeout = Settings.Secure.getLong(getContentResolver(),
@@ -315,16 +286,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 +298,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 +319,13 @@
         } 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 == mToggleAppInstallation) {
+            if (mToggleAppInstallation.isChecked()) {
+                mToggleAppInstallation.setChecked(false);
+                warnAppInstallation();
+            } else {
+                setNonMarketAppsAllowed(false);
             }
-        } 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 +334,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 +357,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..15366e8 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,15 +49,18 @@
  */
 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 =
         "com.android.settings.PARENT_FRAGMENT_CLASS";
 
+    private static final String EXTRA_THEME = "settings:theme";
+
     private static final String SAVE_KEY_CURRENT_HEADER = "com.android.settings.CURRENT_HEADER";
     private static final String SAVE_KEY_PARENT_HEADER = "com.android.settings.PARENT_HEADER";
 
@@ -58,9 +74,14 @@
     // 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) {
+        final int theme = getIntent().getIntExtra(
+                EXTRA_THEME, android.R.style.Theme_Holo_SolidActionBar_SplitActionBarWhenNarrow);
+        setTheme(theme);
+
         getMetaData();
         mInLocalHeaderSwitch = true;
         super.onCreate(savedInstanceState);
@@ -92,6 +113,10 @@
                 }
             });
         }
+
+        // TODO Add support for android.R.id.home in all Setting's onOptionsItemSelected
+        // getActionBar().setDisplayOptions(ActionBar.DISPLAY_HOME_AS_UP,
+        // ActionBar.DISPLAY_HOME_AS_UP);
     }
 
     @Override
@@ -107,6 +132,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 +193,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);
         }
     }
 
@@ -158,7 +203,7 @@
 
         // If it is not launched from history, then reset to top-level
         if ((intent.getFlags() & Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY) == 0
-                && mFirstHeader != null) {
+                && mFirstHeader != null && !onIsHidingHeaders() && onIsMultiPane()) {
             switchToHeaderLocal(mFirstHeader);
         }
     }
@@ -174,21 +219,24 @@
 
     @Override
     public Intent getIntent() {
-        String startingFragment = getStartingFragmentClass(super.getIntent());
+        Intent superIntent = super.getIntent();
+        String startingFragment = getStartingFragmentClass(superIntent);
+        // This is called from super.onCreate, isMultiPane() is not yet reliable
+        // Do not use onIsHidingHeaders either, which relies itself on this method
         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 +252,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 +274,35 @@
             mCurrentHeader = header;
             return header;
         }
-        return super.onGetInitialHeader();
+
+        return mFirstHeader;
     }
 
+    @Override
+    public Intent onBuildStartFragmentIntent(String fragmentName, Bundle args,
+            int titleRes, int shortTitleRes) {
+        Intent intent = super.onBuildStartFragmentIntent(fragmentName, args,
+                titleRes, shortTitleRes);
+
+        // some fragments would like a custom activity theme
+        if (DataUsageSummary.class.getName().equals(fragmentName)) {
+            intent.putExtra(EXTRA_THEME, android.R.style.Theme_Holo_SolidActionBar);
+        }
+
+        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) {
@@ -250,14 +316,25 @@
                     target.remove(header);
             } else if (id == R.id.operator_settings || id == R.id.manufacturer_settings) {
                 Utils.updateHeaderToSpecificActivityFromMetaDataOrRemove(this, target, header);
-            } else if (id == R.id.call_settings) {
-                if (!Utils.isVoiceCapable(this))
+            } 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
-                if (i == 0) mFirstHeader = header;
+                if (mFirstHeader == null &&
+                        HeaderAdapter.getHeaderType(header) != HeaderAdapter.HEADER_TYPE_CATEGORY) {
+                    mFirstHeader = header;
+                }
                 mHeaderIndexMap.put(id, i);
                 i++;
             }
@@ -287,6 +364,7 @@
                 }
             }
         } catch (NameNotFoundException nnfe) {
+            // No recovery
         }
     }
 
@@ -300,38 +378,207 @@
         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);
+            
+            // Temp Switches 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 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 */ }
+    public static class AdvancedWifiSettingsActivity extends Settings { /* empty */ }
+    public static class AdvancedBluetoothSettingsActivity extends Settings { /* empty */ }
+    public static class TextToSpeechSettingsActivity 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..026e4e6
--- /dev/null
+++ b/src/com/android/settings/SettingsCheckBoxPreference.java
@@ -0,0 +1,85 @@
+/*
+ * 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 (mSettingsIntent != null) {
+            CheckBox checkbox = (CheckBox) view.findViewById(com.android.internal.R.id.checkbox);
+            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);
+            view.findViewById(R.id.divider).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/res/values-sw600dp/colors.xml b/src/com/android/settings/SubSettings.java
similarity index 66%
rename from res/values-sw600dp/colors.xml
rename to src/com/android/settings/SubSettings.java
index 4447333..9cd3c31 100644
--- a/res/values-sw600dp/colors.xml
+++ b/src/com/android/settings/SubSettings.java
@@ -1,7 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
 /*
- * Copyright (C) 2010 Google Inc.
+ * 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.
@@ -15,8 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
--->
 
-<resources>
-    <color name="divider_color">#20ffffff</color>
-</resources>
+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..d76f08f 100644
--- a/src/com/android/settings/TextToSpeechSettings.java
+++ b/src/com/android/settings/TextToSpeechSettings.java
@@ -21,28 +21,23 @@
 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.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 +51,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 +59,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 +71,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 +92,7 @@
     private boolean mVoicesMissing = false;
 
     private TextToSpeech mTts = null;
+    private TtsEngines mEnginesHelper = null;
     private boolean mTtsStarted = false;
 
     /**
@@ -112,10 +107,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 +117,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 +149,6 @@
         }
     }
 
-
     @Override
     public void onDestroy() {
         super.onDestroy();
@@ -165,97 +171,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 +213,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 +243,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 +261,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 +293,6 @@
                 mDefaultLocVariant = new String();
             }
             mTts.setLanguage(new Locale(mDefaultLanguage, mDefaultCountry, mDefaultLocVariant));
-            initDefaultSettings();
             updateWidgetState();
             checkVoiceData();
             mTtsStarted = true;
@@ -370,142 +304,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 +469,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 +502,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 +526,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 +629,81 @@
         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;
+
+        // Persist this value to settings and update the UI before we check
+        // voice data because if the TTS class connected without any exception, "engine"
+        // will be the default engine irrespective of whether the voice check
+        // passes or not.
+        Settings.Secure.putString(getContentResolver(), TTS_DEFAULT_SYNTH, engine);
+        mDefaultSynthPref.setValue(engine);
+        updateWidgetState();
+
+        checkVoiceData();
+
+        Log.v(TAG, "The default synth is now: " + engine);
     }
 
 }
diff --git a/src/com/android/settings/TrustedCredentialsSettings.java b/src/com/android/settings/TrustedCredentialsSettings.java
new file mode 100644
index 0000000..687663a
--- /dev/null
+++ b/src/com/android/settings/TrustedCredentialsSettings.java
@@ -0,0 +1,417 @@
+/*
+ * 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.app.AlertDialog;
+import android.app.Dialog;
+import android.app.Fragment;
+import android.content.DialogInterface;
+import android.net.http.SslCertificate;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.os.RemoteException;
+import android.security.IKeyChainService;
+import android.security.KeyChain;
+import android.security.KeyChain.KeyChainConnection;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.BaseAdapter;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.FrameLayout;
+import android.widget.ListView;
+import android.widget.ProgressBar;
+import android.widget.TabHost;
+import android.widget.TextView;
+import java.security.cert.CertificateEncodingException;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import org.apache.harmony.xnet.provider.jsse.TrustedCertificateStore;
+
+public class TrustedCredentialsSettings extends Fragment {
+
+    private static final String TAG = "TrustedCredentialsSettings";
+
+    private enum Tab {
+        SYSTEM("system",
+               R.string.trusted_credentials_system_tab,
+               R.id.system_tab,
+               R.id.system_progress,
+               R.id.system_list,
+               true),
+        USER("user",
+             R.string.trusted_credentials_user_tab,
+             R.id.user_tab,
+             R.id.user_progress,
+             R.id.user_list,
+             false);
+
+        private final String mTag;
+        private final int mLabel;
+        private final int mView;
+        private final int mProgress;
+        private final int mList;
+        private final boolean mCheckbox;
+        private Tab(String tag, int label, int view, int progress, int list, boolean checkbox) {
+            mTag = tag;
+            mLabel = label;
+            mView = view;
+            mProgress = progress;
+            mList = list;
+            mCheckbox = checkbox;
+        }
+        private Set<String> getAliases(TrustedCertificateStore store) {
+            switch (this) {
+                case SYSTEM:
+                    return store.allSystemAliases();
+                case USER:
+                    return store.userAliases();
+            }
+            throw new AssertionError();
+        }
+        private boolean deleted(TrustedCertificateStore store, String alias) {
+            switch (this) {
+                case SYSTEM:
+                    return !store.containsAlias(alias);
+                case USER:
+                    return false;
+            }
+            throw new AssertionError();
+        }
+        private int getButtonLabel(CertHolder certHolder) {
+            switch (this) {
+                case SYSTEM:
+                    if (certHolder.mDeleted) {
+                        return R.string.trusted_credentials_enable_label;
+                    }
+                    return R.string.trusted_credentials_disable_label;
+                case USER:
+                    return R.string.trusted_credentials_remove_label;
+            }
+            throw new AssertionError();
+        }
+        private int getButtonConfirmation(CertHolder certHolder) {
+            switch (this) {
+                case SYSTEM:
+                    if (certHolder.mDeleted) {
+                        return R.string.trusted_credentials_enable_confirmation;
+                    }
+                    return R.string.trusted_credentials_disable_confirmation;
+                case USER:
+                    return R.string.trusted_credentials_remove_confirmation;
+            }
+            throw new AssertionError();
+        }
+        private void postOperationUpdate(boolean ok, CertHolder certHolder) {
+            if (ok) {
+                if (certHolder.mTab.mCheckbox) {
+                    certHolder.mDeleted = !certHolder.mDeleted;
+                } else {
+                    certHolder.mAdapter.mCertHolders.remove(certHolder);
+                }
+                certHolder.mAdapter.notifyDataSetChanged();
+            } else {
+                // bail, reload to reset to known state
+                certHolder.mAdapter.load();
+            }
+        }
+    }
+
+    // be careful not to use this on the UI thread since it is does file operations
+    private final TrustedCertificateStore mStore = new TrustedCertificateStore();
+
+    private TabHost mTabHost;
+
+    @Override public View onCreateView(
+            LayoutInflater inflater, ViewGroup parent, Bundle savedInstanceState) {
+        mTabHost = (TabHost) inflater.inflate(R.layout.trusted_credentials, parent, false);
+        mTabHost.setup();
+        addTab(Tab.SYSTEM);
+        // TODO add Install button on Tab.USER to go to CertInstaller like KeyChainActivity
+        addTab(Tab.USER);
+        return mTabHost;
+    }
+
+    private void addTab(Tab tab) {
+        TabHost.TabSpec systemSpec = mTabHost.newTabSpec(tab.mTag)
+                .setIndicator(getActivity().getString(tab.mLabel))
+                .setContent(tab.mView);
+        mTabHost.addTab(systemSpec);
+
+        ListView lv = (ListView) mTabHost.findViewById(tab.mList);
+        final TrustedCertificateAdapter adapter = new TrustedCertificateAdapter(tab);
+        lv.setAdapter(adapter);
+        lv.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override public void onItemClick(AdapterView<?> parent, View view, int pos, long id) {
+                showCertDialog(adapter.getItem(pos));
+            }
+        });
+    }
+
+    private class TrustedCertificateAdapter extends BaseAdapter {
+        private final List<CertHolder> mCertHolders = new ArrayList<CertHolder>();
+        private final Tab mTab;
+        private TrustedCertificateAdapter(Tab tab) {
+            mTab = tab;
+            load();
+        }
+        private void load() {
+            new AliasLoader().execute();
+        }
+        @Override public int getCount() {
+            return mCertHolders.size();
+        }
+        @Override public CertHolder getItem(int position) {
+            return mCertHolders.get(position);
+        }
+        @Override public long getItemId(int position) {
+            return position;
+        }
+        @Override public View getView(int position, View view, ViewGroup parent) {
+            ViewHolder holder;
+            if (view == null) {
+                LayoutInflater inflater = LayoutInflater.from(getActivity());
+                view = inflater.inflate(R.layout.trusted_credential, parent, false);
+                holder = new ViewHolder();
+                holder.mSubjectPrimaryView = (TextView)
+                        view.findViewById(R.id.trusted_credential_subject_primary);
+                holder.mSubjectSecondaryView = (TextView)
+                        view.findViewById(R.id.trusted_credential_subject_secondary);
+                holder.mCheckBox = (CheckBox) view.findViewById(R.id.trusted_credential_status);
+                view.setTag(holder);
+            } else {
+                holder = (ViewHolder) view.getTag();
+            }
+            CertHolder certHolder = mCertHolders.get(position);
+            holder.mSubjectPrimaryView.setText(certHolder.mSubjectPrimary);
+            holder.mSubjectSecondaryView.setText(certHolder.mSubjectSecondary);
+            if (mTab.mCheckbox) {
+                holder.mCheckBox.setChecked(!certHolder.mDeleted);
+                holder.mCheckBox.setVisibility(View.VISIBLE);
+            }
+            return view;
+        };
+
+        private class AliasLoader extends AsyncTask<Void, Integer, List<CertHolder>> {
+            ProgressBar mProgressBar;
+            View mList;
+            @Override protected void onPreExecute() {
+                View content = mTabHost.getTabContentView();
+                mProgressBar = (ProgressBar) content.findViewById(mTab.mProgress);
+                mList = content.findViewById(mTab.mList);
+                mProgressBar.setVisibility(View.VISIBLE);
+                mList.setVisibility(View.GONE);
+            }
+            @Override protected List<CertHolder> doInBackground(Void... params) {
+                Set<String> aliases = mTab.getAliases(mStore);
+                int max = aliases.size();
+                int progress = 0;
+                List<CertHolder> certHolders = new ArrayList<CertHolder>(max);
+                for (String alias : aliases) {
+                    X509Certificate cert = (X509Certificate) mStore.getCertificate(alias, true);
+                    certHolders.add(new CertHolder(mStore,
+                                                   TrustedCertificateAdapter.this,
+                                                   mTab,
+                                                   alias,
+                                                   cert));
+                    publishProgress(++progress, max);
+                }
+                Collections.sort(certHolders);
+                return certHolders;
+            }
+            @Override protected void onProgressUpdate(Integer... progressAndMax) {
+                int progress = progressAndMax[0];
+                int max = progressAndMax[1];
+                if (max != mProgressBar.getMax()) {
+                    mProgressBar.setMax(max);
+                }
+                mProgressBar.setProgress(progress);
+            }
+            @Override protected void onPostExecute(List<CertHolder> certHolders) {
+                mCertHolders.clear();
+                mCertHolders.addAll(certHolders);
+                notifyDataSetChanged();
+                View content = mTabHost.getTabContentView();
+                mProgressBar.setVisibility(View.GONE);
+                mList.setVisibility(View.VISIBLE);
+                mProgressBar.setProgress(0);
+            }
+        }
+    }
+
+    private static class CertHolder implements Comparable<CertHolder> {
+        private final TrustedCertificateStore mStore;
+        private final TrustedCertificateAdapter mAdapter;
+        private final Tab mTab;
+        private final String mAlias;
+        private final X509Certificate mX509Cert;
+
+        private final SslCertificate mSslCert;
+        private final String mSubjectPrimary;
+        private final String mSubjectSecondary;
+        private boolean mDeleted;
+
+        private CertHolder(TrustedCertificateStore store,
+                           TrustedCertificateAdapter adapter,
+                           Tab tab,
+                           String alias,
+                           X509Certificate x509Cert) {
+            mStore = store;
+            mAdapter = adapter;
+            mTab = tab;
+            mAlias = alias;
+            mX509Cert = x509Cert;
+
+            mSslCert = new SslCertificate(x509Cert);
+
+            String cn = mSslCert.getIssuedTo().getCName();
+            String o = mSslCert.getIssuedTo().getOName();
+            String ou = mSslCert.getIssuedTo().getUName();
+            // if we have a O, use O as primary subject, secondary prefer CN over OU
+            // if we don't have an O, use CN as primary, empty secondary
+            // if we don't have O or CN, use DName as primary, empty secondary
+            if (!o.isEmpty()) {
+                if (!cn.isEmpty()) {
+                    mSubjectPrimary = o;
+                    mSubjectSecondary = cn;
+                } else {
+                    mSubjectPrimary = o;
+                    mSubjectSecondary = ou;
+                }
+            } else {
+                if (!cn.isEmpty()) {
+                    mSubjectPrimary = cn;
+                    mSubjectSecondary = "";
+                } else {
+                    mSubjectPrimary = mSslCert.getIssuedTo().getDName();
+                    mSubjectSecondary = "";
+                }
+            }
+            mDeleted = mTab.deleted(mStore, mAlias);
+        }
+        @Override public int compareTo(CertHolder o) {
+            int primary = this.mSubjectPrimary.compareToIgnoreCase(o.mSubjectPrimary);
+            if (primary != 0) {
+                return primary;
+            }
+            return this.mSubjectSecondary.compareToIgnoreCase(o.mSubjectSecondary);
+        }
+        @Override public boolean equals(Object o) {
+            if (!(o instanceof CertHolder)) {
+                return false;
+            }
+            CertHolder other = (CertHolder) o;
+            return mAlias.equals(other.mAlias);
+        }
+        @Override public int hashCode() {
+            return mAlias.hashCode();
+        }
+    }
+
+    private static class ViewHolder {
+        private TextView mSubjectPrimaryView;
+        private TextView mSubjectSecondaryView;
+        private CheckBox mCheckBox;
+    }
+
+    private void showCertDialog(final CertHolder certHolder) {
+        View view = certHolder.mSslCert.inflateCertificateView(getActivity());
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        builder.setTitle(com.android.internal.R.string.ssl_certificate);
+        builder.setView(view);
+        builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+            @Override public void onClick(DialogInterface dialog, int id) {
+                dialog.dismiss();
+            }
+        });
+        final Dialog certDialog = builder.create();
+
+        ViewGroup body = (ViewGroup) view.findViewById(com.android.internal.R.id.body);
+        LayoutInflater inflater = LayoutInflater.from(getActivity());
+        Button removeButton = (Button) inflater.inflate(R.layout.trusted_credential_details,
+                                                        body,
+                                                        false);
+        body.addView(removeButton);
+        removeButton.setText(certHolder.mTab.getButtonLabel(certHolder));
+        removeButton.setOnClickListener(new View.OnClickListener() {
+            @Override public void onClick(View v) {
+                AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+                builder.setMessage(certHolder.mTab.getButtonConfirmation(certHolder));
+                builder.setPositiveButton(
+                        android.R.string.yes, new DialogInterface.OnClickListener() {
+                    @Override public void onClick(DialogInterface dialog, int id) {
+                        new AliasOperation(certHolder).execute();
+                        dialog.dismiss();
+                        certDialog.dismiss();
+                    }
+                });
+                builder.setNegativeButton(
+                        android.R.string.no, new DialogInterface.OnClickListener() {
+                    @Override public void onClick(DialogInterface dialog, int id) {
+                        dialog.cancel();
+                    }
+                });
+                AlertDialog alert = builder.create();
+                alert.show();
+            }
+        });
+
+        certDialog.show();
+    }
+
+    private class AliasOperation extends AsyncTask<Void, Void, Boolean> {
+        private final CertHolder mCertHolder;
+        private AliasOperation(CertHolder certHolder) {
+            mCertHolder = certHolder;
+        }
+        @Override protected Boolean doInBackground(Void... params) {
+            try {
+                KeyChainConnection keyChainConnection = KeyChain.bind(getActivity());
+                IKeyChainService service = keyChainConnection.getService();
+                try {
+                    if (mCertHolder.mDeleted) {
+                        byte[] bytes = mCertHolder.mX509Cert.getEncoded();
+                        service.installCaCertificate(bytes);
+                        return true;
+                    } else {
+                        return service.deleteCaCertificate(mCertHolder.mAlias);
+                    }
+                } finally {
+                    keyChainConnection.close();
+                }
+            } catch (CertificateEncodingException e) {
+                return false;
+            } catch (IllegalStateException e) {
+                // used by installCaCertificate to report errors
+                return false;
+            } catch (RemoteException e) {
+                return false;
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+                return false;
+            }
+        }
+        @Override protected void onPostExecute(Boolean ok) {
+            mCertHolder.mTab.postOperationUpdate(ok, mCertHolder);
+        }
+    }
+}
diff --git a/src/com/android/settings/UserDictionarySettings.java b/src/com/android/settings/UserDictionarySettings.java
index b13126a..ea89a1b 100644
--- a/src/com/android/settings/UserDictionarySettings.java
+++ b/src/com/android/settings/UserDictionarySettings.java
@@ -63,23 +63,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;
 
@@ -93,7 +99,7 @@
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
-        mView = inflater.inflate(R.layout.list_content_with_empty_view, container, false);
+        mView = inflater.inflate(R.layout.custom_preference_list_fragment, container, false);
         return mView;
     }
 
@@ -101,7 +107,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 +141,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 +163,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 +193,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 +275,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/AccountSyncSettings.java b/src/com/android/settings/accounts/AccountSyncSettings.java
index 9ef0481..547b0e1 100644
--- a/src/com/android/settings/accounts/AccountSyncSettings.java
+++ b/src/com/android/settings/accounts/AccountSyncSettings.java
@@ -16,10 +16,6 @@
 
 package com.android.settings.accounts;
 
-import com.android.settings.R;
-import com.google.android.collect.Lists;
-import com.google.android.collect.Maps;
-
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.AccountManagerCallback;
@@ -53,6 +49,10 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.android.settings.R;
+import com.google.android.collect.Lists;
+import com.google.android.collect.Maps;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -175,7 +175,13 @@
         mDateFormat = DateFormat.getDateFormat(activity);
         mTimeFormat = DateFormat.getTimeFormat(activity);
 
-        mAccount = (Account) getArguments().getParcelable(ACCOUNT_KEY);
+        Bundle arguments = getArguments();
+        if (arguments == null) {
+            Log.e(TAG, "No arguments provided when starting intent. ACCOUNT_KEY needed.");
+            return;
+        }
+
+        mAccount = (Account) arguments.getParcelable(ACCOUNT_KEY);
         if (mAccount != null) {
             if (Log.isLoggable(TAG, Log.VERBOSE)) Log.v(TAG, "Got account: " + mAccount);
             mUserId.setText(mAccount.name);
@@ -486,11 +492,13 @@
     protected void onAuthDescriptionsUpdated() {
         super.onAuthDescriptionsUpdated();
         getPreferenceScreen().removeAll();
-        mProviderIcon.setImageDrawable(getDrawableForType(mAccount.type));
-        mProviderId.setText(getLabelForType(mAccount.type));
-        PreferenceScreen prefs = addPreferencesForType(mAccount.type);
-        if (prefs != null) {
-            updatePreferenceIntents(prefs);
+        if (mAccount != null) {
+            mProviderIcon.setImageDrawable(getDrawableForType(mAccount.type));
+            mProviderId.setText(getLabelForType(mAccount.type));
+            PreferenceScreen prefs = addPreferencesForType(mAccount.type);
+            if (prefs != null) {
+                updatePreferenceIntents(prefs);
+            }
         }
         addPreferencesFromResource(R.xml.account_sync_settings);
     }
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/accounts/ManageAccountsSettings.java b/src/com/android/settings/accounts/ManageAccountsSettings.java
index 06c5ff0..7d935f0 100644
--- a/src/com/android/settings/accounts/ManageAccountsSettings.java
+++ b/src/com/android/settings/accounts/ManageAccountsSettings.java
@@ -19,7 +19,6 @@
 import com.android.settings.AccountPreference;
 import com.android.settings.DialogCreatable;
 import com.android.settings.R;
-import com.android.settings.vpn.VpnTypeSelection;
 import com.google.android.collect.Maps;
 
 import android.accounts.Account;
diff --git a/src/com/android/settings/applications/ApplicationsState.java b/src/com/android/settings/applications/ApplicationsState.java
index 11e4aae..519c203 100644
--- a/src/com/android/settings/applications/ApplicationsState.java
+++ b/src/com/android/settings/applications/ApplicationsState.java
@@ -5,14 +5,11 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.content.pm.ActivityInfo;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.IPackageStatsObserver;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageStats;
 import android.content.pm.PackageManager.NameNotFoundException;
-import android.content.res.Configuration;
-import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Handler;
@@ -74,7 +71,8 @@
         long cacheSize;
         long codeSize;
         long dataSize;
-        long externalSize;
+        long externalCodeSize;
+        long externalDataSize;
     }
     
     public static class AppEntry extends SizeInfo {
@@ -97,6 +95,8 @@
         ApplicationInfo info;
         Drawable icon;
         String sizeStr;
+        String internalSizeStr;
+        String externalSizeStr;
         boolean sizeStale;
         long sizeLoadStart;
 
@@ -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;
@@ -652,8 +660,8 @@
 
     private long getTotalExternalSize(PackageStats ps) {
         if (ps != null) {
-            return ps.externalDataSize + ps.externalMediaSize + ps.externalCacheSize
-                    + ps.externalObbSize;
+            return ps.externalCodeSize + ps.externalDataSize
+                    + ps.externalMediaSize + ps.externalObbSize;
         }
         return SIZE_INVALID;
     }
@@ -685,19 +693,27 @@
                         synchronized (entry) {
                             entry.sizeStale = false;
                             entry.sizeLoadStart = 0;
-                            long externalSize = getTotalExternalSize(stats);
-                            long newSize = externalSize + getTotalInternalSize(stats);
+                            long externalCodeSize = stats.externalCodeSize
+                                    + stats.externalObbSize;
+                            long externalDataSize = stats.externalDataSize
+                                    + stats.externalMediaSize + stats.externalCacheSize;
+                            long newSize = externalCodeSize + externalDataSize
+                                    + getTotalInternalSize(stats);
                             if (entry.size != newSize ||
                                     entry.cacheSize != stats.cacheSize ||
                                     entry.codeSize != stats.codeSize ||
                                     entry.dataSize != stats.dataSize ||
-                                    entry.externalSize != externalSize) {
+                                    entry.externalCodeSize != externalCodeSize ||
+                                    entry.externalDataSize != externalDataSize) {
                                 entry.size = newSize;
                                 entry.cacheSize = stats.cacheSize;
                                 entry.codeSize = stats.codeSize;
                                 entry.dataSize = stats.dataSize;
-                                entry.externalSize = externalSize;
+                                entry.externalCodeSize = externalCodeSize;
+                                entry.externalDataSize = externalDataSize;
                                 entry.sizeStr = getSizeStr(entry.size);
+                                entry.internalSizeStr = getSizeStr(getTotalInternalSize(stats));
+                                entry.externalSizeStr = getSizeStr(getTotalExternalSize(stats));
                                 if (DEBUG) Log.i(TAG, "Set size of " + entry.label + " " + entry
                                         + ": " + entry.sizeStr);
                                 sizeChanged = true;
diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index 629bac5..ab46661 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";
@@ -103,7 +103,8 @@
     private TextView mTotalSize;
     private TextView mAppSize;
     private TextView mDataSize;
-    private TextView mExternalSize;
+    private TextView mExternalCodeSize;
+    private TextView mExternalDataSize;
     private ClearUserDataObserver mClearDataObserver;
     // Views related to cache info
     private TextView mCacheSize;
@@ -118,7 +119,8 @@
     private boolean mHaveSizes = false;
     private long mLastCodeSize = -1;
     private long mLastDataSize = -1;
-    private long mLastExternalSize = -1;
+    private long mLastExternalCodeSize = -1;
+    private long mLastExternalDataSize = -1;
     private long mLastCacheSize = -1;
     private long mLastTotalSize = -1;
     
@@ -282,7 +284,7 @@
                         intent.setPackage(mAppEntry.info.packageName);
                         List<ResolveInfo> homes = mPm.queryIntentActivities(intent, 0);
                         if ((homes != null && homes.size() > 0) ||
-                                (mPackageInfo != null &&
+                                (mPackageInfo != null && mPackageInfo.signatures != null &&
                                         sys.signatures[0].equals(mPackageInfo.signatures[0]))) {
                             // Disable button for core system applications.
                             mUninstallButton.setText(R.string.disable_text);
@@ -331,7 +333,8 @@
         mTotalSize = (TextView)view.findViewById(R.id.total_size_text);
         mAppSize = (TextView)view.findViewById(R.id.application_size_text);
         mDataSize = (TextView)view.findViewById(R.id.data_size_text);
-        mExternalSize = (TextView)view.findViewById(R.id.external_size_text);
+        mExternalCodeSize = (TextView)view.findViewById(R.id.external_code_size_text);
+        mExternalDataSize = (TextView)view.findViewById(R.id.external_data_size_text);
         
         // Get Control button panel
         View btnPanel = view.findViewById(R.id.control_buttons_panel);
@@ -547,9 +550,13 @@
                 mLastDataSize = mAppEntry.dataSize;
                 mDataSize.setText(getSizeStr(mAppEntry.dataSize));
             }
-            if (mLastExternalSize != mAppEntry.externalSize) {
-                mLastExternalSize = mAppEntry.externalSize;
-                mExternalSize.setText(getSizeStr(mAppEntry.externalSize));
+            if (mLastExternalCodeSize != mAppEntry.externalCodeSize) {
+                mLastExternalCodeSize = mAppEntry.externalCodeSize;
+                mExternalCodeSize.setText(getSizeStr(mAppEntry.externalCodeSize));
+            }
+            if (mLastExternalDataSize != mAppEntry.externalDataSize) {
+                mLastExternalDataSize = mAppEntry.externalDataSize;
+                mExternalDataSize.setText(getSizeStr(mAppEntry.externalDataSize));
             }
             if (mLastCacheSize != mAppEntry.cacheSize) {
                 mLastCacheSize = mAppEntry.cacheSize;
@@ -831,7 +838,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/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index 85db45e..554ece3 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -121,6 +121,10 @@
     // constant value that can be used to check return code from sub activity.
     private static final int INSTALLED_APP_DETAILS = 1;
 
+    public static final int SIZE_TOTAL = 0;
+    public static final int SIZE_INTERNAL = 1;
+    public static final int SIZE_EXTERNAL = 2;
+
     // sort order that can be changed through the menu can be sorted alphabetically
     // or size(descending)
     private static final int MENU_OPTIONS_BASE = 0;
@@ -208,11 +212,21 @@
         TextView disabled;
         CheckBox checkBox;
         
-        void updateSizeText(ManageApplications ma) {
+        void updateSizeText(ManageApplications ma, int whichSize) {
             if (DEBUG) Log.i(TAG, "updateSizeText of " + entry.label + " " + entry
                     + ": " + entry.sizeStr);
             if (entry.sizeStr != null) {
-                appSize.setText(entry.sizeStr);
+                switch (whichSize) {
+                    case SIZE_INTERNAL:
+                        appSize.setText(entry.internalSizeStr);
+                        break;
+                    case SIZE_EXTERNAL:
+                        appSize.setText(entry.externalSizeStr);
+                        break;
+                    default:
+                        appSize.setText(entry.sizeStr);
+                        break;
+                }
             } else if (entry.size == ApplicationsState.SIZE_INVALID) {
                 appSize.setText(ma.mInvalidSizeStr);
             }
@@ -237,6 +251,7 @@
         private boolean mResumed;
         private int mLastFilterMode=-1, mLastSortMode=-1;
         private boolean mWaitingForData;
+        private int mWhichSize = SIZE_TOTAL;
         CharSequence mCurFilterPrefix;
 
         private Filter mFilter = new Filter() {
@@ -296,12 +311,21 @@
             if (DEBUG) Log.i(TAG, "Rebuilding app list...");
             ApplicationsState.AppFilter filterObj;
             Comparator<AppEntry> comparatorObj;
+            boolean emulated = Environment.isExternalStorageEmulated();
+            if (emulated) {
+                mWhichSize = SIZE_TOTAL;
+            } else {
+                mWhichSize = SIZE_INTERNAL;
+            }
             switch (mLastFilterMode) {
                 case FILTER_APPS_THIRD_PARTY:
                     filterObj = ApplicationsState.THIRD_PARTY_FILTER;
                     break;
                 case FILTER_APPS_SDCARD:
                     filterObj = ApplicationsState.ON_SD_CARD_FILTER;
+                    if (!emulated) {
+                        mWhichSize = SIZE_EXTERNAL;
+                    }
                     break;
                 default:
                     filterObj = null;
@@ -399,7 +423,7 @@
                 AppViewHolder holder = (AppViewHolder)mActive.get(i).getTag();
                 if (holder.entry.info.packageName.equals(packageName)) {
                     synchronized (holder.entry) {
-                        holder.updateSizeText(ManageApplications.this);
+                        holder.updateSizeText(ManageApplications.this, mWhichSize);
                     }
                     if (holder.entry.info.packageName.equals(mCurrentPkgName)
                             && mLastSortMode == SORT_ORDER_SIZE) {
@@ -478,7 +502,7 @@
                 if (entry.icon != null) {
                     holder.appIcon.setImageDrawable(entry.icon);
                 }
-                holder.updateSizeText(ManageApplications.this);
+                holder.updateSizeText(ManageApplications.this, mWhichSize);
                 if (InstalledAppDetails.SUPPORT_DISABLE_APPS) {
                     holder.disabled.setVisibility(entry.info.enabled ? View.GONE : View.VISIBLE);
                 } else {
@@ -777,6 +801,11 @@
             } catch (IllegalArgumentException e) {
                 // use the old value of mFreeMem
             }
+            final int N = mApplicationsAdapter.getCount();
+            for (int i=0; i<N; i++) {
+                ApplicationsState.AppEntry ae = mApplicationsAdapter.getAppEntry(i);
+                appStorage += ae.externalCodeSize + ae.externalDataSize;
+            }
         } else {
             if (!mLastShowedInternalStorage) {
                 mLastShowedInternalStorage = true;
@@ -790,10 +819,14 @@
                     mDataFileStats.getBlockSize();
             } catch (IllegalArgumentException e) {
             }
+            final boolean emulatedStorage = Environment.isExternalStorageEmulated();
             final int N = mApplicationsAdapter.getCount();
             for (int i=0; i<N; i++) {
                 ApplicationsState.AppEntry ae = mApplicationsAdapter.getAppEntry(i);
                 appStorage += ae.codeSize + ae.dataSize;
+                if (emulatedStorage) {
+                    appStorage += ae.externalCodeSize + ae.externalDataSize;
+                }
             }
             freeStorage += mApplicationsState.sumCacheSizes();
         }
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/BluetoothDeviceFilter.java b/src/com/android/settings/bluetooth/BluetoothDeviceFilter.java
index 00e342c..e4f11a2 100644
--- a/src/com/android/settings/bluetooth/BluetoothDeviceFilter.java
+++ b/src/com/android/settings/bluetooth/BluetoothDeviceFilter.java
@@ -42,6 +42,9 @@
     /** Bonded devices only filter (referenced directly). */
     static final Filter BONDED_DEVICE_FILTER = new BondedDeviceFilter();
 
+    /** Unbonded devices only filter (referenced directly). */
+    static final Filter UNBONDED_DEVICE_FILTER = new UnbondedDeviceFilter();
+
     /** Table of singleton filter objects. */
     private static final Filter[] FILTERS = {
             ALL_FILTER,             // FILTER_TYPE_ALL
@@ -85,6 +88,13 @@
         }
     }
 
+    /** Filter that matches only unbonded devices. */
+    private static final class UnbondedDeviceFilter implements Filter {
+        public boolean matches(BluetoothDevice device) {
+            return device.getBondState() != BluetoothDevice.BOND_BONDED;
+        }
+    }
+
     /** Parent class of filters based on UUID and/or Bluetooth class. */
     private abstract static class ClassUuidFilter implements Filter {
         abstract boolean matches(ParcelUuid[] uuids, BluetoothClass btClass);
diff --git a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
index 391c941..06c708b 100644
--- a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
+++ b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
@@ -49,8 +49,6 @@
 
     private final CachedBluetoothDevice mCachedDevice;
 
-    private ImageView mDeviceSettings;
-
     private OnClickListener mOnSettingsClickListener;
 
     private AlertDialog mDisconnectDialog;
@@ -121,13 +119,13 @@
         btClass.setImageResource(getBtClassDrawable());
         btClass.setAlpha(isEnabled() ? 255 : sDimAlpha);
         btClass.setVisibility(View.VISIBLE);
-        mDeviceSettings = (ImageView) view.findViewById(R.id.deviceDetails);
+        ImageView deviceDetails = (ImageView) view.findViewById(R.id.deviceDetails);
         if (mOnSettingsClickListener != null) {
-            mDeviceSettings.setOnClickListener(this);
-            mDeviceSettings.setTag(mCachedDevice);
-            mDeviceSettings.setAlpha(isEnabled() ? 255 : sDimAlpha);
+            deviceDetails.setOnClickListener(this);
+            deviceDetails.setTag(mCachedDevice);
+            deviceDetails.setAlpha(isEnabled() ? 255 : sDimAlpha);
         } else { // Hide the settings icon and divider
-            mDeviceSettings.setVisibility(View.GONE);
+            deviceDetails.setVisibility(View.GONE);
             View divider = view.findViewById(R.id.divider);
             if (divider != null) {
                 divider.setVisibility(View.GONE);
@@ -152,13 +150,13 @@
     }
 
     public void onClick(View v) {
-        if (v == mDeviceSettings) {
-            if (mOnSettingsClickListener != null) {
-                mOnSettingsClickListener.onClick(v);
-            }
+        // Should never be null by construction
+        if (mOnSettingsClickListener != null) {
+            mOnSettingsClickListener.onClick(v);
         }
     }
 
+    @Override
     public boolean equals(Object o) {
         if ((o == null) || !(o instanceof BluetoothDevicePreference)) {
             return false;
@@ -167,6 +165,7 @@
                 ((BluetoothDevicePreference) o).mCachedDevice);
     }
 
+    @Override
     public int hashCode() {
         return mCachedDevice.hashCode();
     }
@@ -174,8 +173,8 @@
     @Override
     public int compareTo(Preference another) {
         if (!(another instanceof BluetoothDevicePreference)) {
-            // Put other preference types above us
-            return 1;
+            // Rely on default sort
+            return super.compareTo(another);
         }
 
         return mCachedDevice
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/BluetoothPermissionActivity.java b/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
new file mode 100644
index 0000000..1a0965c
--- /dev/null
+++ b/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
@@ -0,0 +1,232 @@
+/*
+ * 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.bluetooth.BluetoothDevice;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Bundle;
+import android.preference.Preference;
+import android.util.Log;
+import android.view.View;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
+import android.widget.EditText;
+import android.widget.TextView;
+import android.widget.Button;
+import android.widget.CompoundButton.OnCheckedChangeListener;
+
+import com.android.internal.app.AlertActivity;
+import com.android.internal.app.AlertController;
+
+import com.android.settings.R;
+
+/**
+ * BluetoothPermissionActivity shows a dialog for accepting incoming
+ * profile connection request from untrusted devices.
+ * It is also used to show a dialogue for accepting incoming phonebook
+ * read request. The request could be initiated by PBAP PCE or by HF AT+CPBR.
+ */
+public class BluetoothPermissionActivity extends AlertActivity implements
+        DialogInterface.OnClickListener, Preference.OnPreferenceChangeListener {
+    private static final String TAG = "BluetoothPermissionActivity";
+    private static final boolean DEBUG = Utils.D;
+
+    private View mView;
+    private TextView messageView;
+    private Button mOkButton;
+    private BluetoothDevice mDevice;
+
+    private CheckBox mAlwaysAllowed;
+    private boolean mAlwaysAllowedValue = true;
+
+    private String mReturnPackage = null;
+    private String mReturnClass = null;
+
+    private BroadcastReceiver mReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            if (action.equals(BluetoothDevice.ACTION_CONNECTION_ACCESS_CANCEL)) {
+                BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
+                if (mDevice.equals(device)) dismissDialog();
+            }
+        }
+    };
+
+    private void dismissDialog() {
+        this.dismiss();
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        Intent i = getIntent();
+        String action = i.getAction();
+        mDevice = i.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
+        mReturnPackage = i.getStringExtra(BluetoothDevice.EXTRA_PACKAGE_NAME);
+        mReturnClass = i.getStringExtra(BluetoothDevice.EXTRA_CLASS_NAME);
+
+        if (action.equals(BluetoothDevice.ACTION_CONNECTION_ACCESS_REQUEST)) {
+            mDevice = i.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
+            if (i.getIntExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE,
+                              BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS) ==
+                BluetoothDevice.REQUEST_TYPE_PROFILE_CONNECTION) {
+                showConnectionDialog();
+            } else {
+                showPbapDialog();
+            }
+        } else {
+            Log.e(TAG, "Error: this activity may be started only with intent "
+                    + "ACTION_CONNECTION_ACCESS_REQUEST");
+            finish();
+        }
+        registerReceiver(mReceiver,
+                         new IntentFilter(BluetoothDevice.ACTION_CONNECTION_ACCESS_CANCEL));
+    }
+
+    private void showConnectionDialog() {
+        final AlertController.AlertParams p = mAlertParams;
+        p.mIconId = android.R.drawable.ic_dialog_info;
+        p.mTitle = getString(R.string.bluetooth_connection_permission_request);
+        p.mView = createConnectionDialogView();
+        p.mPositiveButtonText = getString(R.string.yes);
+        p.mPositiveButtonListener = this;
+        p.mNegativeButtonText = getString(R.string.no);
+        p.mNegativeButtonListener = this;
+        mOkButton = mAlert.getButton(DialogInterface.BUTTON_POSITIVE);
+        setupAlert();
+    }
+
+    private void showPbapDialog() {
+        final AlertController.AlertParams p = mAlertParams;
+        p.mIconId = android.R.drawable.ic_dialog_info;
+        p.mTitle = getString(R.string.bluetooth_phonebook_request);
+        p.mView = createPbapDialogView();
+        p.mPositiveButtonText = getString(android.R.string.yes);
+        p.mPositiveButtonListener = this;
+        p.mNegativeButtonText = getString(android.R.string.no);
+        p.mNegativeButtonListener = this;
+        mOkButton = mAlert.getButton(DialogInterface.BUTTON_POSITIVE);
+        setupAlert();
+    }
+
+    private String createConnectionDisplayText() {
+        String mRemoteName = mDevice != null ? mDevice.getName() : null;
+
+        if (mRemoteName == null) mRemoteName = getString(R.string.unknown);
+        String mMessage1 = getString(R.string.bluetooth_connection_dialog_text,
+                mRemoteName);
+        return mMessage1;
+    }
+
+    private String createPbapDisplayText() {
+        String mRemoteName = mDevice != null ? mDevice.getName() : null;
+
+        if (mRemoteName == null) mRemoteName = getString(R.string.unknown);
+        String mMessage1 = getString(R.string.bluetooth_pb_acceptance_dialog_text,
+                                     mRemoteName, mRemoteName);
+        return mMessage1;
+    }
+
+    private View createConnectionDialogView() {
+        mView = getLayoutInflater().inflate(R.layout.bluetooth_connection_access, null);
+        messageView = (TextView)mView.findViewById(R.id.message);
+        messageView.setText(createConnectionDisplayText());
+        return mView;
+    }
+
+    private View createPbapDialogView() {
+        mView = getLayoutInflater().inflate(R.layout.bluetooth_pb_access, null);
+        messageView = (TextView)mView.findViewById(R.id.message);
+        messageView.setText(createPbapDisplayText());
+        mAlwaysAllowed = (CheckBox)mView.findViewById(R.id.bluetooth_pb_alwaysallowed);
+        mAlwaysAllowed.setChecked(true);
+        mAlwaysAllowed.setOnCheckedChangeListener(new OnCheckedChangeListener() {
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                if (isChecked) {
+                    mAlwaysAllowedValue = true;
+                } else {
+                    mAlwaysAllowedValue = false;
+                }
+            }
+            });
+        return mView;
+    }
+
+    private void onPositive() {
+        if (DEBUG) Log.d(TAG, "onPositive mAlwaysAllowedValue: " + mAlwaysAllowedValue);
+        sendIntentToReceiver(BluetoothDevice.ACTION_CONNECTION_ACCESS_REPLY, true,
+                             BluetoothDevice.EXTRA_ALWAYS_ALLOWED, mAlwaysAllowedValue);
+        finish();
+    }
+
+    private void onNegative() {
+        if (DEBUG) Log.d(TAG, "onNegative mAlwaysAllowedValue: " + mAlwaysAllowedValue);
+        sendIntentToReceiver(BluetoothDevice.ACTION_CONNECTION_ACCESS_REPLY, false,
+                             null, false // dummy value, no effect since last param is null
+                             );
+        finish();
+    }
+
+    private void sendIntentToReceiver(final String intentName, final boolean allowed,
+                                      final String extraName, final boolean extraValue) {
+        Intent intent = new Intent(intentName);
+
+        if (mReturnPackage != null && mReturnClass != null) {
+            intent.setClassName(mReturnPackage, mReturnClass);
+        }
+
+        intent.putExtra(BluetoothDevice.EXTRA_CONNECTION_ACCESS_RESULT,
+                        allowed ? BluetoothDevice.CONNECTION_ACCESS_YES :
+                                  BluetoothDevice.CONNECTION_ACCESS_NO);
+
+        if (extraName != null) {
+            intent.putExtra(extraName, extraValue);
+        }
+        intent.putExtra(BluetoothDevice.EXTRA_DEVICE, mDevice);
+        sendBroadcast(intent, android.Manifest.permission.BLUETOOTH_ADMIN);
+    }
+
+    public void onClick(DialogInterface dialog, int which) {
+        switch (which) {
+            case DialogInterface.BUTTON_POSITIVE:
+                onPositive();
+                break;
+
+            case DialogInterface.BUTTON_NEGATIVE:
+                onNegative();
+                break;
+            default:
+                break;
+        }
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        unregisterReceiver(mReceiver);
+    }
+
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        return true;
+    }
+}
diff --git a/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java b/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
new file mode 100644
index 0000000..c769ba6
--- /dev/null
+++ b/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
@@ -0,0 +1,107 @@
+/*
+ * 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.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.bluetooth.BluetoothDevice;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.os.PowerManager;
+import android.util.Log;
+
+import com.android.settings.R;
+
+/**
+ * BluetoothPermissionRequest is a receiver to receive Bluetooth connection
+ * access request.
+ */
+public final class BluetoothPermissionRequest extends BroadcastReceiver {
+
+    private static final String TAG = "BluetoothPermissionRequest";
+    private static final boolean DEBUG = Utils.V;
+    public static final int NOTIFICATION_ID = android.R.drawable.stat_sys_data_bluetooth;
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        String action = intent.getAction();
+
+        if (DEBUG) Log.d(TAG, "onReceive");
+
+        if (action.equals(BluetoothDevice.ACTION_CONNECTION_ACCESS_REQUEST)) {
+            // convert broadcast intent into activity intent (same action string)
+            BluetoothDevice device =
+                intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
+            int requestType = intent.getIntExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE,
+                                                 BluetoothDevice.REQUEST_TYPE_PROFILE_CONNECTION);
+            String returnPackage = intent.getStringExtra(BluetoothDevice.EXTRA_PACKAGE_NAME);
+            String returnClass = intent.getStringExtra(BluetoothDevice.EXTRA_CLASS_NAME);
+
+            Intent connectionAccessIntent = new Intent(action);
+            connectionAccessIntent.setClass(context, BluetoothPermissionActivity.class);
+            connectionAccessIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            connectionAccessIntent.putExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE, requestType);
+            connectionAccessIntent.putExtra(BluetoothDevice.EXTRA_DEVICE, device);
+            connectionAccessIntent.putExtra(BluetoothDevice.EXTRA_PACKAGE_NAME, returnPackage);
+            connectionAccessIntent.putExtra(BluetoothDevice.EXTRA_CLASS_NAME, returnClass);
+
+            String deviceAddress = device != null ? device.getAddress() : null;
+
+            PowerManager powerManager =
+                (PowerManager) context.getSystemService(Context.POWER_SERVICE);
+
+            if (powerManager.isScreenOn() &&
+                LocalBluetoothPreferences.shouldShowDialogInForeground(context, deviceAddress) ) {
+                context.startActivity(connectionAccessIntent);
+            } else {
+                // Put up a notification that leads to the dialog
+
+                // Create an intent triggered by clicking on the
+                // "Clear All Notifications" button
+
+                Intent deleteIntent = new Intent(BluetoothDevice.ACTION_CONNECTION_ACCESS_REPLY);
+                deleteIntent.putExtra(BluetoothDevice.EXTRA_DEVICE, device);
+                deleteIntent.putExtra(BluetoothDevice.EXTRA_CONNECTION_ACCESS_RESULT,
+                        BluetoothDevice.CONNECTION_ACCESS_NO);
+
+                Notification notification = new Notification(android.R.drawable.stat_sys_data_bluetooth,
+                    context.getString(R.string.bluetooth_connection_permission_request),
+                    System.currentTimeMillis());
+                String deviceName = device != null ? device.getName() : null;
+                notification.setLatestEventInfo(context,
+                    context.getString(R.string.bluetooth_connection_permission_request),
+                    context.getString(R.string.bluetooth_connection_notif_message, deviceName),
+                    PendingIntent.getActivity(context, 0, connectionAccessIntent, 0));
+                notification.flags = Notification.FLAG_AUTO_CANCEL |
+                                     Notification.FLAG_ONLY_ALERT_ONCE;
+                notification.defaults = Notification.DEFAULT_SOUND;
+                notification.deleteIntent = PendingIntent.getBroadcast(context, 0, deleteIntent, 0);
+
+                NotificationManager notificationManager =
+                    (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+                notificationManager.notify(NOTIFICATION_ID, notification);
+            }
+        } else if (action.equals(BluetoothDevice.ACTION_CONNECTION_ACCESS_CANCEL)) {
+            // Remove the notification
+            NotificationManager manager = (NotificationManager) context
+                .getSystemService(Context.NOTIFICATION_SERVICE);
+            manager.cancel(NOTIFICATION_ID);
+        }
+   }
+}
diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java
index 5e4e130..2208223 100644
--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java
@@ -16,16 +16,28 @@
 
 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.os.Bundle;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
+import android.preference.PreferenceCategory;
+import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
 import android.util.Log;
+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.widget.Switch;
+import android.widget.TextView;
 
+import com.android.settings.ProgressCategory;
 import com.android.settings.R;
 
 /**
@@ -35,107 +47,253 @@
 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_SCAN = Menu.FIRST;
+    private static final int MENU_ID_ADVANCED = Menu.FIRST + 1;
 
-    private BluetoothEnabler mEnabler;
-    private BluetoothDiscoverableEnabler mDiscoverableEnabler;
-    private BluetoothNamePreference mNamePreference;
+    private BluetoothEnabler mBluetoothEnabler;
 
-    /* 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 PreferenceGroup mAvailableDevicesCategory;
+    private boolean mAvailableDevicesCategoryIsPresent;
 
-    /** Initialize the filter to show bonded devices only. */
-    public BluetoothSettings() {
-        super(BluetoothDeviceFilter.BONDED_DEVICE_FILTER);
+    private View mView;
+    private TextView mEmptyView;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        mView = inflater.inflate(R.layout.custom_preference_list_fragment, container, false);
+        return mView;
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        mEmptyView = (TextView) mView.findViewById(R.id.empty);
+        getListView().setEmptyView(mEmptyView);
     }
 
     @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);
+
+        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();
     }
 
-    private final View.OnClickListener mListener = new View.OnClickListener() {
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        boolean bluetoothIsEnabled = mLocalAdapter.getBluetoothState() == BluetoothAdapter.STATE_ON;
+        boolean isDiscovering = mLocalAdapter.isDiscovering();
+        int textId = isDiscovering ? R.string.bluetooth_searching_for_devices :
+            R.string.bluetooth_search_for_devices;
+        menu.add(Menu.NONE, MENU_ID_SCAN, 0, textId)
+                //.setIcon(R.drawable.ic_menu_scan_network)
+                .setEnabled(bluetoothIsEnabled && !isDiscovering)
+                .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+        menu.add(Menu.NONE, MENU_ID_ADVANCED, 0, R.string.bluetooth_menu_advanced)
+                //.setIcon(android.R.drawable.ic_menu_manage)
+                .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case MENU_ID_SCAN:
+                if (mLocalAdapter.getBluetoothState() == BluetoothAdapter.STATE_ON) {
+                    startScanning();
+                }
+                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 void startScanning() {
+        if (!mAvailableDevicesCategoryIsPresent) {
+            getPreferenceScreen().addPreference(mAvailableDevicesCategory);
+        }
+        mLocalAdapter.startScanning(true);
+    }
+
+    @Override
+    void onDevicePreferenceClick(BluetoothDevicePreference btPreference) {
+        mLocalAdapter.stopScanning();
+        super.onDevicePreferenceClick(btPreference);
+    }
+
+    private void addDeviceCategory(PreferenceGroup preferenceGroup, int titleId,
+            BluetoothDeviceFilter.Filter filter) {
+        preferenceGroup.setTitle(titleId);
+        getPreferenceScreen().addPreference(preferenceGroup);
+        setFilter(filter);
+        setDeviceListGroup(preferenceGroup);
+        addCachedDevices();
+        preferenceGroup.setEnabled(true);
+    }
+
+    private void updateContent(int bluetoothState) {
+        final PreferenceScreen preferenceScreen = getPreferenceScreen();
+        getActivity().invalidateOptionsMenu();
+        int messageId = 0;
+
+        switch (bluetoothState) {
+            case BluetoothAdapter.STATE_ON:
+                preferenceScreen.removeAll();
+                preferenceScreen.setOrderingAsAdded(true);
+
+                // This device
+                if (mMyDevicePreference == null) {
+                    mMyDevicePreference = new Preference(getActivity());
+                }
+                if (mLocalAdapter != null) {
+                    mMyDevicePreference.setTitle(mLocalAdapter.getName());
+                }
+                mMyDevicePreference.setEnabled(true);
+                preferenceScreen.addPreference(mMyDevicePreference);
+
+                // Paired devices category
+                if (mPairedDevicesCategory == null) {
+                    mPairedDevicesCategory = new PreferenceCategory(getActivity());
+                } else {
+                    mPairedDevicesCategory.removeAll();
+                }
+                addDeviceCategory(mPairedDevicesCategory,
+                        R.string.bluetooth_preference_paired_devices,
+                        BluetoothDeviceFilter.BONDED_DEVICE_FILTER);
+                int numberOfPairedDevices = mPairedDevicesCategory.getPreferenceCount();
+
+                // Available devices category
+                if (mAvailableDevicesCategory == null) {
+                    mAvailableDevicesCategory = new ProgressCategory(getActivity(), null);
+                } else {
+                    mAvailableDevicesCategory.removeAll();
+                }
+                addDeviceCategory(mAvailableDevicesCategory,
+                        R.string.bluetooth_preference_found_devices,
+                        BluetoothDeviceFilter.UNBONDED_DEVICE_FILTER);
+                int numberOfAvailableDevices = mAvailableDevicesCategory.getPreferenceCount();
+                mAvailableDevicesCategoryIsPresent = true;
+
+                if (numberOfAvailableDevices == 0) {
+                    preferenceScreen.removePreference(mAvailableDevicesCategory);
+                    mAvailableDevicesCategoryIsPresent = false;
+                }
+
+                if (numberOfPairedDevices == 0) {
+                    preferenceScreen.removePreference(mPairedDevicesCategory);
+                    startScanning();
+                }
+                return; // not break
+
+            case BluetoothAdapter.STATE_TURNING_OFF:
+                int preferenceCount = preferenceScreen.getPreferenceCount();
+                for (int i = 0; i < preferenceCount; i++) {
+                    preferenceScreen.getPreference(i).setEnabled(false);
+                }
+                return; // not break
+
+            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;
+        }
+
+        setDeviceListGroup(preferenceScreen);
+        removeAllDevices();
+        mEmptyView.setText(messageId);
+    }
+
+    @Override
+    public void onBluetoothStateChanged(int bluetoothState) {
+        super.onBluetoothStateChanged(bluetoothState);
+        updateContent(bluetoothState);
+    }
+
+    @Override
+    public void onScanningStateChanged(boolean started) {
+        super.onScanningStateChanged(started);
+        // Update options' enabled state
+        getActivity().invalidateOptionsMenu();
+    }
+
+    public void onDeviceBondStateChanged(CachedBluetoothDevice cachedDevice, int bondState) {
+        setDeviceListGroup(getPreferenceScreen());
+        removeAllDevices();
+        updateContent(mLocalAdapter.getBluetoothState());
+    }
+
+    private final View.OnClickListener mDeviceProfilesListener = 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);
+                Log.w(TAG, "onClick() called for other View: " + v); // TODO remove
             }
         }
     };
 
-    @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;
-        }
+    private Preference mMyDevicePreference;
 
-        return super.onPreferenceTreeClick(preferenceScreen, preference);
-    }
-
-    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) {
-                createDevicePreference(cachedDevice);
-            }
-        } else if (bondState == BluetoothDevice.BOND_NONE) {
-            // remove unpaired device from paired devices list
-            onDeviceDeleted(cachedDevice);
-        }
-    }
+    private PreferenceGroup mPairedDevicesCategory;
 
     /**
      * Add a listener, which enables the advanced settings icon.
@@ -143,6 +301,10 @@
      */
     @Override
     void initDevicePreference(BluetoothDevicePreference preference) {
-        preference.setOnSettingsClickListener(mListener);
+        CachedBluetoothDevice cachedDevice = preference.getCachedDevice();
+        if (cachedDevice.getBondState() == BluetoothDevice.BOND_BONDED) {
+            // Only paired device have an associated advanced settings screen
+            preference.setOnSettingsClickListener(mDeviceProfilesListener);
+        }
     }
 }
diff --git a/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
index a978e23..9783fd7 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>();
@@ -62,7 +62,7 @@
         mFilter = BluetoothDeviceFilter.ALL_FILTER;
     }
 
-    DeviceListPreferenceFragment(BluetoothDeviceFilter.Filter filter) {
+    final void setFilter(BluetoothDeviceFilter.Filter filter) {
         mFilter = filter;
     }
 
@@ -83,10 +83,11 @@
 
         addPreferencesForActivity();
 
-        mDeviceList = (PreferenceCategory) findPreference(KEY_BT_DEVICE_LIST);
-        if (mDeviceList == null) {
-            Log.e(TAG, "Could not find device list preference object!");
-        }
+        mDeviceListGroup = (PreferenceCategory) findPreference(KEY_BT_DEVICE_LIST);
+    }
+
+    void setDeviceListGroup(PreferenceGroup preferenceGroup) {
+        mDeviceListGroup = preferenceGroup;
     }
 
     /** Add preferences from the subclass. */
@@ -105,16 +106,18 @@
     @Override
     public void onPause() {
         super.onPause();
-
-        mLocalAdapter.stopScanning();
+        removeAllDevices();
         mLocalManager.setForegroundActivity(null);
         mLocalManager.getEventManager().unregisterCallback(this);
-
-        mDevicePreferenceMap.clear();
-        mDeviceList.removeAll();
     }
 
-    void addDevices() {
+    void removeAllDevices() {
+        mLocalAdapter.stopScanning();
+        mDevicePreferenceMap.clear();
+        mDeviceListGroup.removeAll();
+    }
+
+    void addCachedDevices() {
         Collection<CachedBluetoothDevice> cachedDevices =
                 mLocalManager.getCachedDeviceManager().getCachedDevicesCopy();
         for (CachedBluetoothDevice cachedDevice : cachedDevices) {
@@ -132,7 +135,7 @@
         }
 
         if (preference instanceof BluetoothDevicePreference) {
-            BluetoothDevicePreference btPreference = (BluetoothDevicePreference)preference;
+            BluetoothDevicePreference btPreference = (BluetoothDevicePreference) preference;
             CachedBluetoothDevice device = btPreference.getCachedDevice();
             mSelectedDevice = device.getDevice();
             onDevicePreferenceClick(btPreference);
@@ -152,6 +155,9 @@
             return;
         }
 
+        // Prevent updates while the list shows one of the state messages
+        if (mLocalAdapter.getBluetoothState() != BluetoothAdapter.STATE_ON) return;
+
         if (mFilter.matches(cachedDevice.getDevice())) {
             createDevicePreference(cachedDevice);
         }
@@ -162,7 +168,7 @@
                 getActivity(), cachedDevice);
 
         initDevicePreference(preference);
-        mDeviceList.addPreference(preference);
+        mDeviceListGroup.addPreference(preference);
         mDevicePreferenceMap.put(cachedDevice, preference);
     }
 
@@ -170,13 +176,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,8 +192,8 @@
     }
 
     private void updateProgressUi(boolean start) {
-        if (mDeviceList instanceof ProgressCategory) {
-            ((ProgressCategory) mDeviceList).setProgress(start);
+        if (mDeviceListGroup instanceof ProgressCategory) {
+            ((ProgressCategory) mDeviceListGroup).setProgress(start);
         }
     }
 
diff --git a/src/com/android/settings/bluetooth/DevicePickerFragment.java b/src/com/android/settings/bluetooth/DevicePickerFragment.java
index 126df02..8b32941 100644
--- a/src/com/android/settings/bluetooth/DevicePickerFragment.java
+++ b/src/com/android/settings/bluetooth/DevicePickerFragment.java
@@ -55,7 +55,7 @@
     @Override
     public void onResume() {
         super.onResume();
-        addDevices();
+        addCachedDevices();
         mLocalAdapter.startScanning(true);
     }
 
@@ -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/Memory.java b/src/com/android/settings/deviceinfo/Memory.java
index db60c37..fff1570 100644
--- a/src/com/android/settings/deviceinfo/Memory.java
+++ b/src/com/android/settings/deviceinfo/Memory.java
@@ -34,8 +34,12 @@
 import android.os.storage.StorageManager;
 import android.os.storage.StorageVolume;
 import android.preference.Preference;
+import android.preference.PreferenceActivity;
 import android.preference.PreferenceScreen;
 import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.widget.Toast;
 
 import com.android.settings.R;
@@ -47,6 +51,8 @@
     private static final int DLG_CONFIRM_UNMOUNT = 1;
     private static final int DLG_ERROR_UNMOUNT = 2;
 
+    private static final int MENU_ID_USB = Menu.FIRST;
+
     private Resources mResources;
 
     // The mountToggle Preference that has last been clicked.
@@ -60,6 +66,7 @@
 
     private StorageManager mStorageManager = null;
 
+    private StorageVolumePreferenceCategory mInternalStorageVolumePreferenceCategory;
     private StorageVolumePreferenceCategory[] mStorageVolumePreferenceCategories;
 
     @Override
@@ -75,18 +82,32 @@
 
         mResources = getResources();
 
+        if (!Environment.isExternalStorageEmulated()) {
+            // External storage is separate from internal storage; need to
+            // show internal storage as a separate item.
+            mInternalStorageVolumePreferenceCategory = new StorageVolumePreferenceCategory(
+                    getActivity(), mResources, null, mStorageManager, false);
+            getPreferenceScreen().addPreference(mInternalStorageVolumePreferenceCategory);
+            mInternalStorageVolumePreferenceCategory.init();
+        }
+
         StorageVolume[] storageVolumes = mStorageManager.getVolumeList();
+        // mass storage is enabled if primary volume supports it
+        boolean massStorageEnabled = (storageVolumes.length > 0
+                && storageVolumes[0].allowMassStorage());
         int length = storageVolumes.length;
         mStorageVolumePreferenceCategories = new StorageVolumePreferenceCategory[length];
         for (int i = 0; i < length; i++) {
             StorageVolume storageVolume = storageVolumes[i];
-            StorageVolumePreferenceCategory storagePreferenceCategory =
-                new StorageVolumePreferenceCategory(getActivity(), mResources, storageVolume,
-                        mStorageManager, i == 0); // The first volume is the primary volume
-            mStorageVolumePreferenceCategories[i] = storagePreferenceCategory;
-            getPreferenceScreen().addPreference(storagePreferenceCategory);
-            storagePreferenceCategory.init();
+            boolean isPrimary = i == 0;
+            mStorageVolumePreferenceCategories[i] = new StorageVolumePreferenceCategory(
+                    getActivity(), mResources, storageVolume, mStorageManager, isPrimary);
+            getPreferenceScreen().addPreference(mStorageVolumePreferenceCategories[i]);
+            mStorageVolumePreferenceCategories[i].init();
         }
+
+        // only show options menu if we are not using the legacy USB mass storage support
+        setHasOptionsMenu(!massStorageEnabled);
     }
 
     @Override
@@ -97,6 +118,9 @@
         intentFilter.addDataScheme("file");
         getActivity().registerReceiver(mMediaScannerReceiver, intentFilter);
 
+        if (mInternalStorageVolumePreferenceCategory != null) {
+            mInternalStorageVolumePreferenceCategory.onResume();
+        }
         for (int i = 0; i < mStorageVolumePreferenceCategories.length; i++) {
             mStorageVolumePreferenceCategories[i].onResume();
         }
@@ -105,9 +129,8 @@
     StorageEventListener mStorageListener = new StorageEventListener() {
         @Override
         public void onStorageStateChanged(String path, String oldState, String newState) {
-            Log.i(TAG, "Received storage state changed notification that " +
-                    path + " changed state from " + oldState +
-                    " to " + newState);
+            Log.i(TAG, "Received storage state changed notification that " + path +
+                    " changed state from " + oldState + " to " + newState);
             for (int i = 0; i < mStorageVolumePreferenceCategories.length; i++) {
                 StorageVolumePreferenceCategory svpc = mStorageVolumePreferenceCategories[i];
                 if (path.equals(svpc.getStorageVolume().getPath())) {
@@ -122,6 +145,9 @@
     public void onPause() {
         super.onPause();
         getActivity().unregisterReceiver(mMediaScannerReceiver);
+        if (mInternalStorageVolumePreferenceCategory != null) {
+            mInternalStorageVolumePreferenceCategory.onPause();
+        }
         for (int i = 0; i < mStorageVolumePreferenceCategories.length; i++) {
             mStorageVolumePreferenceCategories[i].onPause();
         }
@@ -135,6 +161,31 @@
         super.onDestroy();
     }
 
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        menu.add(Menu.NONE, MENU_ID_USB, 0, R.string.storage_menu_usb)
+                //.setIcon(com.android.internal.R.drawable.stat_sys_data_usb)
+                .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case MENU_ID_USB:
+                if (getActivity() instanceof PreferenceActivity) {
+                    ((PreferenceActivity) getActivity()).startPreferencePanel(
+                            UsbSettings.class.getCanonicalName(),
+                            null,
+                            R.string.storage_title_usb, null,
+                            this, 0);
+                } else {
+                    startFragment(this, UsbSettings.class.getCanonicalName(), -1, null);
+                }
+                return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
     private synchronized IMountService getMountService() {
        if (mMountService == null) {
            IBinder service = ServiceManager.getService("mount");
@@ -178,6 +229,7 @@
     private final BroadcastReceiver mMediaScannerReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
+            // mInternalStorageVolumePreferenceCategory is not affected by the media scanner
             for (int i = 0; i < mStorageVolumePreferenceCategories.length; i++) {
                 mStorageVolumePreferenceCategories[i].onMediaScannerFinished();
             }
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/StorageMeasurement.java b/src/com/android/settings/deviceinfo/StorageMeasurement.java
index 7fb309c..b4004e9 100644
--- a/src/com/android/settings/deviceinfo/StorageMeasurement.java
+++ b/src/com/android/settings/deviceinfo/StorageMeasurement.java
@@ -88,6 +88,7 @@
 
     private static Map<StorageVolume, StorageMeasurement> sInstances =
         new ConcurrentHashMap<StorageVolume, StorageMeasurement>();
+    private static StorageMeasurement sInternalInstance;
 
     private volatile WeakReference<MeasurementReceiver> mReceiver;
 
@@ -100,6 +101,7 @@
 
     final private StorageVolume mStorageVolume;
     final private boolean mIsPrimary;
+    final private boolean mIsInternal;
 
     List<FileInfo> mFileInfoForMisc;
 
@@ -110,7 +112,8 @@
 
     private StorageMeasurement(Context context, StorageVolume storageVolume, boolean isPrimary) {
         mStorageVolume = storageVolume;
-        mIsPrimary = isPrimary;
+        mIsInternal = storageVolume == null;
+        mIsPrimary = !mIsInternal && isPrimary;
 
         // Start the thread that will measure the disk usage.
         final HandlerThread handlerThread = new HandlerThread("MemoryMeasurement");
@@ -126,6 +129,13 @@
      */
     public static StorageMeasurement getInstance(Context context, StorageVolume storageVolume,
             boolean isPrimary) {
+        if (storageVolume == null) {
+            if (sInternalInstance == null) {
+                sInternalInstance =
+                    new StorageMeasurement(context.getApplicationContext(), storageVolume, isPrimary);
+            }
+            return sInternalInstance;
+        }
         if (sInstances.containsKey(storageVolume)) {
             return sInstances.get(storageVolume);
         } else {
@@ -317,9 +327,18 @@
                 }
 
                 if (succeeded) {
-                    mAppsSizeForThisStatsObserver += stats.codeSize + stats.dataSize +
-                    stats.externalCacheSize + stats.externalDataSize +
-                    stats.externalMediaSize + stats.externalObbSize;
+                    if (mIsInternal) {
+                        mAppsSizeForThisStatsObserver += stats.codeSize + stats.dataSize;
+                    } else if (!Environment.isExternalStorageEmulated()) {
+                        mAppsSizeForThisStatsObserver += stats.externalObbSize +
+                                stats.externalCodeSize + stats.externalDataSize +
+                                stats.externalCacheSize + stats.externalMediaSize;
+                    } else {
+                        mAppsSizeForThisStatsObserver += stats.codeSize + stats.dataSize +
+                                stats.externalCodeSize + stats.externalDataSize +
+                                stats.externalCacheSize + stats.externalMediaSize +
+                                stats.externalObbSize;
+                    }
                 }
 
                 synchronized (mAppsList) {
@@ -349,7 +368,8 @@
         }
 
         private void measureApproximateStorage() {
-            final StatFs stat = new StatFs(mStorageVolume.getPath());
+            final StatFs stat = new StatFs(mStorageVolume != null
+                    ? mStorageVolume.getPath() : Environment.getDataDirectory().getPath());
             final long blockSize = stat.getBlockSize();
             final long totalBlocks = stat.getBlockCount();
             final long availableBlocks = stat.getAvailableBlocks();
@@ -434,7 +454,7 @@
                 return;
             }
             final List<ApplicationInfo> apps;
-            if (mIsPrimary) {
+            if (mIsPrimary || mIsInternal) {
                 apps = pm.getInstalledApplications(PackageManager.GET_UNINSTALLED_PACKAGES |
                         PackageManager.GET_DISABLED_COMPONENTS);
             } else {
@@ -529,7 +549,7 @@
     /**
      * TODO remove this method, only used because external SD Card needs a special treatment.
      */
-    boolean isPrimary() {
-        return mIsPrimary;
+    boolean isExternalSDCard() {
+        return !mIsPrimary && !mIsInternal;
     }
 }
diff --git a/src/com/android/settings/deviceinfo/StorageVolumePreferenceCategory.java b/src/com/android/settings/deviceinfo/StorageVolumePreferenceCategory.java
index 9dbff88..ae6d817 100644
--- a/src/com/android/settings/deviceinfo/StorageVolumePreferenceCategory.java
+++ b/src/com/android/settings/deviceinfo/StorageVolumePreferenceCategory.java
@@ -162,12 +162,13 @@
         mResources = resources;
         mStorageVolume = storageVolume;
         mStorageManager = storageManager;
-        setTitle(storageVolume.getDescription());
+        setTitle(storageVolume != null ? storageVolume.getDescription()
+                : resources.getText(R.string.internal_storage));
         mMeasurement = StorageMeasurement.getInstance(context, storageVolume, isPrimary);
         mMeasurement.setReceiver(this);
 
         // Cannot format emulated storage
-        mAllowFormat = !mStorageVolume.isEmulated();
+        mAllowFormat = mStorageVolume != null && !mStorageVolume.isEmulated();
         // For now we are disabling reformatting secondary external storage
         // until some interoperability problems with MTP are fixed
         if (!isPrimary) mAllowFormat = false;
@@ -240,7 +241,9 @@
     private void updatePreferencesFromState() {
         resetPreferences();
 
-        String state = mStorageManager.getVolumeState(mStorageVolume.getPath());
+        String state = mStorageVolume != null
+                ? mStorageManager.getVolumeState(mStorageVolume.getPath())
+                : Environment.MEDIA_MOUNTED;
 
         String readOnly = "";
         if (Environment.MEDIA_MOUNTED_READ_ONLY.equals(state)) {
@@ -255,7 +258,8 @@
             removePreference(mFormatPreference);
         }
 
-        if (!mStorageVolume.isRemovable() && !Environment.MEDIA_UNMOUNTED.equals(state)) {
+        if ((mStorageVolume == null || !mStorageVolume.isRemovable())
+                && !Environment.MEDIA_UNMOUNTED.equals(state)) {
             // This device has built-in storage that is not removable.
             // There is no reason for the user to unmount it.
             removePreference(mMountTogglePreference);
@@ -307,7 +311,7 @@
 
         mPreferences[TOTAL_SIZE].setSummary(formatSize(totalSize));
 
-        if (!mMeasurement.isPrimary()) {
+        if (mMeasurement.isExternalSDCard()) {
             // TODO FIXME: external SD card will not report any size. Show used space in bar graph
             final long usedSize = totalSize - availSize;
             mUsageBarPreference.addEntry(usedSize / (float) totalSize, android.graphics.Color.GRAY);
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/deviceinfo/UsbSettings.java b/src/com/android/settings/deviceinfo/UsbSettings.java
new file mode 100644
index 0000000..5da13af
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/UsbSettings.java
@@ -0,0 +1,150 @@
+/*
+ * 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.deviceinfo;
+
+import android.content.ContentQueryMap;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.hardware.usb.UsbManager;
+import android.os.Bundle;
+import android.os.storage.StorageManager;
+import android.os.storage.StorageVolume;
+import android.preference.CheckBoxPreference;
+import android.preference.Preference;
+import android.preference.PreferenceScreen;
+import android.provider.Settings;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+
+import java.io.File;
+
+/**
+ * USB storage settings.
+ */
+public class UsbSettings extends SettingsPreferenceFragment {
+
+    private static final String TAG = "UsbSettings";
+
+    private static final String KEY_MTP = "usb_mtp";
+    private static final String KEY_PTP = "usb_ptp";
+    private static final String KEY_INSTALLER_CD = "usb_installer_cd";
+    private static final int MENU_ID_INSTALLER_CD = Menu.FIRST;
+
+    private UsbManager mUsbManager;
+    private String mInstallerImagePath;
+    private CheckBoxPreference mMtp;
+    private CheckBoxPreference mPtp;
+
+    private PreferenceScreen createPreferenceHierarchy() {
+        PreferenceScreen root = getPreferenceScreen();
+        if (root != null) {
+            root.removeAll();
+        }
+        addPreferencesFromResource(R.xml.usb_settings);
+        root = getPreferenceScreen();
+
+        mMtp = (CheckBoxPreference)root.findPreference(KEY_MTP);
+        mPtp = (CheckBoxPreference)root.findPreference(KEY_PTP);
+
+        return root;
+    }
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        mUsbManager = (UsbManager)getSystemService(Context.USB_SERVICE);
+        mInstallerImagePath = getString(com.android.internal.R.string.config_isoImagePath);
+        if (!(new File(mInstallerImagePath)).exists()) {
+            mInstallerImagePath = null;
+        }
+        setHasOptionsMenu(mInstallerImagePath != null);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        // Make sure we reload the preference hierarchy since some of these settings
+        // depend on others...
+        createPreferenceHierarchy();
+        updateToggles();
+    }
+
+    private void updateToggles() {
+        if (mUsbManager.isFunctionEnabled(UsbManager.USB_FUNCTION_MTP)) {
+            mMtp.setChecked(true);
+            mPtp.setChecked(false);
+        } else if (mUsbManager.isFunctionEnabled(UsbManager.USB_FUNCTION_PTP)) {
+            mMtp.setChecked(false);
+            mPtp.setChecked(true);
+        } else  {
+            mMtp.setChecked(false);
+            mPtp.setChecked(false);
+        }
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
+        Log.d(TAG, "onPreferenceTreeClick " + preference);
+
+        // temporary hack - using check boxes as radio buttons
+        // don't allow unchecking them
+        if (preference instanceof CheckBoxPreference) {
+            CheckBoxPreference checkBox = (CheckBoxPreference)preference;
+            if (!checkBox.isChecked()) {
+                checkBox.setChecked(true);
+                return true;
+            }
+        }
+
+        if (preference == mMtp) {
+            mUsbManager.setCurrentFunction(UsbManager.USB_FUNCTION_MTP, true);
+            mPtp.setChecked(false);
+        } else if (preference == mPtp) {
+            mUsbManager.setCurrentFunction(UsbManager.USB_FUNCTION_PTP, true);
+            mMtp.setChecked(false);
+        }
+
+        return true;
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        menu.add(Menu.NONE, MENU_ID_INSTALLER_CD, 0, R.string.usb_label_installer_cd)
+                //.setIcon(com.android.internal.R.drawable.stat_sys_data_usb)
+                .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case MENU_ID_INSTALLER_CD:
+                // installer CD is never default
+                mUsbManager.setCurrentFunction(UsbManager.USB_FUNCTION_MASS_STORAGE, false);
+                mUsbManager.setMassStorageBackingFile(mInstallerImagePath);
+                mMtp.setChecked(false);
+                mPtp.setChecked(false);
+                return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+}
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..4ccebf0 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
@@ -18,28 +18,61 @@
 
 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.Intent;
+import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.os.Bundle;
+import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
+import android.preference.PreferenceCategory;
+import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
 import android.provider.Settings;
+import android.provider.Settings.System;
+import android.text.TextUtils;
+import android.view.inputmethod.InputMethodInfo;
 import android.view.inputmethod.InputMethodManager;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+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_USER_DICTIONARY_SETTINGS = "key_user_dictionary_settings";
+    // false: on ICS or later
+    private static final boolean SHOW_INPUT_METHOD_SWITCHER_SETTINGS = false;
+
+    private static final String[] sSystemSettingNames = {
+        System.TEXT_AUTO_REPLACE, System.TEXT_AUTO_CAPS, System.TEXT_AUTO_PUNCTUATE,
+    };
+
+    private static final String[] sHardKeyboardKeys = {
+        "auto_replace", "auto_caps", "auto_punctuate",
+    };
 
     private int mDefaultInputMethodSelectorVisibility = 0;
     private ListPreference mShowInputMethodSelectorPref;
     private Preference mLanguagePref;
+    private ArrayList<InputMethodPreference> mInputMethodPreferenceList =
+            new ArrayList<InputMethodPreference>();
+    private boolean mHaveHardKeyboard;
+    private PreferenceCategory mHardKeyboardCategory;
+    private InputMethodManager mImm;
+    private List<InputMethodInfo> mImis;
+    private boolean mIsOnlyImeSettings;
 
     @Override
     public void onCreate(Bundle icicle) {
@@ -59,13 +92,26 @@
         } else {
             mLanguagePref = findPreference(KEY_PHONE_LANGUAGE);
         }
-        mShowInputMethodSelectorPref = (ListPreference)findPreference(
-                KEY_INPUT_METHOD_SELECTOR);
-        mShowInputMethodSelectorPref.setOnPreferenceChangeListener(this);
-        // TODO: Update current input method name on summary
-        updateInputMethodSelectorSummary(loadInputMethodSelectorVisibility());
+        if (SHOW_INPUT_METHOD_SWITCHER_SETTINGS) {
+            mShowInputMethodSelectorPref = (ListPreference)findPreference(
+                    KEY_INPUT_METHOD_SELECTOR);
+            mShowInputMethodSelectorPref.setOnPreferenceChangeListener(this);
+            // TODO: Update current input method name on summary
+            updateInputMethodSelectorSummary(loadInputMethodSelectorVisibility());
+        }
 
         new VoiceInputOutputSettings(this).onCreate();
+
+        // Hard keyboard
+        final Configuration config = getResources().getConfiguration();
+        mHaveHardKeyboard = (config.keyboard == Configuration.KEYBOARD_QWERTY);
+
+        // IME
+        mIsOnlyImeSettings = Settings.ACTION_INPUT_METHOD_SETTINGS.equals(
+                getActivity().getIntent().getAction());
+        mImm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+        mImis = mImm.getInputMethodList();
+        createImePreferenceHierarchy((PreferenceGroup)findPreference("keyboard_settings_category"));
     }
 
     private void updateInputMethodSelectorSummary(int value) {
@@ -77,25 +123,71 @@
         }
     }
 
+    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();
-        if (mLanguagePref != null) {
-            Configuration conf = getResources().getConfiguration();
-            String locale = conf.locale.getDisplayName(conf.locale);
-            if (locale != null && locale.length() > 1) {
-                locale = Character.toUpperCase(locale.charAt(0)) + locale.substring(1);
-                mLanguagePref.setSummary(locale);
+        if (!mIsOnlyImeSettings) {
+            if (mLanguagePref != null) {
+                Configuration conf = getResources().getConfiguration();
+                String locale = conf.locale.getDisplayName(conf.locale);
+                if (locale != null && locale.length() > 1) {
+                    locale = Character.toUpperCase(locale.charAt(0)) + locale.substring(1);
+                    mLanguagePref.setSummary(locale);
+                }
+            }
+
+            updateUserDictionaryPreference(findPreference(KEY_USER_DICTIONARY_SETTINGS));
+            if (SHOW_INPUT_METHOD_SWITCHER_SETTINGS) {
+                mShowInputMethodSelectorPref.setOnPreferenceChangeListener(this);
             }
         }
 
-        mShowInputMethodSelectorPref.setOnPreferenceChangeListener(this);
+        // Hard keyboard
+        if (mHaveHardKeyboard) {
+            for (int i = 0; i < sHardKeyboardKeys.length; ++i) {
+                InputMethodPreference chkPref = (InputMethodPreference)
+                        mHardKeyboardCategory.findPreference(sHardKeyboardKeys[i]);
+                chkPref.setChecked(
+                        System.getInt(getContentResolver(), sSystemSettingNames[i], 1) > 0);
+            }
+        }
+
+        // IME
+        InputMethodAndSubtypeUtil.loadInputMethodSubtypeList(
+                this, getContentResolver(), mImis, null);
+        updateActiveInputMethodsSummary();
     }
 
     @Override
     public void onPause() {
         super.onPause();
-        mShowInputMethodSelectorPref.setOnPreferenceChangeListener(null);
+        if (SHOW_INPUT_METHOD_SWITCHER_SETTINGS) {
+            mShowInputMethodSelectorPref.setOnPreferenceChangeListener(null);
+        }
+        InputMethodAndSubtypeUtil.saveInputMethodSubtypeList(
+                this, getContentResolver(), mImis, mHaveHardKeyboard);
     }
 
     @Override
@@ -112,6 +204,17 @@
                         getSystemService(Context.INPUT_METHOD_SERVICE);
                 imm.showInputMethodPicker();
             }
+        } else if (preference instanceof CheckBoxPreference) {
+            final CheckBoxPreference chkPref = (CheckBoxPreference) preference;
+            if (mHaveHardKeyboard) {
+                for (int i = 0; i < sHardKeyboardKeys.length; ++i) {
+                    if (chkPref == mHardKeyboardCategory.findPreference(sHardKeyboardKeys[i])) {
+                        System.putInt(getContentResolver(), sSystemSettingNames[i],
+                                chkPref.isChecked() ? 1 : 0);
+                        return true;
+                    }
+                }
+            }
         }
         return super.onPreferenceTreeClick(preferenceScreen, preference);
     }
@@ -134,12 +237,84 @@
 
     @Override
     public boolean onPreferenceChange(Preference preference, Object value) {
-        if (preference == mShowInputMethodSelectorPref) {
-            if (value instanceof String) {
-                saveInputMethodSelectorVisibility((String)value);
+        if (SHOW_INPUT_METHOD_SWITCHER_SETTINGS) {
+            if (preference == mShowInputMethodSelectorPref) {
+                if (value instanceof String) {
+                    saveInputMethodSelectorVisibility((String)value);
+                }
             }
         }
         return false;
     }
 
+    private void updateActiveInputMethodsSummary() {
+        for (Preference pref : mInputMethodPreferenceList) {
+            if (pref instanceof InputMethodPreference) {
+                ((InputMethodPreference)pref).updateSummary();
+            }
+        }
+    }
+
+    private InputMethodPreference getInputMethodPreference(InputMethodInfo imi, int imiSize) {
+        final PackageManager pm = getPackageManager();
+        final CharSequence label = imi.loadLabel(pm);
+        // IME settings
+        final Intent intent;
+        final String settingsActivity = imi.getSettingsActivity();
+        if (!TextUtils.isEmpty(settingsActivity)) {
+            intent = new Intent(Intent.ACTION_MAIN);
+            intent.setClassName(imi.getPackageName(), settingsActivity);
+        } else {
+            intent = null;
+        }
+
+        // Add a check box for enabling/disabling IME
+        InputMethodPreference pref = new InputMethodPreference(this, intent, mImm, imi, imiSize);
+        pref.setKey(imi.getId());
+        pref.setTitle(label);
+        return pref;
+    }
+
+    private void createImePreferenceHierarchy(PreferenceGroup root) {
+        final Preference hardKeyPref = findPreference("hard_keyboard");
+        if (mIsOnlyImeSettings) {
+            getPreferenceScreen().removeAll();
+            if (hardKeyPref != null && mHaveHardKeyboard) {
+                getPreferenceScreen().addPreference(hardKeyPref);
+            }
+            if (SHOW_INPUT_METHOD_SWITCHER_SETTINGS) {
+                getPreferenceScreen().addPreference(mShowInputMethodSelectorPref);
+            }
+            getPreferenceScreen().addPreference(root);
+        }
+        if (hardKeyPref != null) {
+            if (mHaveHardKeyboard) {
+                mHardKeyboardCategory = (PreferenceCategory) hardKeyPref;
+            } else {
+                getPreferenceScreen().removePreference(hardKeyPref);
+            }
+        }
+        root.removeAll();
+        mInputMethodPreferenceList.clear();
+
+        if (!mIsOnlyImeSettings) {
+            // Current IME selection
+            final PreferenceScreen currentIme = new PreferenceScreen(getActivity(), null);
+            currentIme.setKey(KEY_CURRENT_INPUT_METHOD);
+            currentIme.setTitle(getResources().getString(R.string.current_input_method));
+            root.addPreference(currentIme);
+        }
+
+        final int N = (mImis == null ? 0 : mImis.size());
+        for (int i = 0; i < N; ++i) {
+            final InputMethodInfo imi = mImis.get(i);
+            final InputMethodPreference pref = getInputMethodPreference(imi, N);
+            mInputMethodPreferenceList.add(pref);
+        }
+
+        Collections.sort(mInputMethodPreferenceList);
+        for (int i = 0; i < N; ++i) {
+            root.addPreference(mInputMethodPreferenceList.get(i));
+        }
+    }
 }
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/InputMethodAndSubtypeUtil.java b/src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java
index 362fbb5..f62edc4 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java
@@ -169,9 +169,10 @@
             final boolean isImeChecked = (pref instanceof CheckBoxPreference) ?
                     ((CheckBoxPreference) pref).isChecked()
                             : enabledIMEAndSubtypesMap.containsKey(imiId);
-            boolean isCurrentInputMethod = imiId.equals(currentInputMethodId);
-            boolean systemIme = isSystemIme(imi);
-            if (((onlyOneIME || systemIme) && !hasHardKeyboard) || isImeChecked) {
+            final boolean isCurrentInputMethod = imiId.equals(currentInputMethodId);
+            final boolean auxIme = isAuxiliaryIme(imi);
+            final boolean systemIme = isSystemIme(imi);
+            if (((onlyOneIME || (systemIme && !auxIme)) && !hasHardKeyboard) || isImeChecked) {
                 if (!enabledIMEAndSubtypesMap.containsKey(imiId)) {
                     // imiId has just been enabled
                     enabledIMEAndSubtypesMap.put(imiId, new HashSet<String>());
@@ -276,7 +277,7 @@
             List<InputMethodInfo> inputMethodInfos,
             final Map<String, List<Preference>> inputMethodPrefsMap) {
         HashMap<String, HashSet<String>> enabledSubtypes =
-            getEnabledInputMethodsAndSubtypeList(resolver);
+                getEnabledInputMethodsAndSubtypeList(resolver);
 
         for (InputMethodInfo imi : inputMethodInfos) {
             final String imiId = imi.getId();
@@ -342,4 +343,19 @@
         return (property.getServiceInfo().applicationInfo.flags
                 & ApplicationInfo.FLAG_SYSTEM) != 0;
     }
+
+    public static boolean isAuxiliaryIme(InputMethodInfo imi) {
+        final int subtypeCount = imi.getSubtypeCount();
+        if (subtypeCount == 0) {
+            return false;
+        } else {
+            for (int i = 0; i < subtypeCount; ++i) {
+                final InputMethodSubtype subtype = imi.getSubtypeAt(i);
+                if (!subtype.isAuxiliary()) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
 }
diff --git a/src/com/android/settings/inputmethod/InputMethodConfig.java b/src/com/android/settings/inputmethod/InputMethodConfig.java
deleted file mode 100644
index 2cfe35d..0000000
--- a/src/com/android/settings/inputmethod/InputMethodConfig.java
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
- * 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.inputmethod;
-
-import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
-
-import android.app.AlertDialog;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.res.Configuration;
-import android.os.Bundle;
-import android.preference.CheckBoxPreference;
-import android.preference.Preference;
-import android.preference.Preference.OnPreferenceClickListener;
-import android.preference.PreferenceCategory;
-import android.preference.PreferenceScreen;
-import android.provider.Settings;
-import android.provider.Settings.System;
-import android.text.TextUtils;
-import android.view.inputmethod.InputMethodInfo;
-import android.view.inputmethod.InputMethodManager;
-import android.view.inputmethod.InputMethodSubtype;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-public class InputMethodConfig extends SettingsPreferenceFragment {
-
-    private static final String[] sSystemSettingNames = {
-        System.TEXT_AUTO_REPLACE, System.TEXT_AUTO_CAPS, System.TEXT_AUTO_PUNCTUATE,
-    };
-
-    private static final String[] sHardKeyboardKeys = {
-        "auto_replace", "auto_caps", "auto_punctuate",
-    };
-
-    private AlertDialog mDialog = null;
-    private boolean mHaveHardKeyboard;
-    private PreferenceCategory mHardKeyboardCategory;
-    // Map of imi and its preferences
-    final private HashMap<String, List<Preference>> mInputMethodPrefsMap =
-            new HashMap<String, List<Preference>>();
-    final private HashMap<InputMethodInfo, Preference> mActiveInputMethodsPrefMap =
-            new HashMap<InputMethodInfo, Preference>();
-    private List<InputMethodInfo> mInputMethodProperties;
-
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        Configuration config = getResources().getConfiguration();
-        mHaveHardKeyboard = (config.keyboard == Configuration.KEYBOARD_QWERTY);
-        InputMethodManager imm = (InputMethodManager) getSystemService(
-                Context.INPUT_METHOD_SERVICE);
-
-        // TODO: Change mInputMethodProperties to Map
-        mInputMethodProperties = imm.getInputMethodList();
-        setPreferenceScreen(createPreferenceHierarchy());
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-
-        ContentResolver resolver = getContentResolver();
-        if (mHaveHardKeyboard) {
-            for (int i = 0; i < sHardKeyboardKeys.length; ++i) {
-                CheckBoxPreference chkPref = (CheckBoxPreference)
-                        mHardKeyboardCategory.findPreference(sHardKeyboardKeys[i]);
-                chkPref.setChecked(System.getInt(resolver, sSystemSettingNames[i], 1) > 0);
-            }
-        }
-
-        InputMethodAndSubtypeUtil.loadInputMethodSubtypeList(
-                this, resolver, mInputMethodProperties, mInputMethodPrefsMap);
-        updateActiveInputMethodsSummary();
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        InputMethodAndSubtypeUtil.saveInputMethodSubtypeList(this, getContentResolver(),
-                mInputMethodProperties, mHaveHardKeyboard);
-    }
-
-    private void showSecurityWarnDialog(InputMethodInfo imi, final CheckBoxPreference chkPref,
-            final String imiId) {
-        if (mDialog != null && mDialog.isShowing()) {
-            mDialog.dismiss();
-        }
-        mDialog = (new AlertDialog.Builder(getActivity()))
-                .setTitle(android.R.string.dialog_alert_title)
-                .setIcon(android.R.drawable.ic_dialog_alert)
-                .setCancelable(true)
-                .setPositiveButton(android.R.string.ok,
-                        new DialogInterface.OnClickListener() {
-                    public void onClick(DialogInterface dialog, int which) {
-                        chkPref.setChecked(true);
-                        for (Preference pref: mInputMethodPrefsMap.get(imiId)) {
-                            pref.setEnabled(true);
-                        }
-                    }
-                })
-                .setNegativeButton(android.R.string.cancel,
-                        new DialogInterface.OnClickListener() {
-                    public void onClick(DialogInterface dialog, int which) {
-                    }
-                })
-                .create();
-        mDialog.setMessage(getResources().getString(R.string.ime_security_warning,
-                imi.getServiceInfo().applicationInfo.loadLabel(getPackageManager())));
-        mDialog.show();
-    }
-
-    private InputMethodInfo getInputMethodInfoFromImiId(String imiId) {
-        final int N = mInputMethodProperties.size();
-        for (int i = 0; i < N; ++i) {
-            InputMethodInfo imi = mInputMethodProperties.get(i);
-            if (imiId.equals(imi.getId())) {
-                return imi;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public boolean onPreferenceTreeClick(
-            PreferenceScreen preferenceScreen, Preference preference) {
-
-        if (preference instanceof CheckBoxPreference) {
-            final CheckBoxPreference chkPref = (CheckBoxPreference) preference;
-
-            if (mHaveHardKeyboard) {
-                for (int i = 0; i < sHardKeyboardKeys.length; ++i) {
-                    if (chkPref == mHardKeyboardCategory.findPreference(sHardKeyboardKeys[i])) {
-                        System.putInt(getContentResolver(), sSystemSettingNames[i],
-                                chkPref.isChecked() ? 1 : 0);
-                        return true;
-                    }
-                }
-            }
-
-            final String imiId = chkPref.getKey();
-            if (chkPref.isChecked()) {
-                InputMethodInfo selImi = getInputMethodInfoFromImiId(imiId);
-                if (selImi != null) {
-                    if (InputMethodAndSubtypeUtil.isSystemIme(selImi)) {
-                        // This is a built-in IME, so no need to warn.
-                        return super.onPreferenceTreeClick(preferenceScreen, preference);
-                    }
-                } else {
-                    return super.onPreferenceTreeClick(preferenceScreen, preference);
-                }
-                chkPref.setChecked(false);
-                showSecurityWarnDialog(selImi, chkPref, imiId);
-            } else {
-                for (Preference pref: mInputMethodPrefsMap.get(imiId)) {
-                    pref.setEnabled(false);
-                }
-            }
-        }
-        return super.onPreferenceTreeClick(preferenceScreen, preference);
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        if (mDialog != null) {
-            mDialog.dismiss();
-            mDialog = null;
-        }
-    }
-
-    private void addInputMethodPreference(PreferenceScreen root, InputMethodInfo imi,
-            final int imiSize) {
-        PreferenceCategory keyboardSettingsCategory = new PreferenceCategory(getActivity());
-        root.addPreference(keyboardSettingsCategory);
-        final String imiId = imi.getId();
-        mInputMethodPrefsMap.put(imiId, new ArrayList<Preference>());
-
-        PackageManager pm = getPackageManager();
-        CharSequence label = imi.loadLabel(pm);
-        keyboardSettingsCategory.setTitle(label);
-
-        final boolean isSystemIME = InputMethodAndSubtypeUtil.isSystemIme(imi);
-        // Add a check box for enabling/disabling IME
-        CheckBoxPreference chkbxPref = new CheckBoxPreference(getActivity());
-        chkbxPref.setKey(imiId);
-        chkbxPref.setTitle(label);
-        keyboardSettingsCategory.addPreference(chkbxPref);
-        // Disable the toggle if it's the only keyboard in the system, or it's a system IME.
-        if (imiSize <= 1 || isSystemIME) {
-            chkbxPref.setEnabled(false);
-        }
-
-        Intent intent;
-        // Add subtype settings when this IME has two or more subtypes.
-        PreferenceScreen prefScreen = new PreferenceScreen(getActivity(), null);
-        prefScreen.setTitle(R.string.active_input_method_subtypes);
-        if (imi.getSubtypeCount() > 1) {
-            prefScreen.setOnPreferenceClickListener(new OnPreferenceClickListener() {
-                @Override 
-                public boolean onPreferenceClick(Preference preference){
-                    final Bundle bundle = new Bundle();
-                    bundle.putString(Settings.EXTRA_INPUT_METHOD_ID, imiId);
-                    startFragment(InputMethodConfig.this,
-                            InputMethodAndSubtypeEnabler.class.getName(),
-                            0, bundle);
-                    return true;
-                }
-            });
-            keyboardSettingsCategory.addPreference(prefScreen);
-            mActiveInputMethodsPrefMap.put(imi, prefScreen);
-            mInputMethodPrefsMap.get(imiId).add(prefScreen);
-        }
-
-        // Add IME settings
-        String settingsActivity = imi.getSettingsActivity();
-        if (!TextUtils.isEmpty(settingsActivity)) {
-            prefScreen = new PreferenceScreen(getActivity(), null);
-            prefScreen.setTitle(R.string.input_method_settings);
-            intent = new Intent(Intent.ACTION_MAIN);
-            intent.setClassName(imi.getPackageName(), settingsActivity);
-            prefScreen.setIntent(intent);
-            keyboardSettingsCategory.addPreference(prefScreen);
-            mInputMethodPrefsMap.get(imiId).add(prefScreen);
-        }
-    }
-
-    private PreferenceScreen createPreferenceHierarchy() {
-        addPreferencesFromResource(R.xml.hard_keyboard_settings);
-        PreferenceScreen root = getPreferenceScreen();
-
-        if (mHaveHardKeyboard) {
-            mHardKeyboardCategory = (PreferenceCategory) findPreference("hard_keyboard");
-        } else {
-            root.removeAll();
-        }
-
-        final int N = (mInputMethodProperties == null ? 0 : mInputMethodProperties.size());
-        for (int i = 0; i < N; ++i) {
-            addInputMethodPreference(root, mInputMethodProperties.get(i), N);
-        }
-        return root;
-    }
-
-    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);
-            StringBuilder summary = new StringBuilder();
-            boolean subtypeAdded = false;
-            for (InputMethodSubtype subtype: subtypes) {
-                if (subtypeAdded) {
-                    summary.append(", ");
-                }
-                summary.append(pm.getText(imi.getPackageName(), subtype.getNameResId(),
-                        imi.getServiceInfo().applicationInfo));
-                subtypeAdded = true;
-            }
-            pref.setSummary(summary.toString());
-        }
-    }
-}
diff --git a/src/com/android/settings/inputmethod/InputMethodDialogReceiver.java b/src/com/android/settings/inputmethod/InputMethodDialogReceiver.java
new file mode 100644
index 0000000..46be132
--- /dev/null
+++ b/src/com/android/settings/inputmethod/InputMethodDialogReceiver.java
@@ -0,0 +1,32 @@
+/*
+ * 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.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.provider.Settings;
+import android.view.inputmethod.InputMethodManager;
+
+public class InputMethodDialogReceiver extends BroadcastReceiver {
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        if (Settings.ACTION_SHOW_INPUT_METHOD_PICKER.equals(intent.getAction())) {
+            ((InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE))
+                    .showInputMethodPicker();
+        }
+    }
+}
diff --git a/src/com/android/settings/inputmethod/InputMethodPreference.java b/src/com/android/settings/inputmethod/InputMethodPreference.java
new file mode 100644
index 0000000..21057a6
--- /dev/null
+++ b/src/com/android/settings/inputmethod/InputMethodPreference.java
@@ -0,0 +1,242 @@
+/*
+ * 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 android.app.AlertDialog;
+import android.app.Fragment;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.res.Configuration;
+import android.os.Bundle;
+import android.preference.CheckBoxPreference;
+import android.preference.PreferenceActivity;
+import android.provider.Settings;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.View.OnLongClickListener;
+import android.view.inputmethod.InputMethodInfo;
+import android.view.inputmethod.InputMethodManager;
+import android.view.inputmethod.InputMethodSubtype;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import java.util.Comparator;
+import java.util.List;
+
+public class InputMethodPreference extends CheckBoxPreference
+        implements Comparator<InputMethodPreference> {
+    private static final String TAG = InputMethodPreference.class.getSimpleName();
+    private static final float DISABLED_ALPHA = 0.4f;
+    private final SettingsPreferenceFragment mFragment;
+    private final InputMethodInfo mImi;
+    private final InputMethodManager mImm;
+    private final Intent mSettingsIntent;
+    private final boolean mIsSystemIme;
+
+    private AlertDialog mDialog = null;
+    private ImageView mInputMethodSettingsButton;
+    private TextView mTitleText;
+    private TextView mSummaryText;
+    private View mInputMethodPref;
+
+    public InputMethodPreference(SettingsPreferenceFragment fragment, Intent settingsIntent,
+            InputMethodManager imm, InputMethodInfo imi, int imiCount) {
+        super(fragment.getActivity(), null, R.style.InputMethodPreferenceStyle);
+        setLayoutResource(R.layout.preference_inputmethod);
+        setWidgetLayoutResource(R.layout.preference_inputmethod_widget);
+        mFragment = fragment;
+        mSettingsIntent = settingsIntent;
+        mImm = imm;
+        mImi = imi;
+        updateSummary();
+        mIsSystemIme = InputMethodAndSubtypeUtil.isSystemIme(imi);
+        final boolean isAuxIme = InputMethodAndSubtypeUtil.isAuxiliaryIme(imi);
+        if (imiCount <= 1 || (mIsSystemIme && !isAuxIme)) {
+            setEnabled(false);
+        }
+    }
+
+    @Override
+    protected void onBindView(View view) {
+        super.onBindView(view);
+        mInputMethodPref = view.findViewById(R.id.inputmethod_pref);
+        mInputMethodPref.setOnClickListener(
+                new OnClickListener() {
+                    @Override
+                    public void onClick(View arg0) {
+                        if (isChecked()) {
+                            setChecked(false);
+                        } else {
+                            if (mIsSystemIme) {
+                                setChecked(true);
+                            } else {
+                                showSecurityWarnDialog(mImi, InputMethodPreference.this);
+                            }
+                        }
+                    }
+                });
+        mInputMethodSettingsButton = (ImageView)view.findViewById(R.id.inputmethod_settings);
+        mTitleText = (TextView)view.findViewById(android.R.id.title);
+        mSummaryText = (TextView)view.findViewById(android.R.id.summary);
+        if (mSettingsIntent != null) {
+            mInputMethodSettingsButton.setOnClickListener(
+                    new OnClickListener() {
+                        @Override
+                        public void onClick(View arg0) {
+                            mFragment.startActivity(mSettingsIntent);
+                        }
+                    });
+        }
+        final boolean hasSubtypes = mImi.getSubtypeCount() > 1;
+        final String imiId = mImi.getId();
+        if (hasSubtypes) {
+            final OnLongClickListener listener = new OnLongClickListener() {
+                @Override
+                public boolean onLongClick(View arg0) {
+                    final Bundle bundle = new Bundle();
+                    bundle.putString(Settings.EXTRA_INPUT_METHOD_ID, imiId);
+                    startFragment(mFragment, InputMethodAndSubtypeEnabler.class.getName(),
+                            0, bundle);
+                    return true;
+                }
+            };
+            mInputMethodSettingsButton.setOnLongClickListener(listener);
+        }
+        if (mSettingsIntent == null) {
+            mInputMethodSettingsButton.setVisibility(View.GONE);
+        } else {
+            enableSettingsButton();
+        }
+    }
+
+    @Override
+    public void setEnabled(boolean enabled) {
+        super.setEnabled(enabled);
+        enableSettingsButton();
+    }
+
+    private void enableSettingsButton() {
+        if (mInputMethodSettingsButton != null) {
+            final boolean checked = isChecked();
+            mInputMethodSettingsButton.setEnabled(checked);
+            mInputMethodSettingsButton.setClickable(checked);
+            mInputMethodSettingsButton.setFocusable(checked);
+            if (!checked) {
+                mInputMethodSettingsButton.setAlpha(DISABLED_ALPHA);
+            }
+        }
+        if (mTitleText != null) {
+            mTitleText.setEnabled(true);
+        }
+        if (mSummaryText != null) {
+            mSummaryText.setEnabled(true);
+        }
+    }
+
+    public static boolean startFragment(
+            Fragment fragment, String fragmentClass, int requestCode, Bundle extras) {
+        if (fragment.getActivity() instanceof PreferenceActivity) {
+            PreferenceActivity preferenceActivity = (PreferenceActivity)fragment.getActivity();
+            preferenceActivity.startPreferencePanel(fragmentClass, extras, 0, null, fragment,
+                    requestCode);
+            return true;
+        } else {
+            Log.w(TAG, "Parent isn't PreferenceActivity, thus there's no way to launch the "
+                    + "given Fragment (name: " + fragmentClass + ", requestCode: " + requestCode
+                    + ")");
+            return false;
+        }
+    }
+
+    public String getSummaryString() {
+        final StringBuilder builder = new StringBuilder();
+        final List<InputMethodSubtype> subtypes = mImm.getEnabledInputMethodSubtypeList(mImi, true);
+        for (InputMethodSubtype subtype : subtypes) {
+            if (builder.length() > 0) {
+                builder.append(", ");
+            }
+            final CharSequence subtypeLabel = subtype.getDisplayName(mFragment.getActivity(),
+                    mImi.getPackageName(), mImi.getServiceInfo().applicationInfo);
+            builder.append(subtypeLabel);
+        }
+        return builder.toString();
+    }
+
+    public void updateSummary() {
+        final String summary = getSummaryString();
+        if (TextUtils.isEmpty(summary)) {
+            return;
+        }
+        setSummary(summary);
+    }
+
+    @Override
+    public void setChecked(boolean checked) {
+        super.setChecked(checked);
+        saveImeSettings();
+    }
+
+    private void showSecurityWarnDialog(InputMethodInfo imi, final CheckBoxPreference chkPref) {
+        if (mDialog != null && mDialog.isShowing()) {
+            mDialog.dismiss();
+        }
+        mDialog = (new AlertDialog.Builder(mFragment.getActivity()))
+                .setTitle(android.R.string.dialog_alert_title)
+                .setIcon(android.R.drawable.ic_dialog_alert)
+                .setCancelable(true)
+                .setPositiveButton(android.R.string.ok,
+                        new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        chkPref.setChecked(true);
+                    }
+                })
+                .setNegativeButton(android.R.string.cancel,
+                        new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                    }
+                })
+                .create();
+        mDialog.setMessage(mFragment.getResources().getString(R.string.ime_security_warning,
+                imi.getServiceInfo().applicationInfo.loadLabel(
+                        mFragment.getActivity().getPackageManager())));
+        mDialog.show();
+    }
+
+    @Override
+    public int compare(InputMethodPreference arg0, InputMethodPreference arg1) {
+        if (arg0.isEnabled() == arg0.isEnabled()) {
+            return arg0.mImi.getId().compareTo(arg1.mImi.getId());
+        } else {
+            // Prefer system IMEs
+            return arg0.isEnabled() ? 1 : -1;
+        }
+    }
+
+    private void saveImeSettings() {
+        InputMethodAndSubtypeUtil.saveInputMethodSubtypeList(
+                mFragment, mFragment.getActivity().getContentResolver(), mImm.getInputMethodList(),
+                mFragment.getResources().getConfiguration().keyboard
+                        == Configuration.KEYBOARD_QWERTY);
+    }
+}
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..61c2550
--- /dev/null
+++ b/src/com/android/settings/net/NetworkPolicyEditor.java
@@ -0,0 +1,172 @@
+/*
+ * 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.NetworkPolicy.LIMIT_DISABLED;
+import static android.net.NetworkPolicy.WARNING_DISABLED;
+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) {
+                // TODO: find better place to clamp these
+                if (policy.limitBytes < -1) {
+                    policy.limitBytes = LIMIT_DISABLED;
+                }
+                if (policy.warningBytes < -1) {
+                    policy.warningBytes = WARNING_DISABLED;
+                }
+
+                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/net/SummaryForAllUidLoader.java b/src/com/android/settings/net/SummaryForAllUidLoader.java
new file mode 100644
index 0000000..c01de45
--- /dev/null
+++ b/src/com/android/settings/net/SummaryForAllUidLoader.java
@@ -0,0 +1,80 @@
+/*
+ * 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 android.content.AsyncTaskLoader;
+import android.content.Context;
+import android.net.INetworkStatsService;
+import android.net.NetworkStats;
+import android.net.NetworkTemplate;
+import android.os.Bundle;
+import android.os.RemoteException;
+
+public class SummaryForAllUidLoader extends AsyncTaskLoader<NetworkStats> {
+    private static final String KEY_TEMPLATE = "template";
+    private static final String KEY_START = "start";
+    private static final String KEY_END = "end";
+
+    private final INetworkStatsService mStatsService;
+    private final Bundle mArgs;
+
+    public static Bundle buildArgs(NetworkTemplate template, long start, long end) {
+        final Bundle args = new Bundle();
+        args.putParcelable(KEY_TEMPLATE, template);
+        args.putLong(KEY_START, start);
+        args.putLong(KEY_END, end);
+        return args;
+    }
+
+    public SummaryForAllUidLoader(
+            Context context, INetworkStatsService statsService, Bundle args) {
+        super(context);
+        mStatsService = statsService;
+        mArgs = args;
+    }
+
+    @Override
+    protected void onStartLoading() {
+        super.onStartLoading();
+        forceLoad();
+    }
+
+    @Override
+    public NetworkStats loadInBackground() {
+        final NetworkTemplate template = mArgs.getParcelable(KEY_TEMPLATE);
+        final long start = mArgs.getLong(KEY_START);
+        final long end = mArgs.getLong(KEY_END);
+
+        try {
+            return mStatsService.getSummaryForAllUid(template, start, end, false);
+        } catch (RemoteException e) {
+            return null;
+        }
+    }
+
+    @Override
+    protected void onStopLoading() {
+        super.onStopLoading();
+        cancelLoad();
+    }
+
+    @Override
+    protected void onReset() {
+        super.onReset();
+        cancelLoad();
+    }
+}
diff --git a/src/com/android/settings/vpn/AuthenticationActor.java b/src/com/android/settings/vpn/AuthenticationActor.java
deleted file mode 100644
index f8401d6..0000000
--- a/src/com/android/settings/vpn/AuthenticationActor.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * 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.
- */
-
-package com.android.settings.vpn;
-
-import com.android.settings.R;
-
-import android.app.Dialog;
-import android.content.Context;
-import android.net.vpn.VpnManager;
-import android.net.vpn.VpnProfile;
-import android.net.vpn.VpnState;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.View;
-import android.widget.CheckBox;
-import android.widget.TextView;
-
-import java.io.IOException;
-
-/**
- * A {@link VpnProfileActor} that provides an authentication view for users to
- * input username and password before connecting to the VPN server.
- */
-public class AuthenticationActor implements VpnProfileActor {
-    private static final String TAG = AuthenticationActor.class.getName();
-
-    private Context mContext;
-    private VpnProfile mProfile;
-    private VpnManager mVpnManager;
-
-    public AuthenticationActor(Context context, VpnProfile p) {
-        mContext = context;
-        mProfile = p;
-        mVpnManager = new VpnManager(context);
-    }
-
-    //@Override
-    public VpnProfile getProfile() {
-        return mProfile;
-    }
-
-    //@Override
-    public boolean isConnectDialogNeeded() {
-        return true;
-    }
-
-    //@Override
-    public String validateInputs(Dialog d) {
-        TextView usernameView = (TextView) d.findViewById(R.id.username_value);
-        TextView passwordView = (TextView) d.findViewById(R.id.password_value);
-        Context c = mContext;
-        if (TextUtils.isEmpty(usernameView.getText().toString())) {
-            return c.getString(R.string.vpn_a_username);
-        } else if (TextUtils.isEmpty(passwordView.getText().toString())) {
-            return c.getString(R.string.vpn_a_password);
-        } else {
-            return null;
-        }
-    }
-
-    //@Override
-    public void connect(Dialog d) {
-        TextView usernameView = (TextView) d.findViewById(R.id.username_value);
-        TextView passwordView = (TextView) d.findViewById(R.id.password_value);
-        CheckBox saveUsername = (CheckBox) d.findViewById(R.id.save_username);
-
-        try {
-            setSavedUsername(saveUsername.isChecked()
-                    ? usernameView.getText().toString()
-                    : "");
-        } catch (IOException e) {
-            Log.e(TAG, "setSavedUsername()", e);
-        }
-
-        connect(usernameView.getText().toString(),
-                passwordView.getText().toString());
-        passwordView.setText("");
-    }
-
-    //@Override
-    public View createConnectView() {
-        View v = View.inflate(mContext, R.layout.vpn_connect_dialog_view, null);
-        TextView usernameView = (TextView) v.findViewById(R.id.username_value);
-        TextView passwordView = (TextView) v.findViewById(R.id.password_value);
-        CheckBox saveUsername = (CheckBox) v.findViewById(R.id.save_username);
-
-        String username = mProfile.getSavedUsername();
-        if (!TextUtils.isEmpty(username)) {
-            usernameView.setText(username);
-            saveUsername.setChecked(true);
-            passwordView.requestFocus();
-        }
-        return v;
-    }
-
-    protected Context getContext() {
-        return mContext;
-    }
-
-    private void connect(String username, String password) {
-        mVpnManager.connect(mProfile, username, password);
-    }
-
-    //@Override
-    public void disconnect() {
-        mVpnManager.disconnect();
-    }
-
-    private void setSavedUsername(String name) throws IOException {
-        if (!name.equals(mProfile.getSavedUsername())) {
-            mProfile.setSavedUsername(name);
-            VpnSettings.saveProfileToStorage(mProfile);
-        }
-    }
-}
diff --git a/src/com/android/settings/vpn/L2tpEditor.java b/src/com/android/settings/vpn/L2tpEditor.java
deleted file mode 100644
index 05d51d6..0000000
--- a/src/com/android/settings/vpn/L2tpEditor.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * 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.
- */
-
-package com.android.settings.vpn;
-
-import com.android.settings.R;
-
-import android.content.Context;
-import android.net.vpn.L2tpProfile;
-import android.preference.CheckBoxPreference;
-import android.preference.EditTextPreference;
-import android.preference.Preference;
-import android.preference.PreferenceGroup;
-
-/**
- * The class for editing {@link L2tpProfile}.
- */
-class L2tpEditor extends VpnProfileEditor {
-    private CheckBoxPreference mSecret;
-    private SecretHandler mSecretHandler;
-
-    public L2tpEditor(L2tpProfile p) {
-        super(p);
-    }
-
-    @Override
-    protected void loadExtraPreferencesTo(PreferenceGroup subpanel) {
-        Context c = subpanel.getContext();
-        subpanel.addPreference(createSecretPreference(c));
-        subpanel.addPreference(createSecretStringPreference(c));
-
-        L2tpProfile profile = (L2tpProfile) getProfile();
-    }
-
-    @Override
-    public String validate() {
-        String result = super.validate();
-        if (!mSecret.isChecked()) return result;
-
-        return ((result != null) ? result : mSecretHandler.validate());
-    }
-
-    private Preference createSecretPreference(Context c) {
-        final L2tpProfile profile = (L2tpProfile) getProfile();
-        CheckBoxPreference secret = mSecret = new CheckBoxPreference(c);
-        boolean enabled = profile.isSecretEnabled();
-        setCheckBoxTitle(secret, R.string.vpn_l2tp_secret);
-        secret.setChecked(enabled);
-        setSecretSummary(secret, enabled);
-        secret.setOnPreferenceChangeListener(
-                new Preference.OnPreferenceChangeListener() {
-                    public boolean onPreferenceChange(
-                            Preference pref, Object newValue) {
-                        boolean enabled = (Boolean) newValue;
-                        profile.setSecretEnabled(enabled);
-                        mSecretHandler.getPreference().setEnabled(enabled);
-                        setSecretSummary(mSecret, enabled);
-                        return true;
-                    }
-                });
-        return secret;
-    }
-
-    private Preference createSecretStringPreference(Context c) {
-        SecretHandler sHandler = mSecretHandler = new SecretHandler(c,
-                R.string.vpn_l2tp_secret_string_title,
-                R.string.vpn_l2tp_secret) {
-            @Override
-            protected String getSecretFromProfile() {
-                return ((L2tpProfile) getProfile()).getSecretString();
-            }
-
-            @Override
-            protected void saveSecretToProfile(String secret) {
-                ((L2tpProfile) getProfile()).setSecretString(secret);
-            }
-        };
-        Preference pref = sHandler.getPreference();
-        pref.setEnabled(mSecret.isChecked());
-        return pref;
-    }
-
-    private void setSecretSummary(CheckBoxPreference secret, boolean enabled) {
-        Context c = secret.getContext();
-        String formatString = c.getString(enabled
-                ? R.string.vpn_is_enabled
-                : R.string.vpn_is_disabled);
-        secret.setSummary(String.format(
-                formatString, c.getString(R.string.vpn_l2tp_secret)));
-    }
-}
diff --git a/src/com/android/settings/vpn/L2tpIpsecEditor.java b/src/com/android/settings/vpn/L2tpIpsecEditor.java
deleted file mode 100644
index 276ee2f..0000000
--- a/src/com/android/settings/vpn/L2tpIpsecEditor.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * 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.
- */
-
-package com.android.settings.vpn;
-
-import com.android.settings.R;
-
-import android.content.Context;
-import android.net.vpn.L2tpIpsecProfile;
-import android.preference.EditTextPreference;
-import android.preference.ListPreference;
-import android.preference.Preference;
-import android.preference.PreferenceGroup;
-import android.security.Credentials;
-import android.security.KeyStore;
-import android.text.TextUtils;
-
-/**
- * The class for editing {@link L2tpIpsecProfile}.
- */
-class L2tpIpsecEditor extends L2tpEditor {
-    private static final String TAG = L2tpIpsecEditor.class.getSimpleName();
-
-    private KeyStore mKeyStore = KeyStore.getInstance();
-
-    private ListPreference mUserCertificate;
-    private ListPreference mCaCertificate;
-
-    private L2tpIpsecProfile mProfile;
-
-    public L2tpIpsecEditor(L2tpIpsecProfile p) {
-        super(p);
-        mProfile = p;
-    }
-
-    @Override
-    protected void loadExtraPreferencesTo(PreferenceGroup subpanel) {
-        super.loadExtraPreferencesTo(subpanel);
-        Context c = subpanel.getContext();
-        subpanel.addPreference(createUserCertificatePreference(c));
-        subpanel.addPreference(createCaCertificatePreference(c));
-    }
-
-    @Override
-    public String validate() {
-        String result = super.validate();
-        if (result == null) {
-            result = validate(mUserCertificate, R.string.vpn_a_user_certificate);
-        }
-        if (result == null) {
-            result = validate(mCaCertificate, R.string.vpn_a_ca_certificate);
-        }
-        return result;
-    }
-
-    private Preference createUserCertificatePreference(Context c) {
-        mUserCertificate = createListPreference(c,
-                R.string.vpn_user_certificate_title,
-                mProfile.getUserCertificate(),
-                mKeyStore.saw(Credentials.USER_CERTIFICATE),
-                new Preference.OnPreferenceChangeListener() {
-                    public boolean onPreferenceChange(
-                            Preference pref, Object newValue) {
-                        mProfile.setUserCertificate((String) newValue);
-                        setSummary(pref, R.string.vpn_user_certificate,
-                                (String) newValue);
-                        return true;
-                    }
-                });
-        setSummary(mUserCertificate, R.string.vpn_user_certificate,
-                mProfile.getUserCertificate());
-        return mUserCertificate;
-    }
-
-    private Preference createCaCertificatePreference(Context c) {
-        mCaCertificate = createListPreference(c,
-                R.string.vpn_ca_certificate_title,
-                mProfile.getCaCertificate(),
-                mKeyStore.saw(Credentials.CA_CERTIFICATE),
-                new Preference.OnPreferenceChangeListener() {
-                    public boolean onPreferenceChange(
-                            Preference pref, Object newValue) {
-                        mProfile.setCaCertificate((String) newValue);
-                        setSummary(pref, R.string.vpn_ca_certificate,
-                                (String) newValue);
-                        return true;
-                    }
-                });
-        setSummary(mCaCertificate, R.string.vpn_ca_certificate,
-                mProfile.getCaCertificate());
-        return mCaCertificate;
-    }
-
-    private ListPreference createListPreference(Context c, int titleResId,
-            String text, String[] keys,
-            Preference.OnPreferenceChangeListener listener) {
-        ListPreference pref = new ListPreference(c);
-        pref.setTitle(titleResId);
-        pref.setDialogTitle(titleResId);
-        pref.setPersistent(true);
-        pref.setEntries(keys);
-        pref.setEntryValues(keys);
-        pref.setValue(text);
-        pref.setOnPreferenceChangeListener(listener);
-        return pref;
-    }
-}
diff --git a/src/com/android/settings/vpn/L2tpIpsecPskEditor.java b/src/com/android/settings/vpn/L2tpIpsecPskEditor.java
deleted file mode 100644
index 1277c28..0000000
--- a/src/com/android/settings/vpn/L2tpIpsecPskEditor.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * 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.
- */
-
-package com.android.settings.vpn;
-
-import com.android.settings.R;
-
-import android.content.Context;
-import android.net.vpn.L2tpIpsecPskProfile;
-import android.preference.EditTextPreference;
-import android.preference.Preference;
-import android.preference.PreferenceGroup;
-
-/**
- * The class for editing {@link L2tpIpsecPskProfile}.
- */
-class L2tpIpsecPskEditor extends L2tpEditor {
-    private EditTextPreference mPresharedKey;
-    private SecretHandler mPskHandler;
-
-    public L2tpIpsecPskEditor(L2tpIpsecPskProfile p) {
-        super(p);
-    }
-
-    @Override
-    protected void loadExtraPreferencesTo(PreferenceGroup subpanel) {
-        Context c = subpanel.getContext();
-        subpanel.addPreference(createPresharedKeyPreference(c));
-        super.loadExtraPreferencesTo(subpanel);
-    }
-
-    @Override
-    public String validate() {
-        String result = super.validate();
-
-        return ((result != null) ? result : mPskHandler.validate());
-    }
-
-    private Preference createPresharedKeyPreference(Context c) {
-        SecretHandler pskHandler = mPskHandler = new SecretHandler(c,
-                R.string.vpn_ipsec_presharedkey_title,
-                R.string.vpn_ipsec_presharedkey) {
-            @Override
-            protected String getSecretFromProfile() {
-                return ((L2tpIpsecPskProfile) getProfile()).getPresharedKey();
-            }
-
-            @Override
-            protected void saveSecretToProfile(String secret) {
-                ((L2tpIpsecPskProfile) getProfile()).setPresharedKey(secret);
-            }
-        };
-        return pskHandler.getPreference();
-    }
-}
diff --git a/src/com/android/settings/vpn/PptpEditor.java b/src/com/android/settings/vpn/PptpEditor.java
deleted file mode 100644
index cfb3fa3..0000000
--- a/src/com/android/settings/vpn/PptpEditor.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/* * 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.
- */
-
-package com.android.settings.vpn;
-
-import com.android.settings.R;
-
-import android.content.Context;
-import android.net.vpn.PptpProfile;
-import android.preference.CheckBoxPreference;
-import android.preference.Preference;
-import android.preference.PreferenceGroup;
-
-/**
- * The class for editing {@link PptpProfile}.
- */
-class PptpEditor extends VpnProfileEditor {
-    private CheckBoxPreference mEncryption;
-
-    public PptpEditor(PptpProfile p) {
-        super(p);
-    }
-
-    @Override
-    protected void loadExtraPreferencesTo(PreferenceGroup subpanel) {
-        Context c = subpanel.getContext();
-        subpanel.addPreference(createEncryptionPreference(c));
-
-        PptpProfile profile = (PptpProfile) getProfile();
-    }
-
-    private Preference createEncryptionPreference(Context c) {
-        final PptpProfile profile = (PptpProfile) getProfile();
-        CheckBoxPreference encryption = mEncryption = new CheckBoxPreference(c);
-        boolean enabled = profile.isEncryptionEnabled();
-        setCheckBoxTitle(encryption, R.string.vpn_pptp_encryption_title);
-        encryption.setChecked(enabled);
-        setEncryptionSummary(encryption, enabled);
-        encryption.setOnPreferenceChangeListener(
-                new Preference.OnPreferenceChangeListener() {
-                    public boolean onPreferenceChange(
-                            Preference pref, Object newValue) {
-                        boolean enabled = (Boolean) newValue;
-                        profile.setEncryptionEnabled(enabled);
-                        setEncryptionSummary(mEncryption, enabled);
-                        return true;
-                    }
-                });
-        return encryption;
-    }
-
-    private void setEncryptionSummary(CheckBoxPreference encryption,
-            boolean enabled) {
-        Context c = encryption.getContext();
-        String formatString = c.getString(enabled
-                ? R.string.vpn_is_enabled
-                : R.string.vpn_is_disabled);
-        encryption.setSummary(String.format(
-                formatString, c.getString(R.string.vpn_pptp_encryption)));
-    }
-}
diff --git a/src/com/android/settings/vpn/Util.java b/src/com/android/settings/vpn/Util.java
deleted file mode 100644
index a37049d..0000000
--- a/src/com/android/settings/vpn/Util.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * 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.
- */
-
-package com.android.settings.vpn;
-
-import com.android.settings.R;
-
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.widget.Toast;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-class Util {
-
-    static void showShortToastMessage(Context context, String message) {
-        Toast.makeText(context, message, Toast.LENGTH_SHORT).show();
-    }
-
-    static void showShortToastMessage(Context context, int messageId) {
-        Toast.makeText(context, messageId, Toast.LENGTH_SHORT).show();
-    }
-
-    static void showLongToastMessage(Context context, String message) {
-        Toast.makeText(context, message, Toast.LENGTH_LONG).show();
-    }
-
-    static void showLongToastMessage(Context context, int messageId) {
-        Toast.makeText(context, messageId, Toast.LENGTH_LONG).show();
-    }
-
-    static void showErrorMessage(Context c, String message) {
-        createErrorDialog(c, message, null).show();
-    }
-
-    static void showErrorMessage(Context c, String message,
-            DialogInterface.OnClickListener listener) {
-        createErrorDialog(c, message, listener).show();
-    }
-
-    static void deleteFile(String path) {
-        deleteFile(new File(path));
-    }
-
-    static void deleteFile(String path, boolean toDeleteSelf) {
-        deleteFile(new File(path), toDeleteSelf);
-    }
-
-    static void deleteFile(File f) {
-        deleteFile(f, true);
-    }
-
-    static void deleteFile(File f, boolean toDeleteSelf) {
-        if (f.isDirectory()) {
-            for (File child : f.listFiles()) deleteFile(child, true);
-        }
-        if (toDeleteSelf) f.delete();
-    }
-
-    static boolean isFileOrEmptyDirectory(String path) {
-        File f = new File(path);
-        if (!f.isDirectory()) return true;
-
-        String[] list = f.list();
-        return ((list == null) || (list.length == 0));
-    }
-
-    static boolean copyFiles(String sourcePath , String targetPath)
-            throws IOException {
-        return copyFiles(new File(sourcePath), new File(targetPath));
-    }
-
-    // returns false if sourceLocation is the same as the targetLocation
-    static boolean copyFiles(File sourceLocation , File targetLocation)
-            throws IOException {
-        if (sourceLocation.equals(targetLocation)) return false;
-
-        if (sourceLocation.isDirectory()) {
-            if (!targetLocation.exists()) {
-                targetLocation.mkdir();
-            }
-            String[] children = sourceLocation.list();
-            for (int i=0; i<children.length; i++) {
-                copyFiles(new File(sourceLocation, children[i]),
-                        new File(targetLocation, children[i]));
-            }
-        } else if (sourceLocation.exists()) {
-            InputStream in = new FileInputStream(sourceLocation);
-            OutputStream out = new FileOutputStream(targetLocation);
-
-            // Copy the bits from instream to outstream
-            byte[] buf = new byte[1024];
-            int len;
-            while ((len = in.read(buf)) > 0) {
-                out.write(buf, 0, len);
-            }
-            in.close();
-            out.close();
-        }
-        return true;
-    }
-
-    private static AlertDialog createErrorDialog(Context c, String message,
-            DialogInterface.OnClickListener okListener) {
-        AlertDialog.Builder b = new AlertDialog.Builder(c)
-                .setTitle(android.R.string.dialog_alert_title)
-                .setIcon(android.R.drawable.ic_dialog_alert)
-                .setMessage(message);
-        if (okListener != null) {
-            b.setPositiveButton(R.string.vpn_back_button, okListener);
-        } else {
-            b.setPositiveButton(android.R.string.ok, null);
-        }
-        return b.create();
-    }
-
-    private Util() {
-    }
-}
diff --git a/src/com/android/settings/vpn/VpnEditor.java b/src/com/android/settings/vpn/VpnEditor.java
deleted file mode 100644
index d362793..0000000
--- a/src/com/android/settings/vpn/VpnEditor.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
- * 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.
- */
-
-package com.android.settings.vpn;
-
-import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.net.vpn.L2tpIpsecProfile;
-import android.net.vpn.L2tpIpsecPskProfile;
-import android.net.vpn.L2tpProfile;
-import android.net.vpn.PptpProfile;
-import android.net.vpn.VpnManager;
-import android.net.vpn.VpnProfile;
-import android.os.Bundle;
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.preference.PreferenceActivity;
-import android.text.TextUtils;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.widget.Toast;
-
-/**
- * The activity class for editing a new or existing VPN profile.
- */
-public class VpnEditor extends SettingsPreferenceFragment {
-    private static final int MENU_SAVE = Menu.FIRST;
-    private static final int MENU_CANCEL = Menu.FIRST + 1;
-    private static final int CONFIRM_DIALOG_ID = 0;
-    private static final String KEY_PROFILE = "profile";
-    private static final String KEY_ORIGINAL_PROFILE_NAME = "orig_profile_name";
-
-    private VpnManager mVpnManager;
-    private VpnProfileEditor mProfileEditor;
-    private boolean mAddingProfile;
-    private byte[] mOriginalProfileData;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        // Loads the XML preferences file
-        addPreferencesFromResource(R.xml.vpn_edit);
-    }
-
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-        mVpnManager = new VpnManager(getActivity());
-
-        VpnProfile p;
-        if (savedInstanceState != null) {
-            p = (VpnProfile)savedInstanceState.getParcelable(KEY_PROFILE);
-        } else {
-            p = (VpnProfile)getArguments().getParcelable(VpnSettings.KEY_VPN_PROFILE);
-            if (p == null) {
-                p = getActivity().getIntent().getParcelableExtra(VpnSettings.KEY_VPN_PROFILE);
-            }
-        }
-
-        Parcel parcel = Parcel.obtain();
-        p.writeToParcel(parcel, 0);
-        mOriginalProfileData = parcel.marshall();
-        parcel.setDataPosition(0);
-        VpnProfile profile = (VpnProfile) VpnProfile.CREATOR.createFromParcel(parcel);
-
-        mProfileEditor = getEditor(profile);
-        mAddingProfile = TextUtils.isEmpty(profile.getName());
-
-        initViewFor(profile);
-
-        registerForContextMenu(getListView());
-        setHasOptionsMenu(true);
-    }
-
-    @Override
-    public synchronized void onSaveInstanceState(Bundle outState) {
-        if (mProfileEditor == null) return;
-
-        outState.putParcelable(KEY_PROFILE, getProfile());
-    }
-
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        super.onCreateOptionsMenu(menu, inflater);
-        menu.add(0, MENU_SAVE, 0, R.string.vpn_menu_done)
-            .setIcon(android.R.drawable.ic_menu_save);
-        menu.add(0, MENU_CANCEL, 0,
-                mAddingProfile ? R.string.vpn_menu_cancel
-                               : R.string.vpn_menu_revert)
-            .setIcon(android.R.drawable.ic_menu_close_clear_cancel);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case MENU_SAVE:
-                Intent resultIntent = validateAndGetResult();
-                if (resultIntent != null) {
-                    PreferenceActivity activity =
-                            (PreferenceActivity) getActivity();
-                    if (!mVpnManager.isIdle()) {
-                        Toast.makeText(activity, R.string.service_busy,
-                                Toast.LENGTH_SHORT).show();
-                    } else {
-                        activity.finishPreferencePanel(this,
-                                Activity.RESULT_OK, resultIntent);
-                    }
-                }
-                return true;
-
-            case MENU_CANCEL:
-                if (profileChanged()) {
-                    showDialog(CONFIRM_DIALOG_ID);
-                } else {
-                    finishFragment();
-                }
-                return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    /*
-    @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event) {
-        switch (keyCode) {
-            case KeyEvent.KEYCODE_BACK:
-                if (validateAndSetResult()) finish();
-                return true;
-        }
-        return super.onKeyDown(keyCode, event);
-    }*/
-
-    private void initViewFor(VpnProfile profile) {
-        mProfileEditor.loadPreferencesTo(getPreferenceScreen());
-    }
-
-    /* package */static String getTitle(Context context, VpnProfile profile, boolean adding) {
-        String formatString = adding
-                ? context.getString(R.string.vpn_edit_title_add)
-                : context.getString(R.string.vpn_edit_title_edit);
-        return String.format(formatString,
-                profile.getType().getDisplayName());
-    }
-
-    /**
-     * Checks the validity of the inputs and set the profile as result if valid.
-     * @return true if the result is successfully set
-     */
-    private Intent validateAndGetResult() {
-        String errorMsg = mProfileEditor.validate();
-
-        if (errorMsg != null) {
-            Util.showErrorMessage(getActivity(), errorMsg);
-            return null;
-        }
-
-        if (profileChanged()) {
-            return getResult(getProfile());
-        }
-        return null;
-    }
-
-    private Intent getResult(VpnProfile p) {
-        Intent intent = new Intent(getActivity(), VpnSettings.class);
-        intent.putExtra(VpnSettings.KEY_VPN_PROFILE, (Parcelable) p);
-        return intent;
-    }
-
-    private VpnProfileEditor getEditor(VpnProfile p) {
-        switch (p.getType()) {
-            case L2TP_IPSEC:
-                return new L2tpIpsecEditor((L2tpIpsecProfile) p);
-
-            case L2TP_IPSEC_PSK:
-                return new L2tpIpsecPskEditor((L2tpIpsecPskProfile) p);
-
-            case L2TP:
-                return new L2tpEditor((L2tpProfile) p);
-
-            case PPTP:
-                return new PptpEditor((PptpProfile) p);
-
-            default:
-                return new VpnProfileEditor(p);
-        }
-    }
-
-
-    @Override
-    public Dialog onCreateDialog(int id) {
-        if (id == CONFIRM_DIALOG_ID) {
-            return new AlertDialog.Builder(getActivity())
-                    .setTitle(android.R.string.dialog_alert_title)
-                    .setIcon(android.R.drawable.ic_dialog_alert)
-                    .setMessage(mAddingProfile
-                            ? R.string.vpn_confirm_add_profile_cancellation
-                            : R.string.vpn_confirm_edit_profile_cancellation)
-                    .setPositiveButton(R.string.vpn_yes_button,
-                            new DialogInterface.OnClickListener() {
-                                public void onClick(DialogInterface dialog, int w) {
-                                    finishFragment();
-                                }
-                            })
-                    .setNegativeButton(R.string.vpn_mistake_button, null)
-                    .create();
-        }
-
-        return super.onCreateDialog(id);
-    }
-
-    /*
-    @Override
-    public void onPrepareDialog(int id, Dialog dialog) {
-        super.onPrepareDialog(id, dialog);
-
-        if (id == CONFIRM_DIALOG_ID) {
-            ((AlertDialog)dialog).setMessage(mAddingProfile
-                    ? getString(R.string.vpn_confirm_add_profile_cancellation)
-                    : getString(R.string.vpn_confirm_edit_profile_cancellation));
-        }
-    }*/
-
-    private VpnProfile getProfile() {
-        return mProfileEditor.getProfile();
-    }
-
-    private boolean profileChanged() {
-        Parcel newParcel = Parcel.obtain();
-        getProfile().writeToParcel(newParcel, 0);
-        byte[] newData = newParcel.marshall();
-        if (mOriginalProfileData.length == newData.length) {
-            for (int i = 0, n = mOriginalProfileData.length; i < n; i++) {
-                if (mOriginalProfileData[i] != newData[i]) return true;
-            }
-            return false;
-        }
-        return true;
-    }
-}
diff --git a/src/com/android/settings/vpn/VpnProfileActor.java b/src/com/android/settings/vpn/VpnProfileActor.java
deleted file mode 100644
index 4c7b014..0000000
--- a/src/com/android/settings/vpn/VpnProfileActor.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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.
- */
-
-package com.android.settings.vpn;
-
-import android.app.Dialog;
-import android.net.vpn.VpnProfile;
-import android.view.View;
-
-/**
- * The interface to act on a {@link VpnProfile}.
- */
-public interface VpnProfileActor {
-    VpnProfile getProfile();
-
-    /**
-     * Returns true if a connect dialog is needed before establishing a
-     * connection.
-     */
-    boolean isConnectDialogNeeded();
-
-    /**
-     * Creates the view in the connect dialog.
-     */
-    View createConnectView();
-
-    /**
-     * Validates the inputs in the dialog.
-     * @param dialog the connect dialog
-     * @return an error message if the inputs are not valid
-     */
-    String validateInputs(Dialog dialog);
-
-    /**
-     * Establishes a VPN connection.
-     * @param dialog the connect dialog
-     */
-    void connect(Dialog dialog);
-
-    /**
-     * Tears down the connection.
-     */
-    void disconnect();
-}
diff --git a/src/com/android/settings/vpn/VpnProfileEditor.java b/src/com/android/settings/vpn/VpnProfileEditor.java
deleted file mode 100644
index 100b78e..0000000
--- a/src/com/android/settings/vpn/VpnProfileEditor.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/*
- * 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.
- */
-
-package com.android.settings.vpn;
-
-import com.android.settings.R;
-
-import android.content.Context;
-import android.net.vpn.VpnProfile;
-import android.preference.CheckBoxPreference;
-import android.preference.EditTextPreference;
-import android.preference.ListPreference;
-import android.preference.Preference;
-import android.preference.PreferenceGroup;
-import android.text.InputType;
-import android.text.TextUtils;
-import android.text.method.PasswordTransformationMethod;
-
-/**
- * The common class for editing {@link VpnProfile}.
- */
-class VpnProfileEditor {
-    private static final String KEY_VPN_NAME = "vpn_name";
-
-    private EditTextPreference mName;
-    private EditTextPreference mServerName;
-    private EditTextPreference mDomainSuffices;
-    private VpnProfile mProfile;
-
-    public VpnProfileEditor(VpnProfile p) {
-        mProfile = p;
-    }
-
-    //@Override
-    public VpnProfile getProfile() {
-        return mProfile;
-    }
-
-    /**
-     * Adds the preferences to the panel. Subclasses should override
-     * {@link #loadExtraPreferencesTo(PreferenceGroup)} instead of this method.
-     */
-    public void loadPreferencesTo(PreferenceGroup subpanel) {
-        Context c = subpanel.getContext();
-
-        mName = (EditTextPreference) subpanel.findPreference(KEY_VPN_NAME);
-        mName.setOnPreferenceChangeListener(
-                new Preference.OnPreferenceChangeListener() {
-                    public boolean onPreferenceChange(
-                            Preference pref, Object newValue) {
-                        setName((String) newValue);
-                        return true;
-                    }
-                });
-        setName(getProfile().getName());
-        mName.getEditText().setInputType(InputType.TYPE_CLASS_TEXT
-                | InputType.TYPE_TEXT_FLAG_CAP_SENTENCES);
-
-        subpanel.addPreference(createServerNamePreference(c));
-        loadExtraPreferencesTo(subpanel);
-        subpanel.addPreference(createDomainSufficesPreference(c));
-    }
-
-    /**
-     * Adds the extra preferences to the panel. Subclasses should add
-     * additional preferences in this method.
-     */
-    protected void loadExtraPreferencesTo(PreferenceGroup subpanel) {
-    }
-
-    /**
-     * Validates the inputs in the preferences.
-     *
-     * @return an error message that is ready to be displayed in a dialog; or
-     *      null if all the inputs are valid
-     */
-    public String validate() {
-        String result = validate(mName, R.string.vpn_a_name);
-        return ((result != null)
-                ? result
-                : validate(mServerName, R.string.vpn_a_vpn_server));
-    }
-
-    /**
-     * Creates a preference for users to input domain suffices.
-     */
-    protected EditTextPreference createDomainSufficesPreference(Context c) {
-        EditTextPreference pref = mDomainSuffices = createEditTextPreference(c,
-                R.string.vpn_dns_search_list_title,
-                R.string.vpn_dns_search_list,
-                mProfile.getDomainSuffices(),
-                new Preference.OnPreferenceChangeListener() {
-                    public boolean onPreferenceChange(
-                            Preference pref, Object newValue) {
-                        String v = ((String) newValue).trim();
-                        mProfile.setDomainSuffices(v);
-                        setSummary(pref, R.string.vpn_dns_search_list, v, false);
-                        return true;
-                    }
-                });
-        pref.getEditText().setInputType(InputType.TYPE_TEXT_VARIATION_URI);
-        return pref;
-    }
-
-    private Preference createServerNamePreference(Context c) {
-        EditTextPreference pref = mServerName = createEditTextPreference(c,
-                R.string.vpn_vpn_server_title,
-                R.string.vpn_vpn_server,
-                mProfile.getServerName(),
-                new Preference.OnPreferenceChangeListener() {
-                    public boolean onPreferenceChange(
-                            Preference pref, Object newValue) {
-                        String v = ((String) newValue).trim();
-                        mProfile.setServerName(v);
-                        setSummary(pref, R.string.vpn_vpn_server, v);
-                        return true;
-                    }
-                });
-        pref.getEditText().setInputType(InputType.TYPE_TEXT_VARIATION_URI);
-        return pref;
-    }
-
-    protected EditTextPreference createEditTextPreference(Context c, int titleId,
-            int prefNameId, String value,
-            Preference.OnPreferenceChangeListener listener) {
-        EditTextPreference pref = new EditTextPreference(c);
-        pref.setTitle(titleId);
-        pref.setDialogTitle(titleId);
-        setSummary(pref, prefNameId, value);
-        pref.setText(value);
-        pref.setPersistent(true);
-        pref.setOnPreferenceChangeListener(listener);
-        return pref;
-    }
-
-    protected String validate(Preference pref, int fieldNameId) {
-        Context c = pref.getContext();
-        String value = (pref instanceof EditTextPreference)
-                ? ((EditTextPreference) pref).getText()
-                : ((ListPreference) pref).getValue();
-        String formatString = (pref instanceof EditTextPreference)
-                ? c.getString(R.string.vpn_error_miss_entering)
-                : c.getString(R.string.vpn_error_miss_selecting);
-        return (TextUtils.isEmpty(value)
-                ? String.format(formatString, c.getString(fieldNameId))
-                : null);
-    }
-
-    protected void setSummary(Preference pref, int fieldNameId, String v) {
-        setSummary(pref, fieldNameId, v, true);
-    }
-
-    protected void setSummary(Preference pref, int fieldNameId, String v,
-            boolean required) {
-        Context c = pref.getContext();
-        String formatString = required
-                ? c.getString(R.string.vpn_field_not_set)
-                : c.getString(R.string.vpn_field_not_set_optional);
-        pref.setSummary(TextUtils.isEmpty(v)
-                ? String.format(formatString, c.getString(fieldNameId))
-                : v);
-    }
-
-    protected void setCheckBoxTitle(CheckBoxPreference pref, int fieldNameId) {
-        Context c = pref.getContext();
-        String formatString = c.getString(R.string.vpn_enable_field);
-        pref.setTitle(String.format(formatString, c.getString(fieldNameId)));
-    }
-
-    private void setName(String newName) {
-        newName = (newName == null) ? "" : newName.trim();
-        mName.setText(newName);
-        getProfile().setName(newName);
-        setSummary(mName, R.string.vpn_name, newName);
-    }
-
-    // Secret is tricky to handle because empty field may mean "not set" or
-    // "unchanged". This class hides that logic from callers.
-    protected static abstract class SecretHandler {
-        private EditTextPreference mPref;
-        private int mFieldNameId;
-        private boolean mHadSecret;
-
-        protected SecretHandler(Context c, int titleId, int fieldNameId) {
-            String value = getSecretFromProfile();
-            mHadSecret = !TextUtils.isEmpty(value);
-            mFieldNameId = fieldNameId;
-
-            EditTextPreference pref = mPref = new EditTextPreference(c);
-            pref.setTitle(titleId);
-            pref.setDialogTitle(titleId);
-            pref.getEditText().setInputType(
-                    InputType.TYPE_TEXT_VARIATION_PASSWORD);
-            pref.getEditText().setTransformationMethod(
-                    new PasswordTransformationMethod());
-            pref.setText("");
-            pref.getEditText().setHint(mHadSecret
-                    ? R.string.vpn_secret_unchanged
-                    : R.string.vpn_secret_not_set);
-            setSecretSummary(value);
-            pref.setPersistent(true);
-            saveSecretToProfile("");
-            pref.setOnPreferenceChangeListener(
-                    new Preference.OnPreferenceChangeListener() {
-                        public boolean onPreferenceChange(
-                                Preference pref, Object newValue) {
-                            saveSecretToProfile((String) newValue);
-                            setSecretSummary((String) newValue);
-                            return true;
-                        }
-                    });
-        }
-
-        protected EditTextPreference getPreference() {
-            return mPref;
-        }
-
-        protected String validate() {
-            Context c = mPref.getContext();
-            String value = mPref.getText();
-            return ((TextUtils.isEmpty(value) && !mHadSecret)
-                    ? String.format(
-                            c.getString(R.string.vpn_error_miss_entering),
-                            c.getString(mFieldNameId))
-                    : null);
-        }
-
-        private void setSecretSummary(String value) {
-            EditTextPreference pref = mPref;
-            Context c = pref.getContext();
-            String formatString = (TextUtils.isEmpty(value) && !mHadSecret)
-                    ? c.getString(R.string.vpn_field_not_set)
-                    : c.getString(R.string.vpn_field_is_set);
-            pref.setSummary(
-                    String.format(formatString, c.getString(mFieldNameId)));
-        }
-
-        protected abstract String getSecretFromProfile();
-        protected abstract void saveSecretToProfile(String secret);
-    }
-}
diff --git a/src/com/android/settings/vpn/VpnSettings.java b/src/com/android/settings/vpn/VpnSettings.java
deleted file mode 100644
index 5d75b6a..0000000
--- a/src/com/android/settings/vpn/VpnSettings.java
+++ /dev/null
@@ -1,1108 +0,0 @@
-/*
- * 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.
- */
-
-package com.android.settings.vpn;
-
-import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.net.vpn.L2tpIpsecProfile;
-import android.net.vpn.L2tpIpsecPskProfile;
-import android.net.vpn.L2tpProfile;
-import android.net.vpn.VpnManager;
-import android.net.vpn.VpnProfile;
-import android.net.vpn.VpnState;
-import android.net.vpn.VpnType;
-import android.os.Bundle;
-import android.preference.Preference;
-import android.preference.PreferenceActivity;
-import android.preference.PreferenceCategory;
-import android.preference.PreferenceScreen;
-import android.preference.Preference.OnPreferenceClickListener;
-import android.security.Credentials;
-import android.security.KeyStore;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.ContextMenu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ContextMenu.ContextMenuInfo;
-import android.widget.AdapterView.AdapterContextMenuInfo;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * The preference activity for configuring VPN settings.
- */
-public class VpnSettings extends SettingsPreferenceFragment
-        implements DialogInterface.OnClickListener {
-
-    private static final boolean DEBUG = false;
-
-    // Key to the field exchanged for profile editing.
-    static final String KEY_VPN_PROFILE = "vpn_profile";
-
-    // Key to the field exchanged for VPN type selection.
-    static final String KEY_VPN_TYPE = "vpn_type";
-
-    private static final String TAG = VpnSettings.class.getSimpleName();
-
-    private static final String PREF_ADD_VPN = "add_new_vpn";
-    private static final String PREF_VPN_LIST = "vpn_list";
-
-    private static final String PROFILES_ROOT = VpnManager.getProfilePath() + "/";
-    private static final String PROFILE_OBJ_FILE = ".pobj";
-
-    private static final String KEY_ACTIVE_PROFILE = "ActiveProfile";
-    private static final String KEY_PROFILE_CONNECTING = "ProfileConnecting";
-    private static final String KEY_CONNECT_DIALOG_SHOWING = "ConnectDialogShowing";
-
-    private static final int REQUEST_ADD_OR_EDIT_PROFILE = 1;
-    static final int REQUEST_SELECT_VPN_TYPE = 2;
-
-    private static final int CONTEXT_MENU_CONNECT_ID = ContextMenu.FIRST + 0;
-    private static final int CONTEXT_MENU_DISCONNECT_ID = ContextMenu.FIRST + 1;
-    private static final int CONTEXT_MENU_EDIT_ID = ContextMenu.FIRST + 2;
-    private static final int CONTEXT_MENU_DELETE_ID = ContextMenu.FIRST + 3;
-
-    private static final int CONNECT_BUTTON = DialogInterface.BUTTON_POSITIVE;
-    private static final int OK_BUTTON = DialogInterface.BUTTON_POSITIVE;
-
-    private static final int DIALOG_CONNECT = VpnManager.VPN_ERROR_LARGEST + 1;
-    private static final int DIALOG_SECRET_NOT_SET = DIALOG_CONNECT + 1;
-
-    private static final int NO_ERROR = VpnManager.VPN_ERROR_NO_ERROR;
-
-    private static final String KEY_PREFIX_IPSEC_PSK = Credentials.VPN + 'i';
-    private static final String KEY_PREFIX_L2TP_SECRET = Credentials.VPN + 'l';
-
-    private static List<VpnProfile> sVpnProfileList = new ArrayList<VpnProfile>();
-
-    private PreferenceScreen mAddVpn;
-    private PreferenceCategory mVpnListContainer;
-
-    // profile name --> VpnPreference
-    private Map<String, VpnPreference> mVpnPreferenceMap;
-
-    // profile engaged in a connection
-    private VpnProfile mActiveProfile;
-
-    // actor engaged in connecting
-    private VpnProfileActor mConnectingActor;
-
-    // states saved for unlocking keystore
-    private Runnable mUnlockAction;
-
-    private KeyStore mKeyStore = KeyStore.getInstance();
-
-    private VpnManager mVpnManager;
-
-    private ConnectivityReceiver mConnectivityReceiver =
-            new ConnectivityReceiver();
-
-    private int mConnectingErrorCode = NO_ERROR;
-
-    private Dialog mShowingDialog;
-
-    private boolean mConnectDialogShowing = false;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        addPreferencesFromResource(R.xml.vpn_settings);
-
-        mVpnManager = new VpnManager(getActivity());
-        // restore VpnProfile list and construct VpnPreference map
-        mVpnListContainer = (PreferenceCategory) findPreference(PREF_VPN_LIST);
-
-        // set up the "add vpn" preference
-        mAddVpn = (PreferenceScreen) findPreference(PREF_ADD_VPN);
-        mAddVpn.setOnPreferenceClickListener(
-                new OnPreferenceClickListener() {
-                    public boolean onPreferenceClick(Preference preference) {
-                        startVpnTypeSelection();
-                        return true;
-                    }
-                });
-
-        retrieveVpnListFromStorage();
-        restoreInstanceState(savedInstanceState);
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle savedInstanceState) {
-        if (mActiveProfile != null) {
-            savedInstanceState.putString(KEY_ACTIVE_PROFILE,
-                    mActiveProfile.getId());
-            savedInstanceState.putBoolean(KEY_PROFILE_CONNECTING,
-                    (mConnectingActor != null));
-            savedInstanceState.putBoolean(KEY_CONNECT_DIALOG_SHOWING,
-                    mConnectDialogShowing);
-        }
-        super.onSaveInstanceState(savedInstanceState);
-    }
-
-    private void restoreInstanceState(Bundle savedInstanceState) {
-        if (savedInstanceState == null) return;
-        String profileId = savedInstanceState.getString(KEY_ACTIVE_PROFILE);
-        if (profileId != null) {
-            mActiveProfile = getProfile(getProfileIndexFromId(profileId));
-            if (savedInstanceState.getBoolean(KEY_PROFILE_CONNECTING)) {
-                mConnectingActor = getActor(mActiveProfile);
-            }
-            mConnectDialogShowing = savedInstanceState.getBoolean(KEY_CONNECT_DIALOG_SHOWING);
-        }
-    }
-
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-
-        // for long-press gesture on a profile preference
-        registerForContextMenu(getListView());
-    }
-
-    @Override
-    public void onPause() {
-        // ignore vpn connectivity event
-        mVpnManager.unregisterConnectivityReceiver(mConnectivityReceiver);
-        if ((mShowingDialog != null) && mShowingDialog.isShowing()) {
-            mShowingDialog.dismiss();
-            mShowingDialog = null;
-        }
-        super.onPause();
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        updatePreferenceMap();
-
-        if (DEBUG) Log.d(TAG, "onResume");
-
-        // listen to vpn connectivity event
-        mVpnManager.registerConnectivityReceiver(mConnectivityReceiver);
-
-        if ((mUnlockAction != null) && isKeyStoreUnlocked()) {
-            Runnable action = mUnlockAction;
-            mUnlockAction = null;
-            getActivity().runOnUiThread(action);
-        }
-
-        if (!mConnectDialogShowing) {
-            // If mActiveProfile is not null but it's in IDLE state, then a
-            // retry dialog must be showing now as the previous connection
-            // attempt failed. In this case, don't call checkVpnConnectionStatus()
-            // as it will clean up mActiveProfile due to the IDLE state.
-            if ((mActiveProfile == null)
-                    || (mActiveProfile.getState() != VpnState.IDLE)) {
-                checkVpnConnectionStatus();
-            }
-        } else {
-            // Dismiss the connect dialog in case there is another instance
-            // trying to operate a vpn connection.
-            if (!mVpnManager.isIdle() || (mActiveProfile == null)) {
-                removeDialog(DIALOG_CONNECT);
-                checkVpnConnectionStatus();
-            }
-        }
-    }
-
-    @Override
-    public void onDestroyView() {
-        unregisterForContextMenu(getListView());
-        // This should be called after the procedure above as ListView inside this Fragment
-        // will be deleted here.
-        super.onDestroyView();
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        // Remove any onClick listeners
-        if (mVpnListContainer != null) {
-            for (int i = 0; i < mVpnListContainer.getPreferenceCount(); i++) {
-                mVpnListContainer.getPreference(i).setOnPreferenceClickListener(null);
-            }
-        }
-    }
-
-    @Override
-    public Dialog onCreateDialog (int id) {
-        setOnCancelListener(new DialogInterface.OnCancelListener() {
-            public void onCancel(DialogInterface dialog) {
-                if (mActiveProfile != null) {
-                    changeState(mActiveProfile, VpnState.IDLE);
-                }
-                // Make sure onIdle() is called as the above changeState()
-                // may not be effective if the state is already IDLE.
-                // XXX: VpnService should broadcast non-IDLE state, say UNUSABLE,
-                // when an error occurs.
-                onIdle();
-            }
-        });
-
-        switch (id) {
-            case DIALOG_CONNECT:
-                mConnectDialogShowing = true;
-                setOnDismissListener(new DialogInterface.OnDismissListener() {
-                    public void onDismiss(DialogInterface dialog) {
-                        mConnectDialogShowing = false;
-                    }
-                });
-                return createConnectDialog();
-
-            case DIALOG_SECRET_NOT_SET:
-                return createSecretNotSetDialog();
-
-            case VpnManager.VPN_ERROR_CHALLENGE:
-            case VpnManager.VPN_ERROR_UNKNOWN_SERVER:
-            case VpnManager.VPN_ERROR_PPP_NEGOTIATION_FAILED:
-                return createEditDialog(id);
-
-            default:
-                Log.d(TAG, "create reconnect dialog for event " + id);
-                return createReconnectDialog(id);
-        }
-    }
-
-    private Dialog createConnectDialog() {
-        final Activity activity = getActivity();
-        return new AlertDialog.Builder(activity)
-                .setView(mConnectingActor.createConnectView())
-                .setTitle(String.format(activity.getString(R.string.vpn_connect_to),
-                        mConnectingActor.getProfile().getName()))
-                .setPositiveButton(activity.getString(R.string.vpn_connect_button),
-                        this)
-                .setNegativeButton(activity.getString(android.R.string.cancel),
-                        this)
-                .create();
-    }
-
-    private Dialog createReconnectDialog(int id) {
-        int msgId;
-        switch (id) {
-            case VpnManager.VPN_ERROR_AUTH:
-                msgId = R.string.vpn_auth_error_dialog_msg;
-                break;
-
-            case VpnManager.VPN_ERROR_REMOTE_HUNG_UP:
-                msgId = R.string.vpn_remote_hung_up_error_dialog_msg;
-                break;
-
-            case VpnManager.VPN_ERROR_CONNECTION_LOST:
-                msgId = R.string.vpn_reconnect_from_lost;
-                break;
-
-            case VpnManager.VPN_ERROR_REMOTE_PPP_HUNG_UP:
-                msgId = R.string.vpn_remote_ppp_hung_up_error_dialog_msg;
-                break;
-
-            default:
-                msgId = R.string.vpn_confirm_reconnect;
-        }
-        return createCommonDialogBuilder().setMessage(msgId).create();
-    }
-
-    private Dialog createEditDialog(int id) {
-        int msgId;
-        switch (id) {
-            case VpnManager.VPN_ERROR_CHALLENGE:
-                msgId = R.string.vpn_challenge_error_dialog_msg;
-                break;
-
-            case VpnManager.VPN_ERROR_UNKNOWN_SERVER:
-                msgId = R.string.vpn_unknown_server_dialog_msg;
-                break;
-
-            case VpnManager.VPN_ERROR_PPP_NEGOTIATION_FAILED:
-                msgId = R.string.vpn_ppp_negotiation_failed_dialog_msg;
-                break;
-
-            default:
-                return null;
-        }
-        return createCommonEditDialogBuilder().setMessage(msgId).create();
-    }
-
-    private Dialog createSecretNotSetDialog() {
-        return createCommonDialogBuilder()
-                .setMessage(R.string.vpn_secret_not_set_dialog_msg)
-                .setPositiveButton(R.string.vpn_yes_button,
-                        new DialogInterface.OnClickListener() {
-                            public void onClick(DialogInterface dialog, int w) {
-                                startVpnEditor(mActiveProfile, false);
-                            }
-                        })
-                .create();
-    }
-
-    private AlertDialog.Builder createCommonEditDialogBuilder() {
-        return createCommonDialogBuilder()
-                .setPositiveButton(R.string.vpn_yes_button,
-                        new DialogInterface.OnClickListener() {
-                            public void onClick(DialogInterface dialog, int w) {
-                                VpnProfile p = mActiveProfile;
-                                onIdle();
-                                startVpnEditor(p, false);
-                            }
-                        });
-    }
-
-    private AlertDialog.Builder createCommonDialogBuilder() {
-        return new AlertDialog.Builder(getActivity())
-                .setTitle(android.R.string.dialog_alert_title)
-                .setIcon(android.R.drawable.ic_dialog_alert)
-                .setPositiveButton(R.string.vpn_yes_button,
-                        new DialogInterface.OnClickListener() {
-                            public void onClick(DialogInterface dialog, int w) {
-                                connectOrDisconnect(mActiveProfile);
-                            }
-                        })
-                .setNegativeButton(R.string.vpn_no_button,
-                        new DialogInterface.OnClickListener() {
-                            public void onClick(DialogInterface dialog, int w) {
-                                onIdle();
-                            }
-                        });
-    }
-
-    @Override
-    public void onCreateContextMenu(ContextMenu menu, View v,
-            ContextMenuInfo menuInfo) {
-        super.onCreateContextMenu(menu, v, menuInfo);
-
-        VpnProfile p = getProfile(getProfilePositionFrom(
-                    (AdapterContextMenuInfo) menuInfo));
-        if (p != null) {
-            VpnState state = p.getState();
-            menu.setHeaderTitle(p.getName());
-
-            boolean isIdle = (state == VpnState.IDLE);
-            boolean isNotConnect = (isIdle || (state == VpnState.DISCONNECTING)
-                    || (state == VpnState.CANCELLED));
-            menu.add(0, CONTEXT_MENU_CONNECT_ID, 0, R.string.vpn_menu_connect)
-                    .setEnabled(isIdle && (mActiveProfile == null));
-            menu.add(0, CONTEXT_MENU_DISCONNECT_ID, 0,
-                    R.string.vpn_menu_disconnect)
-                    .setEnabled(state == VpnState.CONNECTED);
-            menu.add(0, CONTEXT_MENU_EDIT_ID, 0, R.string.vpn_menu_edit)
-                    .setEnabled(isNotConnect);
-            menu.add(0, CONTEXT_MENU_DELETE_ID, 0, R.string.vpn_menu_delete)
-                    .setEnabled(isNotConnect);
-        }
-    }
-
-    @Override
-    public boolean onContextItemSelected(MenuItem item) {
-        int position = getProfilePositionFrom(
-                (AdapterContextMenuInfo) item.getMenuInfo());
-        VpnProfile p = getProfile(position);
-
-        switch(item.getItemId()) {
-        case CONTEXT_MENU_CONNECT_ID:
-        case CONTEXT_MENU_DISCONNECT_ID:
-            connectOrDisconnect(p);
-            return true;
-
-        case CONTEXT_MENU_EDIT_ID:
-                startVpnEditor(p, false);
-            return true;
-
-        case CONTEXT_MENU_DELETE_ID:
-            deleteProfile(position);
-            return true;
-        }
-
-        return super.onContextItemSelected(item);
-    }
-
-    @Override
-    public void onActivityResult(final int requestCode, final int resultCode,
-            final Intent data) {
-
-        if (DEBUG) Log.d(TAG, "onActivityResult , result = " + resultCode + ", data = " + data);
-        if ((resultCode == Activity.RESULT_CANCELED) || (data == null)) {
-            Log.d(TAG, "no result returned by editor");
-            return;
-        }
-
-        if (requestCode == REQUEST_SELECT_VPN_TYPE) {
-            final String typeName = data.getStringExtra(KEY_VPN_TYPE);
-            startVpnEditor(createVpnProfile(typeName), true);
-        } else if (requestCode == REQUEST_ADD_OR_EDIT_PROFILE) {
-            VpnProfile p = data.getParcelableExtra(KEY_VPN_PROFILE);
-            if (p == null) {
-                Log.e(TAG, "null object returned by editor");
-                return;
-            }
-
-            final Activity activity = getActivity();
-            int index = getProfileIndexFromId(p.getId());
-            if (checkDuplicateName(p, index)) {
-                final VpnProfile profile = p;
-                Util.showErrorMessage(activity, String.format(
-                        activity.getString(R.string.vpn_error_duplicate_name),
-                        p.getName()),
-                        new DialogInterface.OnClickListener() {
-                            public void onClick(DialogInterface dialog, int w) {
-                                startVpnEditor(profile, false);
-                            }
-                        });
-                return;
-            }
-
-            if (needKeyStoreToSave(p)) {
-                Runnable action = new Runnable() {
-                    public void run() {
-                        onActivityResult(requestCode, resultCode, data);
-                    }
-                };
-                if (!unlockKeyStore(p, action)) return;
-            }
-
-            try {
-                if (index < 0) {
-                    addProfile(p);
-                    Util.showShortToastMessage(activity, String.format(
-                            activity.getString(R.string.vpn_profile_added), p.getName()));
-                } else {
-                    replaceProfile(index, p);
-                    Util.showShortToastMessage(activity, String.format(
-                            activity.getString(R.string.vpn_profile_replaced),
-                            p.getName()));
-                }
-            } catch (IOException e) {
-                final VpnProfile profile = p;
-                Util.showErrorMessage(activity, e + ": " + e.getMessage(),
-                        new DialogInterface.OnClickListener() {
-                            public void onClick(DialogInterface dialog, int w) {
-                                startVpnEditor(profile, false);
-                            }
-                        });
-            }
-
-            // Remove cached VpnEditor as it is needless anymore.
-        } else {
-            throw new RuntimeException("unknown request code: " + requestCode);
-        }
-    }
-
-    // Called when the buttons on the connect dialog are clicked.
-    @Override
-    public synchronized void onClick(DialogInterface dialog, int which) {
-        if (which == CONNECT_BUTTON) {
-            Dialog d = (Dialog) dialog;
-            String error = mConnectingActor.validateInputs(d);
-            if (error == null) {
-                mConnectingActor.connect(d);
-            } else {
-                // show error dialog
-                final Activity activity = getActivity();
-                mShowingDialog = new AlertDialog.Builder(activity)
-                        .setTitle(android.R.string.dialog_alert_title)
-                        .setIcon(android.R.drawable.ic_dialog_alert)
-                        .setMessage(String.format(activity.getString(
-                                R.string.vpn_error_miss_entering), error))
-                        .setPositiveButton(R.string.vpn_back_button,
-                                new DialogInterface.OnClickListener() {
-                                    public void onClick(DialogInterface dialog,
-                                            int which) {
-                                        showDialog(DIALOG_CONNECT);
-                                    }
-                                })
-                        .create();
-                // The profile state is "connecting". If we allow the dialog to
-                // be cancelable, then we need to clear the state in the
-                // onCancel handler.
-                mShowingDialog.setCancelable(false);
-                mShowingDialog.show();
-            }
-        } else {
-            changeState(mActiveProfile, VpnState.IDLE);
-        }
-    }
-
-    private int getProfileIndexFromId(String id) {
-        int index = 0;
-        for (VpnProfile p : sVpnProfileList) {
-            if (p.getId().equals(id)) {
-                return index;
-            } else {
-                index++;
-            }
-        }
-        return -1;
-    }
-
-    // Replaces the profile at index in sVpnProfileList with p.
-    // Returns true if p's name is a duplicate.
-    private boolean checkDuplicateName(VpnProfile p, int index) {
-        List<VpnProfile> list = sVpnProfileList;
-        VpnPreference pref = mVpnPreferenceMap.get(p.getName());
-        if ((pref != null) && (index >= 0) && (index < list.size())) {
-            // not a duplicate if p is to replace the profile at index
-            if (pref.mProfile == list.get(index)) pref = null;
-        }
-        return (pref != null);
-    }
-
-    private int getProfilePositionFrom(AdapterContextMenuInfo menuInfo) {
-        // excludes mVpnListContainer and the preferences above it
-        return menuInfo.position - mVpnListContainer.getOrder() - 1;
-    }
-
-    // position: position in sVpnProfileList
-    private VpnProfile getProfile(int position) {
-        return ((position >= 0) ? sVpnProfileList.get(position) : null);
-    }
-
-    // position: position in sVpnProfileList
-    private void deleteProfile(final int position) {
-        if ((position < 0) || (position >= sVpnProfileList.size())) return;
-        final VpnProfile target = sVpnProfileList.get(position);
-        DialogInterface.OnClickListener onClickListener =
-                new DialogInterface.OnClickListener() {
-                    public void onClick(DialogInterface dialog, int which) {
-                        // Double check if the target is still the one we want
-                        // to remove.
-                        VpnProfile p = sVpnProfileList.get(position);
-                        if (p != target) return;
-                        if (which == OK_BUTTON) {
-                            sVpnProfileList.remove(position);
-                            VpnPreference pref =
-                                    mVpnPreferenceMap.remove(p.getName());
-                            mVpnListContainer.removePreference(pref);
-                            removeProfileFromStorage(p);
-                        }
-                    }
-                };
-        mShowingDialog = new AlertDialog.Builder(getActivity())
-                .setTitle(android.R.string.dialog_alert_title)
-                .setIcon(android.R.drawable.ic_dialog_alert)
-                .setMessage(R.string.vpn_confirm_profile_deletion)
-                .setPositiveButton(android.R.string.ok, onClickListener)
-                .setNegativeButton(R.string.vpn_no_button, onClickListener)
-                .create();
-        mShowingDialog.show();
-    }
-
-    // Randomly generates an ID for the profile.
-    // The ID is unique and only set once when the profile is created.
-    private void setProfileId(VpnProfile profile) {
-        String id;
-
-        while (true) {
-            id = String.valueOf(Math.abs(
-                    Double.doubleToLongBits(Math.random())));
-            if (id.length() >= 8) break;
-        }
-        for (VpnProfile p : sVpnProfileList) {
-            if (p.getId().equals(id)) {
-                setProfileId(profile);
-                return;
-            }
-        }
-        profile.setId(id);
-    }
-
-    private void addProfile(VpnProfile p) throws IOException {
-        setProfileId(p);
-        processSecrets(p);
-        saveProfileToStorage(p);
-
-        sVpnProfileList.add(p);
-        addPreferenceFor(p, true);
-        disableProfilePreferencesIfOneActive();
-    }
-
-    // Adds a preference in mVpnListContainer
-    private VpnPreference addPreferenceFor(
-            VpnProfile p, boolean addToContainer) {
-        VpnPreference pref = new VpnPreference(getActivity(), p);
-        mVpnPreferenceMap.put(p.getName(), pref);
-        if (addToContainer) mVpnListContainer.addPreference(pref);
-
-        pref.setOnPreferenceClickListener(
-                new Preference.OnPreferenceClickListener() {
-                    public boolean onPreferenceClick(Preference pref) {
-                        connectOrDisconnect(((VpnPreference) pref).mProfile);
-                        return true;
-                    }
-                });
-        return pref;
-    }
-
-    // index: index to sVpnProfileList
-    private void replaceProfile(int index, VpnProfile p) throws IOException {
-        Map<String, VpnPreference> map = mVpnPreferenceMap;
-        VpnProfile oldProfile = sVpnProfileList.set(index, p);
-        VpnPreference pref = map.remove(oldProfile.getName());
-        if (pref.mProfile != oldProfile) {
-            throw new RuntimeException("inconsistent state!");
-        }
-
-        p.setId(oldProfile.getId());
-
-        processSecrets(p);
-
-        // TODO: remove copyFiles once the setId() code propagates.
-        // Copy config files and remove the old ones if they are in different
-        // directories.
-        if (Util.copyFiles(getProfileDir(oldProfile), getProfileDir(p))) {
-            removeProfileFromStorage(oldProfile);
-        }
-        saveProfileToStorage(p);
-
-        pref.setProfile(p);
-        map.put(p.getName(), pref);
-    }
-
-    private void startVpnTypeSelection() {
-        if ((getActivity() == null) || isRemoving()) return;
-
-        ((PreferenceActivity) getActivity()).startPreferencePanel(
-                VpnTypeSelection.class.getCanonicalName(), null, R.string.vpn_type_title, null,
-                this, REQUEST_SELECT_VPN_TYPE);
-    }
-
-    private boolean isKeyStoreUnlocked() {
-        return mKeyStore.test() == KeyStore.NO_ERROR;
-    }
-
-    // Returns true if the profile needs to access keystore
-    private boolean needKeyStoreToSave(VpnProfile p) {
-        switch (p.getType()) {
-            case L2TP_IPSEC_PSK:
-                L2tpIpsecPskProfile pskProfile = (L2tpIpsecPskProfile) p;
-                String presharedKey = pskProfile.getPresharedKey();
-                if (!TextUtils.isEmpty(presharedKey)) return true;
-                // $FALL-THROUGH$
-            case L2TP:
-                L2tpProfile l2tpProfile = (L2tpProfile) p;
-                if (l2tpProfile.isSecretEnabled() &&
-                        !TextUtils.isEmpty(l2tpProfile.getSecretString())) {
-                    return true;
-                }
-                // $FALL-THROUGH$
-            default:
-                return false;
-        }
-    }
-
-    // Returns true if the profile needs to access keystore
-    private boolean needKeyStoreToConnect(VpnProfile p) {
-        switch (p.getType()) {
-            case L2TP_IPSEC:
-            case L2TP_IPSEC_PSK:
-                return true;
-
-            case L2TP:
-                return ((L2tpProfile) p).isSecretEnabled();
-
-            default:
-                return false;
-        }
-    }
-
-    // Returns true if keystore is unlocked or keystore is not a concern
-    private boolean unlockKeyStore(VpnProfile p, Runnable action) {
-        if (isKeyStoreUnlocked()) return true;
-        mUnlockAction = action;
-        Credentials.getInstance().unlock(getActivity());
-        return false;
-    }
-
-    private void startVpnEditor(final VpnProfile profile, boolean add) {
-        if ((getActivity() == null) || isRemoving()) return;
-
-        Bundle args = new Bundle();
-        args.putParcelable(KEY_VPN_PROFILE, profile);
-        // TODO: Show different titles for add and edit.
-        ((PreferenceActivity)getActivity()).startPreferencePanel(
-                VpnEditor.class.getCanonicalName(), args,
-                0, VpnEditor.getTitle(getActivity(), profile, add),
-                this, REQUEST_ADD_OR_EDIT_PROFILE);
-    }
-
-    private synchronized void connect(final VpnProfile p) {
-        if (needKeyStoreToConnect(p)) {
-            Runnable action = new Runnable() {
-                public void run() {
-                    connect(p);
-                }
-            };
-            if (!unlockKeyStore(p, action)) return;
-        }
-
-        if (!checkSecrets(p)) return;
-        changeState(p, VpnState.CONNECTING);
-        if (mConnectingActor.isConnectDialogNeeded()) {
-            showDialog(DIALOG_CONNECT);
-        } else {
-            mConnectingActor.connect(null);
-        }
-    }
-
-    // Do connect or disconnect based on the current state.
-    private synchronized void connectOrDisconnect(VpnProfile p) {
-        VpnPreference pref = mVpnPreferenceMap.get(p.getName());
-        switch (p.getState()) {
-            case IDLE:
-                connect(p);
-                break;
-
-            case CONNECTING:
-                // do nothing
-                break;
-
-            case CONNECTED:
-            case DISCONNECTING:
-                changeState(p, VpnState.DISCONNECTING);
-                getActor(p).disconnect();
-                break;
-        }
-    }
-
-    private void changeState(VpnProfile p, VpnState state) {
-        VpnState oldState = p.getState();
-        p.setState(state);
-        mVpnPreferenceMap.get(p.getName()).setSummary(
-                getProfileSummaryString(p));
-
-        switch (state) {
-        case CONNECTED:
-            mConnectingActor = null;
-            mActiveProfile = p;
-            disableProfilePreferencesIfOneActive();
-            break;
-
-        case CONNECTING:
-            if (mConnectingActor == null) {
-                mConnectingActor = getActor(p);
-            }
-            // $FALL-THROUGH$
-        case DISCONNECTING:
-            mActiveProfile = p;
-            disableProfilePreferencesIfOneActive();
-            break;
-
-        case CANCELLED:
-            changeState(p, VpnState.IDLE);
-            break;
-
-        case IDLE:
-            assert(mActiveProfile == p);
-
-            if (mConnectingErrorCode == NO_ERROR) {
-                onIdle();
-            } else {
-                showDialog(mConnectingErrorCode);
-                mConnectingErrorCode = NO_ERROR;
-            }
-            break;
-        }
-    }
-
-    private void onIdle() {
-        if (DEBUG) Log.d(TAG, "   onIdle()");
-        mActiveProfile = null;
-        mConnectingActor = null;
-        enableProfilePreferences();
-    }
-
-    private void disableProfilePreferencesIfOneActive() {
-        if (mActiveProfile == null) return;
-
-        for (VpnProfile p : sVpnProfileList) {
-            switch (p.getState()) {
-                case CONNECTING:
-                case DISCONNECTING:
-                case IDLE:
-                    mVpnPreferenceMap.get(p.getName()).setEnabled(false);
-                    break;
-
-                default:
-                    mVpnPreferenceMap.get(p.getName()).setEnabled(true);
-            }
-        }
-    }
-
-    private void enableProfilePreferences() {
-        for (VpnProfile p : sVpnProfileList) {
-            mVpnPreferenceMap.get(p.getName()).setEnabled(true);
-        }
-    }
-
-    static String getProfileDir(VpnProfile p) {
-        return PROFILES_ROOT + p.getId();
-    }
-
-    static void saveProfileToStorage(VpnProfile p) throws IOException {
-        File f = new File(getProfileDir(p));
-        if (!f.exists()) f.mkdirs();
-        ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(
-                new File(f, PROFILE_OBJ_FILE)));
-        oos.writeObject(p);
-        oos.close();
-    }
-
-    private void removeProfileFromStorage(VpnProfile p) {
-        Util.deleteFile(getProfileDir(p));
-    }
-
-    private void updatePreferenceMap() {
-        mVpnPreferenceMap = new LinkedHashMap<String, VpnPreference>();
-        mVpnListContainer.removeAll();
-        for (VpnProfile p : sVpnProfileList) {
-            addPreferenceFor(p, true);
-        }
-        // reset the mActiveProfile if the profile has been removed from the
-        // other instance.
-        if ((mActiveProfile != null)
-                && !mVpnPreferenceMap.containsKey(mActiveProfile.getName())) {
-            onIdle();
-        }
-    }
-
-    private void retrieveVpnListFromStorage() {
-        // skip the loop if the profile is loaded already.
-        if (sVpnProfileList.size() > 0) return;
-        File root = new File(PROFILES_ROOT);
-        String[] dirs = root.list();
-        if (dirs == null) return;
-        for (String dir : dirs) {
-            File f = new File(new File(root, dir), PROFILE_OBJ_FILE);
-            if (!f.exists()) continue;
-            try {
-                VpnProfile p = deserialize(f);
-                if (p == null) continue;
-                if (!checkIdConsistency(dir, p)) continue;
-
-                sVpnProfileList.add(p);
-            } catch (IOException e) {
-                Log.e(TAG, "retrieveVpnListFromStorage()", e);
-            }
-        }
-        Collections.sort(sVpnProfileList, new Comparator<VpnProfile>() {
-            public int compare(VpnProfile p1, VpnProfile p2) {
-                return p1.getName().compareTo(p2.getName());
-            }
-        });
-        disableProfilePreferencesIfOneActive();
-    }
-
-    private void checkVpnConnectionStatus() {
-        for (VpnProfile p : sVpnProfileList) {
-            changeState(p, mVpnManager.getState(p));
-        }
-    }
-
-    // A sanity check. Returns true if the profile directory name and profile ID
-    // are consistent.
-    private boolean checkIdConsistency(String dirName, VpnProfile p) {
-        if (!dirName.equals(p.getId())) {
-            Log.d(TAG, "ID inconsistent: " + dirName + " vs " + p.getId());
-            return false;
-        } else {
-            return true;
-        }
-    }
-
-    private VpnProfile deserialize(File profileObjectFile) throws IOException {
-        try {
-            ObjectInputStream ois = new ObjectInputStream(new FileInputStream(
-                    profileObjectFile));
-            VpnProfile p = (VpnProfile) ois.readObject();
-            ois.close();
-            return p;
-        } catch (ClassNotFoundException e) {
-            Log.d(TAG, "deserialize a profile", e);
-            return null;
-        }
-    }
-
-    private String getProfileSummaryString(VpnProfile p) {
-        final Activity activity = getActivity();
-        switch (p.getState()) {
-        case CONNECTING:
-            return activity.getString(R.string.vpn_connecting);
-        case DISCONNECTING:
-            return activity.getString(R.string.vpn_disconnecting);
-        case CONNECTED:
-            return activity.getString(R.string.vpn_connected);
-        default:
-            return activity.getString(R.string.vpn_connect_hint);
-        }
-    }
-
-    private VpnProfileActor getActor(VpnProfile p) {
-        return new AuthenticationActor(getActivity(), p);
-    }
-
-    private VpnProfile createVpnProfile(String type) {
-        return mVpnManager.createVpnProfile(Enum.valueOf(VpnType.class, type));
-    }
-
-    private boolean checkSecrets(VpnProfile p) {
-        boolean secretMissing = false;
-
-        if (p instanceof L2tpIpsecProfile) {
-            L2tpIpsecProfile certProfile = (L2tpIpsecProfile) p;
-
-            String cert = certProfile.getCaCertificate();
-            if (TextUtils.isEmpty(cert) ||
-                    !mKeyStore.contains(Credentials.CA_CERTIFICATE + cert)) {
-                certProfile.setCaCertificate(null);
-                secretMissing = true;
-            }
-
-            cert = certProfile.getUserCertificate();
-            if (TextUtils.isEmpty(cert) ||
-                    !mKeyStore.contains(Credentials.USER_CERTIFICATE + cert)) {
-                certProfile.setUserCertificate(null);
-                secretMissing = true;
-            }
-        }
-
-        if (p instanceof L2tpIpsecPskProfile) {
-            L2tpIpsecPskProfile pskProfile = (L2tpIpsecPskProfile) p;
-            String presharedKey = pskProfile.getPresharedKey();
-            String key = KEY_PREFIX_IPSEC_PSK + p.getId();
-            if (TextUtils.isEmpty(presharedKey) || !mKeyStore.contains(key)) {
-                pskProfile.setPresharedKey(null);
-                secretMissing = true;
-            }
-        }
-
-        if (p instanceof L2tpProfile) {
-            L2tpProfile l2tpProfile = (L2tpProfile) p;
-            if (l2tpProfile.isSecretEnabled()) {
-                String secret = l2tpProfile.getSecretString();
-                String key = KEY_PREFIX_L2TP_SECRET + p.getId();
-                if (TextUtils.isEmpty(secret) || !mKeyStore.contains(key)) {
-                    l2tpProfile.setSecretString(null);
-                    secretMissing = true;
-                }
-            }
-        }
-
-        if (secretMissing) {
-            mActiveProfile = p;
-            showDialog(DIALOG_SECRET_NOT_SET);
-            return false;
-        } else {
-            return true;
-        }
-    }
-
-    private void processSecrets(VpnProfile p) {
-        switch (p.getType()) {
-            case L2TP_IPSEC_PSK:
-                L2tpIpsecPskProfile pskProfile = (L2tpIpsecPskProfile) p;
-                String presharedKey = pskProfile.getPresharedKey();
-                String key = KEY_PREFIX_IPSEC_PSK + p.getId();
-                if (!TextUtils.isEmpty(presharedKey) &&
-                        !mKeyStore.put(key, presharedKey)) {
-                    Log.e(TAG, "keystore write failed: key=" + key);
-                }
-                pskProfile.setPresharedKey(key);
-                // $FALL-THROUGH$
-            case L2TP_IPSEC:
-            case L2TP:
-                L2tpProfile l2tpProfile = (L2tpProfile) p;
-                key = KEY_PREFIX_L2TP_SECRET + p.getId();
-                if (l2tpProfile.isSecretEnabled()) {
-                    String secret = l2tpProfile.getSecretString();
-                    if (!TextUtils.isEmpty(secret) &&
-                            !mKeyStore.put(key, secret)) {
-                        Log.e(TAG, "keystore write failed: key=" + key);
-                    }
-                    l2tpProfile.setSecretString(key);
-                } else {
-                    mKeyStore.delete(key);
-                }
-                break;
-        }
-    }
-
-    private class VpnPreference extends Preference {
-        VpnProfile mProfile;
-        VpnPreference(Context c, VpnProfile p) {
-            super(c);
-            setProfile(p);
-        }
-
-        void setProfile(VpnProfile p) {
-            mProfile = p;
-            setTitle(p.getName());
-            setSummary(getProfileSummaryString(p));
-        }
-    }
-
-    // to receive vpn connectivity events broadcast by VpnService
-    private class ConnectivityReceiver extends BroadcastReceiver {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            String profileName = intent.getStringExtra(
-                    VpnManager.BROADCAST_PROFILE_NAME);
-            if (profileName == null) return;
-
-            VpnState s = (VpnState) intent.getSerializableExtra(
-                    VpnManager.BROADCAST_CONNECTION_STATE);
-
-            if (s == null) {
-                Log.e(TAG, "received null connectivity state");
-                return;
-            }
-
-            mConnectingErrorCode = intent.getIntExtra(
-                    VpnManager.BROADCAST_ERROR_CODE, NO_ERROR);
-
-            VpnPreference pref = mVpnPreferenceMap.get(profileName);
-            if (pref != null) {
-                Log.d(TAG, "received connectivity: " + profileName
-                        + ": connected? " + s
-                        + "   err=" + mConnectingErrorCode);
-                // XXX: VpnService should broadcast non-IDLE state, say UNUSABLE,
-                // when an error occurs.
-                changeState(pref.mProfile, s);
-            } else {
-                Log.e(TAG, "received connectivity: " + profileName
-                        + ": connected? " + s + ", but profile does not exist;"
-                        + " just ignore it");
-            }
-        }
-    }
-}
diff --git a/src/com/android/settings/vpn/VpnTypeSelection.java b/src/com/android/settings/vpn/VpnTypeSelection.java
deleted file mode 100644
index 45e33b9..0000000
--- a/src/com/android/settings/vpn/VpnTypeSelection.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * 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.
- */
-
-package com.android.settings.vpn;
-
-import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.net.vpn.VpnManager;
-import android.net.vpn.VpnType;
-import android.os.Bundle;
-import android.preference.Preference;
-import android.preference.PreferenceActivity;
-import android.preference.PreferenceScreen;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * The activity to select a VPN type.
- */
-public class VpnTypeSelection extends SettingsPreferenceFragment {
-    private Map<String, VpnType> mTypeMap = new HashMap<String, VpnType>();
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        addPreferencesFromResource(R.xml.vpn_type);
-        initTypeList();
-    }
-
-    @Override
-    public boolean onPreferenceTreeClick(PreferenceScreen ps, Preference pref) {
-        ((PreferenceActivity)getActivity())
-                .finishPreferencePanel(this, Activity.RESULT_OK,
-                        getResultIntent(mTypeMap.get(pref.getTitle().toString())));
-        return true;
-    }
-
-    private void initTypeList() {
-        PreferenceScreen root = getPreferenceScreen();
-        final Activity activity = getActivity();
-        for (VpnType t : VpnManager.getSupportedVpnTypes()) {
-            String displayName = t.getDisplayName();
-            String message = String.format(
-                    activity.getString(R.string.vpn_edit_title_add), displayName);
-            mTypeMap.put(message, t);
-
-            Preference pref = new Preference(activity);
-            pref.setTitle(message);
-            pref.setSummary(t.getDescriptionId());
-            root.addPreference(pref);
-        }
-    }
-
-    private Intent getResultIntent(VpnType type) {
-        Intent intent = new Intent(getActivity(), VpnSettings.class);
-        intent.putExtra(VpnSettings.KEY_VPN_TYPE, type.toString());
-        return intent;
-    }
-}
diff --git a/src/com/android/settings/vpn2/VpnDialog.java b/src/com/android/settings/vpn2/VpnDialog.java
new file mode 100644
index 0000000..4f9d0a2
--- /dev/null
+++ b/src/com/android/settings/vpn2/VpnDialog.java
@@ -0,0 +1,327 @@
+/*
+ * 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.vpn2;
+
+import com.android.settings.R;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.security.Credentials;
+import android.security.KeyStore;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemSelectedListener;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.Spinner;
+import android.widget.TextView;
+
+class VpnDialog extends AlertDialog implements TextWatcher, OnItemSelectedListener {
+    private static final String DUMMY = "\r";
+
+    private static String getDummy(String secret) {
+        return secret.isEmpty() ? "" : DUMMY;
+    }
+
+    private static String getSecret(String oldSecret, TextView view) {
+        String newSecret = view.getText().toString();
+        return DUMMY.equals(newSecret) ? oldSecret : newSecret;
+    }
+
+    private final KeyStore mKeyStore = KeyStore.getInstance();
+    private final DialogInterface.OnClickListener mListener;
+    private final VpnProfile mProfile;
+
+    private boolean mEditing;
+
+    private View mView;
+
+    private TextView mName;
+    private Spinner mType;
+    private TextView mServer;
+    private TextView mUsername;
+    private TextView mPassword;
+    private TextView mSearchDomains;
+    private TextView mRoutes;
+    private CheckBox mMppe;
+    private TextView mL2tpSecret;
+    private TextView mIpsecIdentifier;
+    private TextView mIpsecSecret;
+    private Spinner mIpsecUserCert;
+    private Spinner mIpsecCaCert;
+    private CheckBox mSaveLogin;
+
+    VpnDialog(Context context, DialogInterface.OnClickListener listener,
+            VpnProfile profile, boolean editing) {
+        super(context);
+        mListener = listener;
+        mProfile = profile;
+        mEditing = editing;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedState) {
+        mView = getLayoutInflater().inflate(R.layout.vpn_dialog, null);
+        setView(mView);
+        setInverseBackgroundForced(true);
+
+        Context context = getContext();
+
+        // First, find out all the fields.
+        mName = (TextView) mView.findViewById(R.id.name);
+        mType = (Spinner) mView.findViewById(R.id.type);
+        mServer = (TextView) mView.findViewById(R.id.server);
+        mUsername = (TextView) mView.findViewById(R.id.username);
+        mPassword = (TextView) mView.findViewById(R.id.password);
+        mSearchDomains = (TextView) mView.findViewById(R.id.search_domains);
+        mRoutes = (TextView) mView.findViewById(R.id.routes);
+        mMppe = (CheckBox) mView.findViewById(R.id.mppe);
+        mL2tpSecret = (TextView) mView.findViewById(R.id.l2tp_secret);
+        mIpsecIdentifier = (TextView) mView.findViewById(R.id.ipsec_identifier);
+        mIpsecSecret = (TextView) mView.findViewById(R.id.ipsec_secret);
+        mIpsecUserCert = (Spinner) mView.findViewById(R.id.ipsec_user_cert);
+        mIpsecCaCert = (Spinner) mView.findViewById(R.id.ipsec_ca_cert);
+        mSaveLogin = (CheckBox) mView.findViewById(R.id.save_login);
+
+        // Second, copy values from the profile.
+        mName.setText(mProfile.name);
+        mType.setSelection(mProfile.type);
+        mServer.setText(mProfile.server);
+        mUsername.setText(mProfile.username);
+        mPassword.setText(getDummy(mProfile.password));
+        mSearchDomains.setText(mProfile.searchDomains);
+        mRoutes.setText(mProfile.routes);
+        mMppe.setChecked(mProfile.mppe);
+        mL2tpSecret.setText(getDummy(mProfile.l2tpSecret));
+        mIpsecIdentifier.setText(mProfile.ipsecIdentifier);
+        mIpsecSecret.setText(getDummy(mProfile.ipsecSecret));
+        loadCertificates(mIpsecUserCert, Credentials.USER_CERTIFICATE,
+                0, mProfile.ipsecUserCert);
+        loadCertificates(mIpsecCaCert, Credentials.CA_CERTIFICATE,
+                R.string.vpn_no_ca_cert, mProfile.ipsecCaCert);
+        mSaveLogin.setChecked(mProfile.saveLogin);
+
+        // Third, add listeners to required fields.
+        mName.addTextChangedListener(this);
+        mType.setOnItemSelectedListener(this);
+        mServer.addTextChangedListener(this);
+        mUsername.addTextChangedListener(this);
+        mPassword.addTextChangedListener(this);
+        mIpsecSecret.addTextChangedListener(this);
+        mIpsecUserCert.setOnItemSelectedListener(this);
+
+        // Forth, determine to do editing or connecting.
+        boolean valid = validate(true);
+        mEditing = mEditing || !valid;
+
+        if (mEditing) {
+            setTitle(R.string.vpn_edit);
+
+            // Show common fields.
+            mView.findViewById(R.id.editor).setVisibility(View.VISIBLE);
+
+            // Show type-specific fields.
+            changeType(mProfile.type);
+
+            // Create a button to save the profile.
+            setButton(DialogInterface.BUTTON_POSITIVE,
+                    context.getString(R.string.vpn_save), mListener);
+        } else {
+            setTitle(context.getString(R.string.vpn_connect_to, mProfile.name));
+
+            // Not editing, just show username and password.
+            mView.findViewById(R.id.login).setVisibility(View.VISIBLE);
+
+            // Create a button to connect the network.
+            setButton(DialogInterface.BUTTON_POSITIVE,
+                    context.getString(R.string.vpn_connect), mListener);
+        }
+
+        // Always provide a cancel button.
+        setButton(DialogInterface.BUTTON_NEGATIVE,
+                context.getString(R.string.vpn_cancel), mListener);
+
+        // Let AlertDialog create everything.
+        super.onCreate(null);
+
+        // Disable the action button if necessary.
+        getButton(DialogInterface.BUTTON_POSITIVE)
+                .setEnabled(mEditing ? valid : validate(false));
+    }
+
+    @Override
+    public void afterTextChanged(Editable field) {
+        getButton(DialogInterface.BUTTON_POSITIVE).setEnabled(validate(mEditing));
+    }
+
+    @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 onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+        if (parent == mType) {
+            changeType(position);
+        }
+        getButton(DialogInterface.BUTTON_POSITIVE).setEnabled(validate(mEditing));
+    }
+
+    @Override
+    public void onNothingSelected(AdapterView<?> parent) {
+    }
+
+    private void changeType(int type) {
+        // First, hide everything.
+        mMppe.setVisibility(View.GONE);
+        mView.findViewById(R.id.l2tp).setVisibility(View.GONE);
+        mView.findViewById(R.id.ipsec_id).setVisibility(View.GONE);
+        mView.findViewById(R.id.ipsec_psk).setVisibility(View.GONE);
+        mView.findViewById(R.id.ipsec_user).setVisibility(View.GONE);
+        mView.findViewById(R.id.ipsec_ca).setVisibility(View.GONE);
+
+        // Then, unhide type-specific fields.
+        switch (type) {
+            case VpnProfile.TYPE_PPTP:
+                mMppe.setVisibility(View.VISIBLE);
+                break;
+            case VpnProfile.TYPE_L2TP_IPSEC_PSK:
+                mView.findViewById(R.id.l2tp).setVisibility(View.VISIBLE);
+                mView.findViewById(R.id.ipsec_psk).setVisibility(View.VISIBLE);
+                break;
+            case VpnProfile.TYPE_IPSEC_XAUTH_PSK:
+                mView.findViewById(R.id.ipsec_id).setVisibility(View.VISIBLE);
+                mView.findViewById(R.id.ipsec_psk).setVisibility(View.VISIBLE);
+                break;
+
+            case VpnProfile.TYPE_L2TP_IPSEC_RSA:
+                mView.findViewById(R.id.l2tp).setVisibility(View.VISIBLE);
+                // fall through
+            case VpnProfile.TYPE_IPSEC_XAUTH_RSA:
+                mView.findViewById(R.id.ipsec_user).setVisibility(View.VISIBLE);
+                // fall through
+            case VpnProfile.TYPE_IPSEC_HYBRID_RSA:
+                mView.findViewById(R.id.ipsec_ca).setVisibility(View.VISIBLE);
+                break;
+        }
+    }
+
+    private boolean validate(boolean editing) {
+        if (!editing) {
+            return mUsername.getText().length() != 0 && mPassword.getText().length() != 0;
+        }
+        if (mName.getText().length() == 0 || mServer.getText().length() == 0) {
+            return false;
+        }
+        switch (mType.getSelectedItemPosition()) {
+            case VpnProfile.TYPE_PPTP:
+                return true;
+
+            case VpnProfile.TYPE_L2TP_IPSEC_PSK:
+            case VpnProfile.TYPE_IPSEC_XAUTH_PSK:
+                return mIpsecSecret.getText().length() != 0;
+
+            case VpnProfile.TYPE_L2TP_IPSEC_RSA:
+            case VpnProfile.TYPE_IPSEC_XAUTH_RSA:
+                return mIpsecUserCert.getSelectedItemPosition() != 0;
+        }
+        return false;
+    }
+
+    private void loadCertificates(Spinner spinner, String prefix, int firstId, String selected) {
+        Context context = getContext();
+        String first = (firstId == 0) ? "" : context.getString(firstId);
+        String[] certificates = mKeyStore.saw(prefix);
+
+        if (certificates == null || certificates.length == 0) {
+            certificates = new String[] {first};
+        } else {
+            String[] array = new String[certificates.length + 1];
+            array[0] = first;
+            System.arraycopy(certificates, 0, array, 1, certificates.length);
+            certificates = array;
+        }
+
+        ArrayAdapter<String> adapter = new ArrayAdapter<String>(
+                context, android.R.layout.simple_spinner_item, certificates);
+        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        spinner.setAdapter(adapter);
+
+        for (int i = 1; i < certificates.length; ++i) {
+            if (certificates[i].equals(selected)) {
+                spinner.setSelection(i);
+                break;
+            }
+        }
+    }
+
+    boolean isEditing() {
+        return mEditing;
+    }
+
+    VpnProfile getProfile() {
+        // First, save common fields.
+        VpnProfile profile = new VpnProfile(mProfile.key);
+        profile.name = mName.getText().toString();
+        profile.type = mType.getSelectedItemPosition();
+        profile.server = mServer.getText().toString().trim();
+        profile.username = mUsername.getText().toString();
+        profile.password = getSecret(mProfile.password, mPassword);
+        profile.searchDomains = mSearchDomains.getText().toString().trim();
+        profile.routes = mRoutes.getText().toString().trim();
+
+        // Then, save type-specific fields.
+        switch (profile.type) {
+            case VpnProfile.TYPE_PPTP:
+                profile.mppe = mMppe.isChecked();
+                break;
+            case VpnProfile.TYPE_L2TP_IPSEC_PSK:
+                profile.l2tpSecret = getSecret(mProfile.l2tpSecret, mL2tpSecret);
+                profile.ipsecSecret = getSecret(mProfile.ipsecSecret, mIpsecSecret);
+                break;
+            case VpnProfile.TYPE_IPSEC_XAUTH_PSK:
+                profile.ipsecIdentifier = mIpsecIdentifier.getText().toString();
+                profile.ipsecSecret = getSecret(mProfile.ipsecSecret, mIpsecSecret);
+                break;
+
+            case VpnProfile.TYPE_L2TP_IPSEC_RSA:
+                profile.l2tpSecret = getSecret(mProfile.l2tpSecret, mL2tpSecret);
+                // fall through
+            case VpnProfile.TYPE_IPSEC_XAUTH_RSA:
+                if (mIpsecUserCert.getSelectedItemPosition() != 0) {
+                    profile.ipsecUserCert = (String) mIpsecUserCert.getSelectedItem();
+                }
+                // fall through
+            case VpnProfile.TYPE_IPSEC_HYBRID_RSA:
+                if (mIpsecCaCert.getSelectedItemPosition() != 0) {
+                    profile.ipsecCaCert = (String) mIpsecCaCert.getSelectedItem();
+                }
+                break;
+        }
+
+        profile.saveLogin = mSaveLogin.isChecked();
+        return profile;
+    }
+}
diff --git a/src/com/android/settings/vpn2/VpnProfile.java b/src/com/android/settings/vpn2/VpnProfile.java
new file mode 100644
index 0000000..24c2f5f
--- /dev/null
+++ b/src/com/android/settings/vpn2/VpnProfile.java
@@ -0,0 +1,118 @@
+/*
+ * 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.vpn2;
+
+import java.nio.charset.Charsets;
+
+/**
+ * Parcel-like entity class for VPN profiles. To keep things simple, all
+ * fields are package private. Methods are provided for serialization, so
+ * storage can be implemented easily. Two rules are set for this class.
+ * First, all fields must be kept non-null. Second, always make a copy
+ * using clone() before modifying.
+ */
+class VpnProfile implements Cloneable {
+    // Match these constants with R.array.vpn_types.
+    static final int TYPE_PPTP = 0;
+    static final int TYPE_L2TP_IPSEC_PSK = 1;
+    static final int TYPE_L2TP_IPSEC_RSA = 2;
+    static final int TYPE_IPSEC_XAUTH_PSK = 3;
+    static final int TYPE_IPSEC_XAUTH_RSA = 4;
+    static final int TYPE_IPSEC_HYBRID_RSA = 5;
+    static final int TYPE_MAX = 5;
+
+    // Entity fields.
+    final String key;           // -1
+    String name = "";           // 0
+    int type = TYPE_PPTP;       // 1
+    String server = "";         // 2
+    String username = "";       // 3
+    String password = "";       // 4
+    String dnsServers = "";     // 5
+    String searchDomains = "";  // 6
+    String routes = "";         // 7
+    boolean mppe = false;       // 8
+    String l2tpSecret = "";     // 9
+    String ipsecIdentifier = "";// 10
+    String ipsecSecret = "";    // 11
+    String ipsecUserCert = "";  // 12
+    String ipsecCaCert = "";    // 13
+
+    // Helper fields.
+    boolean saveLogin = false;
+
+    VpnProfile(String key) {
+        this.key = key;
+    }
+
+    static VpnProfile decode(String key, byte[] value) {
+        try {
+            if (key == null) {
+                return null;
+            }
+
+            String[] values = new String(value, Charsets.UTF_8).split("\0", -1);
+            // Currently it always has 14 fields.
+            if (values.length < 14) {
+                return null;
+            }
+
+            VpnProfile profile = new VpnProfile(key);
+            profile.name = values[0];
+            profile.type = Integer.valueOf(values[1]);
+            if (profile.type < 0 || profile.type > TYPE_MAX) {
+                return null;
+            }
+            profile.server = values[2];
+            profile.username = values[3];
+            profile.password = values[4];
+            profile.dnsServers = values[5];
+            profile.searchDomains = values[6];
+            profile.routes = values[7];
+            profile.mppe = Boolean.valueOf(values[8]);
+            profile.l2tpSecret = values[9];
+            profile.ipsecIdentifier = values[10];
+            profile.ipsecSecret = values[11];
+            profile.ipsecUserCert = values[12];
+            profile.ipsecCaCert = values[13];
+
+            profile.saveLogin = !profile.username.isEmpty() || !profile.password.isEmpty();
+            return profile;
+        } catch (Exception e) {
+            // ignore
+        }
+        return null;
+    }
+
+    byte[] encode() {
+        StringBuilder builder = new StringBuilder(name);
+        builder.append('\0').append(type);
+        builder.append('\0').append(server);
+        builder.append('\0').append(saveLogin ? username : "");
+        builder.append('\0').append(saveLogin ? password : "");
+        builder.append('\0').append(dnsServers);
+        builder.append('\0').append(searchDomains);
+        builder.append('\0').append(routes);
+        builder.append('\0').append(mppe);
+        builder.append('\0').append(l2tpSecret);
+        builder.append('\0').append(ipsecIdentifier);
+        builder.append('\0').append(ipsecSecret);
+        builder.append('\0').append(ipsecUserCert);
+        builder.append('\0').append(ipsecCaCert);
+        return builder.toString().getBytes(Charsets.UTF_8);
+    }
+}
diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java
new file mode 100644
index 0000000..f345c22
--- /dev/null
+++ b/src/com/android/settings/vpn2/VpnSettings.java
@@ -0,0 +1,473 @@
+/*
+ * 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.vpn2;
+
+import com.android.settings.R;
+
+import android.content.Context;
+import android.content.DialogInterface;
+import android.net.IConnectivityManager;
+import android.net.LinkProperties;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.os.ServiceManager;
+import android.preference.Preference;
+import android.preference.PreferenceGroup;
+import android.security.Credentials;
+import android.security.KeyStore;
+import android.util.Log;
+import android.view.ContextMenu;
+import android.view.ContextMenu.ContextMenuInfo;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.AdapterView.AdapterContextMenuInfo;
+
+import com.android.internal.net.LegacyVpnInfo;
+import com.android.internal.net.VpnConfig;
+import com.android.settings.SettingsPreferenceFragment;
+
+import java.nio.charset.Charsets;
+import java.util.Arrays;
+import java.util.HashMap;
+
+public class VpnSettings extends SettingsPreferenceFragment implements
+        Handler.Callback, Preference.OnPreferenceClickListener,
+        DialogInterface.OnClickListener, DialogInterface.OnDismissListener {
+
+    private static final String TAG = "VpnSettings";
+
+    private final IConnectivityManager mService = IConnectivityManager.Stub
+            .asInterface(ServiceManager.getService(Context.CONNECTIVITY_SERVICE));
+    private final KeyStore mKeyStore = KeyStore.getInstance();
+    private boolean mUnlocking = false;
+
+    private HashMap<String, VpnPreference> mPreferences;
+    private VpnDialog mDialog;
+
+    private Handler mUpdater;
+    private LegacyVpnInfo mInfo;
+
+    // The key of the profile for the current ContextMenu.
+    private String mSelectedKey;
+
+    @Override
+    public void onCreate(Bundle savedState) {
+        super.onCreate(savedState);
+        addPreferencesFromResource(R.xml.vpn_settings2);
+        PreferenceGroup group = getPreferenceScreen();
+        group.setOrderingAsAdded(false);
+        group.findPreference("add_network").setOnPreferenceClickListener(this);
+
+        if (savedState != null) {
+            VpnProfile profile = VpnProfile.decode(savedState.getString("VpnKey"),
+                    savedState.getByteArray("VpnProfile"));
+            if (profile != null) {
+                mDialog = new VpnDialog(getActivity(), this, profile,
+                        savedState.getBoolean("VpnEditing"));
+            }
+        }
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle savedState) {
+        // We do not save view hierarchy, as they are just profiles.
+        if (mDialog != null) {
+            VpnProfile profile = mDialog.getProfile();
+            savedState.putString("VpnKey", profile.key);
+            savedState.putByteArray("VpnProfile", profile.encode());
+            savedState.putBoolean("VpnEditing", mDialog.isEditing());
+        }
+        // else?
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        // Check KeyStore here, so others do not need to deal with it.
+        if (mKeyStore.state() != KeyStore.State.UNLOCKED) {
+            if (!mUnlocking) {
+                // Let us unlock KeyStore. See you later!
+                Credentials.getInstance().unlock(getActivity());
+            } else {
+                // We already tried, but it is still not working!
+                getActivity().getFragmentManager().popBackStack();
+            }
+            mUnlocking = !mUnlocking;
+            return;
+        }
+
+        // Now KeyStore is always unlocked. Reset the flag.
+        mUnlocking = false;
+
+        // Currently we are the only user of profiles in KeyStore.
+        // Assuming KeyStore and KeyGuard do the right thing, we can
+        // safely cache profiles in the memory.
+        if (mPreferences == null) {
+            mPreferences = new HashMap<String, VpnPreference>();
+
+            String[] keys = mKeyStore.saw(Credentials.VPN);
+            if (keys != null && keys.length > 0) {
+                Context context = getActivity();
+
+                for (String key : keys) {
+                    VpnProfile profile = VpnProfile.decode(key,
+                            mKeyStore.get(Credentials.VPN + key));
+                    if (profile == null) {
+                        Log.w(TAG, "bad profile: key = " + key);
+                        mKeyStore.delete(Credentials.VPN + key);
+                    } else {
+                        VpnPreference preference = new VpnPreference(context, profile);
+                        mPreferences.put(key, preference);
+                    }
+                }
+            }
+        }
+        PreferenceGroup group = getPreferenceScreen();
+        for (VpnPreference preference : mPreferences.values()) {
+            group.addPreference(preference);
+        }
+
+        // Show the dialog if there is one.
+        if (mDialog != null) {
+            mDialog.setOnDismissListener(this);
+            mDialog.show();
+        }
+
+        // Start monitoring.
+        if (mUpdater == null) {
+            mUpdater = new Handler(this);
+        }
+        mUpdater.sendEmptyMessage(0);
+
+        // Register for context menu. Hmmm, getListView() is hidden?
+        registerForContextMenu(getListView());
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+
+        // Hide the dialog if there is one.
+        if (mDialog != null) {
+            mDialog.setOnDismissListener(null);
+            mDialog.dismiss();
+        }
+
+        // Unregister for context menu.
+        unregisterForContextMenu(getListView());
+    }
+
+    @Override
+    public void onDismiss(DialogInterface dialog) {
+        // Here is the exit of a dialog.
+        mDialog = null;
+    }
+
+    @Override
+    public void onClick(DialogInterface dialog, int button) {
+        if (button == DialogInterface.BUTTON_POSITIVE) {
+            // Always save the profile.
+            VpnProfile profile = mDialog.getProfile();
+            mKeyStore.put(Credentials.VPN + profile.key, profile.encode());
+
+            // Update the preference.
+            VpnPreference preference = mPreferences.get(profile.key);
+            if (preference != null) {
+                disconnect(profile.key);
+                preference.update(profile);
+            } else {
+                preference = new VpnPreference(getActivity(), profile);
+                mPreferences.put(profile.key, preference);
+                getPreferenceScreen().addPreference(preference);
+            }
+
+            // If we are not editing, connect!
+            if (!mDialog.isEditing()) {
+                try {
+                    connect(profile);
+                } catch (Exception e) {
+                    Log.e(TAG, "connect", e);
+                }
+            }
+        }
+    }
+
+    @Override
+    public void onCreateContextMenu(ContextMenu menu, View view, ContextMenuInfo info) {
+        if (mDialog != null) {
+            Log.v(TAG, "onCreateContextMenu() is called when mDialog != null");
+            return;
+        }
+
+        if (info instanceof AdapterContextMenuInfo) {
+            Preference preference = (Preference) getListView().getItemAtPosition(
+                    ((AdapterContextMenuInfo) info).position);
+            if (preference instanceof VpnPreference) {
+                VpnProfile profile = ((VpnPreference) preference).getProfile();
+                mSelectedKey = profile.key;
+                menu.setHeaderTitle(profile.name);
+                menu.add(Menu.NONE, R.string.vpn_menu_edit, 0, R.string.vpn_menu_edit);
+                menu.add(Menu.NONE, R.string.vpn_menu_delete, 0, R.string.vpn_menu_delete);
+            }
+        }
+    }
+
+    @Override
+    public boolean onContextItemSelected(MenuItem item) {
+        if (mDialog != null) {
+            Log.v(TAG, "onContextItemSelected() is called when mDialog != null");
+            return false;
+        }
+
+        VpnPreference preference = mPreferences.get(mSelectedKey);
+        if (preference == null) {
+            Log.v(TAG, "onContextItemSelected() is called but no preference is found");
+            return false;
+        }
+
+        switch (item.getItemId()) {
+            case R.string.vpn_menu_edit:
+                mDialog = new VpnDialog(getActivity(), this, preference.getProfile(), true);
+                mDialog.setOnDismissListener(this);
+                mDialog.show();
+                return true;
+            case R.string.vpn_menu_delete:
+                disconnect(mSelectedKey);
+                getPreferenceScreen().removePreference(preference);
+                mPreferences.remove(mSelectedKey);
+                mKeyStore.delete(Credentials.VPN + mSelectedKey);
+                return true;
+        }
+        return false;
+    }
+
+    @Override
+    public boolean onPreferenceClick(Preference preference) {
+        if (mDialog != null) {
+            Log.v(TAG, "onPreferenceClick() is called when mDialog != null");
+            return true;
+        }
+
+        if (preference instanceof VpnPreference) {
+            VpnProfile profile = ((VpnPreference) preference).getProfile();
+            if (mInfo != null && profile.key.equals(mInfo.key) &&
+                    mInfo.state == LegacyVpnInfo.STATE_CONNECTED) {
+                try {
+                    mInfo.intent.send();
+                    return true;
+                } catch (Exception e) {
+                    // ignore
+                }
+            }
+            mDialog = new VpnDialog(getActivity(), this, profile, false);
+        } else {
+            // Generate a new key. Here we just use the current time.
+            long millis = System.currentTimeMillis();
+            while (mPreferences.containsKey(Long.toHexString(millis))) {
+                ++millis;
+            }
+            mDialog = new VpnDialog(getActivity(), this,
+                    new VpnProfile(Long.toHexString(millis)), true);
+        }
+        mDialog.setOnDismissListener(this);
+        mDialog.show();
+        return true;
+    }
+
+    @Override
+    public boolean handleMessage(Message message) {
+        mUpdater.removeMessages(0);
+
+        if (isResumed()) {
+            try {
+                LegacyVpnInfo info = mService.getLegacyVpnInfo();
+                if (mInfo != null) {
+                    VpnPreference preference = mPreferences.get(mInfo.key);
+                    if (preference != null) {
+                        preference.update(-1);
+                    }
+                    mInfo = null;
+                }
+                if (info != null) {
+                    VpnPreference preference = mPreferences.get(info.key);
+                    if (preference != null) {
+                        preference.update(info.state);
+                        mInfo = info;
+                    }
+                }
+            } catch (Exception e) {
+                // ignore
+            }
+            mUpdater.sendEmptyMessageDelayed(0, 1000);
+        }
+        return true;
+    }
+
+    private void connect(VpnProfile profile) throws Exception {
+        // Get the current active interface.
+        LinkProperties network = mService.getActiveLinkProperties();
+        String interfaze = (network == null) ? null : network.getInterfaceName();
+        if (interfaze == null) {
+            throw new IllegalStateException("Cannot get network interface");
+        }
+
+        // Load certificates.
+        String privateKey = "";
+        String userCert = "";
+        String caCert = "";
+        if (!profile.ipsecUserCert.isEmpty()) {
+            byte[] value = mKeyStore.get(Credentials.USER_PRIVATE_KEY + profile.ipsecUserCert);
+            privateKey = (value == null) ? null : new String(value, Charsets.UTF_8);
+            value = mKeyStore.get(Credentials.USER_CERTIFICATE + profile.ipsecUserCert);
+            userCert = (value == null) ? null : new String(value, Charsets.UTF_8);
+        }
+        if (!profile.ipsecCaCert.isEmpty()) {
+            byte[] value = mKeyStore.get(Credentials.CA_CERTIFICATE + profile.ipsecCaCert);
+            caCert = (value == null) ? null : new String(value, Charsets.UTF_8);
+        }
+        if (privateKey == null || userCert == null || caCert == null) {
+            // TODO: find out a proper way to handle this. Delete these keys?
+            throw new IllegalStateException("Cannot load credentials");
+        }
+        Log.i(TAG, userCert);
+
+        // Prepare arguments for racoon.
+        String[] racoon = null;
+        switch (profile.type) {
+            case VpnProfile.TYPE_L2TP_IPSEC_PSK:
+                racoon = new String[] {
+                    interfaze, profile.server, "udppsk", "1701", profile.ipsecSecret,
+                };
+                break;
+            case VpnProfile.TYPE_L2TP_IPSEC_RSA:
+                racoon = new String[] {
+                    interfaze, profile.server, "udprsa", "1701", privateKey, userCert, caCert,
+                };
+                break;
+            case VpnProfile.TYPE_IPSEC_XAUTH_PSK:
+                break;
+            case VpnProfile.TYPE_IPSEC_XAUTH_RSA:
+                break;
+            case VpnProfile.TYPE_IPSEC_HYBRID_RSA:
+                break;
+        }
+
+        // Prepare arguments for mtpd.
+        String[] mtpd = null;
+        switch (profile.type) {
+            case VpnProfile.TYPE_PPTP:
+                mtpd = new String[] {
+                    "pptp", profile.server, "1723",
+                    "name", profile.username, "password", profile.password,
+                    "linkname", "vpn", "refuse-eap", "nodefaultroute",
+                    "usepeerdns", "idle", "1800", "mtu", "1400", "mru", "1400",
+                    "ipparam", profile.routes, (profile.mppe ? "+mppe" : "nomppe"),
+                };
+                break;
+            case VpnProfile.TYPE_L2TP_IPSEC_PSK:
+            case VpnProfile.TYPE_L2TP_IPSEC_RSA:
+                mtpd = new String[] {
+                    "l2tp", profile.server, "1701", profile.l2tpSecret,
+                    "name", profile.username, "password", profile.password,
+                    "linkname", "vpn", "refuse-eap", "nodefaultroute",
+                    "usepeerdns", "idle", "1800", "mtu", "1400", "mru", "1400",
+                    "ipparam", profile.routes,
+                };
+                break;
+        }
+
+        VpnConfig config = new VpnConfig();
+        config.packagz = profile.key;
+        config.session = profile.name;
+        config.routes = profile.routes;
+        if (!profile.searchDomains.isEmpty()) {
+            config.searchDomains = Arrays.asList(profile.searchDomains.split(" "));
+        }
+
+        mService.startLegacyVpn(config, racoon, mtpd);
+    }
+
+    private void disconnect(String key) {
+        if (mInfo != null && key.equals(mInfo.key)) {
+            try {
+                mService.prepareVpn(VpnConfig.LEGACY_VPN, VpnConfig.LEGACY_VPN);
+            } catch (Exception e) {
+                // ignore
+            }
+        }
+    }
+
+    private class VpnPreference extends Preference {
+        private VpnProfile mProfile;
+        private int mState = -1;
+
+        VpnPreference(Context context, VpnProfile profile) {
+            super(context);
+            setPersistent(false);
+            setOrder(0);
+            setOnPreferenceClickListener(VpnSettings.this);
+
+            mProfile = profile;
+            update();
+        }
+
+        VpnProfile getProfile() {
+            return mProfile;
+        }
+
+        void update(VpnProfile profile) {
+            mProfile = profile;
+            update();
+        }
+
+        void update(int state) {
+            mState = state;
+            update();
+        }
+
+        void update() {
+            if (mState < 0) {
+                String[] types = getContext().getResources()
+                        .getStringArray(R.array.vpn_types_long);
+                setSummary(types[mProfile.type]);
+            } else {
+                String[] states = getContext().getResources()
+                        .getStringArray(R.array.vpn_states);
+                setSummary(states[mState]);
+            }
+            setTitle(mProfile.name);
+            notifyHierarchyChanged();
+        }
+
+        @Override
+        public int compareTo(Preference preference) {
+            int result = -1;
+            if (preference instanceof VpnPreference) {
+                VpnPreference another = (VpnPreference) preference;
+                if ((result = another.mState - mState) == 0 &&
+                        (result = mProfile.name.compareTo(another.mProfile.name)) == 0 &&
+                        (result = mProfile.type - another.mProfile.type) == 0) {
+                    result = mProfile.key.compareTo(another.mProfile.key);
+                }
+            }
+            return result;
+        }
+    }
+}
diff --git a/src/com/android/settings/widget/ChartAxis.java b/src/com/android/settings/widget/ChartAxis.java
new file mode 100644
index 0000000..463541f
--- /dev/null
+++ b/src/com/android/settings/widget/ChartAxis.java
@@ -0,0 +1,38 @@
+/*
+ * 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.res.Resources;
+import android.text.SpannableStringBuilder;
+
+/**
+ * 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 void buildLabel(Resources res, SpannableStringBuilder builder, 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..10d8976
--- /dev/null
+++ b/src/com/android/settings/widget/ChartNetworkSeriesView.java
@@ -0,0 +1,222 @@
+/*
+ * 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);
+        setWillNotDraw(false);
+
+        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();
+        invalidate();
+    }
+
+    /**
+     * Set the range to paint with {@link #mPaintFill}, leaving the remaining
+     * area to be painted with {@link #mPaintFillSecondary}.
+     */
+    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.size() < 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;
+
+        NetworkStatsHistory.Entry entry = null;
+        for (int i = 0; i < mStats.size(); i++) {
+            entry = mStats.getValues(i, entry);
+
+            final float x = mHoriz.convertToPoint(entry.bucketStart);
+            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 += entry.rxBytes + entry.txBytes;
+            }
+
+            // 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;
+
+        final float primaryLeftPoint = mHoriz.convertToPoint(mPrimaryLeft);
+        final float primaryRightPoint = mHoriz.convertToPoint(mPrimaryRight);
+
+        save = canvas.save();
+        canvas.clipRect(0, 0, primaryLeftPoint, getHeight());
+        canvas.drawPath(mPathFill, mPaintFillSecondary);
+        canvas.restoreToCount(save);
+
+        save = canvas.save();
+        canvas.clipRect(primaryRightPoint, 0, getWidth(), getHeight());
+        canvas.drawPath(mPathFill, mPaintFillSecondary);
+        canvas.restoreToCount(save);
+
+        save = canvas.save();
+        canvas.clipRect(primaryLeftPoint, 0, primaryRightPoint, 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..4e37657
--- /dev/null
+++ b/src/com/android/settings/widget/ChartSweepView.java
@@ -0,0 +1,437 @@
+/*
+ * 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.Point;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
+import android.text.DynamicLayout;
+import android.text.Layout.Alignment;
+import android.text.SpannableStringBuilder;
+import android.text.TextPaint;
+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 {
+
+    private Drawable mSweep;
+    private Rect mSweepPadding = new Rect();
+    private Point mSweepOffset = new Point();
+
+    private Rect mMargins = new Rect();
+
+    private int mFollowAxis;
+
+    private int mLabelSize;
+    private int mLabelTemplateRes;
+    private int mLabelColor;
+
+    private SpannableStringBuilder mLabelTemplate;
+    private DynamicLayout mLabelLayout;
+
+    private ChartAxis mAxis;
+    private long mValue;
+
+    private ChartSweepView mClampAfter;
+    private ChartSweepView mClampBefore;
+
+    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));
+
+        setLabelSize(a.getDimensionPixelSize(R.styleable.ChartSweepView_labelSize, 0));
+        setLabelTemplate(a.getResourceId(R.styleable.ChartSweepView_labelTemplate, 0));
+        setLabelColor(a.getColor(R.styleable.ChartSweepView_labelColor, Color.BLUE));
+
+        a.recycle();
+
+        setClipToPadding(false);
+        setClipChildren(false);
+        setWillNotDraw(false);
+    }
+
+    void init(ChartAxis axis) {
+        mAxis = Preconditions.checkNotNull(axis, "missing axis");
+    }
+
+    public int getFollowAxis() {
+        return mFollowAxis;
+    }
+
+    public Rect getMargins() {
+        return mMargins;
+    }
+
+    /**
+     * Return the number of pixels that the "target" area is inset from the
+     * {@link View} edge, along the current {@link #setFollowAxis(int)}.
+     */
+    private float getTargetInset() {
+        if (mFollowAxis == VERTICAL) {
+            final float targetHeight = mSweep.getIntrinsicHeight() - mSweepPadding.top
+                    - mSweepPadding.bottom;
+            return mSweepPadding.top + (targetHeight / 2);
+        } else {
+            final float targetWidth = mSweep.getIntrinsicWidth() - mSweepPadding.left
+                    - mSweepPadding.right;
+            return mSweepPadding.left + (targetWidth / 2);
+        }
+    }
+
+    public void addOnSweepListener(OnSweepListener listener) {
+        mListener = listener;
+    }
+
+    private void dispatchOnSweep(boolean sweepDone) {
+        if (mListener != null) {
+            mListener.onSweep(this, sweepDone);
+        }
+    }
+
+    @Override
+    public void setEnabled(boolean enabled) {
+        super.setEnabled(enabled);
+        requestLayout();
+    }
+
+    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;
+            sweep.getPadding(mSweepPadding);
+        } else {
+            mSweep = null;
+        }
+
+        invalidate();
+    }
+
+    public void setFollowAxis(int followAxis) {
+        mFollowAxis = followAxis;
+    }
+
+    public void setLabelSize(int size) {
+        mLabelSize = size;
+        invalidateLabelTemplate();
+    }
+
+    public void setLabelTemplate(int resId) {
+        mLabelTemplateRes = resId;
+        invalidateLabelTemplate();
+    }
+
+    public void setLabelColor(int color) {
+        mLabelColor = color;
+        invalidateLabelTemplate();
+    }
+
+    private void invalidateLabelTemplate() {
+        if (mLabelTemplateRes != 0) {
+            final CharSequence template = getResources().getText(mLabelTemplateRes);
+
+            final TextPaint paint = new TextPaint(Paint.ANTI_ALIAS_FLAG);
+            paint.density = getResources().getDisplayMetrics().density;
+            paint.setCompatibilityScaling(getResources().getCompatibilityInfo().applicationScale);
+            paint.setColor(mLabelColor);
+
+            mLabelTemplate = new SpannableStringBuilder(template);
+            mLabelLayout = new DynamicLayout(
+                    mLabelTemplate, paint, mLabelSize, Alignment.ALIGN_RIGHT, 1f, 0f, false);
+            invalidateLabel();
+
+        } else {
+            mLabelTemplate = null;
+            mLabelLayout = null;
+        }
+
+        invalidate();
+        requestLayout();
+    }
+
+    private void invalidateLabel() {
+        if (mLabelTemplate != null && mAxis != null) {
+            mAxis.buildLabel(getResources(), mLabelTemplate, mValue);
+            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;
+        invalidateLabel();
+    }
+
+    public long getValue() {
+        return mValue;
+    }
+
+    public float getPoint() {
+        if (isEnabled()) {
+            return mAxis.convertToPoint(mValue);
+        } else {
+            // when disabled, show along top edge
+            return 0;
+        }
+    }
+
+    public void setClampAfter(ChartSweepView clampAfter) {
+        mClampAfter = clampAfter;
+    }
+
+    public void setClampBefore(ChartSweepView clampBefore) {
+        mClampBefore = clampBefore;
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        if (!isEnabled()) return false;
+
+        final View parent = (View) getParent();
+        switch (event.getAction()) {
+            case MotionEvent.ACTION_DOWN: {
+
+                // only start tracking when in sweet spot
+                final boolean accept;
+                if (mFollowAxis == VERTICAL) {
+                    accept = event.getX() > getWidth() - (mSweepPadding.right * 2);
+                } else {
+                    accept = event.getY() > getHeight() - (mSweepPadding.bottom * 2);
+                }
+
+                if (accept) {
+                    mTracking = event.copy();
+                    return true;
+                } else {
+                    return false;
+                }
+            }
+            case MotionEvent.ACTION_MOVE: {
+                getParent().requestDisallowInterceptTouchEvent(true);
+
+                // content area of parent
+                final Rect parentContent = new Rect(parent.getPaddingLeft(), parent.getPaddingTop(),
+                        parent.getWidth() - parent.getPaddingRight(),
+                        parent.getHeight() - parent.getPaddingBottom());
+                final Rect clampRect = computeClampRect(parentContent);
+
+                if (mFollowAxis == VERTICAL) {
+                    final float currentTargetY = getTop() - mMargins.top;
+                    final float requestedTargetY = currentTargetY
+                            + (event.getRawY() - mTracking.getRawY());
+                    final float clampedTargetY = MathUtils.constrain(
+                            requestedTargetY, clampRect.top, clampRect.bottom);
+                    setTranslationY(clampedTargetY - currentTargetY);
+
+                    setValue(mAxis.convertToValue(clampedTargetY - parentContent.top));
+                } else {
+                    final float currentTargetX = getLeft() - mMargins.left;
+                    final float requestedTargetX = currentTargetX
+                            + (event.getRawX() - mTracking.getRawX());
+                    final float clampedTargetX = MathUtils.constrain(
+                            requestedTargetX, clampRect.left, clampRect.right);
+                    setTranslationX(clampedTargetX - currentTargetX);
+
+                    setValue(mAxis.convertToValue(clampedTargetX - parentContent.left));
+                }
+
+                dispatchOnSweep(false);
+                return true;
+            }
+            case MotionEvent.ACTION_UP: {
+                mTracking = null;
+                dispatchOnSweep(true);
+                setTranslationX(0);
+                setTranslationY(0);
+                requestLayout();
+                return true;
+            }
+            default: {
+                return false;
+            }
+        }
+    }
+
+    /**
+     * Compute {@link Rect} in {@link #getParent()} coordinates that we should
+     * be clamped inside of, usually from {@link #setClampAfter(ChartSweepView)}
+     * style rules.
+     */
+    private Rect computeClampRect(Rect parentContent) {
+        final Rect clampRect = new Rect(parentContent);
+
+        final ChartSweepView after = mClampAfter;
+        final ChartSweepView before = mClampBefore;
+
+        if (mFollowAxis == VERTICAL) {
+            if (after != null) {
+                clampRect.top += after.getPoint();
+            }
+            if (before != null) {
+                clampRect.bottom -= clampRect.height() - before.getPoint();
+            }
+        } else {
+            if (after != null) {
+                clampRect.left += after.getPoint();
+            }
+            if (before != null) {
+                clampRect.right -= clampRect.width() - before.getPoint();
+            }
+        }
+        return clampRect;
+    }
+
+    @Override
+    protected void drawableStateChanged() {
+        super.drawableStateChanged();
+        if (mSweep.isStateful()) {
+            mSweep.setState(getDrawableState());
+        }
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+
+        // TODO: handle vertical labels
+        if (isEnabled() && mLabelLayout != null) {
+            final int sweepHeight = mSweep.getIntrinsicHeight();
+            final int templateHeight = mLabelLayout.getHeight();
+
+            mSweepOffset.x = 0;
+            mSweepOffset.y = (int) ((templateHeight / 2) - getTargetInset());
+            setMeasuredDimension(mSweep.getIntrinsicWidth(), Math.max(sweepHeight, templateHeight));
+
+        } else {
+            mSweepOffset.x = 0;
+            mSweepOffset.y = 0;
+            setMeasuredDimension(mSweep.getIntrinsicWidth(), mSweep.getIntrinsicHeight());
+        }
+
+        if (mFollowAxis == VERTICAL) {
+            final int targetHeight = mSweep.getIntrinsicHeight() - mSweepPadding.top
+                    - mSweepPadding.bottom;
+            mMargins.top = -(mSweepPadding.top + (targetHeight / 2));
+            mMargins.bottom = 0;
+            mMargins.left = -mSweepPadding.left;
+            mMargins.right = mSweepPadding.right;
+        } else {
+            final int targetWidth = mSweep.getIntrinsicWidth() - mSweepPadding.left
+                    - mSweepPadding.right;
+            mMargins.left = -(mSweepPadding.left + (targetWidth / 2));
+            mMargins.right = 0;
+            mMargins.top = -mSweepPadding.top;
+            mMargins.bottom = mSweepPadding.bottom;
+        }
+
+        mMargins.offset(-mSweepOffset.x, -mSweepOffset.y);
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        final int width = getWidth();
+        final int height = getHeight();
+
+        final int labelSize;
+        if (isEnabled() && mLabelLayout != null) {
+            mLabelLayout.draw(canvas);
+            labelSize = mLabelSize;
+        } else {
+            labelSize = 0;
+        }
+
+        if (mFollowAxis == VERTICAL) {
+            mSweep.setBounds(labelSize, mSweepOffset.y, width,
+                    mSweepOffset.y + mSweep.getIntrinsicHeight());
+        } else {
+            mSweep.setBounds(mSweepOffset.x, labelSize,
+                    mSweepOffset.x + mSweep.getIntrinsicWidth(), 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..a5b8b09
--- /dev/null
+++ b/src/com/android/settings/widget/ChartView.java
@@ -0,0 +1,119 @@
+/*
+ * 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
+
+    private static final int SWEEP_GRAVITY = Gravity.TOP | Gravity.LEFT;
+
+    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();
+
+        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 Rect sweepMargins = sweep.getMargins();
+
+                if (sweep.getFollowAxis() == ChartSweepView.VERTICAL) {
+                    parentRect.top += sweepMargins.top + (int) sweep.getPoint();
+                    parentRect.bottom = parentRect.top;
+                    parentRect.left += sweepMargins.left;
+                    parentRect.right += sweepMargins.right;
+                    Gravity.apply(SWEEP_GRAVITY, parentRect.width(), child.getMeasuredHeight(),
+                            parentRect, childRect);
+
+                } else {
+                    parentRect.left += sweepMargins.left + (int) sweep.getPoint();
+                    parentRect.right = parentRect.left;
+                    parentRect.top += sweepMargins.top;
+                    parentRect.bottom += sweepMargins.bottom;
+                    Gravity.apply(SWEEP_GRAVITY, child.getMeasuredWidth(), parentRect.height(),
+                            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..affede0
--- /dev/null
+++ b/src/com/android/settings/widget/DataUsageChartView.java
@@ -0,0 +1,406 @@
+/*
+ * 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.Resources;
+import android.net.NetworkPolicy;
+import android.net.NetworkStatsHistory;
+import android.text.Spannable;
+import android.text.SpannableStringBuilder;
+import android.text.TextUtils;
+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
+
+    private ChartGridView mGrid;
+    private ChartNetworkSeriesView mSeries;
+    private ChartNetworkSeriesView mDetailSeries;
+
+    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);
+        mDetailSeries = (ChartNetworkSeriesView) findViewById(R.id.detail_series);
+        mDetailSeries.setVisibility(View.GONE);
+
+        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);
+
+        // prevent sweeps from crossing each other
+        mSweepLeft.setClampBefore(mSweepRight);
+        mSweepRight.setClampAfter(mSweepLeft);
+        mSweepLimit.setClampBefore(mSweepWarning);
+        mSweepWarning.setClampAfter(mSweepLimit);
+
+        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);
+        mDetailSeries.init(mHoriz, mVert);
+        mSweepLeft.init(mHoriz);
+        mSweepRight.init(mHoriz);
+        mSweepWarning.init(mVert);
+        mSweepLimit.init(mVert);
+
+        setActivated(false);
+    }
+
+    public void setListener(DataUsageChartListener listener) {
+        mListener = listener;
+    }
+
+    public void bindNetworkStats(NetworkStatsHistory stats) {
+        mSeries.bindNetworkStats(stats);
+        updatePrimaryRange();
+        requestLayout();
+    }
+
+    public void bindDetailNetworkStats(NetworkStatsHistory stats) {
+        mDetailSeries.bindNetworkStats(stats);
+        mDetailSeries.setVisibility(stats != null ? View.VISIBLE : View.GONE);
+        updatePrimaryRange();
+        requestLayout();
+    }
+
+    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 {
+            mSweepLimit.setVisibility(View.VISIBLE);
+            mSweepLimit.setEnabled(false);
+        }
+
+        if (policy.warningBytes != NetworkPolicy.WARNING_DISABLED) {
+            mSweepWarning.setVisibility(View.VISIBLE);
+            mSweepWarning.setValue(policy.warningBytes);
+        } else {
+            mSweepWarning.setVisibility(View.INVISIBLE);
+        }
+
+        requestLayout();
+    }
+
+    private OnSweepListener mSweepListener = new OnSweepListener() {
+        public void onSweep(ChartSweepView sweep, boolean sweepDone) {
+            updatePrimaryRange();
+
+            // 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;
+            }
+        }
+    }
+
+    @Override
+    public boolean onInterceptTouchEvent(MotionEvent ev) {
+        if (!isActivated()) {
+            return true;
+        } else {
+            return super.onInterceptTouchEvent(ev);
+        }
+    }
+
+    public long getInspectStart() {
+        return mSweepLeft.getValue();
+    }
+
+    public long getInspectEnd() {
+        return mSweepRight.getValue();
+    }
+
+    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);
+        updatePrimaryRange();
+
+        requestLayout();
+        mSeries.generatePath();
+        mSeries.invalidate();
+    }
+
+    private void updatePrimaryRange() {
+        final long left = mSweepLeft.getValue();
+        final long right = mSweepRight.getValue();
+
+        // prefer showing primary range on detail series, when available
+        if (mDetailSeries.getVisibility() == View.VISIBLE) {
+            mDetailSeries.setPrimaryRange(left, right);
+            mSeries.setPrimaryRange(0, 0);
+        } else {
+            mSeries.setPrimaryRange(left, right);
+        }
+    }
+
+    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 void buildLabel(Resources res, SpannableStringBuilder builder, long value) {
+            // TODO: convert to better string
+            builder.replace(0, builder.length(), 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 float mSize;
+
+        public DataAxis() {
+            // TODO: adapt ranges to show when history >5GB, and handle 4G
+            // interfaces with higher limits.
+            setBounds(0, 5 * GB_IN_BYTES);
+        }
+
+        /** {@inheritDoc} */
+        public void setBounds(long min, long max) {
+            mMin = min;
+            mMax = max;
+        }
+
+        /** {@inheritDoc} */
+        public void setSize(float size) {
+            mSize = size;
+        }
+
+        /** {@inheritDoc} */
+        public float convertToPoint(long value) {
+            // TODO: this assumes range of [0,5]GB
+            final double fraction = Math.pow(
+                    10, 0.36884343106175160321 * Math.log10(value) + -3.62828151137812282556);
+            return (float) fraction * mSize;
+        }
+
+        /** {@inheritDoc} */
+        public long convertToValue(float point) {
+            final double y = point / mSize;
+            // TODO: this assumes range of [0,5]GB
+            final double fraction = 6.869341163271789302 * Math.pow(10, 9)
+                    * Math.pow(y, 2.71117746931646030774);
+            return (long) fraction;
+        }
+
+        private static final Object sSpanSize = new Object();
+        private static final Object sSpanUnit = new Object();
+
+        /** {@inheritDoc} */
+        public void buildLabel(Resources res, SpannableStringBuilder builder, long value) {
+
+            float result = value;
+            final CharSequence unit;
+            if (result <= 100 * MB_IN_BYTES) {
+                unit = res.getText(com.android.internal.R.string.megabyteShort);
+                result /= MB_IN_BYTES;
+            } else {
+                unit = res.getText(com.android.internal.R.string.gigabyteShort);
+                result /= GB_IN_BYTES;
+            }
+
+            final CharSequence size;
+            if (result < 10) {
+                size = String.format("%.1f", result);
+            } else {
+                size = String.format("%.0f", result);
+            }
+
+            final int[] sizeBounds = findOrCreateSpan(builder, sSpanSize, "^1");
+            builder.replace(sizeBounds[0], sizeBounds[1], size);
+            final int[] unitBounds = findOrCreateSpan(builder, sSpanUnit, "^2");
+            builder.replace(unitBounds[0], unitBounds[1], unit);
+        }
+
+        /** {@inheritDoc} */
+        public float[] getTickPoints() {
+            final float[] tickPoints = new float[16];
+
+            final long jump = ((mMax - mMin) / tickPoints.length);
+            long value = mMin;
+            for (int i = 0; i < tickPoints.length; i++) {
+                tickPoints[i] = convertToPoint(value);
+                value += jump;
+            }
+
+            return tickPoints;
+        }
+    }
+
+    private static int[] findOrCreateSpan(
+            SpannableStringBuilder builder, Object key, CharSequence bootstrap) {
+        int start = builder.getSpanStart(key);
+        int end = builder.getSpanEnd(key);
+        if (start == -1) {
+            start = TextUtils.indexOf(builder, bootstrap);
+            end = start + bootstrap.length();
+            builder.setSpan(key, start, end, Spannable.SPAN_INCLUSIVE_INCLUSIVE);
+        }
+        return new int[] { start, end };
+    }
+
+}
diff --git a/src/com/android/settings/widget/InvertedChartAxis.java b/src/com/android/settings/widget/InvertedChartAxis.java
new file mode 100644
index 0000000..e589da9
--- /dev/null
+++ b/src/com/android/settings/widget/InvertedChartAxis.java
@@ -0,0 +1,67 @@
+/*
+ * 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.res.Resources;
+import android.text.SpannableStringBuilder;
+
+/**
+ * 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 void buildLabel(Resources res, SpannableStringBuilder builder, long value) {
+        mWrapped.buildLabel(res, builder, 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
deleted file mode 100644
index faea9f2..0000000
--- a/src/com/android/settings/wifi/AdvancedSettings.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * 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.
- */
-
-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.ListPreference;
-import android.preference.Preference;
-import android.text.TextUtils;
-import android.widget.Toast;
-import android.util.Log;
-
-public class AdvancedSettings extends SettingsPreferenceFragment
-        implements Preference.OnPreferenceChangeListener {
-
-    private static final String TAG = "AdvancedSettings";
-    private static final String KEY_MAC_ADDRESS = "mac_address";
-    private static final String KEY_CURRENT_IP_ADDRESS = "current_ip_address";
-    private static final String KEY_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/AdvancedWifiSettings.java b/src/com/android/settings/wifi/AdvancedWifiSettings.java
new file mode 100644
index 0000000..6c983fd
--- /dev/null
+++ b/src/com/android/settings/wifi/AdvancedWifiSettings.java
@@ -0,0 +1,174 @@
+/*
+ * 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.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.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 static final String KEY_NOTIFY_OPEN_NETWORKS = "notify_open_networks";
+    private static final String KEY_SLEEP_POLICY = "sleep_policy";
+    private static final String KEY_ENABLE_WIFI_WATCHDOG = "wifi_enable_watchdog_service";
+
+    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() {
+        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());
+
+        CheckBoxPreference watchdogEnabled =
+            (CheckBoxPreference) findPreference(KEY_ENABLE_WIFI_WATCHDOG);
+        watchdogEnabled.setChecked(Secure.getInt(getContentResolver(),
+                Secure.WIFI_WATCHDOG_ON, 1) == 1);
+
+        watchdogEnabled.setEnabled(mWifiManager.isWifiEnabled());
+
+        ListPreference frequencyPref = (ListPreference) findPreference(KEY_FREQUENCY_BAND);
+
+        if (mWifiManager.isDualBandSupported()) {
+            frequencyPref.setOnPreferenceChangeListener(this);
+            int value = mWifiManager.getFrequencyBand();
+            if (value != -1) {
+                frequencyPref.setValue(String.valueOf(value));
+            } else {
+                Log.e(TAG, "Failed to fetch frequency band");
+            }
+        } else {
+            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 if (KEY_ENABLE_WIFI_WATCHDOG.equals(key)) {
+            Secure.putInt(getContentResolver(),
+                    Secure.WIFI_WATCHDOG_ON,
+                    ((CheckBoxPreference) preference).isChecked() ? 1 : 0);
+        } else {
+            return super.onPreferenceTreeClick(screen, preference);
+        }
+        return true;
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        String key = preference.getKey();
+
+        if (KEY_FREQUENCY_BAND.equals(key)) {
+            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;
+            }
+        }
+
+        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;
+    }
+
+    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..74400d4 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,36 @@
 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.TextView;
+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 +80,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 +95,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;
@@ -114,6 +107,9 @@
 
     private WifiDialog mDialog;
 
+    private View mView;
+    private TextView mEmptyView;
+
     /* Used in Wifi Setup context */
 
     // this boolean extra specifies whether to disable the Next button when not connected
@@ -157,11 +153,8 @@
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
-        if (mInXlSetupWizard) {
-            return inflater.inflate(R.layout.custom_preference_list_fragment, container, false);
-        } else {
-            return super.onCreateView(inflater, container, savedInstanceState);
-        }
+        mView = inflater.inflate(R.layout.custom_preference_list_fragment, container, false);
+        return mView;
     }
 
     @Override
@@ -180,60 +173,51 @@
         // 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);
+        }
+
+        mEmptyView = (TextView) mView.findViewById(R.id.empty);
+        getListView().setEmptyView(mEmptyView);
+
+        registerForContextMenu(getListView());
+        setHasOptionsMenu(true);
+
         // After confirming PreferenceScreen is available, we call super.
         super.onActivityCreated(savedInstanceState);
-
     }
 
     @Override
@@ -245,10 +229,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,10 +255,18 @@
     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)
+                    .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+            menu.add(Menu.NONE, MENU_ID_ADD_NETWORK, 0, R.string.wifi_add_network)
+                    //.setIcon(android.R.drawable.ic_menu_add)
+                    .setEnabled(wifiIsEnabled)
+                    .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
             menu.add(Menu.NONE, MENU_ID_ADVANCED, 0, R.string.wifi_menu_advanced)
-                    .setIcon(android.R.drawable.ic_menu_manage);
+                    //.setIcon(android.R.drawable.ic_menu_manage)
+                    .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
         }
         super.onCreateOptionsMenu(menu, inflater);
     }
@@ -286,15 +279,20 @@
                     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(
-                            AdvancedSettings.class.getCanonicalName(),
+                            AdvancedWifiSettings.class.getCanonicalName(),
                             null,
                             R.string.wifi_advanced_titlebar, null,
                             this, 0);
                 } else {
-                    startFragment(this, AdvancedSettings.class.getCanonicalName(), -1, null);
+                    startFragment(this, AdvancedWifiSettings.class.getCanonicalName(), -1, null);
                 }
                 return true;
         }
@@ -363,43 +361,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 +389,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 +402,42 @@
      * the strength of network and the security for it.
      */
     private void updateAccessPoints() {
-        mAccessPoints.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:
+                getPreferenceScreen().removeAll();
+                // 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_ENABLING:
+                getPreferenceScreen().removeAll();
+                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) {
+        if (mEmptyView != null) mEmptyView.setText(messageId);
+        getPreferenceScreen().removeAll();
+    }
+
     private Collection<AccessPoint> constructAccessPoints() {
         Collection<AccessPoint> accessPoints = new ArrayList<AccessPoint>();
 
@@ -542,9 +536,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 +551,23 @@
     }
 
     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 the call to pause() below
+
+            case WifiManager.WIFI_STATE_ENABLING:
+                addMessagePreference(R.string.wifi_starting);
+                break;
+
+            case WifiManager.WIFI_STATE_DISABLED:
+                addMessagePreference(R.string.wifi_empty_list_wifi_off);
+                break;
         }
+
+        mScanner.pause();
     }
 
     private class Scanner extends Handler {
@@ -580,7 +585,6 @@
 
         void pause() {
             mRetry = 0;
-            mAccessPoints.setProgress(false);
             removeMessages(0);
         }
 
@@ -594,7 +598,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 +639,7 @@
                             }
                             break;
                     }
+                    break;
                 //TODO: more connectivity feedback
                 default:
                     //Ignore
@@ -740,7 +744,7 @@
             mScanner.resume();
         }
 
-        mAccessPoints.removeAll();
+        getPreferenceScreen().removeAll();
     }
 
     /**
@@ -753,8 +757,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>